* [PATCH v1 0/2] platform/x86: intel_pmc_core: Add Comet Lake
@ 2019-11-18 19:05 Gayatri Kammela
2019-11-18 19:05 ` [PATCH v1 1/2] platform/x86: intel_pmc_core: Fix the SoC naming inconsistency Gayatri Kammela
2019-11-18 19:05 ` [PATCH v1 2/2] platform/x86: intel_pmc_core: Add Comet Lake (CML) platform support to intel_pmc_core driver Gayatri Kammela
0 siblings, 2 replies; 3+ messages in thread
From: Gayatri Kammela @ 2019-11-18 19:05 UTC (permalink / raw)
To: platform-driver-x86
Cc: vishwanath.somayaji, dvhart, linux-kernel, charles.d.prestopine,
Gayatri Kammela, Mario Limonciello, Peter Zijlstra,
Srinivas Pandruvada, Andy Shevchenko, Kan Liang, David E . Box,
Rajneesh Bhardwaj, Tony Luck
Hi,
Patch 1: Fix SoC naming inconsistency
Patch 2: Add Comet Lake legacy support to pmc_core
Gayatri Kammela (2):
platform/x86: intel_pmc_core: Fix the SoC naming inconsistency
platform/x86: intel_pmc_core: Add Comet Lake (CML) platform support to
intel_pmc_core driver
drivers/platform/x86/intel_pmc_core.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
Cc: Mario Limonciello <mario.limonciello@dell.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: David E. Box <david.e.box@intel.com>
Cc: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v1 1/2] platform/x86: intel_pmc_core: Fix the SoC naming inconsistency
2019-11-18 19:05 [PATCH v1 0/2] platform/x86: intel_pmc_core: Add Comet Lake Gayatri Kammela
@ 2019-11-18 19:05 ` Gayatri Kammela
2019-11-18 19:05 ` [PATCH v1 2/2] platform/x86: intel_pmc_core: Add Comet Lake (CML) platform support to intel_pmc_core driver Gayatri Kammela
1 sibling, 0 replies; 3+ messages in thread
From: Gayatri Kammela @ 2019-11-18 19:05 UTC (permalink / raw)
To: platform-driver-x86
Cc: vishwanath.somayaji, dvhart, linux-kernel, charles.d.prestopine,
Gayatri Kammela, Mario Limonciello, Peter Zijlstra,
Srinivas Pandruvada, Andy Shevchenko, Kan Liang, David E . Box,
Rajneesh Bhardwaj, Tony Luck
Intel's SoCs follow a naming convention which spells out the SoC name as
two words instead of one word (E.g: Cannon Lake vs Cannonlake). Thus fix
the naming inconsistency across the intel_pmc_core driver, so future
SoCs can follow the naming consistency as below.
Cometlake -> Comet Lake
Tigerlake -> Tiger Lake
Elkhartlake -> Elkhart Lake
Cc: Mario Limonciello <mario.limonciello@dell.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: David E. Box <david.e.box@intel.com>
Cc: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
---
drivers/platform/x86/intel_pmc_core.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 94a008efb09b..6b6edc30f835 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -158,7 +158,7 @@ static const struct pmc_reg_map spt_reg_map = {
.pm_vric1_offset = SPT_PMC_VRIC1_OFFSET,
};
-/* Cannonlake: PGD PFET Enable Ack Status Register(s) bitmap */
+/* Cannon Lake: PGD PFET Enable Ack Status Register(s) bitmap */
static const struct pmc_bit_map cnp_pfear_map[] = {
{"PMC", BIT(0)},
{"OPI-DMI", BIT(1)},
@@ -185,7 +185,7 @@ static const struct pmc_bit_map cnp_pfear_map[] = {
{"SDX", BIT(4)},
{"SPE", BIT(5)},
{"Fuse", BIT(6)},
- /* Reserved for Cannonlake but valid for Icelake */
+ /* Reserved for Cannon Lake but valid for Ice Lake */
{"SBR8", BIT(7)},
{"CSME_FSC", BIT(0)},
@@ -229,12 +229,12 @@ static const struct pmc_bit_map cnp_pfear_map[] = {
{"HDA_PGD4", BIT(2)},
{"HDA_PGD5", BIT(3)},
{"HDA_PGD6", BIT(4)},
- /* Reserved for Cannonlake but valid for Icelake */
+ /* Reserved for Cannon Lake but valid for Ice Lake */
{"PSF6", BIT(5)},
{"PSF7", BIT(6)},
{"PSF8", BIT(7)},
- /* Icelake generation onwards only */
+ /* Ice Lake generation onwards only */
{"RES_65", BIT(0)},
{"RES_66", BIT(1)},
{"RES_67", BIT(2)},
@@ -324,7 +324,7 @@ static const struct pmc_bit_map cnp_ltr_show_map[] = {
{"ISH", CNP_PMC_LTR_ISH},
{"UFSX2", CNP_PMC_LTR_UFSX2},
{"EMMC", CNP_PMC_LTR_EMMC},
- /* Reserved for Cannonlake but valid for Icelake */
+ /* Reserved for Cannon Lake but valid for Ice Lake */
{"WIGIG", ICL_PMC_LTR_WIGIG},
/* Below two cannot be used for LTR_IGNORE */
{"CURRENT_PLATFORM", CNP_PMC_LTR_CUR_PLT},
@@ -871,8 +871,8 @@ static int pmc_core_probe(struct platform_device *pdev)
pmcdev->map = (struct pmc_reg_map *)cpu_id->driver_data;
/*
- * Coffeelake has CPU ID of Kabylake and Cannonlake PCH. So here
- * Sunrisepoint PCH regmap can't be used. Use Cannonlake PCH regmap
+ * Coffee Lake has CPU ID of Kaby Lake and Cannon Lake PCH. So here
+ * Sunrisepoint PCH regmap can't be used. Use Cannon Lake PCH regmap
* in this case.
*/
if (pmcdev->map == &spt_reg_map && !pci_dev_present(pmc_pci_ids))
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v1 2/2] platform/x86: intel_pmc_core: Add Comet Lake (CML) platform support to intel_pmc_core driver
2019-11-18 19:05 [PATCH v1 0/2] platform/x86: intel_pmc_core: Add Comet Lake Gayatri Kammela
2019-11-18 19:05 ` [PATCH v1 1/2] platform/x86: intel_pmc_core: Fix the SoC naming inconsistency Gayatri Kammela
@ 2019-11-18 19:05 ` Gayatri Kammela
1 sibling, 0 replies; 3+ messages in thread
From: Gayatri Kammela @ 2019-11-18 19:05 UTC (permalink / raw)
To: platform-driver-x86
Cc: vishwanath.somayaji, dvhart, linux-kernel, charles.d.prestopine,
Gayatri Kammela, Mario Limonciello, Peter Zijlstra,
Srinivas Pandruvada, Andy Shevchenko, Kan Liang, David E . Box,
Rajneesh Bhardwaj, Tony Luck
Add Comet Lake to the list of the platforms that intel_pmc_core driver
supports for pmc_core device.
Just like Ice Lake, Comet Lake can also reuse all the Cannon Lake PCH
IPs. No additional effort is needed to enable but to simply reuse them.
Cc: Mario Limonciello <mario.limonciello@dell.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: David E. Box <david.e.box@intel.com>
Cc: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
---
drivers/platform/x86/intel_pmc_core.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 6b6edc30f835..571b4754477c 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -160,6 +160,7 @@ static const struct pmc_reg_map spt_reg_map = {
/* Cannon Lake: PGD PFET Enable Ack Status Register(s) bitmap */
static const struct pmc_bit_map cnp_pfear_map[] = {
+ /* Reserved for Cannon Lake but valid for Comet Lake */
{"PMC", BIT(0)},
{"OPI-DMI", BIT(1)},
{"SPI/eSPI", BIT(2)},
@@ -185,7 +186,7 @@ static const struct pmc_bit_map cnp_pfear_map[] = {
{"SDX", BIT(4)},
{"SPE", BIT(5)},
{"Fuse", BIT(6)},
- /* Reserved for Cannon Lake but valid for Ice Lake */
+ /* Reserved for Cannon Lake but valid for Ice Lake and Comet Lake */
{"SBR8", BIT(7)},
{"CSME_FSC", BIT(0)},
@@ -229,7 +230,7 @@ static const struct pmc_bit_map cnp_pfear_map[] = {
{"HDA_PGD4", BIT(2)},
{"HDA_PGD5", BIT(3)},
{"HDA_PGD6", BIT(4)},
- /* Reserved for Cannon Lake but valid for Ice Lake */
+ /* Reserved for Cannon Lake but valid for Ice Lake and Comet Lake */
{"PSF6", BIT(5)},
{"PSF7", BIT(6)},
{"PSF8", BIT(7)},
@@ -813,6 +814,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {
INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),
+ INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map),
+ INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map),
{}
};
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-18 19:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18 19:05 [PATCH v1 0/2] platform/x86: intel_pmc_core: Add Comet Lake Gayatri Kammela
2019-11-18 19:05 ` [PATCH v1 1/2] platform/x86: intel_pmc_core: Fix the SoC naming inconsistency Gayatri Kammela
2019-11-18 19:05 ` [PATCH v1 2/2] platform/x86: intel_pmc_core: Add Comet Lake (CML) platform support to intel_pmc_core driver Gayatri Kammela
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).