platform/x86: intel_pmc_core: Add Tiger Lake and
v4 cover platform/x86: intel_pmc_core: Add Tiger Lake and
Hi,
Patch 1: Cleans up termination lines
Patch 2: Refactor driver for ease of adding new SoCs Patch 3: Add debugfs entry for PCH IPs only if platform supports Patch 4: Add Tiger Lake legacy support to pmc_core Patch 5: Add Elkhart Lake legacy support to pmc_core
All the information regarding the PCH IPs and names of IPs will be available in Intel's Platform Controller Hub (PCH) External Design Specification (EDS) document expected to be released in 2020 before product launch.
Changes since v1:
1) Added a patch that fixes the naming inconsistency.
2) Fixed the prefix of all the patches.
Changes since v2:
1) Add Comet Lake legacy support to pmc_core up on Dell's request.
Changes since v3:
1) Removed both "SoC naming inconsistency" patch and "Add Comet Lake legacy support to pmc_core" patch from this series and sent them as a series which was made upstream.
2) Updated LTR IGNORE Max offset for Tiger Lake and Elkhart Lake by defining a macro as they are platform specific.
Gayatri Kammela (5):
platform/x86: intel_pmc_core: Clean up: Remove comma after the
termination line
platform/x86: intel_pmc_core: Create platform dependent pmc bitmap
structs
platform/x86: intel_pmc_core: Make debugfs entry for
pch_ip_power_gating_status conditional
platform/x86: intel_pmc_core: Add Tiger Lake (TGL) platform support to
intel_pmc_core driver
platform/x86: intel_pmc_core: Add Atom based Elkhart Lake (EHL)
platform support to intel_pmc_core driver
drivers/platform/x86/intel_pmc_core.c | 108 +++++++++++++++++++++----- drivers/platform/x86/intel_pmc_core.h | 4 +- 2 files changed, 90 insertions(+), 22 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/5 platform/x86: intel_pmc_core: Clean up: Remove comma after the termination line
It is common practice to place a comma after the last entry in an initialized array to avoid the need to add one in future patches that extend the array. But when the last element is a termination marker, the comma could be harmful. Any new entries must be added before the terminator (and the comma would prevent the compiler from issuing a warning about an entry after the terminator).
--- drivers/platform/x86/intel_pmc_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/platform/x86/intel_pmc_core.c +5 -5
@@ -49,7 +49,7 @@ static const struct pmc_bit_map spt_pll_map[] = { {"GEN2 USB2PCIE2 PLL", SPT_PMC_BIT_MPHY_CMN_LANE1}, {"DMIPCIE3 PLL", SPT_PMC_BIT_MPHY_CMN_LANE2}, {"SATA PLL", SPT_PMC_BIT_MPHY_CMN_LANE3}, - {}, + {} }; static const struct pmc_bit_map spt_mphy_map[] = {
@@ -69,7 +69,7 @@ static const struct pmc_bit_map spt_mphy_map[] = { {"MPHY CORE LANE 13", SPT_PMC_BIT_MPHY_LANE13}, {"MPHY CORE LANE 14", SPT_PMC_BIT_MPHY_LANE14}, {"MPHY CORE LANE 15", SPT_PMC_BIT_MPHY_LANE15}, - {}, + {} }; static const struct pmc_bit_map spt_pfear_map[] = {
@@ -113,7 +113,7 @@ static const struct pmc_bit_map spt_pfear_map[] = { {"CSME_SMS1", SPT_PMC_BIT_CSME_SMS1}, {"CSME_RTC", SPT_PMC_BIT_CSME_RTC}, {"CSME_PSF", SPT_PMC_BIT_CSME_PSF}, - {}, + {} }; static const struct pmc_bit_map spt_ltr_show_map[] = {
@@ -300,7 +300,7 @@ static const struct pmc_bit_map *cnp_slps0_dbg_maps[] = { cnp_slps0_dbg0_map, cnp_slps0_dbg1_map, cnp_slps0_dbg2_map, - NULL, +NULL }; static const struct pmc_bit_map cnp_ltr_show_map[] = {
@@ -823,7 +823,7 @@ MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_ids);static const struct pci_device_id pmc_pci_ids[] = { {PCI_VDEVICE (INTEL ,SPT_PMC_PCI_DEVICE_ID ),0 }, - {0 , }, + {0 , } };/*
Signature · 1 line
2.17.1
PATCH v4 2/5 platform/x86: intel_pmc_core: Create platform dependent pmc bitmap structs
In reply to Gayatri KammelaThe current implementation of pmc_core driver allows to reuse, but does not reflect the exact number and names of IPs for a newer platform which does not necessarily support all the IPs in the entries. The names and number of these IPs might differ from its previous platforms. The number of PCH IPs per platform is calculated based on PPFEAR_NUM_ENTRIES defined, where each entry represents a bucket (8 bits). The platform can support 'n' entries, but not necessarily all 'n*8' IPs.
Create platform dependent bitmap structures to specify the exact number, names of IPs while reusing the existing IPs.
The changes in this patch are preparatory to accommodate future SoCs that might reuse the CNL/ICL PCH IPs, and to reflect the exact number of IPs with its names.
--- drivers/platform/x86/intel_pmc_core.c | 46 ++++++++++++++++++++------- drivers/platform/x86/intel_pmc_core.h | 2 +- 2 files changed, 35 insertions(+), 13 deletions(-)
drivers/platform/x86/intel_pmc_core.c +34 -12
@@ -116,6 +116,11 @@ static const struct pmc_bit_map spt_pfear_map[] = { {} }; +static const struct pmc_bit_map *ext_spt_pfear_map[] = { + spt_pfear_map, +NULL +}; +static const struct pmc_bit_map spt_ltr_show_map[] = { {"SOUTHPORT_A" ,SPT_PMC_LTR_SPA }, {"SOUTHPORT_B" ,SPT_PMC_LTR_SPB },
@@ -142,7 +147,7 @@ static const struct pmc_bit_map spt_ltr_show_map[] = { };static const struct pmc_reg_map spt_reg_map = { - .pfear_sts = spt_pfear_map, + .pfear_sts = ext_spt_pfear_map, .mphy_sts = spt_mphy_map, .pll_sts = spt_pll_map, .ltr_show_sts = spt_ltr_show_map,
@@ -234,7 +239,15 @@ static const struct pmc_bit_map cnp_pfear_map[] = { {"PSF6", BIT(5)}, {"PSF7", BIT(6)}, {"PSF8", BIT(7)}, + {} +}; + +static const struct pmc_bit_map *ext_cnp_pfear_map[] = { + cnp_pfear_map, +NULL +}; +static const struct pmc_bit_map icl_pfear_map[] = {/* Ice Lake generation onwards only */ {"RES_65" ,BIT (0 )}, {"RES_66", BIT(1)},
@@ -247,6 +260,12 @@ static const struct pmc_bit_map cnp_pfear_map[] = { {} }; +static const struct pmc_bit_map *ext_icl_pfear_map[] = { + cnp_pfear_map, + icl_pfear_map, +NULL +}; +static const struct pmc_bit_map cnp_slps0_dbg0_map[] = { {"AUDIO_D3" ,BIT (0 )}, {"OTG_D3" ,BIT (1 )},
@@ -334,7 +353,7 @@ static const struct pmc_bit_map cnp_ltr_show_map[] = { };static const struct pmc_reg_map cnp_reg_map = { - .pfear_sts = cnp_pfear_map, + .pfear_sts = ext_cnp_pfear_map, .slp_s0_offset =CNP_PMC_SLP_S0_RES_COUNTER_OFFSET , .slps0_dbg_maps = cnp_slps0_dbg_maps, .ltr_show_sts = cnp_ltr_show_map,
@@ -350,7 +369,7 @@ static const struct pmc_reg_map cnp_reg_map = { };static const struct pmc_reg_map icl_reg_map = { - .pfear_sts = cnp_pfear_map, + .pfear_sts = ext_icl_pfear_map, .slp_s0_offset =CNP_PMC_SLP_S0_RES_COUNTER_OFFSET , .slps0_dbg_maps = cnp_slps0_dbg_maps, .ltr_show_sts = cnp_ltr_show_map,
@@ -412,20 +431,20 @@ static int pmc_core_check_read_lock_bit(void)#if IS_ENABLED (CONFIG_DEBUG_FS )static bool slps0_dbg_latch; -static void pmc_core_display_map (struct seq_file *s,int index, -u8 pf_reg,const struct pmc_bit_map *pf_map) +static void pmc_core_display_map (struct seq_file *s,int index,int idx,int ip, +u8 pf_reg,const struct pmc_bit_map **pf_map) {seq_printf (s,"PCH IP: %-2d - %-32s\tState: %s\n" , - index, pf_map[index].name, - pf_map[index].bit_mask & pf_reg ?"Off" :"On" ); + ip, pf_map[idx][index].name, + pf_map[idx][index].bit_mask & pf_reg ?"Off" :"On" ); }static int pmc_core_ppfear_show (struct seq_file *s,void *unused) {struct pmc_dev *pmcdev = s->private; -const struct pmc_bit_map *map = pmcdev->map->pfear_sts; +const struct pmc_bit_map **maps = pmcdev->map->pfear_sts;u8 pf_regs[PPFEAR_MAX_NUM_ENTRIES ]; -int index, iter; +int index, iter, idx, ip =0 ; iter = pmcdev->map->ppfear0_offset;
@@ -433,9 +452,12 @@ static int pmc_core_ppfear_show(struct seq_file *s, void *unused) index < PPFEAR_MAX_NUM_ENTRIES; index++, iter++) pf_regs[index] =pmc_core_reg_read_byte (pmcdev, iter); -for (index =0 ; map[index].name && - index < pmcdev->map->ppfear_buckets *8 ; index++) -pmc_core_display_map (s, index, pf_regs[index /8 ], map); +for (idx =0 ; maps[idx]; idx++) { +for (index =0 ; maps[idx][index].name && + index < pmcdev->map->ppfear_buckets *8 ; ip++, index++) +pmc_core_display_map (s, index, idx, ip, + pf_regs[index /8 ], maps); + }return 0 ; }
drivers/platform/x86/intel_pmc_core.h +1 -1
@@ -213,7 +213,7 @@ struct pmc_bit_map {* captures them to have a common implementation. */ struct pmc_reg_map { -const struct pmc_bit_map *pfear_sts; +const struct pmc_bit_map **pfear_sts;const struct pmc_bit_map *mphy_sts;const struct pmc_bit_map *pll_sts;const struct pmc_bit_map **slps0_dbg_maps;
Signature · 1 line
2.17.1
PATCH v4 3/5 platform/x86: intel_pmc_core: Make debugfs entry for pch_ip_power_gating_status conditional
In reply to Gayatri KammelaCheck if the platform supports and only then add a debugfs entry for PCH IP power gating status.
--- drivers/platform/x86/intel_pmc_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/platform/x86/intel_pmc_core.c +3 -2
@@ -789,8 +789,9 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev)debugfs_create_file ("slp_s0_residency_usec" ,0444 , dir, pmcdev, &pmc_core_dev_state); -debugfs_create_file ("pch_ip_power_gating_status" ,0444 , dir, pmcdev, - &pmc_core_ppfear_fops); +if (pmcdev->map->pfear_sts) +debugfs_create_file ("pch_ip_power_gating_status" ,0444 , dir, + pmcdev, &pmc_core_ppfear_fops);debugfs_create_file ("ltr_ignore" ,0644 , dir, pmcdev, &pmc_core_ltr_ignore_ops);
Signature · 1 line
2.17.1
PATCH v4 4/5 platform/x86: intel_pmc_core: Add Tiger Lake (TGL) platform support to intel_pmc_core driver
In reply to Gayatri KammelaAdd Tiger Lake to the list of the platforms that intel_pmc_core driver supports for the pmc_core device.
Just like Ice Lake, Tiger Lake can also reuse all the Cannon Lake PCH IPs. Since Tiger Lake has almost the same number of PCH IPs as Ice Lake, reuse Ice Lake's PPFEAR_NUM_ENTRIES instead of defining a new macro.
--- drivers/platform/x86/intel_pmc_core.c | 46 +++++++++++++++++++++++++-- drivers/platform/x86/intel_pmc_core.h | 2 ++ 2 files changed, 46 insertions(+), 2 deletions(-)
drivers/platform/x86/intel_pmc_core.c +44 -2
@@ -191,7 +191,10 @@ 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 and Comet Lake */ +/* +* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake +* and Tiger Lake. +*/ {"SBR8", BIT(7)}, {"CSME_FSC", BIT(0)},
@@ -235,7 +238,10 @@ 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 and Comet Lake */ +/* +* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake +* and Tiger Lake. +*/ {"PSF6", BIT(5)}, {"PSF7", BIT(6)}, {"PSF8", BIT(7)},
@@ -266,6 +272,24 @@ static const struct pmc_bit_map *ext_icl_pfear_map[] = {NULL }; +static const struct pmc_bit_map tgl_pfear_map[] = { +/* Tiger Lake generation onwards only */ + {"PSF9" ,BIT (0 )}, + {"RES_66" ,BIT (1 )}, + {"RES_67" ,BIT (2 )}, + {"RES_68" ,BIT (3 )}, + {"RES_69" ,BIT (4 )}, + {"RES_70" ,BIT (5 )}, + {"TBTLSX" ,BIT (6 )}, + {} +}; + +static const struct pmc_bit_map *ext_tgl_pfear_map[] = { + cnp_pfear_map, + tgl_pfear_map, +NULL +}; +static const struct pmc_bit_map cnp_slps0_dbg0_map[] = { {"AUDIO_D3" ,BIT (0 )}, {"OTG_D3" ,BIT (1 )},
@@ -384,6 +408,22 @@ static const struct pmc_reg_map icl_reg_map = { .ltr_ignore_max = ICL_NUM_IP_IGN_ALLOWED, }; +static const struct pmc_reg_map tgl_reg_map = { + .pfear_sts = ext_tgl_pfear_map, + .slp_s0_offset =CNP_PMC_SLP_S0_RES_COUNTER_OFFSET , + .slps0_dbg_maps = cnp_slps0_dbg_maps, + .ltr_show_sts = cnp_ltr_show_map, + .msr_sts = msr_map, + .slps0_dbg_offset =CNP_PMC_SLPS0_DBG_OFFSET , + .ltr_ignore_offset =CNP_PMC_LTR_IGNORE_OFFSET , + .regmap_length =CNP_PMC_MMIO_REG_LEN , + .ppfear0_offset =CNP_PMC_HOST_PPFEAR0A , + .ppfear_buckets =ICL_PPFEAR_NUM_ENTRIES , + .pm_cfg_offset =CNP_PMC_PM_CFG_OFFSET , + .pm_read_disable_bit =CNP_PMC_READ_DISABLE_BIT , + .ltr_ignore_max =TGL_NUM_IP_IGN_ALLOWED , +}; +static inline u8 pmc_core_reg_read_byte (struct pmc_dev *pmcdev,int offset) {return readb (pmcdev->regbase + offset);
@@ -839,6 +879,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {INTEL_CPU_FAM6 (ICELAKE_NNPI , icl_reg_map),INTEL_CPU_FAM6 (COMETLAKE , cnp_reg_map),INTEL_CPU_FAM6 (COMETLAKE_L , cnp_reg_map), +INTEL_CPU_FAM6 (TIGERLAKE_L , tgl_reg_map), + INTEL_CPU_FAM6(TIGERLAKE, tgl_reg_map), {} };
drivers/platform/x86/intel_pmc_core.h +2 -0
@@ -186,6 +186,8 @@ enum ppfear_regs {#define ICL_NUM_IP_IGN_ALLOWED 20#define ICL_PMC_LTR_WIGIG 0x1BFC +#define TGL_NUM_IP_IGN_ALLOWED 22 +struct pmc_bit_map {const char *name;u32 bit_mask;
Signature · 1 line
2.17.1
PATCH v4 5/5 platform/x86: intel_pmc_core: Add Atom based Elkhart Lake (EHL) platform support to intel_pmc_core driver
In reply to Gayatri KammelaAdd Elkhart Lake to the list of the platforms that intel_pmc_core driver supports for pmc_core device.
Just like Ice Lake and Tiger Lake, Elkhart Lake can also reuse all the Cannon Lake PCH IPs. Also, it uses the same PCH IPs of Tiger Lake, no additional effort is needed to enable but to simply reuse them.
--- drivers/platform/x86/intel_pmc_core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/platform/x86/intel_pmc_core.c +6 -5
@@ -192,8 +192,8 @@ static const struct pmc_bit_map cnp_pfear_map[] = { {"SPE", BIT(5)}, {"Fuse", BIT(6)},/* -* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake -* and Tiger Lake. +* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake, +* Tiger Lake and Elkhart Lake. */ {"SBR8", BIT(7)},
@@ -239,8 +239,8 @@ static const struct pmc_bit_map cnp_pfear_map[] = { {"HDA_PGD5", BIT(3)}, {"HDA_PGD6", BIT(4)},/* -* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake -* and Tiger Lake. +* Reserved for Cannon Lake but valid for Ice Lake, Comet Lake, +* Tiger Lake and ELkhart Lake. */ {"PSF6", BIT(5)}, {"PSF7", BIT(6)},
@@ -273,7 +273,7 @@ static const struct pmc_bit_map *ext_icl_pfear_map[] = { };static const struct pmc_bit_map tgl_pfear_map[] = { -/* Tiger Lake generation onwards only */ +/* Tiger Lake and Elkhart Lake generation onwards only */ {"PSF9" ,BIT (0 )}, {"RES_66" ,BIT (1 )}, {"RES_67" ,BIT (2 )},
@@ -881,6 +881,7 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {INTEL_CPU_FAM6 (COMETLAKE_L , cnp_reg_map),INTEL_CPU_FAM6 (TIGERLAKE_L , tgl_reg_map),INTEL_CPU_FAM6 (TIGERLAKE , tgl_reg_map), + INTEL_CPU_FAM6(ATOM_TREMONT, tgl_reg_map), {} };
Signature · 1 line
2.17.1