thermal: int340x: Handle workload hint interrupts

On thermal device interrupt, if the interrupt is generated for passing
workload hint, call the callback to pass notification to the user
space.

First call proc_thermal_check_wt_intr() to check interrupt, if this
callback returns true, wake the IRQ thread to call
proc_thermal_wt_intr_callback() to notify user space.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
[ rjw: Subject adjustment, changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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 eed59630fe59a3b2ffdc6f009e6fccc2392802f1..7253277e476ad3a029ef8005a715ba1f911f9b63 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
@@ -122,20 +122,43 @@ static void pkg_thermal_schedule_work(struct delayed_work *work)
        schedule_delayed_work(work, ms);
 }
 
+static irqreturn_t proc_thermal_irq_thread_handler(int irq, void *devid)
+{
+       struct proc_thermal_pci *pci_info = devid;
+
+       proc_thermal_wt_intr_callback(pci_info->pdev, pci_info->proc_priv);
+
+       return IRQ_HANDLED;
+}
+
 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;
        u32 status;
 
-       proc_thermal_mmio_read(pci_info, PROC_THERMAL_MMIO_INT_STATUS_0, &status);
+       proc_priv = pci_info->proc_priv;
 
-       /* Disable enable interrupt flag */
-       proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0);
-       pci_write_config_byte(pci_info->pdev, 0xdc, 0x01);
+       if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_WT_HINT) {
+               if (proc_thermal_check_wt_intr(pci_info->proc_priv))
+                       ret = IRQ_WAKE_THREAD;
+       }
 
-       pkg_thermal_schedule_work(&pci_info->work);
+       /*
+        * Since now there are two sources of interrupts: one from thermal threshold
+        * and another from workload hint, add a check if there was really a threshold
+        * interrupt before scheduling work function for thermal threshold.
+        */
+       proc_thermal_mmio_read(pci_info, PROC_THERMAL_MMIO_INT_STATUS_0, &status);
+       if (status) {
+               /* Disable enable interrupt flag */
+               proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0);
+               pci_write_config_byte(pci_info->pdev, 0xdc, 0x01);
+               pkg_thermal_schedule_work(&pci_info->work);
+       }
 
-       return IRQ_HANDLED;
+       return ret;
 }
 
 static int sys_get_curr_temp(struct thermal_zone_device *tzd, int *temp)
@@ -270,7 +293,7 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
        }
 
        ret = devm_request_threaded_irq(&pdev->dev, irq,
-                                       proc_thermal_irq_handler, NULL,
+                                       proc_thermal_irq_handler, proc_thermal_irq_thread_handler,
                                        irq_flag, KBUILD_MODNAME, pci_info);
        if (ret) {
                dev_err(&pdev->dev, "Request IRQ %d failed\n", pdev->irq);
@@ -384,6 +407,8 @@ static struct pci_driver proc_thermal_pci_driver = {
 
 module_pci_driver(proc_thermal_pci_driver);
 
+MODULE_IMPORT_NS(INT340X_THERMAL);
+
 MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
 MODULE_DESCRIPTION("Processor Thermal Reporting Device Driver");
 MODULE_LICENSE("GPL v2");