mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
02a49aacef
Critical trip points appear in the DTS thermal zones only after those thermal zones have been registered via intel_soc_dts_iosf_init(). Moreover, they are "created" by changing the type of an existing trip point from THERMAL_TRIP_PASSIVE to THERMAL_TRIP_CRITICAL via intel_soc_dts_iosf_add_read_only_critical_trip(), the caller of which has to be careful enough to pass at least 1 as the number of read-only trip points to intel_soc_dts_iosf_init() beforehand. This is questionable, because user space may have started to use the trips at the time when intel_soc_dts_iosf_add_read_only_critical_trip() runs and there is no synchronization between it and sys_set_trip_temp(). To address it, use the observation that nonzero number of read-only trip points is only passed to intel_soc_dts_iosf_init() when critical trip points are going to be used, so in fact that function may get all of the information regarding the critical trip points upfront and it can configure them before registering the corresponding thermal zones. Accordingly, replace the read_only_trip_count argument of intel_soc_dts_iosf_init() with a pair of new arguments related to critical trip points: a bool one indicating whether or not critical trip points are to be used at all and an int one representing the critical trip point temperature offset relative to Tj_max. Use these arguments to configure the critical trip points before the registration of the thermal zones and to compute the number of writeable trip points in add_dts_thermal_zone(). Modify both callers of intel_soc_dts_iosf_init() to take these changes into account and drop the intel_soc_dts_iosf_add_read_only_critical_trip() call, that is not necessary any more, from intel_soc_thermal_init(), which also allows it to return success right after requesting the IRQ. Finally, drop intel_soc_dts_iosf_add_read_only_critical_trip() altogether, because it does not have any more users. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
109 lines
2.8 KiB
C
109 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* intel_soc_dts_thermal.c
|
|
* Copyright (c) 2014, Intel Corporation.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/module.h>
|
|
#include <linux/interrupt.h>
|
|
#include <asm/cpu_device_id.h>
|
|
#include <asm/intel-family.h>
|
|
#include "intel_soc_dts_iosf.h"
|
|
|
|
#define CRITICAL_OFFSET_FROM_TJ_MAX 5000
|
|
|
|
static int crit_offset = CRITICAL_OFFSET_FROM_TJ_MAX;
|
|
module_param(crit_offset, int, 0644);
|
|
MODULE_PARM_DESC(crit_offset,
|
|
"Critical Temperature offset from tj max in millidegree Celsius.");
|
|
|
|
/* IRQ 86 is a fixed APIC interrupt for BYT DTS Aux threshold notifications */
|
|
#define BYT_SOC_DTS_APIC_IRQ 86
|
|
|
|
static int soc_dts_thres_gsi;
|
|
static int soc_dts_thres_irq;
|
|
static struct intel_soc_dts_sensors *soc_dts;
|
|
|
|
static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data)
|
|
{
|
|
pr_debug("proc_thermal_interrupt\n");
|
|
intel_soc_dts_iosf_interrupt_handler(soc_dts);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static const struct x86_cpu_id soc_thermal_ids[] = {
|
|
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ),
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids);
|
|
|
|
static int __init intel_soc_thermal_init(void)
|
|
{
|
|
int err = 0;
|
|
const struct x86_cpu_id *match_cpu;
|
|
|
|
match_cpu = x86_match_cpu(soc_thermal_ids);
|
|
if (!match_cpu)
|
|
return -ENODEV;
|
|
|
|
/* Create a zone with 2 trips with marked as read only */
|
|
soc_dts = intel_soc_dts_iosf_init(INTEL_SOC_DTS_INTERRUPT_APIC, true,
|
|
crit_offset);
|
|
if (IS_ERR(soc_dts)) {
|
|
err = PTR_ERR(soc_dts);
|
|
return err;
|
|
}
|
|
|
|
soc_dts_thres_gsi = (int)match_cpu->driver_data;
|
|
if (soc_dts_thres_gsi) {
|
|
/*
|
|
* Note the flags here MUST match the firmware defaults, rather
|
|
* then the request_irq flags, otherwise we get an EBUSY error.
|
|
*/
|
|
soc_dts_thres_irq = acpi_register_gsi(NULL, soc_dts_thres_gsi,
|
|
ACPI_LEVEL_SENSITIVE,
|
|
ACPI_ACTIVE_LOW);
|
|
if (soc_dts_thres_irq < 0) {
|
|
pr_warn("intel_soc_dts: Could not get IRQ for GSI %d, err %d\n",
|
|
soc_dts_thres_gsi, soc_dts_thres_irq);
|
|
soc_dts_thres_irq = 0;
|
|
}
|
|
}
|
|
|
|
if (soc_dts_thres_irq) {
|
|
err = request_threaded_irq(soc_dts_thres_irq, NULL,
|
|
soc_irq_thread_fn,
|
|
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
|
|
"soc_dts", soc_dts);
|
|
if (err) {
|
|
/*
|
|
* Do not just error out because the user space thermal
|
|
* daemon such as DPTF may use polling instead of being
|
|
* interrupt driven.
|
|
*/
|
|
pr_warn("request_threaded_irq ret %d\n", err);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void __exit intel_soc_thermal_exit(void)
|
|
{
|
|
if (soc_dts_thres_irq) {
|
|
free_irq(soc_dts_thres_irq, soc_dts);
|
|
acpi_unregister_gsi(soc_dts_thres_gsi);
|
|
}
|
|
intel_soc_dts_iosf_exit(soc_dts);
|
|
}
|
|
|
|
module_init(intel_soc_thermal_init)
|
|
module_exit(intel_soc_thermal_exit)
|
|
|
|
MODULE_DESCRIPTION("Intel SoC DTS Thermal Driver");
|
|
MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
|
|
MODULE_LICENSE("GPL v2");
|