| Message ID | 20240619044424.481239-1-srinivas.pandruvada@linux.intel.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | thermal: int340x: processor_thermal: Support shared interrupts | expand |
On Wed, Jun 19, 2024 at 6:44 AM Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> wrote: > > On some systems the processor thermal device interrupt is shared with > other PCI devices. In this case return IRQ_NONE from the interrupt > handler when the interrupt is not for the processor thermal device. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Fixes: f0658708e863 ("thermal: int340x: processor_thermal: Use non MSI interrupts by default") > Cc: <stable@vger.kernel.org> # v6.7+ > --- > This was only observed on a non production system. So not urgent. > > .../intel/int340x_thermal/processor_thermal_device_pci.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c > index 14e34eabc419..4a1bfebb1b8e 100644 > --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c > +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c > @@ -150,7 +150,7 @@ static irqreturn_t proc_thermal_irq_handler(int irq, void *devid) > { > struct proc_thermal_pci *pci_info = devid; > struct proc_thermal_device *proc_priv; > - int ret = IRQ_HANDLED; > + int ret = IRQ_NONE; > u32 status; > > proc_priv = pci_info->proc_priv; > @@ -175,6 +175,7 @@ static irqreturn_t proc_thermal_irq_handler(int irq, void *devid) > /* Disable enable interrupt flag */ > proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0); > pkg_thermal_schedule_work(&pci_info->work); > + ret = IRQ_HANDLED; > } > > pci_write_config_byte(pci_info->pdev, 0xdc, 0x01); > -- Applied as 6.10-rc material, thanks!
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c index 14e34eabc419..4a1bfebb1b8e 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c @@ -150,7 +150,7 @@ static irqreturn_t proc_thermal_irq_handler(int irq, void *devid) { struct proc_thermal_pci *pci_info = devid; struct proc_thermal_device *proc_priv; - int ret = IRQ_HANDLED; + int ret = IRQ_NONE; u32 status; proc_priv = pci_info->proc_priv; @@ -175,6 +175,7 @@ static irqreturn_t proc_thermal_irq_handler(int irq, void *devid) /* Disable enable interrupt flag */ proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0); pkg_thermal_schedule_work(&pci_info->work); + ret = IRQ_HANDLED; } pci_write_config_byte(pci_info->pdev, 0xdc, 0x01);
On some systems the processor thermal device interrupt is shared with other PCI devices. In this case return IRQ_NONE from the interrupt handler when the interrupt is not for the processor thermal device. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Fixes: f0658708e863 ("thermal: int340x: processor_thermal: Use non MSI interrupts by default") Cc: <stable@vger.kernel.org> # v6.7+ --- This was only observed on a non production system. So not urgent. .../intel/int340x_thermal/processor_thermal_device_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)