platform/x86: intel_pmc_core: Read base address from LPIT

BugLink: http://bugs.launchpad.net/bugs/1730770
Read SLP_S0 address from ACPI LPIT table when present and use PMC
specific SLP_S0 offset to get the base address of PMC MMIO.

Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
(cherry picked from commit 745698c37c08f48fb5ad3c0cb7ee955bd5701d4a)
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 5c401e17cfb67900dd3a456378f659e4835d148a..bb80aed4c3c119ae72c9d5000d471b9722449706 100644 (file)
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -20,6 +20,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/acpi.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/io.h>
@@ -455,6 +456,7 @@ static int __init pmc_core_probe(void)
 {
        struct pmc_dev *pmcdev = &pmc;
        const struct x86_cpu_id *cpu_id;
+       u64 slp_s0_addr;
        int err;
 
        cpu_id = x86_match_cpu(intel_pmc_core_ids);
@@ -462,7 +464,12 @@ static int __init pmc_core_probe(void)
                return -ENODEV;
 
        pmcdev->map = (struct pmc_reg_map *)cpu_id->driver_data;
-       pmcdev->base_addr = PMC_BASE_ADDR_DEFAULT;
+
+       if (lpit_read_residency_count_address(&slp_s0_addr))
+               pmcdev->base_addr = PMC_BASE_ADDR_DEFAULT;
+       else
+               pmcdev->base_addr = slp_s0_addr - pmcdev->map->slp_s0_offset;
+
        pmcdev->regbase = ioremap(pmcdev->base_addr,
                                  pmcdev->map->regmap_length);
        if (!pmcdev->regbase)