|
@@ -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)
|