mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
54c5848c21
The Intel SoC DTS uses a hardcoded GSI number, before this commit it was passing it to request_irq as if it were a linux irq number, but there is no 1:1 mapping so in essence it was requesting a random interrupt. Besides this causing the DTS driver to not actually get an interrupt if the thermal thresholds are exceeded this also is causing an interrupt conflict on some devices since the linux irq 86 which is being requested is already in use, leading to oopses like this: genirq: Flags mismatch irq 86. 00002001 (soc_dts) vs. 00000083 (volume_down) CPU: 0 PID: 601 Comm: systemd-udevd Tainted: G C OE 4.17.0-rc6+ #45 Hardware name: Insyde i86/Type2 - Board Product Name, BIOS CHUWI.D86JLBNR03 01/14/2015 Call Trace: dump_stack+0x5c/0x80 __setup_irq.cold.50+0x4e/0xac ? request_threaded_irq+0xad/0x160 request_threaded_irq+0xf5/0x160 ? 0xffffffffc0a93000 intel_soc_thermal_init+0x74/0x1000 [intel_soc_dts_thermal] This commit makes the intel_soc_dts_thermal.c code call acpi_register_gsi() to translate the hardcoded IO-APIC GSI number (86) to a linux irq, so that the dts code uses the right interrupt and we no longer get an oops about an irq conflict. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
132 lines
3.5 KiB
C
132 lines
3.5 KiB
C
/*
|
|
* intel_soc_dts_thermal.c
|
|
* Copyright (c) 2014, Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
*/
|
|
|
|
#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_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1, 0,
|
|
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, 2, 1);
|
|
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);
|
|
}
|
|
}
|
|
|
|
err = intel_soc_dts_iosf_add_read_only_critical_trip(soc_dts,
|
|
crit_offset);
|
|
if (err)
|
|
goto error_trips;
|
|
|
|
return 0;
|
|
|
|
error_trips:
|
|
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);
|
|
|
|
return err;
|
|
}
|
|
|
|
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");
|