From 4e7912217bd3ffdf02a72db357f61132620e38b7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 May 2019 10:44:37 +0200 Subject: [PATCH] 4.19-stable patches added patches: platform-x86-intel_pmc_core-fix-pch-ip-name.patch platform-x86-intel_pmc_core-handle-cfl-regmap-properly.patch --- ...m-x86-intel_pmc_core-fix-pch-ip-name.patch | 35 +++++++++++++++++ ..._pmc_core-handle-cfl-regmap-properly.patch | 38 +++++++++++++++++++ queue-4.19/series | 2 + 3 files changed, 75 insertions(+) create mode 100644 queue-4.19/platform-x86-intel_pmc_core-fix-pch-ip-name.patch create mode 100644 queue-4.19/platform-x86-intel_pmc_core-handle-cfl-regmap-properly.patch diff --git a/queue-4.19/platform-x86-intel_pmc_core-fix-pch-ip-name.patch b/queue-4.19/platform-x86-intel_pmc_core-fix-pch-ip-name.patch new file mode 100644 index 00000000000..45ad9ce9857 --- /dev/null +++ b/queue-4.19/platform-x86-intel_pmc_core-fix-pch-ip-name.patch @@ -0,0 +1,35 @@ +From d6827015e671cd17871c9b7a0fabe06c044f7470 Mon Sep 17 00:00:00 2001 +From: Rajneesh Bhardwaj +Date: Fri, 1 Feb 2019 13:02:27 +0530 +Subject: platform/x86: intel_pmc_core: Fix PCH IP name + +From: Rajneesh Bhardwaj + +commit d6827015e671cd17871c9b7a0fabe06c044f7470 upstream. + +For Cannonlake and Icelake, the IP name for Res_6 should be SPF i.e. +South Port F. No functional change is intended other than just renaming +the IP appropriately. + +Cc: "David E. Box" +Cc: Srinivas Pandruvada +Fixes: 291101f6a735 ("platform/x86: intel_pmc_core: Add CannonLake PCH support") +Signed-off-by: Rajneesh Bhardwaj +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -185,7 +185,7 @@ static const struct pmc_bit_map cnp_pfea + {"CNVI", BIT(3)}, + {"UFS0", BIT(4)}, + {"EMMC", BIT(5)}, +- {"Res_6", BIT(6)}, ++ {"SPF", BIT(6)}, + {"SBR6", BIT(7)}, + + {"SBR7", BIT(0)}, diff --git a/queue-4.19/platform-x86-intel_pmc_core-handle-cfl-regmap-properly.patch b/queue-4.19/platform-x86-intel_pmc_core-handle-cfl-regmap-properly.patch new file mode 100644 index 00000000000..d3257e78bdd --- /dev/null +++ b/queue-4.19/platform-x86-intel_pmc_core-handle-cfl-regmap-properly.patch @@ -0,0 +1,38 @@ +From e50af8332785355de3cb40d9f5e8c45dbfc86f53 Mon Sep 17 00:00:00 2001 +From: Rajneesh Bhardwaj +Date: Fri, 1 Feb 2019 13:02:25 +0530 +Subject: platform/x86: intel_pmc_core: Handle CFL regmap properly + +From: Rajneesh Bhardwaj + +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" +Cc: Srinivas Pandruvada +Fixes: 661405bd817b ("platform/x86: intel_pmc_core: Special case for Coffeelake") +Acked-by: "David E. Box" +Signed-off-by: Rajneesh Bhardwaj +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -682,7 +682,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)) diff --git a/queue-4.19/series b/queue-4.19/series index 34260a778cc..1ebf855e247 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -78,3 +78,5 @@ scsi-rdma-srpt-fix-a-credit-leak-for-aborted-commands.patch asoc-intel-bytcr_rt5651-revert-fix-dmic-map-headsetmic-mapping.patch asoc-wm_adsp-correct-handling-of-compressed-streams-that-restart.patch asoc-stm32-fix-sai-driver-name-initialisation.patch +platform-x86-intel_pmc_core-fix-pch-ip-name.patch +platform-x86-intel_pmc_core-handle-cfl-regmap-properly.patch -- 2.47.2