| Message ID | 20231018231624.1044633-14-david.e.box@linux.intel.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | intel_pmc: Add telemetry API to read counters | expand |
On Wed, 18 Oct 2023, David E. Box wrote: > From: Rajvi Jingar <rajvi.jingar@linux.intel.com> > > Update the substate_requirements attribute to display the requirements for > all the PMCs on a package. > > Signed-off-by: Rajvi Jingar <rajvi.jingar@linux.intel.com> > Signed-off-by: David E. Box <david.e.box@linux.intel.com> > --- > V4 - No change > > V3 - Add missing submitter signoff > > V2 - no change > > drivers/platform/x86/intel/pmc/core.c | 129 ++++++++++++++------------ > 1 file changed, 71 insertions(+), 58 deletions(-) > > diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c > index 3894119d61b0..fcb0dc702aea 100644 > --- a/drivers/platform/x86/intel/pmc/core.c > +++ b/drivers/platform/x86/intel/pmc/core.c > @@ -728,7 +728,7 @@ static int pmc_core_substate_l_sts_regs_show(struct seq_file *s, void *unused) > } > DEFINE_SHOW_ATTRIBUTE(pmc_core_substate_l_sts_regs); > > -static void pmc_core_substate_req_header_show(struct seq_file *s) > +static void pmc_core_substate_req_header_show(struct seq_file *s, int pmc_index) > { > struct pmc_dev *pmcdev = s->private; > int i, mode; > @@ -743,68 +743,81 @@ static void pmc_core_substate_req_header_show(struct seq_file *s) > static int pmc_core_substate_req_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; > - const struct pmc_bit_map *map; > - const int num_maps = pmc->map->lpm_num_maps; > - u32 sts_offset = pmc->map->lpm_status_offset; > - u32 *lpm_req_regs = pmc->lpm_req_regs; > - int mp; > - > - /* Display the header */ > - pmc_core_substate_req_header_show(s); > - > - /* Loop over maps */ > - for (mp = 0; mp < num_maps; mp++) { > - u32 req_mask = 0; > - u32 lpm_status; > - int mode, idx, i, len = 32; > - > - /* > - * Capture the requirements and create a mask so that we only > - * show an element if it's required for at least one of the > - * enabled low power modes > - */ > - pmc_for_each_mode(idx, mode, pmcdev) > - req_mask |= lpm_req_regs[mp + (mode * num_maps)]; > - > - /* Get the last latched status for this map */ > - lpm_status = pmc_core_reg_read(pmc, sts_offset + (mp * 4)); > - > - /* Loop over elements in this map */ > - map = maps[mp]; > - for (i = 0; map[i].name && i < len; i++) { > - u32 bit_mask = map[i].bit_mask; > - > - if (!(bit_mask & req_mask)) > - /* > - * Not required for any enabled states > - * so don't display > - */ > - continue; > - > - /* Display the element name in the first column */ > - seq_printf(s, "%30s |", map[i].name); > - > - /* Loop over the enabled states and display if required */ > - pmc_for_each_mode(idx, mode, pmcdev) { > - if (lpm_req_regs[mp + (mode * num_maps)] & bit_mask) > - seq_printf(s, " %9s |", > - "Required"); > + u32 sts_offset; > + u32 *lpm_req_regs; > + int num_maps, mp, pmc_index; > + > + for (pmc_index = 0; pmc_index < ARRAY_SIZE(pmcdev->pmcs); ++pmc_index) { > + struct pmc *pmc = pmcdev->pmcs[pmc_index]; > + const struct pmc_bit_map **maps; > + > + if (!pmc) > + continue; > + > + maps = pmc->map->lpm_sts; > + num_maps = pmc->map->lpm_num_maps; > + sts_offset = pmc->map->lpm_status_offset; > + lpm_req_regs = pmc->lpm_req_regs; > + > + if (!lpm_req_regs) > + continue; > + > + /* Display the header */ > + pmc_core_substate_req_header_show(s, pmc_index); > + > + /* Loop over maps */ > + for (mp = 0; mp < num_maps; mp++) { > + u32 req_mask = 0; > + u32 lpm_status; > + const struct pmc_bit_map *map; > + int mode, idx, i, len = 32; > + > + /* > + * Capture the requirements and create a mask so that we only > + * show an element if it's required for at least one of the > + * enabled low power modes > + */ > + pmc_for_each_mode(idx, mode, pmcdev) > + req_mask |= lpm_req_regs[mp + (mode * num_maps)]; > + > + /* Get the last latched status for this map */ > + lpm_status = pmc_core_reg_read(pmc, sts_offset + (mp * 4)); > + > + /* Loop over elements in this map */ > + map = maps[mp]; > + for (i = 0; map[i].name && i < len; i++) { > + u32 bit_mask = map[i].bit_mask; > + > + if (!(bit_mask & req_mask)) { > + /* > + * Not required for any enabled states > + * so don't display > + */ > + continue; > + } > + > + /* Display the element name in the first column */ > + seq_printf(s, "pmc%d: %26s |", pmc_index, map[i].name); > + > + /* Loop over the enabled states and display if required */ > + pmc_for_each_mode(idx, mode, pmcdev) { > + if (lpm_req_regs[mp + (mode * num_maps)] & bit_mask) > + seq_printf(s, " %9s |", > + "Required"); > + else > + seq_printf(s, " %9s |", " "); It would be better to not branch like this but alter param instead: bool required = lpm_req_regs[... seq_printf(s, " %9s |", required ? "Required" : " "); > + } > + > + /* In Status column, show the last captured state of this agent */ > + if (lpm_status & bit_mask) > + seq_printf(s, " %9s |", "Yes"); > else > seq_printf(s, " %9s |", " "); Likewise here although I know this comes from the original.
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index 3894119d61b0..fcb0dc702aea 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -728,7 +728,7 @@ static int pmc_core_substate_l_sts_regs_show(struct seq_file *s, void *unused) } DEFINE_SHOW_ATTRIBUTE(pmc_core_substate_l_sts_regs); -static void pmc_core_substate_req_header_show(struct seq_file *s) +static void pmc_core_substate_req_header_show(struct seq_file *s, int pmc_index) { struct pmc_dev *pmcdev = s->private; int i, mode; @@ -743,68 +743,81 @@ static void pmc_core_substate_req_header_show(struct seq_file *s) static int pmc_core_substate_req_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; - const struct pmc_bit_map *map; - const int num_maps = pmc->map->lpm_num_maps; - u32 sts_offset = pmc->map->lpm_status_offset; - u32 *lpm_req_regs = pmc->lpm_req_regs; - int mp; - - /* Display the header */ - pmc_core_substate_req_header_show(s); - - /* Loop over maps */ - for (mp = 0; mp < num_maps; mp++) { - u32 req_mask = 0; - u32 lpm_status; - int mode, idx, i, len = 32; - - /* - * Capture the requirements and create a mask so that we only - * show an element if it's required for at least one of the - * enabled low power modes - */ - pmc_for_each_mode(idx, mode, pmcdev) - req_mask |= lpm_req_regs[mp + (mode * num_maps)]; - - /* Get the last latched status for this map */ - lpm_status = pmc_core_reg_read(pmc, sts_offset + (mp * 4)); - - /* Loop over elements in this map */ - map = maps[mp]; - for (i = 0; map[i].name && i < len; i++) { - u32 bit_mask = map[i].bit_mask; - - if (!(bit_mask & req_mask)) - /* - * Not required for any enabled states - * so don't display - */ - continue; - - /* Display the element name in the first column */ - seq_printf(s, "%30s |", map[i].name); - - /* Loop over the enabled states and display if required */ - pmc_for_each_mode(idx, mode, pmcdev) { - if (lpm_req_regs[mp + (mode * num_maps)] & bit_mask) - seq_printf(s, " %9s |", - "Required"); + u32 sts_offset; + u32 *lpm_req_regs; + int num_maps, mp, pmc_index; + + for (pmc_index = 0; pmc_index < ARRAY_SIZE(pmcdev->pmcs); ++pmc_index) { + struct pmc *pmc = pmcdev->pmcs[pmc_index]; + const struct pmc_bit_map **maps; + + if (!pmc) + continue; + + maps = pmc->map->lpm_sts; + num_maps = pmc->map->lpm_num_maps; + sts_offset = pmc->map->lpm_status_offset; + lpm_req_regs = pmc->lpm_req_regs; + + if (!lpm_req_regs) + continue; + + /* Display the header */ + pmc_core_substate_req_header_show(s, pmc_index); + + /* Loop over maps */ + for (mp = 0; mp < num_maps; mp++) { + u32 req_mask = 0; + u32 lpm_status; + const struct pmc_bit_map *map; + int mode, idx, i, len = 32; + + /* + * Capture the requirements and create a mask so that we only + * show an element if it's required for at least one of the + * enabled low power modes + */ + pmc_for_each_mode(idx, mode, pmcdev) + req_mask |= lpm_req_regs[mp + (mode * num_maps)]; + + /* Get the last latched status for this map */ + lpm_status = pmc_core_reg_read(pmc, sts_offset + (mp * 4)); + + /* Loop over elements in this map */ + map = maps[mp]; + for (i = 0; map[i].name && i < len; i++) { + u32 bit_mask = map[i].bit_mask; + + if (!(bit_mask & req_mask)) { + /* + * Not required for any enabled states + * so don't display + */ + continue; + } + + /* Display the element name in the first column */ + seq_printf(s, "pmc%d: %26s |", pmc_index, map[i].name); + + /* Loop over the enabled states and display if required */ + pmc_for_each_mode(idx, mode, pmcdev) { + if (lpm_req_regs[mp + (mode * num_maps)] & bit_mask) + seq_printf(s, " %9s |", + "Required"); + else + seq_printf(s, " %9s |", " "); + } + + /* In Status column, show the last captured state of this agent */ + if (lpm_status & bit_mask) + seq_printf(s, " %9s |", "Yes"); else seq_printf(s, " %9s |", " "); + + seq_puts(s, "\n"); } - - /* In Status column, show the last captured state of this agent */ - if (lpm_status & bit_mask) - seq_printf(s, " %9s |", "Yes"); - else - seq_printf(s, " %9s |", " "); - - seq_puts(s, "\n"); } } - return 0; } DEFINE_SHOW_ATTRIBUTE(pmc_core_substate_req_regs);