Add multiple PMCs support in pmc core driver
Subsystems (2)
cover Add multiple PMCs support in pmc core driver
Newer platforms starting from Meteor Lake can have multiple PMCs. This patch series include changes to enable pmc core driver to support multiple PMCs for newer platforms. It adds devid and register maps to enable IOE-P and IOE-M available on Meteor Lake platform. It also fixes the register maps for SOC-M.
Patch includes:
platform/x86:intel/pmc: Update maps for Meteor Lake P/M platforms platform/x86:intel/pmc: Combine core_init() and core_configure() platform/x86:intel/pmc: Add support to handle multiple PMCs platform/x86:intel/pmc: Enable debugfs multiple PMC support platform/x86:intel/pmc: Discover PMC devices platform/x86:intel/pmc: Use SSRAM to discover pwrm base address of primary PMC platform/x86:intel/pmc: Add Meteor Lake IOE-P PMC related maps platform/x86:intel/pmc: Add Meteor Lake IOE-M PMC related maps
drivers/platform/x86/intel/pmc/Makefile | 4 +- drivers/platform/x86/intel/pmc/adl.c | 16 +- drivers/platform/x86/intel/pmc/cnp.c | 18 +- drivers/platform/x86/intel/pmc/core.c | 470 ++++++---- drivers/platform/x86/intel/pmc/core.h | 125 ++- drivers/platform/x86/intel/pmc/core_ssram.c | 133 +++ drivers/platform/x86/intel/pmc/icl.c | 7 +- drivers/platform/x86/intel/pmc/mtl.c | 954 +++++++++++++++++++- drivers/platform/x86/intel/pmc/spt.c | 7 +- drivers/platform/x86/intel/pmc/tgl.c | 21 +- 10 files changed, 1516 insertions(+), 239 deletions(-) create mode 100644 drivers/platform/x86/intel/pmc/core_ssram.c
Signature · 1 line
2.25.1
PATCH 1/8 platform/x86:intel/pmc: Update maps for Meteor Lake P/M platforms
From: Xi Pardee <[email protected]>
Fix the IP name errors in the register maps used by the following debugfs attributes in the Meteor Lake SOC-M PMC.
pfear_stslpm_stsltr_show
--- drivers/platform/x86/intel/pmc/core.h | 28 +- drivers/platform/x86/intel/pmc/mtl.c | 448 +++++++++++++++++++++++++- 2 files changed, 466 insertions(+), 10 deletions(-)
drivers/platform/x86/intel/pmc/core.h +27 -1
@@ -249,6 +249,14 @@ enum ppfear_regs {#define MTL_LPM_STATUS_LATCH_EN_OFFSET 0x16F8#define MTL_LPM_STATUS_OFFSET 0x1700#define MTL_LPM_LIVE_STATUS_OFFSET 0x175C +#define MTL_PMC_LTR_IOE_PMC 0x1C0C +#define MTL_PMC_LTR_ESE 0x1BAC +#define MTL_SOCM_NUM_IP_IGN_ALLOWED 25 +#define MTL_SOC_PMC_MMIO_REG_LEN 0x2708 +#define MTL_PMC_LTR_SPG 0x1B74 + +/* Meteor Lake PGD PFET Enable Ack Status */ +#define MTL_SOCM_PPFEAR_NUM_ENTRIES 8extern const char *pmc_lpm_modes[];
@@ -395,7 +403,25 @@ extern const struct pmc_bit_map adl_vnn_req_status_3_map[];extern const struct pmc_bit_map adl_vnn_misc_status_map[];extern const struct pmc_bit_map *adl_lpm_maps[];extern const struct pmc_reg_map adl_reg_map; -extern const struct pmc_reg_map mtl_reg_map; +extern const struct pmc_bit_map mtl_socm_pfear_map[]; +extern const struct pmc_bit_map *ext_mtl_socm_pfear_map[]; +extern const struct pmc_bit_map mtl_socm_ltr_show_map[]; +extern const struct pmc_bit_map mtl_socm_clocksource_status_map[]; +extern const struct pmc_bit_map mtl_socm_power_gating_status_0_map[]; +extern const struct pmc_bit_map mtl_socm_power_gating_status_1_map[]; +extern const struct pmc_bit_map mtl_socm_power_gating_status_2_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_0_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_1_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_2_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_3_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_0_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_1_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_2_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_3_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_misc_status_map[]; +extern const struct pmc_bit_map mtl_socm_signal_status_map[]; +extern const struct pmc_bit_map *mtl_socm_lpm_maps[]; +extern const struct pmc_reg_map mtl_socm_reg_map;extern void pmc_core_get_tgl_lpm_reqs (struct platform_device *pdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value);
drivers/platform/x86/intel/pmc/mtl.c +439 -9
474 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/8 platform/x86:intel/pmc: Combine core_init() and core_configure()
In reply to Rajvi JingarFrom: Xi Pardee <[email protected]>
Combine core_init() and core_configure() functions to have a cleaner setup for platforms.
--- drivers/platform/x86/intel/pmc/adl.c | 15 +++++---- drivers/platform/x86/intel/pmc/cnp.c | 15 ++++++++- drivers/platform/x86/intel/pmc/core.c | 47 +++++++++++++++------------ drivers/platform/x86/intel/pmc/core.h | 19 +++++------ drivers/platform/x86/intel/pmc/icl.c | 3 +- drivers/platform/x86/intel/pmc/mtl.c | 26 ++++++++------- drivers/platform/x86/intel/pmc/spt.c | 3 +- drivers/platform/x86/intel/pmc/tgl.c | 15 +++++---- 8 files changed, 85 insertions(+), 58 deletions(-)
drivers/platform/x86/intel/pmc/adl.c +9 -6
@@ -309,17 +309,20 @@ const struct pmc_reg_map adl_reg_map = { .lpm_live_status_offset = ADL_LPM_LIVE_STATUS_OFFSET, }; -void adl_core_configure (struct pmc_dev *pmcdev) +int adl_core_init (struct pmc_dev *pmcdev) { +int ret; + + pmcdev->map = &adl_reg_map; + ret =get_primary_reg_base (pmcdev); +if (ret) +return ret; +/* Due to a hardware limitation, the GBE LTR blocks PC10 * when a cable is attached. Tell the PMC to ignore it. */ dev_dbg (&pmcdev->pdev->dev,"ignoring GBE LTR\n" );pmc_core_send_ltr_ignore (pmcdev,3 ); -} -void adl_core_init (struct pmc_dev *pmcdev) -{ - pmcdev->map = &adl_reg_map; - pmcdev->core_configure = adl_core_configure; +return 0 ; }
drivers/platform/x86/intel/pmc/cnp.c +14 -1
@@ -204,7 +204,20 @@ const struct pmc_reg_map cnp_reg_map = { .etr3_offset = ETR3_OFFSET, }; -void cnp_core_init (struct pmc_dev *pmcdev) +int cnp_core_init (struct pmc_dev *pmcdev) { +int ret; + pmcdev->map = &cnp_reg_map; + ret =get_primary_reg_base (pmcdev); +if (ret) +return ret; + +/* Due to a hardware limitation, the GBE LTR blocks PC10 +* when a cable is attached. Tell the PMC to ignore it. +*/ +dev_dbg (&pmcdev->pdev->dev,"ignoring GBE LTR\n" ); +pmc_core_send_ltr_ignore (pmcdev,3 ); + +return 0 ; }
drivers/platform/x86/intel/pmc/core.c +26 -21
73 lines not on this page · raw message
drivers/platform/x86/intel/pmc/core.h +8 -11
@@ -334,7 +334,6 @@ struct pmc_reg_map {* @num_lpm_modes: Count of enabled modes * @lpm_en_modes: Array of enabled modes from lowest to highest priority * @lpm_req_regs: List of substate requirements -* @core_configure: Function pointer to configure the platform * @resume: Function to perform platform specific resume * * pmc_dev contains info about power management controller device.
@@ -353,7 +352,6 @@ struct pmc_dev {int num_lpm_modes;int lpm_en_modes[LPM_MAX_NUM_MODES ];u32 *lpm_req_regs; -void (*core_configure)(struct pmc_dev *pmcdev);int (*resume)(struct pmc_dev *pmcdev); };
@@ -427,15 +425,14 @@ extern void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value);int pmc_core_resume_common (struct pmc_dev *pmcdev); -void spt_core_init (struct pmc_dev *pmcdev); -void cnp_core_init (struct pmc_dev *pmcdev); -void icl_core_init (struct pmc_dev *pmcdev); -void tgl_core_init (struct pmc_dev *pmcdev); -void adl_core_init (struct pmc_dev *pmcdev); -void mtl_core_init (struct pmc_dev *pmcdev); -void tgl_core_configure (struct pmc_dev *pmcdev); -void adl_core_configure (struct pmc_dev *pmcdev); -void mtl_core_configure (struct pmc_dev *pmcdev); +int get_primary_reg_base (struct pmc_dev *pmcdev); + +int spt_core_init (struct pmc_dev *pmcdev); +int cnp_core_init (struct pmc_dev *pmcdev); +int icl_core_init (struct pmc_dev *pmcdev); +int tgl_core_init (struct pmc_dev *pmcdev); +int adl_core_init (struct pmc_dev *pmcdev); +int mtl_core_init (struct pmc_dev *pmcdev);#define pmc_for_each_mode (i, mode, pmcdev) \ for (i = 0, mode = pmcdev->lpm_en_modes[i]; \
drivers/platform/x86/intel/pmc/icl.c +2 -1
@@ -50,7 +50,8 @@ const struct pmc_reg_map icl_reg_map = { .etr3_offset = ETR3_OFFSET, }; -void icl_core_init (struct pmc_dev *pmcdev) +int icl_core_init (struct pmc_dev *pmcdev) { pmcdev->map = &icl_reg_map; +return get_primary_reg_base (pmcdev); }
drivers/platform/x86/intel/pmc/mtl.c +15 -11
@@ -467,15 +467,6 @@ const struct pmc_reg_map mtl_socm_reg_map = { .lpm_live_status_offset = MTL_LPM_LIVE_STATUS_OFFSET, }; -void mtl_core_configure (struct pmc_dev *pmcdev) -{ -/* Due to a hardware limitation, the GBE LTR blocks PC10 -* when a cable is attached. Tell the PMC to ignore it. -*/ -dev_dbg (&pmcdev->pdev->dev,"ignoring GBE LTR\n" ); -pmc_core_send_ltr_ignore (pmcdev,3 ); -} -#define MTL_GNA_PCI_DEV 0x7e4c#define MTL_IPU_PCI_DEV 0x7d19#define MTL_VPU_PCI_DEV 0x7d1d
@@ -515,12 +506,25 @@ static int mtl_resume(struct pmc_dev *pmcdev)return pmc_core_resume_common (pmcdev); } -void mtl_core_init (struct pmc_dev *pmcdev) +int mtl_core_init (struct pmc_dev *pmcdev) { +int ret; + pmcdev->map = &mtl_socm_reg_map; - pmcdev->core_configure = mtl_core_configure;mtl_d3_fixup (); pmcdev->resume = mtl_resume; + + ret =get_primary_reg_base (pmcdev); +if (ret) +return ret; + +/* Due to a hardware limitation, the GBE LTR blocks PC10 +* when a cable is attached. Tell the PMC to ignore it. +*/ +dev_dbg (&pmcdev->pdev->dev,"ignoring GBE LTR\n" ); +pmc_core_send_ltr_ignore (pmcdev,3 ); + +return 0 ; }
drivers/platform/x86/intel/pmc/spt.c +2 -1
@@ -134,7 +134,8 @@ const struct pmc_reg_map spt_reg_map = { .pm_vric1_offset = SPT_PMC_VRIC1_OFFSET, }; -void spt_core_init (struct pmc_dev *pmcdev) +int spt_core_init (struct pmc_dev *pmcdev) { pmcdev->map = &spt_reg_map; +return get_primary_reg_base (pmcdev); }
drivers/platform/x86/intel/pmc/tgl.c +9 -6
@@ -252,18 +252,21 @@ void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev)ACPI_FREE (out_obj); } -void tgl_core_configure (struct pmc_dev *pmcdev) +int tgl_core_init (struct pmc_dev *pmcdev) { +int ret; + + pmcdev->map = &tgl_reg_map; + ret =get_primary_reg_base (pmcdev); +if (ret) +return ret; +pmc_core_get_tgl_lpm_reqs (pmcdev->pdev);/* Due to a hardware limitation, the GBE LTR blocks PC10 * when a cable is attached. Tell the PMC to ignore it. */ dev_dbg (&pmcdev->pdev->dev,"ignoring GBE LTR\n" );pmc_core_send_ltr_ignore (pmcdev,3 ); -} -void tgl_core_init (struct pmc_dev *pmcdev) -{ - pmcdev->map = &tgl_reg_map; - pmcdev->core_configure = tgl_core_configure; +return 0 ; }
Signature · 1 line
2.25.1
PATCH 3/8 platform/x86:intel/pmc: Add support to handle multiple PMCs
In reply to Rajvi JingarFrom: Xi Pardee <[email protected]>
To support platforms with multiple PMCs, add a PMC device structure to support each PMC instance.
--- drivers/platform/x86/intel/pmc/adl.c | 5 +- drivers/platform/x86/intel/pmc/cnp.c | 5 +- drivers/platform/x86/intel/pmc/core.c | 272 ++++++++++++++------------ drivers/platform/x86/intel/pmc/core.h | 37 +++- drivers/platform/x86/intel/pmc/icl.c | 6 +- drivers/platform/x86/intel/pmc/mtl.c | 5 +- drivers/platform/x86/intel/pmc/spt.c | 6 +- drivers/platform/x86/intel/pmc/tgl.c | 10 +- 8 files changed, 205 insertions(+), 141 deletions(-)
drivers/platform/x86/intel/pmc/adl.c +3 -2
@@ -311,10 +311,11 @@ const struct pmc_reg_map adl_reg_map = {int adl_core_init (struct pmc_dev *pmcdev) { +struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];int ret; - pmcdev->map = &adl_reg_map; - ret =get_primary_reg_base (pmcdev); + pmc->map = &adl_reg_map; + ret =get_primary_reg_base (pmc);if (ret)return ret;
drivers/platform/x86/intel/pmc/cnp.c +3 -2
@@ -206,10 +206,11 @@ const struct pmc_reg_map cnp_reg_map = {int cnp_core_init (struct pmc_dev *pmcdev) { +struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];int ret; - pmcdev->map = &cnp_reg_map; - ret =get_primary_reg_base (pmcdev); + pmc->map = &cnp_reg_map; + ret =get_primary_reg_base (pmc);if (ret)return ret;
drivers/platform/x86/intel/pmc/core.c +152 -120
759 lines not on this page · raw message
drivers/platform/x86/intel/pmc/core.h +30 -7
@@ -19,6 +19,7 @@#define SLP_S0_RES_COUNTER_MASK GENMASK(31, 0)#define PMC_BASE_ADDR_DEFAULT 0xFE000000 +#define MAX_NUM_PMC 3/* Sunrise Point Power Management Controller PCI Device ID */ #define SPT_PMC_PCI_DEVICE_ID 0x9d21
@@ -319,11 +320,25 @@ struct pmc_reg_map { };/** -* struct pmc_dev - pmc device structure +* struct pmc - pmc private info structure * @base_addr: contains pmc base address * @regbase: pointer to io-remapped memory location * @map: pointer to pmc_reg_map struct that contains platform * specific attributes +* @lpm_req_regs: List of substate requirements +* +* pmc contains info about one power management controller device. +*/ +struct pmc { +u64 base_addr; +void __iomem *regbase; +const struct pmc_reg_map *map; +u32 *lpm_req_regs; +}; + +/** +* struct pmc_dev - pmc device structure +* @devs: pointer to an array of pmc pointers * @pdev: pointer to platform_device struct * @dbgfs_dir: path to debugfs interface * @pmc_xram_read_bit: flag to indicate whether PMC XRAM shadow registers
@@ -333,15 +348,12 @@ struct pmc_reg_map {* @s0ix_counter: S0ix residency (step adjusted) * @num_lpm_modes: Count of enabled modes * @lpm_en_modes: Array of enabled modes from lowest to highest priority -* @lpm_req_regs: List of substate requirements * @resume: Function to perform platform specific resume * * pmc_dev contains info about power management controller device. */ struct pmc_dev { -u32 base_addr; -void __iomem *regbase; -const struct pmc_reg_map *map; +struct pmc *pmcs[MAX_NUM_PMC ];struct dentry *dbgfs_dir;struct platform_device *pdev;int pmc_xram_read_bit;
@@ -351,8 +363,19 @@ struct pmc_dev {u64 s0ix_counter;int num_lpm_modes;int lpm_en_modes[LPM_MAX_NUM_MODES ]; -u32 *lpm_req_regs;int (*resume)(struct pmc_dev *pmcdev); + +bool has_die_c6; +u32 die_c6_offset; +struct telem_endpoint *punit_ep; +}; + +enum pmc_index { +PMC_IDX_MAIN , +PMC_IDX_SOC =PMC_IDX_MAIN , +PMC_IDX_IOE , +PMC_IDX_PCH , +PMC_IDX_MAX };extern const struct pmc_bit_map msr_map[];
@@ -425,7 +448,7 @@ extern void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value);int pmc_core_resume_common (struct pmc_dev *pmcdev); -int get_primary_reg_base (struct pmc_dev *pmcdev); +int get_primary_reg_base (struct pmc *pmc);int spt_core_init (struct pmc_dev *pmcdev);int cnp_core_init (struct pmc_dev *pmcdev);
drivers/platform/x86/intel/pmc/icl.c +4 -2
@@ -52,6 +52,8 @@ const struct pmc_reg_map icl_reg_map = {int icl_core_init (struct pmc_dev *pmcdev) { - pmcdev->map = &icl_reg_map; -return get_primary_reg_base (pmcdev); +struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; + + pmc->map = &icl_reg_map; +return get_primary_reg_base (pmc); }
drivers/platform/x86/intel/pmc/mtl.c +3 -2
@@ -508,15 +508,16 @@ static int mtl_resume(struct pmc_dev *pmcdev)int mtl_core_init (struct pmc_dev *pmcdev) { +struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC ];int ret; - pmcdev->map = &mtl_socm_reg_map; + pmc->map = &mtl_socm_reg_map;mtl_d3_fixup (); pmcdev->resume = mtl_resume; - ret =get_primary_reg_base (pmcdev); + ret =get_primary_reg_base (pmc);if (ret)return ret;
drivers/platform/x86/intel/pmc/spt.c +4 -2
@@ -136,6 +136,8 @@ const struct pmc_reg_map spt_reg_map = {int spt_core_init (struct pmc_dev *pmcdev) { - pmcdev->map = &spt_reg_map; -return get_primary_reg_base (pmcdev); +struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; + + pmc->map = &spt_reg_map; +return get_primary_reg_base (pmc); }
drivers/platform/x86/intel/pmc/tgl.c +6 -4
@@ -208,7 +208,8 @@ const struct pmc_reg_map tgl_reg_map = {void pmc_core_get_tgl_lpm_reqs (struct platform_device *pdev) {struct pmc_dev *pmcdev =platform_get_drvdata (pdev); -const int num_maps = pmcdev->map->lpm_num_maps; +struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; +const int num_maps = pmc->map->lpm_num_maps;u32 lpm_size =LPM_MAX_NUM_MODES * num_maps *4 ;union acpi_object *out_obj;struct acpi_device *adev;
@@ -246,7 +247,7 @@ void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev) goto free_acpi_obj;memcpy (lpm_req_regs, addr, lpm_size); - pmcdev->lpm_req_regs = lpm_req_regs; + pmc->lpm_req_regs = lpm_req_regs; free_acpi_obj:ACPI_FREE (out_obj);
@@ -254,10 +255,11 @@ void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev)int tgl_core_init (struct pmc_dev *pmcdev) { +struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];int ret; - pmcdev->map = &tgl_reg_map; - ret =get_primary_reg_base (pmcdev); + pmc->map = &tgl_reg_map; + ret =get_primary_reg_base (pmc);if (ret)return ret;
Signature · 1 line
2.25.1
PATCH 4/8 platform/x86:intel/pmc: Enable debugfs multiple PMC support
In reply to Rajvi JingarFrom: Xi Pardee <[email protected]>
Enable debugfs support for multiple PMC. These debugfs attributes show information for all enabled PMCs.
pch_ip_power_gating_statussubstate_status_registerssubstate_live_status_registersltr_showltr_ignore
--- drivers/platform/x86/intel/pmc/core.c | 195 +++++++++++++++++--------- 1 file changed, 129 insertions(+), 66 deletions(-)
drivers/platform/x86/intel/pmc/core.c +129 -66
@@ -252,7 +252,7 @@ static int pmc_core_lpm_get_arr_size(const struct pmc_bit_map **maps) }static void pmc_core_lpm_display (struct pmc *pmc,struct device *dev, -struct seq_file *s,u32 offset, +struct seq_file *s,u32 offset,int pmc_index,const char *str,const struct pmc_bit_map **maps) {
@@ -271,19 +271,19 @@ static void pmc_core_lpm_display(struct pmc *pmc, struct device *dev,for (idx =0 ; idx < arr_size; idx++) {if (dev) -dev_info (dev,"\nLPM_%s_%d:\t0x%x\n" , str, idx, +dev_info (dev,"\nPMC%d:LPM_%s_%d:\t0x%x\n" , pmc_index, str, idx, lpm_regs[idx]);if (s) -seq_printf (s,"\nLPM_%s_%d:\t0x%x\n" , str, idx, +seq_printf (s,"\nPMC%d:LPM_%s_%d:\t0x%x\n" , pmc_index, str, idx, lpm_regs[idx]);for (index =0 ; maps[idx][index].name && index < len; index++) { bit_mask = maps[idx][index].bit_mask;if (dev) -dev_info (dev,"%-30s %-30d\n" , +dev_info (dev,"PMC%d:%-30s %-30d\n" , pmc_index, maps[idx][index].name, lpm_regs[idx] & bit_mask ?1 :0 );if (s) -seq_printf (s,"%-30s %-30d\n" , +seq_printf (s,"PMC%d:%-30s %-30d\n" , pmc_index, maps[idx][index].name, lpm_regs[idx] & bit_mask ?1 :0 ); }
@@ -300,32 +300,40 @@ static inline u8 pmc_core_reg_read_byte(struct pmc *pmc, int offset) }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) +int pmc_index,u8 pf_reg,const struct pmc_bit_map **pf_map) { -seq_printf (s,"PCH IP: %-2d - %-32s\tState: %s\n" , - ip, pf_map[idx][index].name, +seq_printf (s,"PMC%d:PCH IP: %-2d - %-32s\tState: %s\n" , + pmc_index, 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; -struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; -const struct pmc_bit_map **maps = pmc->map->pfear_sts; -u8 pf_regs[PPFEAR_MAX_NUM_ENTRIES ]; -int index, iter, idx, ip =0 ; +int i; + +for (i =0 ; i <ARRAY_SIZE (pmcdev->pmcs); ++i) { +struct pmc *pmc = pmcdev->pmcs[i]; +const struct pmc_bit_map **maps; +u8 pf_regs[PPFEAR_MAX_NUM_ENTRIES ]; +int index, iter, idx, ip =0 ; + +if (!pmc) +continue ; - iter = pmc->map->ppfear0_offset; + maps = pmc->map->pfear_sts; + iter = pmc->map->ppfear0_offset; -for (index =0 ; index < pmc->map->ppfear_buckets && - index <PPFEAR_MAX_NUM_ENTRIES ; index++, iter++) - pf_regs[index] =pmc_core_reg_read_byte (pmc, iter); +for (index =0 ; index < pmc->map->ppfear_buckets && + index <PPFEAR_MAX_NUM_ENTRIES ; index++, iter++) + pf_regs[index] =pmc_core_reg_read_byte (pmc, iter); -for (idx =0 ; maps[idx]; idx++) { -for (index =0 ; maps[idx][index].name && - index < pmc->map->ppfear_buckets *8 ; ip++, index++) -pmc_core_display_map (s, index, idx, ip, - pf_regs[index /8 ], maps); +for (idx =0 ; maps[idx]; idx++) { +for (index =0 ; maps[idx][index].name && + index < pmc->map->ppfear_buckets *8 ; ip++, index++) +pmc_core_display_map (s, index, idx, ip, i, + pf_regs[index /8 ], maps); + } }return 0 ;
@@ -454,26 +462,48 @@ DEFINE_SHOW_ATTRIBUTE(pmc_core_pll);int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value) { -struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; -const struct pmc_reg_map *map = pmc->map; +struct pmc *pmc; +const struct pmc_reg_map *map;u32 reg; -int err =0 ; +int pmc_index, ltr_index; -mutex_lock (&pmcdev->lock); + ltr_index = value; +/* For platforms with multiple pmcs, ltr index value given by user +* is based on the contiguous indexes from ltr_show output. +* pmc index and ltr index needs to be calculated from it. +*/ +for (pmc_index =0 ; pmc_index <ARRAY_SIZE (pmcdev->pmcs) && ltr_index >0 ; pmc_index++) { + pmc = pmcdev->pmcs[pmc_index]; -if (value > map->ltr_ignore_max) { - err = -EINVAL ; - goto out_unlock; +if (!pmc) +continue ; + + map = pmc->map; +if (ltr_index <= map->ltr_ignore_max) +break ; + +/* Along with IP names, ltr_show map includes CURRENT_PLATFORM +* and AGGREGATED_SYSTEM values per PMC. Take these two index +* values into account in ltr_index calculation. Also, to start +* ltr index from zero for next pmc, subtract it by 1. +*/ + ltr_index = ltr_index - (map->ltr_ignore_max +2 ) -1 ; } +if (pmc_index >=ARRAY_SIZE (pmcdev->pmcs) || ltr_index <0 ) +return -EINVAL ; + +pr_debug ("ltr_ignore for pmc%d: ltr_index:%d\n" , pmc_index, ltr_index); + +mutex_lock (&pmcdev->lock); + reg =pmc_core_reg_read (pmc, map->ltr_ignore_offset); - reg |=BIT (value); + reg |=BIT (ltr_index);pmc_core_reg_write (pmc, map->ltr_ignore_offset, reg); -out_unlock:mutex_unlock (&pmcdev->lock); -return err; +return 0 ; } static ssize_t pmc_core_ltr_ignore_write(struct file *file,
@@ -586,36 +616,44 @@ static u32 convert_ltr_scale(u32 val)static int pmc_core_ltr_show (struct seq_file *s,void *unused) { -struct pmc *pmc = s->private; -const struct pmc_bit_map *map = pmc->map->ltr_show_sts; +struct pmc_dev *pmcdev = s->private;u64 decoded_snoop_ltr, decoded_non_snoop_ltr;u32 ltr_raw_data, scale, val;u16 snoop_ltr, nonsnoop_ltr; -int index; +int i, index, ltr_index =0 ; -for (index =0 ; map[index].name ; index++) { - decoded_snoop_ltr = decoded_non_snoop_ltr =0 ; - ltr_raw_data =pmc_core_reg_read (pmc, - map[index].bit_mask); - snoop_ltr = ltr_raw_data & ~MTPMC_MASK ; - nonsnoop_ltr = (ltr_raw_data >>0x10 ) & ~MTPMC_MASK ; - -if (FIELD_GET (LTR_REQ_NONSNOOP , ltr_raw_data)) { - scale =FIELD_GET (LTR_DECODED_SCALE , nonsnoop_ltr); - val =FIELD_GET (LTR_DECODED_VAL , nonsnoop_ltr); - decoded_non_snoop_ltr = val *convert_ltr_scale (scale); - } +for (i =0 ; i <ARRAY_SIZE (pmcdev->pmcs); ++i) { +struct pmc *pmc = pmcdev->pmcs[i]; +const struct pmc_bit_map *map; -if (FIELD_GET (LTR_REQ_SNOOP , ltr_raw_data)) { - scale =FIELD_GET (LTR_DECODED_SCALE , snoop_ltr); - val =FIELD_GET (LTR_DECODED_VAL , snoop_ltr); - decoded_snoop_ltr = val *convert_ltr_scale (scale); - } +if (!pmc) +continue ; + + map = pmc->map->ltr_show_sts; +for (index =0 ; map[index].name; index++) { + decoded_snoop_ltr = decoded_non_snoop_ltr =0 ; + ltr_raw_data =pmc_core_reg_read (pmc, + map[index].bit_mask); + snoop_ltr = ltr_raw_data & ~MTPMC_MASK ; + nonsnoop_ltr = (ltr_raw_data >>0x10 ) & ~MTPMC_MASK ; + +if (FIELD_GET (LTR_REQ_NONSNOOP , ltr_raw_data)) { + scale =FIELD_GET (LTR_DECODED_SCALE , nonsnoop_ltr); + val =FIELD_GET (LTR_DECODED_VAL , nonsnoop_ltr); + decoded_non_snoop_ltr = val *convert_ltr_scale (scale); + } +if (FIELD_GET (LTR_REQ_SNOOP , ltr_raw_data)) { + scale =FIELD_GET (LTR_DECODED_SCALE , snoop_ltr); + val =FIELD_GET (LTR_DECODED_VAL , snoop_ltr); + decoded_snoop_ltr = val *convert_ltr_scale (scale); + } -seq_printf (s,"%-32s\tLTR: RAW: 0x%-16x\tNon-Snoop(ns): %-16llu\tSnoop(ns): %-16llu\n" , - map[index].name, ltr_raw_data, - decoded_non_snoop_ltr, - decoded_snoop_ltr); +seq_printf (s,"%d\tPMC%d:%-32s\tLTR: RAW: 0x%-16x\tNon-Snoop(ns): %-16llu\tSnoop(ns): %-16llu\n" , + ltr_index, i, map[index].name, ltr_raw_data, + decoded_non_snoop_ltr, + decoded_snoop_ltr); + ltr_index++; + } }return 0 ; }
@@ -651,11 +689,19 @@ DEFINE_SHOW_ATTRIBUTE(pmc_core_substate_res);static int pmc_core_substate_sts_regs_show (struct seq_file *s,void *unused) {struct pmc_dev *pmcdev = s->private; -struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; -const struct pmc_bit_map **maps = pmc->map->lpm_sts; -u32 offset = pmc->map->lpm_status_offset; +int i; + +for (i =0 ; i <ARRAY_SIZE (pmcdev->pmcs); ++i) { +struct pmc *pmc = pmcdev->pmcs[i]; +const struct pmc_bit_map **maps; +u32 offset; -pmc_core_lpm_display (pmc,NULL , s, offset,"STATUS" , maps); +if (!pmc) +continue ; + maps = pmc->map->lpm_sts; + offset = pmc->map->lpm_status_offset; +pmc_core_lpm_display (pmc,NULL , s, offset, i,"STATUS" , maps); + }return 0 ; }
@@ -664,11 +710,19 @@ DEFINE_SHOW_ATTRIBUTE(pmc_core_substate_sts_regs);static int pmc_core_substate_l_sts_regs_show (struct seq_file *s,void *unused) {struct pmc_dev *pmcdev = s->private; -struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; -const struct pmc_bit_map **maps = pmc->map->lpm_sts; -u32 offset = pmc->map->lpm_live_status_offset; +int i; + +for (i =0 ; i <ARRAY_SIZE (pmcdev->pmcs); ++i) { +struct pmc *pmc = pmcdev->pmcs[i]; +const struct pmc_bit_map **maps; +u32 offset; -pmc_core_lpm_display (pmc,NULL , s, offset,"LIVE_STATUS" , maps); +if (!pmc) +continue ; + maps = pmc->map->lpm_sts; + offset = pmc->map->lpm_live_status_offset; +pmc_core_lpm_display (pmc,NULL , s, offset, i,"LIVE_STATUS" , maps); + }return 0 ; }
@@ -1005,7 +1059,7 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev)debugfs_create_file ("ltr_ignore" ,0644 , dir, pmcdev, &pmc_core_ltr_ignore_ops); -debugfs_create_file ("ltr_show" ,0444 , dir, primary_pmc, &pmc_core_ltr_fops); +debugfs_create_file ("ltr_show" ,0444 , dir, pmcdev, &pmc_core_ltr_fops);debugfs_create_file ("package_cstate_show" ,0444 , dir, primary_pmc, &pmc_core_pkgc_fops);
@@ -1264,6 +1318,7 @@ int pmc_core_resume_common(struct pmc_dev *pmcdev)struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];const struct pmc_bit_map **maps = pmc->map->lpm_sts;int offset = pmc->map->lpm_status_offset; +int i;/* Check if the syspend used S0ix */ if (pm_suspend_via_firmware ())
@@ -1285,10 +1340,18 @@ int pmc_core_resume_common(struct pmc_dev *pmcdev)/* The real interesting case - S0ix failed - lets ask PMC why. */ dev_warn (dev,"CPU did not enter SLP_S0!!! (S0ix cnt=%llu)\n" , pmcdev->s0ix_counter); +if (pmc->map->slps0_dbg_maps)pmc_core_slps0_display (pmc, dev,NULL ); -if (pmc->map->lpm_sts) -pmc_core_lpm_display (pmc, dev,NULL , offset,"STATUS" , maps); + +for (i =0 ; i <ARRAY_SIZE (pmcdev->pmcs); ++i) { +struct pmc *pmc = pmcdev->pmcs[i]; + +if (!pmc) +continue ; +if (pmc->map->lpm_sts) +pmc_core_lpm_display (pmc, dev,NULL , offset, i,"STATUS" , maps); + }return 0 ; }
Signature · 1 line
2.25.1
PATCH 5/8 platform/x86:intel/pmc: Discover PMC devices
In reply to Rajvi JingarFrom: "David E. Box" <[email protected]>
On platforms with multiple PMCs, additional PMC devices are discovered in the SSRAM device associated with the primary PMC. Add support for discovering PMC devices from SSRAM. Use PMC devid to assign the corresponding register map.
--- drivers/platform/x86/intel/pmc/Makefile | 4 +- drivers/platform/x86/intel/pmc/core.c | 34 +++-- drivers/platform/x86/intel/pmc/core.h | 16 +++ drivers/platform/x86/intel/pmc/core_ssram.c | 133 ++++++++++++++++++++ drivers/platform/x86/intel/pmc/mtl.c | 7 ++ 5 files changed, 180 insertions(+), 14 deletions(-) create mode 100644 drivers/platform/x86/intel/pmc/core_ssram.c
drivers/platform/x86/intel/pmc/Makefile +2 -2
@@ -3,8 +3,8 @@ # Intel x86 Platform-Specific Drivers # -intel_pmc_core-y := core.o spt.o cnp.o icl.o tgl.o \ - adl.o mtl.o +intel_pmc_core-y := core.o core_ssram.o spt.o cnp.o \ + icl.o tgl.o adl.o mtl.o obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o intel_pmc_core_pltdrv-y := pltdrv.o obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core_pltdrv.o
drivers/platform/x86/intel/pmc/core.c +22 -12
@@ -1183,6 +1183,26 @@ static void pmc_core_do_dmi_quirks(struct pmc *pmc)pmc_core_xtal_ignore (pmc); } +static void pmc_core_clean_structure (struct platform_device *pdev) +{ +struct pmc_dev *pmcdev =platform_get_drvdata (pdev); +int i; + +for (i =0 ; i <ARRAY_SIZE (pmcdev->pmcs); ++i) { +struct pmc *pmc = pmcdev->pmcs[i]; + +if (pmc) +iounmap (pmc->regbase); + } + +if (pmcdev->ssram_pcidev) { +pci_dev_put (pmcdev->ssram_pcidev); +pci_disable_device (pmcdev->ssram_pcidev); + } +platform_set_drvdata (pdev,NULL ); +mutex_destroy (&pmcdev->lock); +} +static int pmc_core_probe (struct platform_device *pdev) {static bool device_initialized;
@@ -1225,7 +1245,7 @@ static int pmc_core_probe(struct platform_device *pdev)mutex_init (&pmcdev->lock); ret =core_init (pmcdev);if (ret) { -mutex_destroy (&pmcdev->lock); +pmc_core_clean_structure (pdev);return ret; }
@@ -1246,18 +1266,8 @@ static int pmc_core_probe(struct platform_device *pdev)static void pmc_core_remove (struct platform_device *pdev) {struct pmc_dev *pmcdev =platform_get_drvdata (pdev); -int i; - -for (i =0 ; i <ARRAY_SIZE (pmcdev->pmcs); ++i) { -struct pmc *pmc = pmcdev->pmcs[i]; - -if (pmc) -iounmap (pmc->regbase); - } -pmc_core_dbgfs_unregister (pmcdev); -platform_set_drvdata (pdev,NULL ); -mutex_destroy (&pmcdev->lock); +pmc_core_clean_structure (pdev); }static bool warn_on_s0ix_failures;
drivers/platform/x86/intel/pmc/core.h +16 -0
@@ -319,6 +319,17 @@ struct pmc_reg_map {const u32 etr3_offset; }; +/** +* struct pmc_info - Structure to keep pmc info +* @devid: device id of the pmc device +* @map: pointer to a pmc_reg_map struct that contains platform +* specific attributes +*/ +struct pmc_info { +u16 devid; +const struct pmc_reg_map *map; +}; +/** * struct pmc - pmc private info structure * @base_addr: contains pmc base address
@@ -340,6 +351,7 @@ struct pmc {* struct pmc_dev - pmc device structure * @devs: pointer to an array of pmc pointers * @pdev: pointer to platform_device struct +* @ssram_pcidev: pointer to pci device struct for the PMC SSRAM * @dbgfs_dir: path to debugfs interface * @pmc_xram_read_bit: flag to indicate whether PMC XRAM shadow registers * used to read MPHY PG and PLL status are available
@@ -356,6 +368,7 @@ struct pmc_dev {struct pmc *pmcs[MAX_NUM_PMC ];struct dentry *dbgfs_dir;struct platform_device *pdev; +struct pci_dev *ssram_pcidev;int pmc_xram_read_bit;struct mutex lock;/* generic mutex lock for PMC Core */
@@ -368,6 +381,7 @@ struct pmc_dev {bool has_die_c6;u32 die_c6_offset;struct telem_endpoint *punit_ep; +struct pmc_info *regmap_list; };enum pmc_index {
@@ -450,6 +464,8 @@ extern int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value);int pmc_core_resume_common (struct pmc_dev *pmcdev);int get_primary_reg_base (struct pmc *pmc); +extern void pmc_core_ssram_init (struct pmc_dev *pmcdev); +int spt_core_init (struct pmc_dev *pmcdev);int cnp_core_init (struct pmc_dev *pmcdev);int icl_core_init (struct pmc_dev *pmcdev);
drivers/platform/x86/intel/pmc/core_ssram.c new file +133 -0
133 lines not on this page · raw message
drivers/platform/x86/intel/pmc/mtl.c +7 -0
@@ -467,6 +467,10 @@ const struct pmc_reg_map mtl_socm_reg_map = { .lpm_live_status_offset = MTL_LPM_LIVE_STATUS_OFFSET, }; +static struct pmc_info mtl_pmc_info_list[] = { + {} +}; +#define MTL_GNA_PCI_DEV 0x7e4c#define MTL_IPU_PCI_DEV 0x7d19#define MTL_VPU_PCI_DEV 0x7d1d
@@ -517,6 +521,9 @@ int mtl_core_init(struct pmc_dev *pmcdev) pmcdev->resume = mtl_resume; + pmcdev->regmap_list = mtl_pmc_info_list; +pmc_core_ssram_init (pmcdev); + ret =get_primary_reg_base (pmc);if (ret)return ret;
Signature · 1 line
2.25.1
PATCH 6/8 platform/x86:intel/pmc: Use SSRAM to discover pwrm base address of primary PMC
In reply to Rajvi JingarFrom: Xi Pardee <[email protected]>
On older platforms, the base address for PMC was hardcoded in the driver. Newer platforms can now retrieve the base address from SSRAM. Use SSRAM to discover pwrm base address on Meteor Lake platform. If this method fails, it will fall back to the hardcoded value.
--- drivers/platform/x86/intel/pmc/mtl.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/platform/x86/intel/pmc/mtl.c +13 -6
@@ -467,7 +467,12 @@ const struct pmc_reg_map mtl_socm_reg_map = { .lpm_live_status_offset = MTL_LPM_LIVE_STATUS_OFFSET, }; +#define PMC_DEVID_SOCM 0x7e7fstatic struct pmc_info mtl_pmc_info_list[] = { + { + .devid =PMC_DEVID_SOCM , + .map = &mtl_socm_reg_map, + }, {} };
@@ -513,9 +518,7 @@ static int mtl_resume(struct pmc_dev *pmcdev)int mtl_core_init (struct pmc_dev *pmcdev) {struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC ]; -int ret; - - pmc->map = &mtl_socm_reg_map; +int ret =0 ;mtl_d3_fixup ();
@@ -524,9 +527,13 @@ int mtl_core_init(struct pmc_dev *pmcdev) pmcdev->regmap_list = mtl_pmc_info_list;pmc_core_ssram_init (pmcdev); - ret =get_primary_reg_base (pmc); -if (ret) -return ret; +/* If regbase not assigned, set map and discover using legacy method */ +if (!pmc->regbase) { + pmc->map = &mtl_socm_reg_map; + ret =get_primary_reg_base (pmc); +if (ret) +return ret; + }/* Due to a hardware limitation, the GBE LTR blocks PC10 * when a cable is attached. Tell the PMC to ignore it.
Signature · 1 line
2.25.1
PATCH 7/8 platform/x86:intel/pmc: Add Meteor Lake IOE-P PMC related maps
In reply to Rajvi JingarFrom: Xi Pardee <[email protected]>
Add device ID and register maps for the PMC in IO expansion die P in Meteor Lake.
--- drivers/platform/x86/intel/pmc/core.h | 21 ++ drivers/platform/x86/intel/pmc/mtl.c | 322 ++++++++++++++++++++++++++ 2 files changed, 343 insertions(+)
drivers/platform/x86/intel/pmc/core.h +21 -0
@@ -252,12 +252,15 @@ enum ppfear_regs {#define MTL_LPM_LIVE_STATUS_OFFSET 0x175C#define MTL_PMC_LTR_IOE_PMC 0x1C0C#define MTL_PMC_LTR_ESE 0x1BAC +#define MTL_PMC_LTR_RESERVED 0x1BA4 +#define MTL_IOE_PMC_MMIO_REG_LEN 0x23A4#define MTL_SOCM_NUM_IP_IGN_ALLOWED 25#define MTL_SOC_PMC_MMIO_REG_LEN 0x2708#define MTL_PMC_LTR_SPG 0x1B74/* Meteor Lake PGD PFET Enable Ack Status */ #define MTL_SOCM_PPFEAR_NUM_ENTRIES 8 +#define MTL_IOE_PPFEAR_NUM_ENTRIES 10extern const char *pmc_lpm_modes[];
@@ -457,6 +460,24 @@ extern const struct pmc_bit_map mtl_socm_vnn_misc_status_map[];extern const struct pmc_bit_map mtl_socm_signal_status_map[];extern const struct pmc_bit_map *mtl_socm_lpm_maps[];extern const struct pmc_reg_map mtl_socm_reg_map; +extern const struct pmc_bit_map mtl_ioep_pfear_map[]; +extern const struct pmc_bit_map *ext_mtl_ioep_pfear_map[]; +extern const struct pmc_bit_map mtl_ioep_ltr_show_map[]; +extern const struct pmc_bit_map mtl_ioep_clocksource_status_map[]; +extern const struct pmc_bit_map mtl_ioep_power_gating_status_0_map[]; +extern const struct pmc_bit_map mtl_ioep_power_gating_status_1_map[]; +extern const struct pmc_bit_map mtl_ioep_power_gating_status_2_map[]; +extern const struct pmc_bit_map mtl_ioep_d3_status_0_map[]; +extern const struct pmc_bit_map mtl_ioep_d3_status_1_map[]; +extern const struct pmc_bit_map mtl_ioep_d3_status_2_map[]; +extern const struct pmc_bit_map mtl_ioep_d3_status_3_map[]; +extern const struct pmc_bit_map mtl_ioep_vnn_req_status_0_map[]; +extern const struct pmc_bit_map mtl_ioep_vnn_req_status_1_map[]; +extern const struct pmc_bit_map mtl_ioep_vnn_req_status_2_map[]; +extern const struct pmc_bit_map mtl_ioep_vnn_req_status_3_map[]; +extern const struct pmc_bit_map mtl_ioep_vnn_misc_status_map[]; +extern const struct pmc_bit_map *mtl_ioep_lpm_maps[]; +extern const struct pmc_reg_map mtl_ioep_reg_map;extern void pmc_core_get_tgl_lpm_reqs (struct platform_device *pdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value);
drivers/platform/x86/intel/pmc/mtl.c +322 -0
334 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 8/8 platform/x86:intel/pmc: Add Meteor Lake IOE-M PMC related maps
In reply to Rajvi JingarFrom: Xi Pardee <[email protected]>
Add device ID and register maps for the PMC in IO expansion die M in Meteor Lake.
--- drivers/platform/x86/intel/pmc/core.h | 6 ++ drivers/platform/x86/intel/pmc/mtl.c | 145 ++++++++++++++++++++++++++ 2 files changed, 151 insertions(+)
drivers/platform/x86/intel/pmc/core.h +6 -0
@@ -478,6 +478,12 @@ extern const struct pmc_bit_map mtl_ioep_vnn_req_status_3_map[];extern const struct pmc_bit_map mtl_ioep_vnn_misc_status_map[];extern const struct pmc_bit_map *mtl_ioep_lpm_maps[];extern const struct pmc_reg_map mtl_ioep_reg_map; +extern const struct pmc_bit_map mtl_ioem_pfear_map[]; +extern const struct pmc_bit_map *ext_mtl_ioem_pfear_map[]; +extern const struct pmc_bit_map mtl_ioem_power_gating_status_1_map[]; +extern const struct pmc_bit_map mtl_ioem_vnn_req_status_1_map[]; +extern const struct pmc_bit_map *mtl_ioem_lpm_maps[]; +extern const struct pmc_reg_map mtl_ioem_reg_map;extern void pmc_core_get_tgl_lpm_reqs (struct platform_device *pdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value);
drivers/platform/x86/intel/pmc/mtl.c +145 -0
159 lines not on this page · raw message
Signature · 1 line
2.25.1
Hi,
Quoted 6 lines · Rajvi Jingar
Newer platforms starting from Meteor Lake can have multiple PMCs. This patch series include changes to enable pmc core driver to support multiple PMCs for newer platforms. It adds devid and register maps to enable IOE-P and IOE-M available on Meteor Lake platform. It also fixes the register maps for SOC-M.
Quoted 9 lines
Patch includes:
platform/x86:intel/pmc: Update maps for Meteor Lake P/M platforms platform/x86:intel/pmc: Combinecore_init()andcore_configure()platform/x86:intel/pmc: Add support to handle multiple PMCs platform/x86:intel/pmc: Enable debugfs multiple PMC support platform/x86:intel/pmc: Discover PMC devices platform/x86:intel/pmc: Use SSRAM to discover pwrm base address of primary PMC platform/x86:intel/pmc: Add Meteor Lake IOE-P PMC related maps platform/x86:intel/pmc: Add Meteor Lake IOE-M PMC related maps
Thank you for your patch-series, I've applied the series to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 14 lines
drivers/platform/x86/intel/pmc/Makefile | 4 +- drivers/platform/x86/intel/pmc/adl.c | 16 +- drivers/platform/x86/intel/pmc/cnp.c | 18 +- drivers/platform/x86/intel/pmc/core.c | 470 ++++++---- drivers/platform/x86/intel/pmc/core.h | 125 ++- drivers/platform/x86/intel/pmc/core_ssram.c | 133 +++ drivers/platform/x86/intel/pmc/icl.c | 7 +- drivers/platform/x86/intel/pmc/mtl.c | 954 +++++++++++++++++++- drivers/platform/x86/intel/pmc/spt.c | 7 +- drivers/platform/x86/intel/pmc/tgl.c | 21 +- 10 files changed, 1516 insertions(+), 239 deletions(-) create mode 100644 drivers/platform/x86/intel/pmc/core_ssram.c