On Thu, Nov 8, 2018 at 9:05 PM Rajneesh Bhardwaj
<rajneesh.bhardwaj@xxxxxxxxxxxxxxx> wrote:
>
> This adds support to show the Latency Tolerance Reporting for the IPs on
> the PCH as reported by the PMC. The format shown here is raw LTR data
> payload that can further be decoded as per the PCI specification.
>
> This also fixes some minor alignment issues in the header file by
> removing spaces and converting to tabs at some places.
>
All three pushed to my review and testing queue, thanks!
> Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@xxxxxxxxxxxxxxx>
> ---
> Changes in v4:
> * Removed unnecessary comments related to reserved IPs
> * Reordered #defines in the header in chronological order
> * Worked on patch taken from review-andy branch that removed LTR
> duplication strings and other style fixes.
>
> drivers/platform/x86/intel_pmc_core.c | 69 +++++++++++++++++++++++++++
> drivers/platform/x86/intel_pmc_core.h | 57 +++++++++++++++++++---
> 2 files changed, 119 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
> index 6b31d410cb09..54080c0e52fb 100644
> --- a/drivers/platform/x86/intel_pmc_core.c
> +++ b/drivers/platform/x86/intel_pmc_core.c
> @@ -101,10 +101,35 @@ static const struct pmc_bit_map spt_pfear_map[] = {
> {},
> };
>
> +static const struct pmc_bit_map spt_ltr_show_map[] = {
> + {"SOUTHPORT_A", SPT_PMC_LTR_SPA},
> + {"SOUTHPORT_B", SPT_PMC_LTR_SPB},
> + {"SATA", SPT_PMC_LTR_SATA},
> + {"GIGABIT_ETHERNET", SPT_PMC_LTR_GBE},
> + {"XHCI", SPT_PMC_LTR_XHCI},
> + {"ME", SPT_PMC_LTR_ME},
> + /* EVA is Enterprise Value Add, doesn't really exist on PCH */
> + {"EVA", SPT_PMC_LTR_EVA},
> + {"SOUTHPORT_C", SPT_PMC_LTR_SPC},
> + {"HD_AUDIO", SPT_PMC_LTR_AZ},
> + {"LPSS", SPT_PMC_LTR_LPSS},
> + {"SOUTHPORT_D", SPT_PMC_LTR_SPD},
> + {"SOUTHPORT_E", SPT_PMC_LTR_SPE},
> + {"CAMERA", SPT_PMC_LTR_CAM},
> + {"ESPI", SPT_PMC_LTR_ESPI},
> + {"SCC", SPT_PMC_LTR_SCC},
> + {"ISH", SPT_PMC_LTR_ISH},
> + /* Below two cannot be used for LTR_IGNORE */
> + {"CURRENT_PLATFORM", SPT_PMC_LTR_CUR_PLT},
> + {"AGGREGATED_SYSTEM", SPT_PMC_LTR_CUR_ASLT},
> + {}
> +};
> +
> static const struct pmc_reg_map spt_reg_map = {
> .pfear_sts = spt_pfear_map,
> .mphy_sts = spt_mphy_map,
> .pll_sts = spt_pll_map,
> + .ltr_show_sts = spt_ltr_show_map,
> .slp_s0_offset = SPT_PMC_SLP_S0_RES_COUNTER_OFFSET,
> .ltr_ignore_offset = SPT_PMC_LTR_IGNORE_OFFSET,
> .regmap_length = SPT_PMC_MMIO_REG_LEN,
> @@ -243,10 +268,38 @@ static const struct pmc_bit_map *cnp_slps0_dbg_maps[] = {
> NULL,
> };
>
> +static const struct pmc_bit_map cnp_ltr_show_map[] = {
> + {"SOUTHPORT_A", CNP_PMC_LTR_SPA},
> + {"SOUTHPORT_B", CNP_PMC_LTR_SPB},
> + {"SATA", CNP_PMC_LTR_SATA},
> + {"GIGABIT_ETHERNET", CNP_PMC_LTR_GBE},
> + {"XHCI", CNP_PMC_LTR_XHCI},
> + {"ME", CNP_PMC_LTR_ME},
> + /* EVA is Enterprise Value Add, doesn't really exist on PCH */
> + {"EVA", CNP_PMC_LTR_EVA},
> + {"SOUTHPORT_C", CNP_PMC_LTR_SPC},
> + {"HD_AUDIO", CNP_PMC_LTR_AZ},
> + {"CNV", CNP_PMC_LTR_CNV},
> + {"LPSS", CNP_PMC_LTR_LPSS},
> + {"SOUTHPORT_D", CNP_PMC_LTR_SPD},
> + {"SOUTHPORT_E", CNP_PMC_LTR_SPE},
> + {"CAMERA", CNP_PMC_LTR_CAM},
> + {"ESPI", CNP_PMC_LTR_ESPI},
> + {"SCC", CNP_PMC_LTR_SCC},
> + {"ISH", CNP_PMC_LTR_ISH},
> + {"UFSX2", CNP_PMC_LTR_UFSX2},
> + {"EMMC", CNP_PMC_LTR_EMMC},
> + /* Below two cannot be used for LTR_IGNORE */
> + {"CURRENT_PLATFORM", CNP_PMC_LTR_CUR_PLT},
> + {"AGGREGATED_SYSTEM", CNP_PMC_LTR_CUR_ASLT},
> + {}
> +};
> +
> static const struct pmc_reg_map cnp_reg_map = {
> .pfear_sts = 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,
> .slps0_dbg_offset = CNP_PMC_SLPS0_DBG_OFFSET,
> .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET,
> .regmap_length = CNP_PMC_MMIO_REG_LEN,
> @@ -583,6 +636,20 @@ static int pmc_core_slps0_dbg_show(struct seq_file *s, void *unused)
> }
> DEFINE_SHOW_ATTRIBUTE(pmc_core_slps0_dbg);
>
> +static int pmc_core_ltr_show(struct seq_file *s, void *unused)
> +{
> + struct pmc_dev *pmcdev = s->private;
> + const struct pmc_bit_map *map = pmcdev->map->ltr_show_sts;
> + int index;
> +
> + for (index = 0; map[index].name ; index++) {
> + seq_printf(s, "%-32s\tRAW LTR: 0x%x\n", map[index].name,
> + pmc_core_reg_read(pmcdev, map[index].bit_mask));
> + }
> + return 0;
> +}
> +DEFINE_SHOW_ATTRIBUTE(pmc_core_ltr);
> +
> static void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev)
> {
> debugfs_remove_recursive(pmcdev->dbgfs_dir);
> @@ -607,6 +674,8 @@ static int 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", 0644, dir, pmcdev, &pmc_core_ltr_fops);
> +
> if (pmcdev->map->pll_sts)
> debugfs_create_file("pll_status", 0444, dir, pmcdev,
> &pmc_core_pll_ops);
> diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel_pmc_core.h
> index be045348ad86..fcb13ca1f2bd 100644
> --- a/drivers/platform/x86/intel_pmc_core.h
> +++ b/drivers/platform/x86/intel_pmc_core.h
> @@ -37,6 +37,25 @@
> #define NUM_RETRIES 100
> #define NUM_IP_IGN_ALLOWED 17
>
> +#define SPT_PMC_LTR_CUR_PLT 0x350
> +#define SPT_PMC_LTR_CUR_ASLT 0x354
> +#define SPT_PMC_LTR_SPA 0x360
> +#define SPT_PMC_LTR_SPB 0x364
> +#define SPT_PMC_LTR_SATA 0x368
> +#define SPT_PMC_LTR_GBE 0x36C
> +#define SPT_PMC_LTR_XHCI 0x370
> +#define SPT_PMC_LTR_ME 0x378
> +#define SPT_PMC_LTR_EVA 0x37C
> +#define SPT_PMC_LTR_SPC 0x380
> +#define SPT_PMC_LTR_AZ 0x384
> +#define SPT_PMC_LTR_LPSS 0x38C
> +#define SPT_PMC_LTR_CAM 0x390
> +#define SPT_PMC_LTR_SPD 0x394
> +#define SPT_PMC_LTR_SPE 0x398
> +#define SPT_PMC_LTR_ESPI 0x39C
> +#define SPT_PMC_LTR_SCC 0x3A0
> +#define SPT_PMC_LTR_ISH 0x3A4
> +
> /* Sunrise Point: PGD PFET Enable Ack Status Registers */
> enum ppfear_regs {
> SPT_PMC_XRAM_PPFEAR0A = 0x590,
> @@ -115,18 +134,40 @@ enum ppfear_regs {
> #define SPT_PMC_BIT_MPHY_CMN_LANE3 BIT(3)
>
> /* Cannonlake Power Management Controller register offsets */
> -#define CNP_PMC_SLP_S0_RES_COUNTER_OFFSET 0x193C
> -#define CNP_PMC_LTR_IGNORE_OFFSET 0x1B0C
> -#define CNP_PMC_PM_CFG_OFFSET 0x1818
> #define CNP_PMC_SLPS0_DBG_OFFSET 0x10B4
> +#define CNP_PMC_PM_CFG_OFFSET 0x1818
> +#define CNP_PMC_SLP_S0_RES_COUNTER_OFFSET 0x193C
> +#define CNP_PMC_LTR_IGNORE_OFFSET 0x1B0C
> /* Cannonlake: PGD PFET Enable Ack Status Register(s) start */
> -#define CNP_PMC_HOST_PPFEAR0A 0x1D90
> +#define CNP_PMC_HOST_PPFEAR0A 0x1D90
>
> -#define CNP_PMC_MMIO_REG_LEN 0x2000
> -#define CNP_PPFEAR_NUM_ENTRIES 8
> -#define CNP_PMC_READ_DISABLE_BIT 22
> #define CNP_PMC_LATCH_SLPS0_EVENTS BIT(31)
>
> +#define CNP_PMC_MMIO_REG_LEN 0x2000
> +#define CNP_PPFEAR_NUM_ENTRIES 8
> +#define CNP_PMC_READ_DISABLE_BIT 22
> +#define CNP_PMC_LTR_CUR_PLT 0x1B50
> +#define CNP_PMC_LTR_CUR_ASLT 0x1B54
> +#define CNP_PMC_LTR_SPA 0x1B60
> +#define CNP_PMC_LTR_SPB 0x1B64
> +#define CNP_PMC_LTR_SATA 0x1B68
> +#define CNP_PMC_LTR_GBE 0x1B6C
> +#define CNP_PMC_LTR_XHCI 0x1B70
> +#define CNP_PMC_LTR_ME 0x1B78
> +#define CNP_PMC_LTR_EVA 0x1B7C
> +#define CNP_PMC_LTR_SPC 0x1B80
> +#define CNP_PMC_LTR_AZ 0x1B84
> +#define CNP_PMC_LTR_LPSS 0x1B8C
> +#define CNP_PMC_LTR_CAM 0x1B90
> +#define CNP_PMC_LTR_SPD 0x1B94
> +#define CNP_PMC_LTR_SPE 0x1B98
> +#define CNP_PMC_LTR_ESPI 0x1B9C
> +#define CNP_PMC_LTR_SCC 0x1BA0
> +#define CNP_PMC_LTR_ISH 0x1BA4
> +#define CNP_PMC_LTR_CNV 0x1BF0
> +#define CNP_PMC_LTR_EMMC 0x1BF4
> +#define CNP_PMC_LTR_UFSX2 0x1BF8
> +
> struct pmc_bit_map {
> const char *name;
> u32 bit_mask;
> @@ -139,6 +180,7 @@ struct pmc_bit_map {
> * @mphy_sts: Maps name of MPHY lane to MPHY status lane status bit
> * @pll_sts: Maps name of PLL to corresponding bit status
> * @slps0_dbg_maps: Array of SLP_S0_DBG* registers containing debug info
> + * @ltr_show_sts: Maps PCH IP Names to their MMIO register offsets
> * @slp_s0_offset: PWRMBASE offset to read SLP_S0 residency
> * @ltr_ignore_offset: PWRMBASE offset to read/write LTR ignore bit
> * @regmap_length: Length of memory to map from PWRMBASE address to access
> @@ -157,6 +199,7 @@ struct pmc_reg_map {
> const struct pmc_bit_map *mphy_sts;
> const struct pmc_bit_map *pll_sts;
> const struct pmc_bit_map **slps0_dbg_maps;
> + const struct pmc_bit_map *ltr_show_sts;
> const u32 slp_s0_offset;
> const u32 ltr_ignore_offset;
> const int regmap_length;
> --
> 2.17.1
>
--
With Best Regards,
Andy Shevchenko
