intel_pmc: Add telemetry API to read counters
Subsystems (4)
David E. Box
maintainerv2 cover intel_pmc: Add telemetry API to read counters
On newer Intel silicon, more IP counters are being added in Intel Platform Monitoring Technology (PMT) telemetry spaces hosted in MMIO. There is a need for the intel_pmc_core driver and other drivers to access PMT hosted telemetry in the kernel using an API. This patchset adds driver APIs to allow registering and reading telemetry entries. It makes changes to the intel_pmc_core driver to use these interfaces to access the low power mode counters that are now exclusively available from PMT.
David E. Box (8):
platform/x86/intel/vsec: Move structures to header platform/x86/intel/vsec: remove platform_info from vsec device
structure
platform/x86/intel/vsec: Add base address field platform/x86/intel/pmt: Add header to struct intel_pmt_entry platform/x86/intel/pmt: telemetry: Export API to read telemetry platform/x86/intel/pmc: Split pmc_core_ssram_get_pmc() platform/x86/intel/pmc: Find and register PMC telemetry entries platform/x86/intel/pmc: Add debug attribute for Die C6 counter
Gayatri Kammela (1):
platform/x86/intel/vsec: Add intel_vsec_register
Rajvi Jingar (1):
platform/x86/intel/pmc: Display LPM requirements for multiple PMCs
Xi Pardee (3):
platform/x86:intel/pmc: Call pmc_get_low_power_modes from platform
init
platform/x86/intel/pmc: Retrieve LPM information using Intel PMT platform/x86/intel/pmc: Read low power mode requirements for MTL-M and
MTL-P
drivers/platform/x86/intel/pmc/Kconfig | 1 + drivers/platform/x86/intel/pmc/adl.c | 2 + drivers/platform/x86/intel/pmc/cnp.c | 2 + drivers/platform/x86/intel/pmc/core.c | 191 ++++++++---- drivers/platform/x86/intel/pmc/core.h | 10 +- drivers/platform/x86/intel/pmc/core_ssram.c | 312 +++++++++++++++++--- drivers/platform/x86/intel/pmc/icl.c | 10 +- drivers/platform/x86/intel/pmc/mtl.c | 87 +++++- drivers/platform/x86/intel/pmc/spt.c | 10 +- drivers/platform/x86/intel/pmc/tgl.c | 1 + drivers/platform/x86/intel/pmt/class.c | 43 ++- drivers/platform/x86/intel/pmt/class.h | 30 +- drivers/platform/x86/intel/pmt/crashlog.c | 2 +- drivers/platform/x86/intel/pmt/telemetry.c | 200 ++++++++++++- drivers/platform/x86/intel/pmt/telemetry.h | 129 ++++++++ drivers/platform/x86/intel/vsec.c | 68 ++--- drivers/platform/x86/intel/vsec.h | 44 ++- 17 files changed, 962 insertions(+), 180 deletions(-) create mode 100644 drivers/platform/x86/intel/pmt/telemetry.h
base-commit: acce85a7dd28eac3858d44230f4c65985d0f271c
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v2 1/13 platform/x86/intel/vsec: Move structures to header
In preparation for exporting an API to register Intel Vendor Specific Extended Capabilities (VSEC) from other drivers, move needed structures to the header file.
---
V2 - New patch splitting previous PATCH 1
drivers/platform/x86/intel/vsec.c | 35 ------------------------------ drivers/platform/x86/intel/vsec.h | 36 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 35 deletions(-)
drivers/platform/x86/intel/vsec.c +0 -35
@@ -24,13 +24,6 @@#include "vsec.h" -/* Intel DVSEC offsets */ -#define INTEL_DVSEC_ENTRIES 0xA -#define INTEL_DVSEC_SIZE 0xB -#define INTEL_DVSEC_TABLE 0xC -#define INTEL_DVSEC_TABLE_BAR (x) ((x) & GENMASK(2, 0)) -#define INTEL_DVSEC_TABLE_OFFSET (x) ((x) & GENMASK(31, 3)) -#define TABLE_OFFSET_SHIFT 3#define PMT_XA_START 0#define PMT_XA_MAX INT_MAX#define PMT_XA_LIMIT XA_LIMIT(PMT_XA_START, PMT_XA_MAX)
@@ -39,34 +32,6 @@ static DEFINE_IDA(intel_vsec_ida);static DEFINE_IDA (intel_vsec_sdsi_ida);static DEFINE_XARRAY_ALLOC (auxdev_array); -/** -* struct intel_vsec_header - Common fields of Intel VSEC and DVSEC registers. -* @rev: Revision ID of the VSEC/DVSEC register space -* @length: Length of the VSEC/DVSEC register space -* @id: ID of the feature -* @num_entries: Number of instances of the feature -* @entry_size: Size of the discovery table for each feature -* @tbir: BAR containing the discovery tables -* @offset: BAR offset of start of the first discovery table -*/ -struct intel_vsec_header { -u8 rev; -u16 length; -u16 id; -u8 num_entries; -u8 entry_size; -u8 tbir; -u32 offset; -}; - -enum intel_vsec_id { -VSEC_ID_TELEMETRY =2 , -VSEC_ID_WATCHER =3 , -VSEC_ID_CRASHLOG =4 , -VSEC_ID_SDSI =65 , -VSEC_ID_TPMI =66 , -}; -static const char *intel_vsec_name (enum intel_vsec_id id) {switch (id) {
drivers/platform/x86/intel/vsec.h +36 -0
@@ -11,9 +11,45 @@#define VSEC_CAP_SDSI BIT(3)#define VSEC_CAP_TPMI BIT(4) +/* Intel DVSEC offsets */ +#define INTEL_DVSEC_ENTRIES 0xA +#define INTEL_DVSEC_SIZE 0xB +#define INTEL_DVSEC_TABLE 0xC +#define INTEL_DVSEC_TABLE_BAR (x) ((x) & GENMASK(2, 0)) +#define INTEL_DVSEC_TABLE_OFFSET (x) ((x) & GENMASK(31, 3)) +#define TABLE_OFFSET_SHIFT 3 +struct pci_dev ;struct resource ; +enum intel_vsec_id { +VSEC_ID_TELEMETRY =2 , +VSEC_ID_WATCHER =3 , +VSEC_ID_CRASHLOG =4 , +VSEC_ID_SDSI =65 , +VSEC_ID_TPMI =66 , +}; + +/** +* struct intel_vsec_header - Common fields of Intel VSEC and DVSEC registers. +* @rev: Revision ID of the VSEC/DVSEC register space +* @length: Length of the VSEC/DVSEC register space +* @id: ID of the feature +* @num_entries: Number of instances of the feature +* @entry_size: Size of the discovery table for each feature +* @tbir: BAR containing the discovery tables +* @offset: BAR offset of start of the first discovery table +*/ +struct intel_vsec_header { +u8 rev; +u16 length; +u16 id; +u8 num_entries; +u8 entry_size; +u8 tbir; +u32 offset; +}; +enum intel_vsec_quirks {/* Watcher feature not supported */ VSEC_QUIRK_NO_WATCHER =BIT (0 ),
Signature · 1 line
2.34.1
Re: [PATCH V2 01/13] platform/x86/intel/vsec: Move structures to header
Quoted 7 lines · David E. Box
In preparation for exporting an API to register Intel Vendor Specific Extended Capabilities (VSEC) from other drivers, move needed structures to the header file.
Signed-off-by David E. Box <[email protected]>---
V2 - New patch splitting previous PATCH 1
Thanks, so much easier to review in this form! :-)
Signature · 1 line
i.
David E. Box
maintainerPATCH v2 2/13 platform/x86/intel/vsec: remove platform_info from vsec device structure
In reply to David E. BoxIn preparation for exporting an API to register Intel Vendor Specific Extended Capabilities (VSEC) from other drivers, remove the pointer to platform_info from intel_vsec_device. This prevents a potential page fault when auxiliary drivers probe and attempt to dereference this pointer to access the needed quirks field. Instead, just add the quirks to intel_vsec_device.
---
V2 - New patch splitting previous PATCH 1
drivers/platform/x86/intel/pmt/class.c | 2 +- drivers/platform/x86/intel/vsec.c | 2 +- drivers/platform/x86/intel/vsec.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/intel/pmt/class.c +1 -1
@@ -31,7 +31,7 @@ bool intel_pmt_is_early_client_hw(struct device *dev)* differences from the server platforms (which use the Out Of Band * Management Services Module OOBMSM). */ -return !!(ivdev->info->quirks &VSEC_QUIRK_EARLY_HW ); +return !!(ivdev->quirks &VSEC_QUIRK_EARLY_HW ); }EXPORT_SYMBOL_NS_GPL (intel_pmt_is_early_client_hw,INTEL_PMT );
drivers/platform/x86/intel/vsec.c +1 -1
@@ -193,7 +193,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he intel_vsec_dev->pcidev = pdev; intel_vsec_dev->resource = res; intel_vsec_dev->num_resources = header->num_entries; - intel_vsec_dev->info = info; + intel_vsec_dev->quirks = info->quirks;if (header->id ==VSEC_ID_SDSI ) intel_vsec_dev->ida = &intel_vsec_sdsi_ida;
drivers/platform/x86/intel/vsec.h +1 -1
@@ -79,10 +79,10 @@ struct intel_vsec_device {struct pci_dev *pcidev;struct resource *resource;struct ida *ida; -struct intel_vsec_platform_info *info;int num_resources;void *priv_data;size_t priv_data_size; +unsigned long quirks; }; int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
Signature · 1 line
2.34.1
Re: [PATCH V2 02/13] platform/x86/intel/vsec: remove platform_info from vsec device structure
Quoted 10 lines · David E. Box
In preparation for exporting an API to register Intel Vendor Specific Extended Capabilities (VSEC) from other drivers, remove the pointer to
platform_infofromintel_vsec_device. This prevents a potential page fault when auxiliary drivers probe and attempt to dereference this pointer to access the needed quirks field. Instead, just add the quirks tointel_vsec_device.Signed-off-by David E. Box <[email protected]>---
V2 - New patch splitting previous PATCH 1
Signature · 1 line
i.
David E. Box
maintainerPATCH v2 3/13 platform/x86/intel/vsec: Add intel_vsec_register
In reply to David E. BoxFrom: Gayatri Kammela <[email protected]>
Add and export intel_vsec_register() to allow the registration of Intel extended capabilities from other drivers. Add check to look for memory conflicts before registering a new capability. Add a parent field to intel_vsec_platform_info to allow specifying the parent device for device managed cleanup.
---
V2 - New patch splitting previous PATCH 1
drivers/platform/x86/intel/vsec.c | 21 ++++++++++++++++++++- drivers/platform/x86/intel/vsec.h | 4 ++++ 2 files changed, 24 insertions(+), 1 deletion(-)
drivers/platform/x86/intel/vsec.c +20 -1
@@ -188,6 +188,15 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he header->offset + i * (header->entry_size *sizeof (u32)); tmp->end = tmp->start + (header->entry_size *sizeof (u32)) -1 ; tmp->flags =IORESOURCE_MEM ; + +/* Check resource is not in use */ +if (!request_mem_region (tmp->start,resource_size (tmp),"" )) { +kfree (res); +kfree (intel_vsec_dev); +return -EBUSY ; + } + +release_mem_region (tmp->start,resource_size (tmp)); } intel_vsec_dev->pcidev = pdev;
@@ -200,7 +209,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *heelse intel_vsec_dev->ida = &intel_vsec_ida; -return intel_vsec_add_aux (pdev,NULL , intel_vsec_dev, +return intel_vsec_add_aux (pdev, info->parent, intel_vsec_dev,intel_vsec_name (header->id)); }
@@ -318,6 +327,16 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,return have_devices; } +void intel_vsec_register (struct pci_dev *pdev, +struct intel_vsec_platform_info *info) +{ +if (!pdev || !info) +return ; + +intel_vsec_walk_header (pdev, info); +} +EXPORT_SYMBOL_NS_GPL (intel_vsec_register,INTEL_VSEC ); +static int intel_vsec_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct intel_vsec_platform_info *info;
drivers/platform/x86/intel/vsec.h +4 -0
@@ -69,6 +69,7 @@ enum intel_vsec_quirks {/* Platform specific data */ struct intel_vsec_platform_info { +struct device *parent;struct intel_vsec_header **headers;unsigned long caps;unsigned long quirks;
@@ -98,4 +99,7 @@ static inline struct intel_vsec_device *auxdev_to_ivdev(struct auxiliary_device { return container_of(auxdev, struct intel_vsec_device, auxdev); } + +void intel_vsec_register (struct pci_dev *pdev, +struct intel_vsec_platform_info *info);#endif
Signature · 1 line
2.34.1
Ilpo Järvinen
maintainerRe: [PATCH V2 03/13] platform/x86/intel/vsec: Add intel_vsec_register
Quoted 22 lines · David E. Box
From: Gayatri Kammela <[email protected]>
Add and export
intel_vsec_register()to allow the registration of Intel extended capabilities from other drivers. Add check to look for memory conflicts before registering a new capability. Add a parent field tointel_vsec_platform_infoto allow specifying the parent device for device managed cleanup.Signed-off-by Gayatri Kammela <[email protected]>Signed-off-by David E. Box <[email protected]>---
V2 - New patch splitting previous PATCH 1drivers/platform/x86/intel/vsec.c | 21 ++++++++++++++++++++- drivers/platform/x86/intel/vsec.h | 4 ++++ 2 files changed, 24 insertions(+), 1 deletion(-)drivers/platform/x86/intel/vsec.c +0
-0
drivers/platform/x86/intel/vsec.c static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he · line 196
Quoted 9 lines
drivers/platform/x86/intel/vsec.c +6
-0@@ -188,6 +188,15 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he header->offset + i * (header->entry_size *sizeof (u32)); tmp->end = tmp->start + (header->entry_size *sizeof (u32)) -1 ; tmp->flags =IORESOURCE_MEM ; + +/* Check resource is not in use */ +if (!request_mem_region (tmp->start,resource_size (tmp),"" )) { +kfree (res); +kfree (intel_vsec_dev); +return -EBUSY ;
Convert this function to do proper rollback as there's already kfree(intel_vsec_dev) above this one, or better yet, use the new cleanup thing if you know how to use it.
Signature · 1 line
i.
Quoted 53 lines
drivers/platform/x86/intel/vsec.c +14
-1+ } + +release_mem_region (tmp->start,resource_size (tmp)); } intel_vsec_dev->pcidev = pdev;@@ -200,7 +209,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *heelse intel_vsec_dev->ida = &intel_vsec_ida; -return intel_vsec_add_aux (pdev,NULL , intel_vsec_dev, +return intel_vsec_add_aux (pdev, info->parent, intel_vsec_dev,intel_vsec_name (header->id)); }@@ -318,6 +327,16 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,return have_devices; } +void intel_vsec_register (struct pci_dev *pdev, +struct intel_vsec_platform_info *info) +{ +if (!pdev || !info) +return ; + +intel_vsec_walk_header (pdev, info); +} +EXPORT_SYMBOL_NS_GPL (intel_vsec_register,INTEL_VSEC ); +static int intel_vsec_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct intel_vsec_platform_info *info;drivers/platform/x86/intel/vsec.h +4
-0@@ -69,6 +69,7 @@ enum intel_vsec_quirks {/* Platform specific data */ struct intel_vsec_platform_info { +struct device *parent;struct intel_vsec_header **headers;unsigned long caps;unsigned long quirks;@@ -98,4 +99,7 @@ static inline struct intel_vsec_device *auxdev_to_ivdev(struct auxiliary_device { return container_of(auxdev, struct intel_vsec_device, auxdev); } + +void intel_vsec_register (struct pci_dev *pdev, +struct intel_vsec_platform_info *info);#endif
David E. Box
maintainerPATCH v2 4/13 platform/x86/intel/vsec: Add base address field
In reply to David E. BoxSome devices may emulate PCI VSEC capabilities in MMIO. In such cases the BAR is not readable from a config space. Provide a field for drivers to indicate the base address to be used.
---
V2 - no change
drivers/platform/x86/intel/pmt/class.c | 14 +++++++++++--- drivers/platform/x86/intel/vsec.c | 10 ++++++++-- drivers/platform/x86/intel/vsec.h | 2 ++ 3 files changed, 21 insertions(+), 5 deletions(-)
drivers/platform/x86/intel/pmt/class.c +11 -3
@@ -160,10 +160,11 @@ static struct class intel_pmt_class = {static int intel_pmt_populate_entry (struct intel_pmt_entry *entry,struct intel_pmt_header *header, -struct device *dev, +struct intel_vsec_device *ivdev,struct resource *disc_res) { -struct pci_dev *pci_dev =to_pci_dev (dev->parent); +struct pci_dev *pci_dev = ivdev->pcidev; +struct device *dev = &ivdev->auxdev.dev;u8 bir;/*
@@ -215,6 +216,13 @@ static int intel_pmt_populate_entry(struct intel_pmt_entry *entry,break ;case ACCESS_BARID : +/* Use the provided base address if it exists */ +if (ivdev->base_addr) { + entry->base_addr = ivdev->base_addr + +GET_ADDRESS (header->base_offset); +break ; + } +/* * If another BAR was specified then the base offset * represents the offset within that BAR. SO retrieve the
@@ -319,7 +327,7 @@ int intel_pmt_dev_create(struct intel_pmt_entry *entry, struct intel_pmt_namespaif (ret)return ret; - ret =intel_pmt_populate_entry (entry, &header, dev, disc_res); + ret =intel_pmt_populate_entry (entry, &header, intel_vsec_dev, disc_res);if (ret)return ret;
drivers/platform/x86/intel/vsec.c +8 -2
@@ -150,6 +150,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *hestruct intel_vsec_device *intel_vsec_dev;struct resource *res, *tmp;unsigned long quirks = info->quirks; +u64 base_addr;int i;if (!intel_vsec_supported (header->id, info->caps))
@@ -178,14 +179,18 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *heif (quirks &VSEC_QUIRK_TABLE_SHIFT ) header->offset >>=TABLE_OFFSET_SHIFT ; +if (info->base_addr) + base_addr = info->base_addr; +else + base_addr = pdev->resource[header->tbir].start; +/* * The DVSEC/VSEC contains the starting offset and count for a block of * discovery tables. Create a resource array of these tables to the * auxiliary device driver. */ for (i =0 , tmp = res; i < header->num_entries; i++, tmp++) { - tmp->start = pdev->resource[header->tbir].start + - header->offset + i * (header->entry_size *sizeof (u32)); + tmp->start = base_addr + header->offset + i * (header->entry_size *sizeof (u32)); tmp->end = tmp->start + (header->entry_size *sizeof (u32)) -1 ; tmp->flags =IORESOURCE_MEM ;
@@ -203,6 +208,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he intel_vsec_dev->resource = res; intel_vsec_dev->num_resources = header->num_entries; intel_vsec_dev->quirks = info->quirks; + intel_vsec_dev->base_addr = info->base_addr;if (header->id ==VSEC_ID_SDSI ) intel_vsec_dev->ida = &intel_vsec_sdsi_ida;
drivers/platform/x86/intel/vsec.h +2 -0
@@ -73,6 +73,7 @@ struct intel_vsec_platform_info {struct intel_vsec_header **headers;unsigned long caps;unsigned long quirks; +u64 base_addr; };struct intel_vsec_device {
@@ -84,6 +85,7 @@ struct intel_vsec_device {void *priv_data;size_t priv_data_size;unsigned long quirks; +u64 base_addr; }; int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v2 5/13 platform/x86/intel/pmt: Add header to struct intel_pmt_entry
In reply to David E. BoxThe PMT header is passed to several functions. Instead, store the header in struct intel_pmt_entry which is also passed to these functions and shorten the argument list. This simplifies the calls in preparation for later changes.
---
V2 - no change
drivers/platform/x86/intel/pmt/class.c | 8 +++----- drivers/platform/x86/intel/pmt/class.h | 16 ++++++++-------- drivers/platform/x86/intel/pmt/crashlog.c | 2 +- drivers/platform/x86/intel/pmt/telemetry.c | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-)
drivers/platform/x86/intel/pmt/class.c +3 -5
@@ -159,12 +159,12 @@ static struct class intel_pmt_class = { };static int intel_pmt_populate_entry (struct intel_pmt_entry *entry, -struct intel_pmt_header *header,struct intel_vsec_device *ivdev,struct resource *disc_res) {struct pci_dev *pci_dev = ivdev->pcidev;struct device *dev = &ivdev->auxdev.dev; +struct intel_pmt_header *header = &entry->header;u8 bir;/*
@@ -313,7 +313,6 @@ int intel_pmt_dev_create(struct intel_pmt_entry *entry, struct intel_pmt_namespa struct intel_vsec_device *intel_vsec_dev, int idx) {struct device *dev = &intel_vsec_dev->auxdev.dev; -struct intel_pmt_header header;struct resource *disc_res;int ret;
@@ -323,16 +322,15 @@ int intel_pmt_dev_create(struct intel_pmt_entry *entry, struct intel_pmt_namespaif (IS_ERR (entry->disc_table))return PTR_ERR (entry->disc_table); - ret = ns->pmt_header_decode (entry, &header, dev); + ret = ns->pmt_header_decode (entry, dev);if (ret)return ret; - ret =intel_pmt_populate_entry (entry, &header, intel_vsec_dev, disc_res); + ret =intel_pmt_populate_entry (entry, intel_vsec_dev, disc_res);if (ret)return ret;return intel_pmt_dev_register (entry, ns, dev); - }EXPORT_SYMBOL_NS_GPL (intel_pmt_dev_create,INTEL_PMT );
drivers/platform/x86/intel/pmt/class.h +8 -8
@@ -18,7 +18,15 @@#define GET_BIR (v) ((v) & GENMASK(2, 0))#define GET_ADDRESS (v) ((v) & GENMASK(31, 3)) +struct intel_pmt_header { +u32 base_offset; +u32 size; +u32 guid; +u8 access_type; +}; +struct intel_pmt_entry { +struct intel_pmt_header header;struct bin_attribute pmt_bin_attr;struct kobject *kobj;void __iomem *disc_table;
@@ -29,19 +37,11 @@ struct intel_pmt_entry {int devid; }; -struct intel_pmt_header { -u32 base_offset; -u32 size; -u32 guid; -u8 access_type; -}; -struct intel_pmt_namespace {const char *name;struct xarray *xa;const struct attribute_group *attr_grp;int (*pmt_header_decode)(struct intel_pmt_entry *entry, -struct intel_pmt_header *header,struct device *dev); };
drivers/platform/x86/intel/pmt/crashlog.c +1 -1
@@ -223,10 +223,10 @@ static const struct attribute_group pmt_crashlog_group = { };static int pmt_crashlog_header_decode (struct intel_pmt_entry *entry, -struct intel_pmt_header *header,struct device *dev) {void __iomem *disc_table = entry->disc_table; +struct intel_pmt_header *header = &entry->header;struct crashlog_entry *crashlog;if (!pmt_crashlog_supported (entry))
drivers/platform/x86/intel/pmt/telemetry.c +1 -1
@@ -58,10 +58,10 @@ static bool pmt_telem_region_overlaps(struct intel_pmt_entry *entry, }static int pmt_telem_header_decode (struct intel_pmt_entry *entry, -struct intel_pmt_header *header,struct device *dev) {void __iomem *disc_table = entry->disc_table; +struct intel_pmt_header *header = &entry->header;if (pmt_telem_region_overlaps (entry, dev))return 1 ;
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v2 6/13 platform/x86/intel/pmt: telemetry: Export API to read telemetry
In reply to David E. BoxExport symbols to allow access to Intel PMT Telemetry data on available devices. Provides APIs to search, register, and read telemetry using a kref managed pointer that serves as a handle to a telemetry endpoint. To simplify searching for present devices, have the IDA start at 1 instead of 0 so that 0 can be used to indicate end of search.
---
V2 - Add explanation of PMT_XA_START change in changelog
- change return and argument type of pmt_telem_get_next_endpoint() to unsigned long
- style fixes
drivers/platform/x86/intel/pmt/class.c | 21 ++- drivers/platform/x86/intel/pmt/class.h | 14 ++ drivers/platform/x86/intel/pmt/telemetry.c | 198 ++++++++++++++++++++- drivers/platform/x86/intel/pmt/telemetry.h | 129 ++++++++++++++ 4 files changed, 354 insertions(+), 8 deletions(-) create mode 100644 drivers/platform/x86/intel/pmt/telemetry.h
drivers/platform/x86/intel/pmt/class.c +16 -5
@@ -17,7 +17,7 @@#include "../vsec.h" #include "class.h" -#define PMT_XA_START 0 +#define PMT_XA_START 1#define PMT_XA_MAX INT_MAX#define PMT_XA_LIMIT XA_LIMIT(PMT_XA_START, PMT_XA_MAX)#define GUID_SPR_PUNIT 0x9956f43f
@@ -247,6 +247,7 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry,struct intel_pmt_namespace *ns, struct device *parent) { + struct intel_vsec_device *ivdev = dev_to_ivdev(parent);struct resource res = {0 };struct device *dev;int ret;
@@ -270,7 +271,7 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry,if (ns->attr_grp) { ret =sysfs_create_group (entry->kobj, ns->attr_grp);if (ret) - goto fail_sysfs; + goto fail_sysfs_create_group; }/* if size is 0 assume no data buffer, so no file needed */
@@ -295,13 +296,23 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry, entry->pmt_bin_attr.size = entry->size; ret =sysfs_create_bin_file (&dev->kobj, &entry->pmt_bin_attr); -if (!ret) -return 0 ; +if (ret) + goto fail_ioremap; +if (ns->pmt_add_endpoint) { + ret = ns->pmt_add_endpoint (entry, ivdev->pcidev); +if (ret) + goto fail_add_endpoint; + } + +return 0 ; + +fail_add_endpoint: +sysfs_remove_bin_file (entry->kobj, &entry->pmt_bin_attr); fail_ioremap:if (ns->attr_grp)sysfs_remove_group (entry->kobj, ns->attr_grp); -fail_sysfs: +fail_sysfs_create_group:device_unregister (dev); fail_dev_create:xa_erase (ns->xa, entry->devid);
drivers/platform/x86/intel/pmt/class.h +14 -0
@@ -9,6 +9,7 @@#include <linux/io.h> #include "../vsec.h" +#include "telemetry.h" /* PMT access types */ #define ACCESS_BARID 2
@@ -18,6 +19,16 @@#define GET_BIR (v) ((v) & GENMASK(2, 0))#define GET_ADDRESS (v) ((v) & GENMASK(31, 3)) +struct pci_dev ; + +struct telem_endpoint { +struct pci_dev *pcidev; +struct telem_header header; +void __iomem *base; +bool present; +struct kref kref; +}; +struct intel_pmt_header {u32 base_offset;u32 size;
@@ -26,6 +37,7 @@ struct intel_pmt_header { };struct intel_pmt_entry { +struct telem_endpoint *ep;struct intel_pmt_header header;struct bin_attribute pmt_bin_attr;struct kobject *kobj;
@@ -43,6 +55,8 @@ struct intel_pmt_namespace {const struct attribute_group *attr_grp;int (*pmt_header_decode)(struct intel_pmt_entry *entry,struct device *dev); +int (*pmt_add_endpoint)(struct intel_pmt_entry *entry, +struct pci_dev *pdev); };bool intel_pmt_is_early_client_hw (struct device *dev);
drivers/platform/x86/intel/pmt/telemetry.c +195 -3
229 lines not on this page · raw message
drivers/platform/x86/intel/pmt/telemetry.h new file +129 -0
129 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH V2 06/13] platform/x86/intel/pmt: telemetry: Export API to read telemetry
Quoted 129 lines · David E. Box
Export symbols to allow access to Intel PMT Telemetry data on available devices. Provides APIs to search, register, and read telemetry using a kref managed pointer that serves as a handle to a telemetry endpoint. To simplify searching for present devices, have the IDA start at 1 instead of 0 so that 0 can be used to indicate end of search.
Signed-off-by David E. Box <[email protected]>---
V2 - Add explanation of
PMT_XA_STARTchange in changelog
- change return and argument type ofpmt_telem_get_next_endpoint()to unsigned long
- style fixesdrivers/platform/x86/intel/pmt/class.c | 21 ++- drivers/platform/x86/intel/pmt/class.h | 14 ++ drivers/platform/x86/intel/pmt/telemetry.c | 198 ++++++++++++++++++++- drivers/platform/x86/intel/pmt/telemetry.h | 129 ++++++++++++++ 4 files changed, 354 insertions(+), 8 deletions(-) create mode 100644 drivers/platform/x86/intel/pmt/telemetry.hdrivers/platform/x86/intel/pmt/class.c +16
-5@@ -17,7 +17,7 @@#include "../vsec.h" #include "class.h" -#define PMT_XA_START 0 +#define PMT_XA_START 1#define PMT_XA_MAX INT_MAX#define PMT_XA_LIMIT XA_LIMIT(PMT_XA_START, PMT_XA_MAX)#define GUID_SPR_PUNIT 0x9956f43f@@ -247,6 +247,7 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry,struct intel_pmt_namespace *ns, struct device *parent) { + struct intel_vsec_device *ivdev = dev_to_ivdev(parent);struct resource res = {0 };struct device *dev;int ret;@@ -270,7 +271,7 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry,if (ns->attr_grp) { ret =sysfs_create_group (entry->kobj, ns->attr_grp);if (ret) - goto fail_sysfs; + goto fail_sysfs_create_group; }/* if size is 0 assume no data buffer, so no file needed */ @@ -295,13 +296,23 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry, entry->pmt_bin_attr.size = entry->size; ret =sysfs_create_bin_file (&dev->kobj, &entry->pmt_bin_attr); -if (!ret) -return 0 ; +if (ret) + goto fail_ioremap; +if (ns->pmt_add_endpoint) { + ret = ns->pmt_add_endpoint (entry, ivdev->pcidev); +if (ret) + goto fail_add_endpoint; + } + +return 0 ; + +fail_add_endpoint: +sysfs_remove_bin_file (entry->kobj, &entry->pmt_bin_attr); fail_ioremap:if (ns->attr_grp)sysfs_remove_group (entry->kobj, ns->attr_grp); -fail_sysfs: +fail_sysfs_create_group:device_unregister (dev); fail_dev_create:xa_erase (ns->xa, entry->devid);drivers/platform/x86/intel/pmt/class.h +14
-0@@ -9,6 +9,7 @@#include <linux/io.h> #include "../vsec.h" +#include "telemetry.h" /* PMT access types */ #define ACCESS_BARID 2@@ -18,6 +19,16 @@#define GET_BIR (v) ((v) & GENMASK(2, 0))#define GET_ADDRESS (v) ((v) & GENMASK(31, 3)) +struct pci_dev ; + +struct telem_endpoint { +struct pci_dev *pcidev; +struct telem_header header; +void __iomem *base; +bool present; +struct kref kref; +}; +struct intel_pmt_header {u32 base_offset;u32 size;@@ -26,6 +37,7 @@ struct intel_pmt_header { };struct intel_pmt_entry { +struct telem_endpoint *ep;struct intel_pmt_header header;struct bin_attribute pmt_bin_attr;struct kobject *kobj;@@ -43,6 +55,8 @@ struct intel_pmt_namespace {const struct attribute_group *attr_grp;int (*pmt_header_decode)(struct intel_pmt_entry *entry,struct device *dev); +int (*pmt_add_endpoint)(struct intel_pmt_entry *entry, +struct pci_dev *pdev); };bool intel_pmt_is_early_client_hw (struct device *dev);drivers/platform/x86/intel/pmt/telemetry.c +0
-0
drivers/platform/x86/intel/pmt/telemetry.c line 39
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.c +7
-0@@ -30,6 +30,14 @@/* Used by client hardware to identify a fixed telemetry entry*/ #define TELEM_CLIENT_FIXED_BLOCK_GUID 0x10000000 +#define NUM_BYTES_QWORD (v) ((v) << 3) +#define SAMPLE_ID_OFFSET (v) ((v) << 3) + +#define NUM_BYTES_DWORD (v) ((v) << 2) +#define SAMPLE_ID_OFFSET32 (v) ((v) << 2) + +static DEFINE_MUTEX (ep_lock);
You should add comment documenting about what this protects.
Quoted 6 lines
drivers/platform/x86/intel/pmt/telemetry.c +1
-0+enum telem_type {TELEM_TYPE_PUNIT =0 ,TELEM_TYPE_CRASHLOG ,@@ -84,21 +92,203 @@ static int pmt_telem_header_decode(struct intel_pmt_entry *entry,return 0 ;
drivers/platform/x86/intel/pmt/telemetry.c static int pmt_telem_header_decode(struct intel_pmt_entry *entry, · line 102
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.c +8
-0} +static int pmt_telem_add_endpoint (struct intel_pmt_entry *entry, +struct pci_dev *pdev) +{ +struct telem_endpoint *ep; + +/* +* Endpoint lifetimes are managed by kref, not devres. +*/
There's no need for multiline comment here.
Quoted 75 lines
drivers/platform/x86/intel/pmt/telemetry.c +68
-0+ entry->ep =kzalloc (sizeof (*(entry->ep)),GFP_KERNEL ); +if (!entry->ep) +return -ENOMEM ; + + ep = entry->ep; + ep->pcidev = pdev; + ep->header.access_type = entry->header.access_type; + ep->header.guid = entry->header.guid; + ep->header.base_offset = entry->header.base_offset; + ep->header.size = entry->header.size; + ep->base = entry->base; + ep->present = true; + +kref_init (&ep->kref); + +return 0 ; +} +static DEFINE_XARRAY_ALLOC (telem_array);static struct intel_pmt_namespace pmt_telem_ns = { .name ="telem" , .xa = &telem_array, .pmt_header_decode = pmt_telem_header_decode, + .pmt_add_endpoint = pmt_telem_add_endpoint, }; +/* Called when all users unregister and the device is removed */ +static void pmt_telem_ep_release (struct kref *kref) +{ +struct telem_endpoint *ep; + + ep = container_of(kref, struct telem_endpoint, kref); +kfree (ep); +} + +/* +* driver api +*/ +unsigned long pmt_telem_get_next_endpoint (unsigned long start) +{ +struct intel_pmt_entry *entry; +unsigned long found_idx; + +mutex_lock (&ep_lock); +xa_for_each_start (&telem_array, found_idx, entry, start) { +/* +* Return first found index after start. +* 0 is not valid id. +*/ +if (found_idx > start) +break ; + } +mutex_unlock (&ep_lock); + +return found_idx == start ?0 : found_idx; +} +EXPORT_SYMBOL_NS_GPL (pmt_telem_get_next_endpoint,INTEL_PMT_TELEMETRY ); + +struct telem_endpoint *pmt_telem_register_endpoint (int devid) +{ +struct intel_pmt_entry *entry; +unsigned long index = devid; + +mutex_lock (&ep_lock); + entry =xa_find (&telem_array, &index, index,XA_PRESENT ); +if (!entry) { +mutex_unlock (&ep_lock); +return ERR_PTR (-ENXIO ); + } + +kref_get (&entry->ep->kref); +mutex_unlock (&ep_lock); + +return entry->ep; +}
drivers/platform/x86/intel/pmt/telemetry.c static int pmt_telem_header_decode(struct intel_pmt_entry *entry, · line 187
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.c +10
-0+EXPORT_SYMBOL_NS_GPL (pmt_telem_register_endpoint,INTEL_PMT_TELEMETRY ); + +void pmt_telem_unregister_endpoint (struct telem_endpoint *ep) +{ +kref_put (&ep->kref, pmt_telem_ep_release); +} +EXPORT_SYMBOL_NS_GPL (pmt_telem_unregister_endpoint,INTEL_PMT_TELEMETRY ); + +int pmt_telem_get_endpoint_info (int devid, +struct telem_endpoint_info *info)
One line.
Quoted 17 lines
drivers/platform/x86/intel/pmt/telemetry.c +17
-0+{ +struct intel_pmt_entry *entry; +unsigned long index = devid; +int err =0 ; + +if (!info) +return -EINVAL ; + +mutex_lock (&ep_lock); + entry =xa_find (&telem_array, &index, index,XA_PRESENT ); +if (!entry) { + err = -ENXIO ; + goto unlock; + } + + info->pdev = entry->ep->pcidev; + info->header = entry->ep->header;
drivers/platform/x86/intel/pmt/telemetry.c static int pmt_telem_header_decode(struct intel_pmt_entry *entry, · line 214
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.c +10
-0+ +unlock: +mutex_unlock (&ep_lock); +return err; + +} +EXPORT_SYMBOL_NS_GPL (pmt_telem_get_endpoint_info,INTEL_PMT_TELEMETRY ); + +int +pmt_telem_read (struct telem_endpoint *ep,u32 id,u64 *data,u32 count)
One line.
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.c +10
-0+{ +u32 offset, size; + +if (!ep->present) +return -ENODEV ; + + offset =SAMPLE_ID_OFFSET (id); + size = ep->header.size; + +if (offset +NUM_BYTES_QWORD (count) > size)
drivers/platform/x86/intel/pmt/telemetry.c static int pmt_telem_header_decode(struct intel_pmt_entry *entry, · line 234
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.c +10
-0+return -EINVAL ; + +memcpy_fromio (data, ep->base + offset,NUM_BYTES_QWORD (count)); + +return ep->present ?0 : -EPIPE ; +} +EXPORT_SYMBOL_NS_GPL (pmt_telem_read,INTEL_PMT_TELEMETRY ); + +int +pmt_telem_read32 (struct telem_endpoint *ep,u32 id,u32 *data,u32 count)
One line.
Quoted 140 lines
drivers/platform/x86/intel/pmt/telemetry.c +54
-3+{ +u32 offset, size; + +if (!ep->present) +return -ENODEV ; + + offset =SAMPLE_ID_OFFSET32 (id); + size = ep->header.size; + +if (offset +NUM_BYTES_DWORD (count) > size) +return -EINVAL ; + +memcpy_fromio (data, ep->base + offset,NUM_BYTES_DWORD (count)); + +return ep->present ?0 : -EPIPE ; +} +EXPORT_SYMBOL_NS_GPL (pmt_telem_read32,INTEL_PMT_TELEMETRY ); + +struct telem_endpoint * +pmt_telem_find_and_register_endpoint (struct pci_dev *pcidev,u32 guid,u16 pos) +{ +int devid =0 ; +int inst =0 ; +int err =0 ; + +while ((devid =pmt_telem_get_next_endpoint (devid))) { +struct telem_endpoint_info ep_info; + + err =pmt_telem_get_endpoint_info (devid, &ep_info); +if (err) +return ERR_PTR (err); + +if (ep_info.header.guid == guid && ep_info.pdev == pcidev) { +if (inst == pos) +return pmt_telem_register_endpoint (devid); + ++inst; + } + } + +return ERR_PTR (-ENXIO ); +} +EXPORT_SYMBOL_NS_GPL (pmt_telem_find_and_register_endpoint,INTEL_PMT_TELEMETRY ); +static void pmt_telem_remove (struct auxiliary_device *auxdev) {struct pmt_telem_priv *priv =auxiliary_get_drvdata (auxdev);int i; -for (i =0 ; i < priv->num_entries; i++) -intel_pmt_dev_destroy (&priv->entry[i], &pmt_telem_ns); -} +mutex_lock (&ep_lock); +for (i =0 ; i < priv->num_entries; i++) { +struct intel_pmt_entry *entry = &priv->entry[i]; + +kref_put (&entry->ep->kref, pmt_telem_ep_release); +intel_pmt_dev_destroy (entry, &pmt_telem_ns); + } +mutex_unlock (&ep_lock); +};static int pmt_telem_probe (struct auxiliary_device *auxdev,const struct auxiliary_device_id *id) {@@ -117,7 +307,9 @@ static int pmt_telem_probe(struct auxiliary_device *auxdev, const struct auxiliafor (i =0 ; i < intel_vsec_dev->num_resources; i++) {struct intel_pmt_entry *entry = &priv->entry[priv->num_entries]; +mutex_lock (&ep_lock); ret =intel_pmt_dev_create (entry, &pmt_telem_ns, intel_vsec_dev, i); +mutex_unlock (&ep_lock);if (ret <0 ) goto abort_probe;if (ret)drivers/platform/x86/intel/pmt/telemetry.h new file +61
-0@@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _TELEMETRY_H +#define _TELEMETRY_H + +/* Telemetry types */ +#define PMT_TELEM_TELEMETRY 0 +#define PMT_TELEM_CRASHLOG 1 + +struct telem_endpoint ; +struct pci_dev ; + +struct telem_header { +u8 access_type; +u16 size; +u32 guid; +u32 base_offset; +}; + +struct telem_endpoint_info { +struct pci_dev *pdev; +struct telem_header header; +}; + +/** +* pmt_telem_get_next_endpoint() - Get next device id for a telemetry endpoint +* @start: starting devid to look from +* +* This functions can be used in a while loop predicate to retrieve the devid +* of all available telemetry endpoints. Functions pmt_telem_get_next_endpoint() +* and pmt_telem_register_endpoint() can be used inside of the loop to examine +* endpoint info and register to receive a pointer to the endpoint. The pointer +* is then usable in the telemetry read calls to access the telemetry data. +* +* Return: +* * devid - devid of the next present endpoint from start +* * 0 - when no more endpoints are present after start +*/ +unsigned long pmt_telem_get_next_endpoint (unsigned long start); + +/** +* pmt_telem_register_endpoint() - Register a telemetry endpoint +* @devid: device id/handle of the telemetry endpoint +* +* Increments the kref usage counter for the endpoint. +* +* Return: +* * endpoint - On success returns pointer to the telemetry endpoint +* * -ENXIO - telemetry endpoint not found +*/ +struct telem_endpoint *pmt_telem_register_endpoint (int devid); + +/** +* pmt_telem_unregister_endpoint() - Unregister a telemetry endpoint +* @ep: ep structure to populate. +* +* Decrements the kref usage counter for the endpoint. +*/ +void pmt_telem_unregister_endpoint (struct telem_endpoint *ep); + +/** +* pmt_telem_get_endpoint_info() - Get info for an endpoint from its devid
drivers/platform/x86/intel/pmt/telemetry.h line 71
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.h new file +10
-0+* @devid: device id/handle of the telemetry endpoint +* @info: Endpoint info structure to be populated +* +* Return: +* * 0 - Success +* * -ENXIO - telemetry endpoint not found for the devid +* * -EINVAL - @info is NULL +*/ +int pmt_telem_get_endpoint_info (int devid, +struct telem_endpoint_info *info);
This easily fits one line.
Quoted 22 lines
drivers/platform/x86/intel/pmt/telemetry.h new file +22
-0+ +/** +* pmt_telem_find_and_register_endpoint() - Get a telemetry endpoint from +* pci_dev device, guid and pos +* @pdev: PCI device inside the Intel vsec +* @guid: GUID of the telemetry space +* @pos: Instance of the guid +* +* Return: +* * endpoint - On success returns pointer to the telemetry endpoint +* * -ENXIO - telemetry endpoint not found +*/ +struct telem_endpoint *pmt_telem_find_and_register_endpoint (struct pci_dev *pcidev, +u32 guid,u16 pos); + +/** +* pmt_telem_read() - Read qwords from counter sram using sample id +* @ep: Telemetry endpoint to be read +* @id: The beginning sample id of the metric(s) to be read +* @data: Allocated qword buffer +* @count: Number of qwords requested +*
drivers/platform/x86/intel/pmt/telemetry.h line 103
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.h new file +10
-0+* Callers must ensure reads are aligned. When the call returns -ENODEV, +* the device has been removed and callers should unregister the telemetry +* endpoint. +* +* Return: +* * 0 - Success +* * -ENODEV - The device is not present. +* * -EINVAL - The offset is out bounds +* * -EPIPE - The device was removed during the read. Data written +* but should be considered invalid.
There space/tab inconsistencies here.
drivers/platform/x86/intel/pmt/telemetry.h line 106
Quoted 3 lines
drivers/platform/x86/intel/pmt/telemetry.h new file +3
-0+*/ +int pmt_telem_read (struct telem_endpoint *ep,u32 id,u64 *data, +u32 count);
One line.
Quoted 8 lines
drivers/platform/x86/intel/pmt/telemetry.h new file +8
-0+ +/** +* pmt_telem_read32() - Read qwords from counter sram using sample id +* @ep: Telemetry endpoint to be read +* @id: The beginning sample id of the metric(s) to be read +* @data: Allocated dword buffer +* @count: Number of dwords requested +*
drivers/platform/x86/intel/pmt/telemetry.h line 124
Quoted 10 lines
drivers/platform/x86/intel/pmt/telemetry.h new file +10
-0+* Callers must ensure reads are aligned. When the call returns -ENODEV, +* the device has been removed and callers should unregister the telemetry +* endpoint. +* +* Return: +* * 0 - Success +* * -ENODEV - The device is not present. +* * -EINVAL - The offset is out bounds +* * -EPIPE - The device was removed during the read. Data written +* but should be considered invalid.
Space/tab inconsistencies.
+int pmt_telem_read32(struct telem_endpoint *ep, u32 id, u32 *data,
+ u32 count);
One line.
After addressing these, feel free to add:
Signature · 1 line
i.
David E. Box
maintainerPATCH v2 7/13 platform/x86:intel/pmc: Call pmc_get_low_power_modes from platform init
In reply to David E. BoxFrom: Xi Pardee <[email protected]>
In order to setup a table of low power mode requirements for Meteor Lake, pmc_core_get_low_power_modes() will need to be run from platform init code so that the enabled modes are known, allowing the use of the pmc_for_each_mode helper. Make the function global and call it from the platform init code.
---
V2 - Added clearer explanation for the change in the changelog
drivers/platform/x86/intel/pmc/adl.c | 2 ++ drivers/platform/x86/intel/pmc/cnp.c | 2 ++ drivers/platform/x86/intel/pmc/core.c | 7 +++---- drivers/platform/x86/intel/pmc/core.h | 1 + drivers/platform/x86/intel/pmc/icl.c | 10 +++++++++- drivers/platform/x86/intel/pmc/mtl.c | 4 +++- drivers/platform/x86/intel/pmc/spt.c | 10 +++++++++- drivers/platform/x86/intel/pmc/tgl.c | 1 + 8 files changed, 30 insertions(+), 7 deletions(-)
drivers/platform/x86/intel/pmc/adl.c +2 -0
@@ -319,6 +319,8 @@ int adl_core_init(struct pmc_dev *pmcdev)if (ret)return ret; +pmc_core_get_low_power_modes (pmcdev); +/* Due to a hardware limitation, the GBE LTR blocks PC10 * when a cable is attached. Tell the PMC to ignore it. */
drivers/platform/x86/intel/pmc/cnp.c +2 -0
@@ -214,6 +214,8 @@ int cnp_core_init(struct pmc_dev *pmcdev)if (ret)return ret; +pmc_core_get_low_power_modes (pmcdev); +/* Due to a hardware limitation, the GBE LTR blocks PC10 * when a cable is attached. Tell the PMC to ignore it. */
drivers/platform/x86/intel/pmc/core.c +3 -4
@@ -966,9 +966,8 @@ static bool pmc_core_pri_verify(u32 lpm_pri, u8 *mode_order)return true; } -static void pmc_core_get_low_power_modes (struct platform_device *pdev) +void pmc_core_get_low_power_modes (struct pmc_dev *pmcdev) { -struct pmc_dev *pmcdev =platform_get_drvdata (pdev);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 ];
@@ -1000,7 +999,8 @@ static void pmc_core_get_low_power_modes(struct platform_device *pdev)for (mode =0 ; mode <LPM_MAX_NUM_MODES ; mode++) pri_order[mode_order[mode]] = mode; else - dev_warn(&pdev->dev, "Assuming a default substate order for this platform\n"); + dev_warn(&pmcdev->pdev->dev, + "Assuming a default substate order for this platform\n");/* * Loop through all modes from lowest to highest priority,
@@ -1250,7 +1250,6 @@ static int pmc_core_probe(struct platform_device *pdev) } pmcdev->pmc_xram_read_bit =pmc_core_check_read_lock_bit (primary_pmc); -pmc_core_get_low_power_modes (pdev);pmc_core_do_dmi_quirks (primary_pmc);pmc_core_dbgfs_register (pmcdev);
drivers/platform/x86/intel/pmc/core.h +1 -0
@@ -490,6 +490,7 @@ 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_get_low_power_modes (struct pmc_dev *pmcdev);extern void pmc_core_ssram_init (struct pmc_dev *pmcdev);
drivers/platform/x86/intel/pmc/icl.c +9 -1
@@ -53,7 +53,15 @@ const struct pmc_reg_map icl_reg_map = {int icl_core_init (struct pmc_dev *pmcdev) {struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; +int ret; pmc->map = &icl_reg_map; -return get_primary_reg_base (pmc); + + ret =get_primary_reg_base (pmc); +if (ret) +return ret; + +pmc_core_get_low_power_modes (pmcdev); + +return ret; }
drivers/platform/x86/intel/pmc/mtl.c +3 -1
@@ -985,7 +985,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 =0 ; +int ret;mtl_d3_fixup ();
@@ -1002,6 +1002,8 @@ int mtl_core_init(struct pmc_dev *pmcdev)return ret; } +pmc_core_get_low_power_modes (pmcdev); +/* Due to a hardware limitation, the GBE LTR blocks PC10 * when a cable is attached. Tell the PMC to ignore it. */
drivers/platform/x86/intel/pmc/spt.c +9 -1
@@ -137,7 +137,15 @@ const struct pmc_reg_map spt_reg_map = {int spt_core_init (struct pmc_dev *pmcdev) {struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN ]; +int ret; pmc->map = &spt_reg_map; -return get_primary_reg_base (pmc); + + ret =get_primary_reg_base (pmc); +if (ret) +return ret; + +pmc_core_get_low_power_modes (pmcdev); + +return ret; }
drivers/platform/x86/intel/pmc/tgl.c +1 -0
@@ -263,6 +263,7 @@ int tgl_core_init(struct pmc_dev *pmcdev)if (ret)return ret; +pmc_core_get_low_power_modes (pmcdev);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.
Signature · 1 line
2.34.1
Re: [PATCH V2 07/13] platform/x86:intel/pmc: Call pmc_get_low_power_modes from platform init
Quoted 10 lines · David E. Box
From: Xi Pardee <[email protected]>
In order to setup a table of low power mode requirements for Meteor Lake,
pmc_core_get_low_power_modes()will need to be run from platform init code so that the enabled modes are known, allowing the use of thepmc_for_each_modehelper. Make the function global and call it from the platform init code.Signed-off-by Xi Pardee <[email protected]>Signed-off-by David E. Box <[email protected]>
Thanks for the update.
Signature · 1 line
i.
David E. Box
maintainerPATCH v2 8/13 platform/x86/intel/pmc: Split pmc_core_ssram_get_pmc()
In reply to David E. BoxEach PMC has an associated SSRAM device for accessing additional counters. However, only the first is discoverable as a PCI device to the OS. The remaining devices are hidden but their BARs are still accessible and their addresses are stored in the BAR of the exposed device. Clean up the code handling the SSRAM discovery. Create two separate functions for finding the primary and secondary PMCs. Also changes the return type from void to allow returning an error when failing to find the primary PMC.
---
V2 - no change
drivers/platform/x86/intel/pmc/core.h | 2 +- drivers/platform/x86/intel/pmc/core_ssram.c | 127 ++++++++++++++------ drivers/platform/x86/intel/pmc/mtl.c | 10 +- 3 files changed, 96 insertions(+), 43 deletions(-)
drivers/platform/x86/intel/pmc/core.h +1 -1
@@ -492,7 +492,7 @@ int pmc_core_resume_common(struct pmc_dev *pmcdev);int get_primary_reg_base (struct pmc *pmc);extern void pmc_core_get_low_power_modes (struct pmc_dev *pmcdev); -extern void pmc_core_ssram_init (struct pmc_dev *pmcdev); +extern int pmc_core_ssram_init (struct pmc_dev *pmcdev);int spt_core_init (struct pmc_dev *pmcdev);int cnp_core_init (struct pmc_dev *pmcdev);
drivers/platform/x86/intel/pmc/core_ssram.c +89 -38
186 lines not on this page · raw message
drivers/platform/x86/intel/pmc/mtl.c +6 -4
@@ -990,12 +990,14 @@ int mtl_core_init(struct pmc_dev *pmcdev)mtl_d3_fixup (); pmcdev->resume = mtl_resume; - pmcdev->regmap_list = mtl_pmc_info_list; -pmc_core_ssram_init (pmcdev); -/* If regbase not assigned, set map and discover using legacy method */ -if (!pmc->regbase) { +/* +* If ssram init fails use legacy method to at least get the +* primary PMC +*/ + ret =pmc_core_ssram_init (pmcdev); +if (ret) { pmc->map = &mtl_socm_reg_map; ret =get_primary_reg_base (pmc);if (ret)
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v2 9/13 platform/x86/intel/pmc: Find and register PMC telemetry entries
In reply to David E. BoxThe PMC SSRAM device contains counters that are structured in Intel Platform Monitoring Technology (PMT) telemetry regions. Look for and register these telemetry regions from the driver so that they may be read using the Intel PMT ABI.
---
V2 - no change
drivers/platform/x86/intel/pmc/Kconfig | 1 + drivers/platform/x86/intel/pmc/core_ssram.c | 52 +++++++++++++++++++++ 2 files changed, 53 insertions(+)
drivers/platform/x86/intel/pmc/Kconfig +1 -0
@@ -7,6 +7,7 @@ config INTEL_PMC_CORE tristate "Intel PMC Core driver" depends on PCI depends on ACPI + depends on INTEL_PMT_TELEMETRY help The Intel Platform Controller Hub for Intel Core SoCs provides access to Power Management Controller registers via various interfaces. This
drivers/platform/x86/intel/pmc/core_ssram.c +52 -0
79 lines not on this page · raw message
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v2 10/13 platform/x86/intel/pmc: Display LPM requirements for multiple PMCs
In reply to David E. BoxFrom: Rajvi Jingar <[email protected]>
Update the substate_requirements attribute to display the requirements for all the PMCs on a package.
---
V2 - no change
drivers/platform/x86/intel/pmc/core.c | 129 ++++++++++++++------------ 1 file changed, 71 insertions(+), 58 deletions(-)
drivers/platform/x86/intel/pmc/core.c +71 -58
@@ -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);
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v2 11/13 platform/x86/intel/pmc: Retrieve LPM information using Intel PMT
In reply to David E. BoxFrom: Xi Pardee <[email protected]>
On supported platforms, the low power mode (LPM) requirements for entering each idle substate are described in Platform Monitoring Technology (PMT) telemetry entries. Provide a function for platform code to attempt to find and read the requirements from the telemetry entries.
---
V2 - remove extra parens
drivers/platform/x86/intel/pmc/core.h | 3 + drivers/platform/x86/intel/pmc/core_ssram.c | 135 ++++++++++++++++++++ 2 files changed, 138 insertions(+)
drivers/platform/x86/intel/pmc/core.h +3 -0
@@ -320,6 +320,7 @@ struct pmc_reg_map {const u32 lpm_status_offset;const u32 lpm_live_status_offset;const u32 etr3_offset; +const u8 *lpm_reg_index; };/**
@@ -329,6 +330,7 @@ struct pmc_reg_map {* specific attributes */ struct pmc_info { +u32 guid;u16 devid;const struct pmc_reg_map *map; };
@@ -486,6 +488,7 @@ 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_ssram_get_lpm_reqs (struct pmc_dev *pmcdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value);int pmc_core_resume_common (struct pmc_dev *pmcdev);
drivers/platform/x86/intel/pmc/core_ssram.c +135 -0
144 lines not on this page · raw message
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v2 12/13 platform/x86/intel/pmc: Read low power mode requirements for MTL-M and MTL-P
In reply to David E. BoxFrom: Xi Pardee <[email protected]>
Add support to read the low power mode requirements for Meteor Lake M and Meteor Lake P.
---
V2 - fixed unused return value
drivers/platform/x86/intel/pmc/mtl.c | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)
drivers/platform/x86/intel/pmc/mtl.c +34 -7
@@ -11,6 +11,13 @@#include <linux/pci.h> #include "core.h" +/* PMC SSRAM PMT Telemetry GUIDS */ +#define SOCP_LPM_REQ_GUID 0x2625030 +#define IOEM_LPM_REQ_GUID 0x4357464 +#define IOEP_LPM_REQ_GUID 0x5077612 + +static const u8 MTL_LPM_REG_INDEX [] = {0 ,4 ,5 ,6 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,16 ,20 }; +/* * Die Mapping to Product. * Product SOCDie IOEDie PCHDie
@@ -465,6 +472,7 @@ const struct pmc_reg_map mtl_socm_reg_map = { .lpm_sts = mtl_socm_lpm_maps, .lpm_status_offset = MTL_LPM_STATUS_OFFSET, .lpm_live_status_offset = MTL_LPM_LIVE_STATUS_OFFSET, + .lpm_reg_index = MTL_LPM_REG_INDEX, };const struct pmc_bit_map mtl_ioep_pfear_map[] = {
@@ -782,6 +790,13 @@ const struct pmc_reg_map mtl_ioep_reg_map = { .ltr_show_sts = mtl_ioep_ltr_show_map, .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET, .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, + .lpm_num_maps = ADL_LPM_NUM_MAPS, + .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, + .lpm_residency_offset = MTL_LPM_RESIDENCY_OFFSET, + .lpm_priority_offset = MTL_LPM_PRI_OFFSET, + .lpm_en_offset = MTL_LPM_EN_OFFSET, + .lpm_sts_latch_en_offset = MTL_LPM_STATUS_LATCH_EN_OFFSET, + .lpm_reg_index = MTL_LPM_REG_INDEX, };const struct pmc_bit_map mtl_ioem_pfear_map[] = {
@@ -922,6 +937,13 @@ const struct pmc_reg_map mtl_ioem_reg_map = { .ltr_show_sts = mtl_ioep_ltr_show_map, .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET, .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, + .lpm_sts_latch_en_offset = MTL_LPM_STATUS_LATCH_EN_OFFSET, + .lpm_num_maps = ADL_LPM_NUM_MAPS, + .lpm_priority_offset = MTL_LPM_PRI_OFFSET, + .lpm_en_offset = MTL_LPM_EN_OFFSET, + .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, + .lpm_residency_offset = MTL_LPM_RESIDENCY_OFFSET, + .lpm_reg_index = MTL_LPM_REG_INDEX, };#define PMC_DEVID_SOCM 0x7e7f
@@ -929,16 +951,19 @@ const struct pmc_reg_map mtl_ioem_reg_map = {#define PMC_DEVID_IOEM 0x7ebfstatic struct pmc_info mtl_pmc_info_list[] = { { - .devid =PMC_DEVID_SOCM , - .map = &mtl_socm_reg_map, + .guid =SOCP_LPM_REQ_GUID , + .devid =PMC_DEVID_SOCM , + .map = &mtl_socm_reg_map, }, { - .devid =PMC_DEVID_IOEP , - .map = &mtl_ioep_reg_map, + .guid =IOEP_LPM_REQ_GUID , + .devid =PMC_DEVID_IOEP , + .map = &mtl_ioep_reg_map, }, { - .devid =PMC_DEVID_IOEM , - .map = &mtl_ioem_reg_map + .guid =IOEM_LPM_REQ_GUID , + .devid =PMC_DEVID_IOEM , + .map = &mtl_ioem_reg_map }, {} };
@@ -1012,5 +1037,7 @@ int mtl_core_init(struct pmc_dev *pmcdev)dev_dbg (&pmcdev->pdev->dev,"ignoring GBE LTR\n" );pmc_core_send_ltr_ignore (pmcdev,3 ); -return 0 ; + ret =pmc_core_ssram_get_lpm_reqs (pmcdev); + +return ret; }
Signature · 1 line
2.34.1
Re: [PATCH V2 12/13] platform/x86/intel/pmc: Read low power mode requirements for MTL-M and MTL-P
Quoted 94 lines · David E. Box
From: Xi Pardee <[email protected]>
Add support to read the low power mode requirements for Meteor Lake M and Meteor Lake P.
Signed-off-by Xi Pardee <[email protected]>Signed-off-by David E. Box <[email protected]>---
V2 - fixed unused return valuedrivers/platform/x86/intel/pmc/mtl.c | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)drivers/platform/x86/intel/pmc/mtl.c +31
-6@@ -11,6 +11,13 @@#include <linux/pci.h> #include "core.h" +/* PMC SSRAM PMT Telemetry GUIDS */ +#define SOCP_LPM_REQ_GUID 0x2625030 +#define IOEM_LPM_REQ_GUID 0x4357464 +#define IOEP_LPM_REQ_GUID 0x5077612 + +static const u8 MTL_LPM_REG_INDEX [] = {0 ,4 ,5 ,6 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,16 ,20 }; +/* * Die Mapping to Product. * Product SOCDie IOEDie PCHDie @@ -465,6 +472,7 @@ const struct pmc_reg_map mtl_socm_reg_map = { .lpm_sts = mtl_socm_lpm_maps, .lpm_status_offset = MTL_LPM_STATUS_OFFSET, .lpm_live_status_offset = MTL_LPM_LIVE_STATUS_OFFSET, + .lpm_reg_index = MTL_LPM_REG_INDEX, };const struct pmc_bit_map mtl_ioep_pfear_map[] = {@@ -782,6 +790,13 @@ const struct pmc_reg_map mtl_ioep_reg_map = { .ltr_show_sts = mtl_ioep_ltr_show_map, .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET, .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, + .lpm_num_maps = ADL_LPM_NUM_MAPS, + .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, + .lpm_residency_offset = MTL_LPM_RESIDENCY_OFFSET, + .lpm_priority_offset = MTL_LPM_PRI_OFFSET, + .lpm_en_offset = MTL_LPM_EN_OFFSET, + .lpm_sts_latch_en_offset = MTL_LPM_STATUS_LATCH_EN_OFFSET, + .lpm_reg_index = MTL_LPM_REG_INDEX, };const struct pmc_bit_map mtl_ioem_pfear_map[] = {@@ -922,6 +937,13 @@ const struct pmc_reg_map mtl_ioem_reg_map = { .ltr_show_sts = mtl_ioep_ltr_show_map, .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET, .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, + .lpm_sts_latch_en_offset = MTL_LPM_STATUS_LATCH_EN_OFFSET, + .lpm_num_maps = ADL_LPM_NUM_MAPS, + .lpm_priority_offset = MTL_LPM_PRI_OFFSET, + .lpm_en_offset = MTL_LPM_EN_OFFSET, + .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, + .lpm_residency_offset = MTL_LPM_RESIDENCY_OFFSET, + .lpm_reg_index = MTL_LPM_REG_INDEX, };#define PMC_DEVID_SOCM 0x7e7f@@ -929,16 +951,19 @@ const struct pmc_reg_map mtl_ioem_reg_map = {#define PMC_DEVID_IOEM 0x7ebfstatic struct pmc_info mtl_pmc_info_list[] = { { - .devid =PMC_DEVID_SOCM , - .map = &mtl_socm_reg_map, + .guid =SOCP_LPM_REQ_GUID , + .devid =PMC_DEVID_SOCM , + .map = &mtl_socm_reg_map, }, { - .devid =PMC_DEVID_IOEP , - .map = &mtl_ioep_reg_map, + .guid =IOEP_LPM_REQ_GUID , + .devid =PMC_DEVID_IOEP , + .map = &mtl_ioep_reg_map, }, { - .devid =PMC_DEVID_IOEM , - .map = &mtl_ioem_reg_map + .guid =IOEM_LPM_REQ_GUID , + .devid =PMC_DEVID_IOEM , + .map = &mtl_ioem_reg_map }, {} };
drivers/platform/x86/intel/pmc/mtl.c int mtl_core_init(struct pmc_dev *pmcdev) · line 1042
Quoted 7 lines
drivers/platform/x86/intel/pmc/mtl.c +3
-1@@ -1012,5 +1037,7 @@ int mtl_core_init(struct pmc_dev *pmcdev)dev_dbg (&pmcdev->pdev->dev,"ignoring GBE LTR\n" );pmc_core_send_ltr_ignore (pmcdev,3 ); -return 0 ; + ret =pmc_core_ssram_get_lpm_reqs (pmcdev); + +return ret;
Just do it directly with:
return pmc_core_ssram_get_lpm_reqs(pmcdev);
Signature · 1 line
i.
David E. Box
maintainerPATCH v2 13/13 platform/x86/intel/pmc: Add debug attribute for Die C6 counter
In reply to David E. BoxAdd a "die_c6_us_show" counter in debugs and add support for Meteor Lake. Reads the counter value using Intel Platform Monitoring Technology (PMT) driver API. This counter is useful for determining the idle residency of CPUs in the compute tile.
---
V2 - Remove use of __func__
- Use HZ_PER_MHZ
- Fix missing newlines in printks
drivers/platform/x86/intel/pmc/core.c | 55 +++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 4 ++ drivers/platform/x86/intel/pmc/mtl.c | 32 ++++++++++++++++ 3 files changed, 91 insertions(+)
drivers/platform/x86/intel/pmc/core.c +55 -0
@@ -20,6 +20,7 @@#include <linux/pci.h> #include <linux/slab.h> #include <linux/suspend.h> +#include <linux/units.h> #include <asm/cpu_device_id.h> #include <asm/intel-family.h>
@@ -27,6 +28,7 @@#include <asm/tsc.h> #include "core.h" +#include "../pmt/telemetry.h" /* Maximum number of modes supported by platfoms that has low power mode capability */ const char *pmc_lpm_modes[] = {
@@ -822,6 +824,47 @@ static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused) }DEFINE_SHOW_ATTRIBUTE (pmc_core_substate_req_regs); +static unsigned int pmc_core_get_crystal_freq (void ) +{ +unsigned int eax_denominator, ebx_numerator, ecx_hz, edx; + +if (boot_cpu_data.cpuid_level <0x15 ) +return 0 ; + + eax_denominator = ebx_numerator = ecx_hz = edx =0 ; + +/* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */ +cpuid (0x15 , &eax_denominator, &ebx_numerator, &ecx_hz, &edx); + +if (ebx_numerator ==0 || eax_denominator ==0 ) +return 0 ; + +return ecx_hz; +} + +static int pmc_core_die_c6_us_show (struct seq_file *s,void *unused) +{ +struct pmc_dev *pmcdev = s->private; +u64 die_c6_res, count; +int ret; + +if (!pmcdev->crystal_freq) { +dev_warn_once (&pmcdev->pdev->dev,"Bad crystal frequency\n" ); +return -EINVAL ; + } + + ret =pmt_telem_read (pmcdev->punit_ep, pmcdev->die_c6_offset, + &count,1 ); +if (ret) +return ret; + + die_c6_res =div64_u64 (count *HZ_PER_MHZ , pmcdev->crystal_freq); +seq_printf (s,"%llu\n" , die_c6_res); + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (pmc_core_die_c6_us); +static int pmc_core_lpm_latch_mode_show (struct seq_file *s,void *unused) {struct pmc_dev *pmcdev = s->private;
@@ -1118,6 +1161,12 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev) pmcdev->dbgfs_dir, pmcdev, &pmc_core_substate_req_regs_fops); } + +if (pmcdev->has_die_c6) { +debugfs_create_file ("die_c6_us_show" ,0444 , + pmcdev->dbgfs_dir, pmcdev, + &pmc_core_die_c6_us_fops); + } }static const struct x86_cpu_id intel_pmc_core_ids[] = {
@@ -1212,6 +1261,10 @@ static void pmc_core_clean_structure(struct platform_device *pdev)pci_dev_put (pmcdev->ssram_pcidev);pci_disable_device (pmcdev->ssram_pcidev); } + +if (pmcdev->punit_ep) +pmt_telem_unregister_endpoint (pmcdev->punit_ep); +platform_set_drvdata (pdev,NULL );mutex_destroy (&pmcdev->lock); }
@@ -1232,6 +1285,8 @@ static int pmc_core_probe(struct platform_device *pdev)if (!pmcdev)return -ENOMEM ; + pmcdev->crystal_freq =pmc_core_get_crystal_freq (); +platform_set_drvdata (pdev, pmcdev); pmcdev->pdev = pdev;
drivers/platform/x86/intel/pmc/core.h +4 -0
@@ -16,6 +16,8 @@#include <linux/bits.h> #include <linux/platform_device.h> +struct telem_endpoint ; +#define SLP_S0_RES_COUNTER_MASK GENMASK(31, 0)#define PMC_BASE_ADDR_DEFAULT 0xFE000000
@@ -357,6 +359,7 @@ struct pmc {* @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 +* @crystal_freq: crystal frequency from cpuid * @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
@@ -374,6 +377,7 @@ struct pmc_dev {struct dentry *dbgfs_dir;struct platform_device *pdev;struct pci_dev *ssram_pcidev; +unsigned int crystal_freq;int pmc_xram_read_bit;struct mutex lock;/* generic mutex lock for PMC Core */
drivers/platform/x86/intel/pmc/mtl.c +32 -0
@@ -10,12 +10,17 @@#include <linux/pci.h> #include "core.h" +#include "../pmt/telemetry.h" /* PMC SSRAM PMT Telemetry GUIDS */ #define SOCP_LPM_REQ_GUID 0x2625030#define IOEM_LPM_REQ_GUID 0x4357464#define IOEP_LPM_REQ_GUID 0x5077612 +/* Die C6 from PUNIT telemetry */ +#define MTL_PMT_DMU_DIE_C6_OFFSET 15 +#define MTL_PMT_DMU_GUID 0x1A067102 +static const u8 MTL_LPM_REG_INDEX [] = {0 ,4 ,5 ,6 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,16 ,20 };/*
@@ -968,6 +973,32 @@ static struct pmc_info mtl_pmc_info_list[] = { {} }; +static void mtl_punit_pmt_init (struct pmc_dev *pmcdev) +{ +struct telem_endpoint *ep; +struct pci_dev *pcidev; + + pcidev =pci_get_domain_bus_and_slot (0 ,0 ,PCI_DEVFN (10 ,0 )); +if (!pcidev) { +dev_err (&pmcdev->pdev->dev,"PUNIT PMT device not found.\n" ); +return ; + } + + ep =pmt_telem_find_and_register_endpoint (pcidev,MTL_PMT_DMU_GUID ,0 ); +if (IS_ERR (ep)) { +dev_err (&pmcdev->pdev->dev, +"pmc_core: couldn't get DMU telem endpoint, %ld\n" , +PTR_ERR (ep)); +return ; + } + +pci_dev_put (pcidev); + pmcdev->punit_ep = ep; + + pmcdev->has_die_c6 = true; + pmcdev->die_c6_offset =MTL_PMT_DMU_DIE_C6_OFFSET ; +} +#define MTL_GNA_PCI_DEV 0x7e4c#define MTL_IPU_PCI_DEV 0x7d19#define MTL_VPU_PCI_DEV 0x7d1d
@@ -1030,6 +1061,7 @@ int mtl_core_init(struct pmc_dev *pmcdev) }pmc_core_get_low_power_modes (pmcdev); +mtl_punit_pmt_init (pmcdev);/* 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.34.1