| From e50af8332785355de3cb40d9f5e8c45dbfc86f53 Mon Sep 17 00:00:00 2001 |
| From: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com> |
| Date: Fri, 1 Feb 2019 13:02:25 +0530 |
| Subject: platform/x86: intel_pmc_core: Handle CFL regmap properly |
| |
| From: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com> |
| |
| commit e50af8332785355de3cb40d9f5e8c45dbfc86f53 upstream. |
| |
| Only Coffeelake should use Cannonlake regmap other than Cannonlake |
| platform. This allows Coffeelake special handling only when there is no |
| matching PCI device and default reg map selected as per CPUID is for |
| Sunrisepoint PCH. This change is needed to enable support for newer SoCs |
| such as Icelake. |
| |
| Cc: "David E. Box" <david.e.box@intel.com> |
| Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
| Fixes: 661405bd817b ("platform/x86: intel_pmc_core: Special case for Coffeelake") |
| Acked-by: "David E. Box" <david.e.box@linux.intel.com> |
| Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com> |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/platform/x86/intel_pmc_core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/platform/x86/intel_pmc_core.c |
| +++ b/drivers/platform/x86/intel_pmc_core.c |
| @@ -802,7 +802,7 @@ static int __init pmc_core_probe(void) |
| * Sunrisepoint PCH regmap can't be used. Use Cannonlake PCH regmap |
| * in this case. |
| */ |
| - if (!pci_dev_present(pmc_pci_ids)) |
| + if (pmcdev->map == &spt_reg_map && !pci_dev_present(pmc_pci_ids)) |
| pmcdev->map = &cnp_reg_map; |
| |
| if (lpit_read_residency_count_address(&slp_s0_addr)) |