Enable substate residencies for multiple PMCs
Subsystems (2)
Xi Pardee
maintainerv2 cover Enable substate residencies for multiple PMCs
This patch series enables substate residencies for multiple PMCs. The first two patches prepare this change:
- The first patch changes the datatype of LPM mode attributes to u8.
- The second patch moves the LPM mode attributes from the pmc_dev to the pmc struture.
- The third patch enables the substate residencies for multiple PMCs.
- The final removes one empty line.
v2->v1:
- Changed the datatype of mode to u8 in pmc_core_get_low_power_mode().
- Added a patch to remove one empty line.
- Rearranged the commit message of the second patch.
- Used post-increment in for loop.
Xi Pardee (4):
platform/x86/intel/pmc: Change LPM mode fields to u8 platform/x86/intel/pmc: Move LPM mode attributes to PMC platform/x86/intel/pmc: Enable substate residencies for multiple PMCs platform/x86/intel/pmc: Remove double empty line
drivers/platform/x86/intel/pmc/core.c | 85 ++++++++++++++++++--------- drivers/platform/x86/intel/pmc/core.h | 15 +++-- 2 files changed, 63 insertions(+), 37 deletions(-)
Signature · 1 line
2.43.0
Xi Pardee
maintainerPATCH v2 1/4 platform/x86/intel/pmc: Change LPM mode fields to u8
Change the datatypes of num_lpm_modes and lpm_en_modes[] from int to u8. The u8 type is more appropriate and improves the readability and maintainability of the code.
--- drivers/platform/x86/intel/pmc/core.c | 23 +++++++++++++---------- drivers/platform/x86/intel/pmc/core.h | 4 ++-- 2 files changed, 15 insertions(+), 12 deletions(-)
drivers/platform/x86/intel/pmc/core.c +13 -10
@@ -779,7 +779,7 @@ static int pmc_core_substate_res_show(struct seq_file *s, void *unused)struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];const int lpm_adj_x2 = pmc->map->lpm_res_counter_step_x2;u32 offset = pmc->map->lpm_residency_offset; -int mode; +u8 mode;seq_printf (s,"%-10s %-15s\n" ,"Substate" ,"Residency" );
@@ -838,7 +838,7 @@ static void pmc_core_substate_req_header_show(struct seq_file *s, int pmc_index, enum header_type type) {struct pmc_dev *pmcdev = s->private; -int mode; +u8 mode;seq_printf (s,"%40s |" ,"Element" );pmc_for_each_mode (mode, pmcdev)
@@ -880,7 +880,7 @@ static int pmc_core_substate_blk_req_show(struct seq_file *s, void *unused)const struct pmc_bit_map *map;for (map = maps[r_idx]; map->name; map++) { -int mode; +u8 mode;if (!map->blk)continue ;
@@ -953,7 +953,8 @@ static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused)u32 lpm_status;u32 lpm_status_live;const struct pmc_bit_map *map; -int mode, i, len =32 ; +int i, len =32 ; +u8 mode;/* * Capture the requirements and create a mask so that we only
@@ -1065,7 +1066,7 @@ static int pmc_core_lpm_latch_mode_show(struct seq_file *s, void *unused)struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];bool c10;u32 reg; -int mode; +u8 mode; reg =pmc_core_reg_read (pmc, pmc->map->lpm_sts_latch_en_offset);if (reg &LPM_STS_LATCH_MODE ) {
@@ -1097,8 +1098,9 @@ static ssize_t pmc_core_lpm_latch_mode_write(struct file *file,struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];bool clear = false, c10 = false;unsigned char buf[8 ]; -int m, mode; +int mode;u32 reg; +u8 m;if (count >sizeof (buf) -1 )return -EINVAL ;
@@ -1218,8 +1220,9 @@ void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev)u8 mode_order[LPM_MAX_NUM_MODES ];u32 lpm_pri;u32 lpm_en; +u8 mode;unsigned int i; -int mode, p; +int p;/* Use LPM Maps to indicate support for substates */ if (!pmc->map->lpm_num_maps)
@@ -1254,7 +1257,7 @@ void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev)*/ i =0 ;for (p =LPM_MAX_NUM_MODES -1 ; p >=0 ; p--) { -int mode = pri_order[p]; +u8 mode = pri_order[p];if (!(BIT (mode) & lpm_en))continue ;
@@ -1490,8 +1493,8 @@ int pmc_core_pmt_get_lpm_req(struct pmc_dev *pmcdev, struct pmc *pmc, struct tel {const u8 *lpm_indices;int num_maps, mode_offset =0 ; -int ret, mode; -int lpm_size; +int ret, lpm_size; +u8 mode; lpm_indices = pmc->map->lpm_reg_index; num_maps = pmc->map->lpm_num_maps;
drivers/platform/x86/intel/pmc/core.h +2 -2
@@ -462,8 +462,8 @@ struct pmc_dev {struct mutex lock;/* generic mutex lock for PMC Core */ u64 s0ix_counter; -int num_lpm_modes; -int lpm_en_modes[LPM_MAX_NUM_MODES ]; +u8 num_lpm_modes; +u8 lpm_en_modes[LPM_MAX_NUM_MODES ];void (*suspend)(struct pmc_dev *pmcdev);int (*resume)(struct pmc_dev *pmcdev);
Signature · 1 line
2.43.0
Xi Pardee
maintainerPATCH v2 2/4 platform/x86/intel/pmc: Move LPM mode attributes to PMC
In reply to Xi PardeeMove LPM modes attributes from the pmc_dev to the pmc structure. LPM modes are PMC-specific and should be stored within the pmc structure.
After the change, LPM mode information will be retrieved and stored per PMC. The substate_requirements attribute in debugfs will display the requirements for each enabled LPM substate.
--- drivers/platform/x86/intel/pmc/core.c | 39 ++++++++++++++++++--------- drivers/platform/x86/intel/pmc/core.h | 15 +++++------ 2 files changed, 34 insertions(+), 20 deletions(-)
drivers/platform/x86/intel/pmc/core.c +27 -12
@@ -783,7 +783,7 @@ static int pmc_core_substate_res_show(struct seq_file *s, void *unused)seq_printf (s,"%-10s %-15s\n" ,"Substate" ,"Residency" ); -pmc_for_each_mode (mode, pmcdev) { +pmc_for_each_mode (mode, pmc) {seq_printf (s,"%-10s %-15llu\n" , pmc_lpm_modes[mode],adjust_lpm_residency (pmc, offset + (4 * mode), lpm_adj_x2)); }
@@ -838,10 +838,11 @@ static void pmc_core_substate_req_header_show(struct seq_file *s, int pmc_index, enum header_type type) {struct pmc_dev *pmcdev = s->private; +struct pmc *pmc = pmcdev->pmcs[pmc_index];u8 mode;seq_printf (s,"%40s |" ,"Element" ); -pmc_for_each_mode (mode, pmcdev) +pmc_for_each_mode (mode, pmc)seq_printf (s," %9s |" , pmc_lpm_modes[mode]);if (type ==HEADER_STATUS ) {
@@ -887,7 +888,7 @@ static int pmc_core_substate_blk_req_show(struct seq_file *s, void *unused) counter =pmc_core_reg_read (pmc, offset);seq_printf (s,"pmc%u: %34s |" , pmc_idx, map->name); -pmc_for_each_mode (mode, pmcdev) { +pmc_for_each_mode (mode, pmc) {bool required = *lpm_req_regs &BIT (mode);seq_printf (s," %9s |" , required ?"Required" :" " );
@@ -961,7 +962,7 @@ static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused)* show an element if it's required for at least one of the * enabled low power modes */ -pmc_for_each_mode (mode, pmcdev) +pmc_for_each_mode (mode, pmc) req_mask |= lpm_req_regs[mp + (mode * num_maps)];/* Get the last latched status for this map */
@@ -987,7 +988,7 @@ static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused)seq_printf (s,"pmc%d: %34s |" , pmc_idx, map[i].name);/* Loop over the enabled states and display if required */ -pmc_for_each_mode (mode, pmcdev) { +pmc_for_each_mode (mode, pmc) {bool required = lpm_req_regs[mp + (mode * num_maps)] & bit_mask;seq_printf (s," %9s |" , required ?"Required" :" " );
@@ -1077,7 +1078,7 @@ static int pmc_core_lpm_latch_mode_show(struct seq_file *s, void *unused) c10 = true; } -pmc_for_each_mode (mode, pmcdev) { +pmc_for_each_mode (mode, pmc) {if ((BIT (mode) & reg) && !c10)seq_printf (s," [%s]" , pmc_lpm_modes[mode]);else
@@ -1117,7 +1118,7 @@ static ssize_t pmc_core_lpm_latch_mode_write(struct file *file, mode =sysfs_match_string (pmc_lpm_modes, buf);/* Check string matches enabled mode */ -pmc_for_each_mode (m, pmcdev) +pmc_for_each_mode (m, pmc)if (mode == m)break ;
@@ -1213,9 +1214,8 @@ static bool pmc_core_pri_verify(u32 lpm_pri, u8 *mode_order)return true; } -void pmc_core_get_low_power_modes (struct pmc_dev *pmcdev) +static void pmc_core_pmc_get_low_power_modes (struct pmc_dev *pmcdev,struct pmc *pmc) { -struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ];u8 pri_order[LPM_MAX_NUM_MODES ] =LPM_DEFAULT_PRI ;u8 mode_order[LPM_MAX_NUM_MODES ];u32 lpm_pri;
@@ -1233,7 +1233,7 @@ void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev)* Lower byte is enough to cover the number of lpm modes for all * platforms and hence mask the upper 3 bytes. */ - pmcdev->num_lpm_modes =hweight32 (lpm_en &0xFF ); + pmc->num_lpm_modes =hweight32 (lpm_en &0xFF );/* Read 32 bit LPM_PRI register */ lpm_pri =pmc_core_reg_read (pmc, pmc->map->lpm_priority_offset);
@@ -1262,7 +1262,22 @@ void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev)if (!(BIT (mode) & lpm_en))continue ; - pmcdev->lpm_en_modes[i++] = mode; + pmc->lpm_en_modes[i++] = mode; + } +} + +static void pmc_core_get_low_power_modes (struct pmc_dev *pmcdev) +{ +unsigned int pmc_idx; + +for (pmc_idx =0 ; pmc_idx <ARRAY_SIZE (pmcdev->pmcs); pmc_idx++) { +struct pmc *pmc; + + pmc = pmcdev->pmcs[pmc_idx]; +if (!pmc) +continue ; + +pmc_core_pmc_get_low_power_modes (pmcdev, pmc); } }
@@ -1507,7 +1522,7 @@ int pmc_core_pmt_get_lpm_req(struct pmc_dev *pmcdev, struct pmc *pmc, struct telreturn -ENOMEM ; mode_offset =LPM_HEADER_OFFSET +LPM_MODE_OFFSET ; -pmc_for_each_mode (mode, pmcdev) { +pmc_for_each_mode (mode, pmc) {u32 *req_offset = pmc->lpm_req_regs + (mode * num_maps);int m;
drivers/platform/x86/intel/pmc/core.h +7 -8
@@ -423,6 +423,8 @@ struct pmc_info {* specific attributes * @lpm_req_regs: List of substate requirements * @ltr_ign: Holds LTR ignore data while suspended +* @num_lpm_modes: Count of enabled modes +* @lpm_en_modes: Array of enabled modes from lowest to highest priority * * pmc contains info about one power management controller device. */
@@ -432,6 +434,8 @@ struct pmc {const struct pmc_reg_map *map;u32 *lpm_req_regs;u32 ltr_ign; +u8 num_lpm_modes; +u8 lpm_en_modes[LPM_MAX_NUM_MODES ]; };/**
@@ -446,8 +450,6 @@ struct pmc {* @pkgc_res_cnt: Array of PKGC residency counters * @num_of_pkgc: Number of PKGC * @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 * @suspend: Function to perform platform specific suspend * @resume: Function to perform platform specific resume *
@@ -462,8 +464,6 @@ struct pmc_dev {struct mutex lock;/* generic mutex lock for PMC Core */ u64 s0ix_counter; -u8 num_lpm_modes; -u8 lpm_en_modes[LPM_MAX_NUM_MODES ];void (*suspend)(struct pmc_dev *pmcdev);int (*resume)(struct pmc_dev *pmcdev);
@@ -535,7 +535,6 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore);int pmc_core_resume_common (struct pmc_dev *pmcdev);int get_primary_reg_base (struct pmc *pmc); -void pmc_core_get_low_power_modes (struct pmc_dev *pmcdev);void pmc_core_punit_pmt_init (struct pmc_dev *pmcdev,u32 *guids);void pmc_core_set_device_d3 (unsigned int device);
@@ -563,10 +562,10 @@ int pmc_core_pmt_get_blk_sub_req(struct pmc_dev *pmcdev, struct pmc *pmc,extern const struct file_operations pmc_core_substate_req_regs_fops;extern const struct file_operations pmc_core_substate_blk_req_fops; -#define pmc_for_each_mode (mode, pmcdev) \ +#define pmc_for_each_mode (mode, pmc) \ for (unsigned int __i = 0, __cond; \ - __cond = __i < (pmcdev)->num_lpm_modes, \ - __cond && ((mode) = (pmcdev)->lpm_en_modes[__i]), \ + __cond = __i < (pmc)->num_lpm_modes, \ + __cond && ((mode) = (pmc)->lpm_en_modes[__i]), \ __cond; \ __i++)
Signature · 1 line
2.43.0
Xi Pardee
maintainerPATCH v2 3/4 platform/x86/intel/pmc: Enable substate residencies for multiple PMCs
In reply to Xi PardeeEnable substate residencies support for multiple PMCs. Previously substate residencies were shown only for the primary PMC. This change enables substate residencies for all available PMCs.
The output of substate_residencies with this patch will be similar to this:
pmc0 Substate Residency
S0i2.0 0
S0i2.1 0
S0i2.2 0
pmc1 Substate Residency
S0i2.0 0
S0i2.1 0
S0i2.2 0pmc2 Substate Residency
S0i2.0 0
--- drivers/platform/x86/intel/pmc/core.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/platform/x86/intel/pmc/core.c +18 -8
@@ -776,16 +776,26 @@ static inline u64 adjust_lpm_residency(struct pmc *pmc, u32 offset,static int pmc_core_substate_res_show (struct seq_file *s,void *unused) {struct pmc_dev *pmcdev = s->private; -struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; -const int lpm_adj_x2 = pmc->map->lpm_res_counter_step_x2; -u32 offset = pmc->map->lpm_residency_offset; -u8 mode; +unsigned int pmc_idx; + +for (pmc_idx =0 ; pmc_idx <ARRAY_SIZE (pmcdev->pmcs); ++pmc_idx) { +int lpm_adj_x2; +struct pmc *pmc; +u32 offset; +u8 mode; -seq_printf (s,"%-10s %-15s\n" ,"Substate" ,"Residency" ); + pmc = pmcdev->pmcs[pmc_idx]; +if (!pmc) +continue ; -pmc_for_each_mode (mode, pmc) { -seq_printf (s,"%-10s %-15llu\n" , pmc_lpm_modes[mode], -adjust_lpm_residency (pmc, offset + (4 * mode), lpm_adj_x2)); + lpm_adj_x2 = pmc->map->lpm_res_counter_step_x2; + offset = pmc->map->lpm_residency_offset; + +seq_printf (s,"pmc%u %10s %15s\n" , pmc_idx,"Substate" ,"Residency" ); +pmc_for_each_mode (mode, pmc) { +seq_printf (s,"%15s %15llu\n" , pmc_lpm_modes[mode], +adjust_lpm_residency (pmc, offset + (4 * mode), lpm_adj_x2)); + } }return 0 ;
Signature · 1 line
2.43.0
Xi Pardee
maintainerPATCH v2 4/4 platform/x86/intel/pmc: Remove double empty line
In reply to Xi PardeeRemove double empty line to improve readability.
--- drivers/platform/x86/intel/pmc/core.c | 1 - 1 file changed, 1 deletion(-)
drivers/platform/x86/intel/pmc/core.c +0 -1
@@ -1248,7 +1248,6 @@ static void pmc_core_pmc_get_low_power_modes(struct pmc_dev *pmcdev, struct pmc/* Read 32 bit LPM_PRI register */ lpm_pri =pmc_core_reg_read (pmc, pmc->map->lpm_priority_offset); -/* * If lpm_pri value passes verification, then override the default * modes here. Otherwise stick with the default.
Signature · 1 line
2.43.0
Ilpo Järvinen
maintainerQuoted 10 lines · Xi Pardee
This patch series enables substate residencies for multiple PMCs. The first two patches prepare this change:
- The first patch changes the datatype of LPM mode attributes to u8.
- The second patch moves the LPM mode attributes from thepmc_devto the pmc struture.
- The third patch enables the substate residencies for multiple PMCs.
- The final removes one empty line.[...]
Thank you for your contribution, it has been applied to my local review-ilpo-next branch. Note it will show up in the public platform-drivers-x86/review-ilpo-next branch only once I've pushed my local branch there, which might take a while.
The list of commits applied:
[1/4] platform/x86/intel/pmc: Change LPM mode fields to u8
commit: d155800918b0106e9a4147d00c81bc6f21c17233
[2/4] platform/x86/intel/pmc: Move LPM mode attributes to PMC
commit: a1c745c84043001f696ae063c213f1eefdb03a1a
[3/4] platform/x86/intel/pmc: Enable substate residencies for multiple PMCs
commit: ec4cda37a62cb736e9c7a5ad1630e6418e465af7
[4/4] platform/x86/intel/pmc: Remove double empty line
commit: 291cb0fc143ca603d4e959ae3fbf4bb149281a39--
i.