intel_pmc: Add telemetry API to read counters
Subsystems (5)
David E. Box
maintainerv5 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 (15):
platform/x86/intel/vsec: Fix xa_alloc memory leak platform/x86/intel/vsec: Move structures to header platform/x86/intel/vsec: remove platform_info from vsec device
structure
platform/x86/intel/vsec: Use cleanup.h platform/x86/intel/vsec: Assign auxdev parent by argument 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: Allow pmc_core_ssram_init to fail asm-generic/io.h: iounmap/ioport_unmap cleanup.h support platform/x86/intel/pmc: Cleanup SSRAM discovery platform/x86/intel/pmc/mtl: Use return value from
pmc_core_ssram_init()
platform/x86/intel/pmc: Find and register PMC telemetry entries platform/x86/intel/pmc: Add debug attribute for Die C6 counter platform/x86/intel/pmc: Show Die C6 counter on Meteor Lake
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 | 190 +++++++++----- drivers/platform/x86/intel/pmc/core.h | 10 +- drivers/platform/x86/intel/pmc/core_ssram.c | 263 +++++++++++++++++--- 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 | 193 +++++++++++++- drivers/platform/x86/intel/pmt/telemetry.h | 126 ++++++++++ drivers/platform/x86/intel/vsec.c | 129 +++++----- drivers/platform/x86/intel/vsec.h | 45 +++- include/asm-generic/io.h | 6 + 18 files changed, 946 insertions(+), 204 deletions(-) create mode 100644 drivers/platform/x86/intel/pmt/telemetry.h
base-commit: b85ea95d086471afb4ad062012a4d73cd328fa86
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 3/20 platform/x86/intel/vsec: remove platform_info from vsec device structure
In 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.
---
V5 - No change
V4 - No change
V3 - No change
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
@@ -201,7 +201,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,11 +79,11 @@ struct intel_vsec_device {struct pci_dev *pcidev;struct resource *resource;struct ida *ida; -struct intel_vsec_platform_info *info;int num_resources;int id;/* xa */ 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
David E. Box
maintainerPATCH v5 1/20 platform/x86/intel/vsec: Fix xa_alloc memory leak
In reply to David E. BoxFixes memory leak, caught be kmemleak, due to failure to erase auxiliary device entries from an xarray on removal.
---
V5 - New patch
drivers/platform/x86/intel/vsec.c | 24 ++++++++++++++++-------- drivers/platform/x86/intel/vsec.h | 1 + 2 files changed, 17 insertions(+), 8 deletions(-)
drivers/platform/x86/intel/vsec.c +16 -8
@@ -120,6 +120,8 @@ static void intel_vsec_dev_release(struct device *dev) {struct intel_vsec_device *intel_vsec_dev =dev_to_ivdev (dev); +xa_erase (&auxdev_array, intel_vsec_dev->id); +mutex_lock (&vsec_ida_lock);ida_free (intel_vsec_dev->ida, intel_vsec_dev->auxdev.id);mutex_unlock (&vsec_ida_lock);
@@ -136,9 +138,21 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,int ret, id;mutex_lock (&vsec_ida_lock); - ret =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL ); + id =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL );mutex_unlock (&vsec_ida_lock); +if (id <0 ) { +kfree (intel_vsec_dev->resource); +kfree (intel_vsec_dev); +return ret; + } + + ret =xa_alloc (&auxdev_array, &intel_vsec_dev->id, intel_vsec_dev, +PMT_XA_LIMIT ,GFP_KERNEL );if (ret <0 ) { +mutex_lock (&vsec_ida_lock); +ida_free (intel_vsec_dev->ida, id); +mutex_unlock (&vsec_ida_lock); +kfree (intel_vsec_dev->resource);kfree (intel_vsec_dev);return ret;
@@ -147,7 +161,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,if (!parent) parent = &pdev->dev; - auxdev->id = ret; + auxdev->id = id; auxdev->name = name; auxdev->dev.parent = parent; auxdev->dev.release = intel_vsec_dev_release;
@@ -169,12 +183,6 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,if (ret <0 )return ret; -/* Add auxdev to list */ - ret =xa_alloc (&auxdev_array, &id, intel_vsec_dev,PMT_XA_LIMIT , -GFP_KERNEL ); -if (ret) -return ret; -return 0 ; }EXPORT_SYMBOL_NS_GPL (intel_vsec_add_aux,INTEL_VSEC );
drivers/platform/x86/intel/vsec.h +1 -0
@@ -45,6 +45,7 @@ struct intel_vsec_device {struct ida *ida;struct intel_vsec_platform_info *info;int num_resources; +int id;/* xa */ void *priv_data;size_t priv_data_size; };
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 4/20 platform/x86/intel/vsec: Use cleanup.h
In reply to David E. BoxUse cleanup.h helpers to handle cleanup of resources in intel_vsec_add_dev() after failures.
---
V5 - Assign no_free_ptr(res) to resource member. This fixes __must_check_fn
warning.
- Remove unsed ret variable.
V4 - Do no_free_ptr() before and in call to intel_vsec_add_aux().
- Add resource cleanup in this patch.
V3 - New patch.
drivers/platform/x86/intel/vsec.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/platform/x86/intel/vsec.c +11 -7
@@ -15,6 +15,7 @@#include <linux/auxiliary_bus.h> #include <linux/bits.h> +#include <linux/cleanup.h> #include <linux/delay.h> #include <linux/kernel.h> #include <linux/idr.h>
@@ -155,8 +156,9 @@ EXPORT_SYMBOL_NS_GPL(intel_vsec_add_aux, INTEL_VSEC);static int intel_vsec_add_dev (struct pci_dev *pdev,struct intel_vsec_header *header,struct intel_vsec_platform_info *info) { -struct intel_vsec_device *intel_vsec_dev; -struct resource *res, *tmp; + struct intel_vsec_device __free(kfree) *intel_vsec_dev = NULL; + struct resource __free(kfree) *res = NULL; + struct resource *tmp; unsigned long quirks = info->quirks; int i;
@@ -178,10 +180,8 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *hereturn -ENOMEM ; res =kcalloc (header->num_entries,sizeof (*res),GFP_KERNEL ); -if (!res) { -kfree (intel_vsec_dev); +if (!res)return -ENOMEM ; - }if (quirks &VSEC_QUIRK_TABLE_SHIFT ) header->offset >>=TABLE_OFFSET_SHIFT ;
@@ -199,7 +199,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->resource =no_free_ptr (res); intel_vsec_dev->num_resources = header->num_entries; intel_vsec_dev->quirks = info->quirks;
@@ -208,7 +208,11 @@ 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, +/* +* Pass the ownership of intel_vsec_dev and resource within it to +* intel_vsec_add_aux() +*/ +return intel_vsec_add_aux (pdev,NULL ,no_free_ptr (intel_vsec_dev),intel_vsec_name (header->id)); }
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 2/20 platform/x86/intel/vsec: Move structures to header
In reply to David E. BoxIn preparation for exporting an API to register Intel Vendor Specific Extended Capabilities (VSEC) from other drivers, move needed structures to the header file.
---
V5 - No change
V4 - No change
V3 - No change
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
David E. Box
maintainerPATCH v5 5/20 platform/x86/intel/vsec: Assign auxdev parent by argument
In reply to David E. BoxInstead of checking for a NULL parent argument in intel_vsec_add_aux() and then assigning it to the probed device, remove this check and just pass the device in the call. Since this function is exported, return -EINVAL if the parent is not specified.
---
V5 - New patch
drivers/platform/x86/intel/vsec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/platform/x86/intel/vsec.c +4 -4
@@ -103,6 +103,9 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,struct auxiliary_device *auxdev = &intel_vsec_dev->auxdev;int ret, id; +if (!parent) +return -EINVAL ; +mutex_lock (&vsec_ida_lock); id =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL );mutex_unlock (&vsec_ida_lock);
@@ -124,9 +127,6 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,return ret; } -if (!parent) - parent = &pdev->dev; - auxdev->id = id; auxdev->name = name; auxdev->dev.parent = parent;
@@ -212,7 +212,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he* Pass the ownership of intel_vsec_dev and resource within it to * intel_vsec_add_aux() */ -return intel_vsec_add_aux (pdev,NULL ,no_free_ptr (intel_vsec_dev), +return intel_vsec_add_aux (pdev, &pdev->dev,no_free_ptr (intel_vsec_dev),intel_vsec_name (header->id)); }
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 8/20 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. While here also perform a newline cleanup.
---
V5 - Mention newline cleanup in changelog
V4 - No change
V3 - No change
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 v5 9/20 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.
---
V5 - No change
V4 - No change
V3 - Add comment for mutex lock
- Fix multiline comments
- Fix line lengths
- Fix space/tab inconsistences in header doc
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 | 191 ++++++++++++++++++++- drivers/platform/x86/intel/pmt/telemetry.h | 126 ++++++++++++++ 4 files changed, 344 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 +188 -3
222 lines not on this page · raw message
drivers/platform/x86/intel/pmt/telemetry.h new file +126 -0
126 lines not on this page · raw message
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 6/20 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.
---
V5 - Add parent variable in intel_vsec_add_dev() and set parent to
the pci device if info->parent is not set.
V4 - Move res cleanup to previous patch
V3 - Replace kfree on request_mem_region fail with use of cleanup.h helper.
V2 - New patch splitting previous PATCH 1
drivers/platform/x86/intel/vsec.c | 24 +++++++++++++++++++++++- drivers/platform/x86/intel/vsec.h | 4 ++++ 2 files changed, 27 insertions(+), 1 deletion(-)
drivers/platform/x86/intel/vsec.c +23 -1
@@ -159,9 +159,15 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he struct intel_vsec_device __free(kfree) *intel_vsec_dev = NULL; struct resource __free(kfree) *res = NULL; struct resource *tmp; + struct device *parent; unsigned long quirks = info->quirks; int i; + if (info->parent) + parent = info->parent; + else + parent = &pdev->dev; + if (!intel_vsec_supported(header->id, info->caps)) return -EINVAL;
@@ -196,6 +202,12 @@ 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),"" )) +return -EBUSY ; + +release_mem_region (tmp->start,resource_size (tmp)); } intel_vsec_dev->pcidev = pdev;
@@ -212,7 +224,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he* Pass the ownership of intel_vsec_dev and resource within it to * intel_vsec_add_aux() */ -return intel_vsec_add_aux (pdev, &pdev->dev,no_free_ptr (intel_vsec_dev), +return intel_vsec_add_aux (pdev, parent,no_free_ptr (intel_vsec_dev),intel_vsec_name (header->id)); }
@@ -330,6 +342,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;
@@ -99,4 +100,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
David E. Box
maintainerPATCH v5 7/20 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.
---
V5 - No change
V4 - No change
V3 - No change
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
@@ -161,6 +161,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *hestruct resource *tmp;struct device *parent;unsigned long quirks = info->quirks; +u64 base_addr;int i;if (info->parent)
@@ -192,14 +193,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 ;
@@ -214,6 +219,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he intel_vsec_dev->resource =no_free_ptr (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 {
@@ -85,6 +86,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 v5 10/20 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.
---
V5 - No change
V4 - No change
V3 - No change
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
David E. Box
maintainerPATCH v5 11/20 platform/x86/intel/pmc: Allow pmc_core_ssram_init to fail
In reply to David E. BoxCurrently, if the PMC SSRAM initialization fails, no error is returned and the only indication is that a PMC device has not been created. Instead, allow an error to be returned and handled directly by the caller.
---
V5 - No change
V4 - Remove return value check in mtl.c. Proper use of the value would
require returning an error status from pmc_core_add_pmc(). But the function that calls it will be removed in the next patch so wait to use it then.
V3 - New patch split from V2 PATCH 9
- Add dev_warn on pmc_core_ssram_init fail
drivers/platform/x86/intel/pmc/core.h | 2 +- drivers/platform/x86/intel/pmc/core_ssram.c | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 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 +13 -8
@@ -35,20 +35,20 @@ static inline u64 get_base(void __iomem *addr, u32 offset)return lo_hi_readq (addr + offset) &GENMASK_ULL (63 ,3 ); } -static void +static int pmc_core_pmc_add (struct pmc_dev *pmcdev,u64 pwrm_base,const struct pmc_reg_map *reg_map,int pmc_index) {struct pmc *pmc = pmcdev->pmcs[pmc_index];if (!pwrm_base) -return ; +return -ENODEV ;/* Memory for primary PMC has been allocated in core.c */ if (!pmc) { pmc =devm_kzalloc (&pmcdev->pdev->dev,sizeof (*pmc),GFP_KERNEL );if (!pmc) -return ; +return -ENOMEM ; } pmc->map = reg_map;
@@ -57,10 +57,12 @@ pmc_core_pmc_add(struct pmc_dev *pmcdev, u64 pwrm_base,if (!pmc->regbase) {devm_kfree (&pmcdev->pdev->dev, pmc); -return ; +return -ENOMEM ; } pmcdev->pmcs[pmc_index] = pmc; + +return 0 ; } static void
@@ -96,7 +98,7 @@ pmc_core_ssram_get_pmc(struct pmc_dev *pmcdev, void __iomem *ssram, u32 offset,iounmap (ssram); } -void pmc_core_ssram_init (struct pmc_dev *pmcdev) +int pmc_core_ssram_init (struct pmc_dev *pmcdev) {void __iomem *ssram;struct pci_dev *pcidev;
@@ -105,7 +107,7 @@ void pmc_core_ssram_init(struct pmc_dev *pmcdev) pcidev =pci_get_domain_bus_and_slot (0 ,0 ,PCI_DEVFN (20 ,2 ));if (!pcidev) - goto out; +return -ENODEV ; ret =pcim_enable_device (pcidev);if (ret)
@@ -123,11 +125,14 @@ void pmc_core_ssram_init(struct pmc_dev *pmcdev)pmc_core_ssram_get_pmc (pmcdev, ssram,SSRAM_PCH_OFFSET ,PMC_IDX_PCH );iounmap (ssram); -out: -return ; + +return 0 ; disable_dev: + pmcdev->ssram_pcidev =NULL ;pci_disable_device (pcidev); release_dev:pci_dev_put (pcidev); + +return ret; }
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 12/20 asm-generic/io.h: iounmap/ioport_unmap cleanup.h support
In reply to David E. BoxAdd auto-release cleanups for iounmap() and ioport_unmap().
---
V2 - Move from linux/io.h to asm-generic/io.h. Adds iounmap cleanup if
iounmap() is defined. Adds ioport_unmap cleanup if CONFIG_IOPORT_MAP is defined.
include/asm-generic/io.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/asm-generic/io.h +6 -0
@@ -8,6 +8,7 @@#define __ASM_GENERIC_IO_H#include <asm/page.h> /* I/O is all done through memory accesses */ +#include <linux/cleanup.h> #include <linux/string.h> /* for memset() and memcpy() */ #include <linux/types.h> #include <linux/instruction_pointer.h>
@@ -1065,6 +1066,10 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size)#endif #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */ +#ifdef iounmap +DEFINE_FREE(iounmap, void __iomem *, iounmap(_T)); +#endif +#ifndef ioremap_wc#define ioremap_wc ioremap#endif
@@ -1127,6 +1132,7 @@ static inline void ioport_unmap(void __iomem *p)extern void __iomem *ioport_map (unsigned long port,unsigned int nr);extern void ioport_unmap (void __iomem *p);#endif /* CONFIG_GENERIC_IOMAP */ +DEFINE_FREE(ioport_unmap, void __iomem *, ioport_unmap(_T));#endif /* CONFIG_HAS_IOPORT_MAP */ #ifndef CONFIG_GENERIC_IOMAP
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 14/20 platform/x86/intel/pmc/mtl: Use return value from pmc_core_ssram_init()
In reply to David E. BoxInstead of checking for a NULL regbase, use the return value from pmc_core_ssram_init() to check if PMC discovery was successful. If not, use the legacy enumeration method (which only works for the primary PMC).
---
V5 - New patch. Split from previous.
drivers/platform/x86/intel/pmc/mtl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/platform/x86/intel/pmc/mtl.c +8 -4
@@ -990,12 +990,16 @@ 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) { +dev_warn (&pmcdev->pdev->dev, +"ssram init failed, %d, using legacy init\n" , 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 v5 15/20 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.
---
V5 - no change
V4 - no change
V3 - no change
V2 - no change
drivers/platform/x86/intel/pmc/Kconfig | 1 + drivers/platform/x86/intel/pmc/core_ssram.c | 49 +++++++++++++++++++++ 2 files changed, 50 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 +49 -0
70 lines not on this page · raw message
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 16/20 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.
---
V5 - Use conditional instead of if/else to do seq_printf()
V4 - No change
V3 - Add missing submitter signoff
V2 - no change
drivers/platform/x86/intel/pmc/core.c | 128 ++++++++++++++------------ 1 file changed, 68 insertions(+), 60 deletions(-)
drivers/platform/x86/intel/pmc/core.c +68 -60
@@ -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,76 @@ 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" ); -else -seq_printf (s," %9s |" ," " ); +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) { +bool required = lpm_req_regs[mp + (mode * num_maps)] & + bit_mask; +seq_printf (s," %9s |" , required ?"Required" :" " ); + } + +/* In Status column, show the last captured state of this agent */ +seq_printf (s," %9s |" , lpm_status & bit_mask ?"Yes" :" " ); + +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 v5 17/20 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.
---
V5 - no change
V4 - no change
V3 - no change
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 v5 13/20 platform/x86/intel/pmc: Cleanup SSRAM discovery
In reply to David E. BoxClean up the code handling SSRAM discovery. Handle all resource allocation and cleanup in pmc_core_ssram_get_pmc(). Return the error status from this function but only fail the init if we fail to discover the primary PMC.
---
V5 - Use single function to handle SSRAM discovery of all PMCs.
V4 - Add checking the return value from pmc_core_sram_init() to mtl.c
- Use iounmap cleanup from io.h
V3 - New patch split from previous PATCH 2
- Update changelog
- Use cleanup.h to cleanup ioremap
V2 - no change
drivers/platform/x86/intel/pmc/core_ssram.c | 60 +++++++++++---------- 1 file changed, 31 insertions(+), 29 deletions(-)
drivers/platform/x86/intel/pmc/core_ssram.c +31 -29
@@ -8,6 +8,7 @@* */ +#include <linux/cleanup.h> #include <linux/pci.h> #include <linux/io-64-nonatomic-lo-hi.h>
@@ -65,44 +66,49 @@ pmc_core_pmc_add(struct pmc_dev *pmcdev, u64 pwrm_base,return 0 ; } -static void -pmc_core_ssram_get_pmc (struct pmc_dev *pmcdev,void __iomem *ssram,u32 offset, -int pmc_idx) +static int +pmc_core_ssram_get_pmc (struct pmc_dev *pmcdev,int pmc_idx,u32 offset) { -u64 pwrm_base; +struct pci_dev *ssram_pcidev = pmcdev->ssram_pcidev; + void __iomem __free(iounmap) *tmp_ssram = NULL; + void __iomem __free(iounmap) *ssram = NULL; +const struct pmc_reg_map *map; +u64 ssram_base, pwrm_base;u16 devid; -if (pmc_idx !=PMC_IDX_SOC ) { -u64 ssram_base =get_base (ssram, offset); + if (!pmcdev->regmap_list) + return -ENOENT; -if (!ssram_base) -return ; + ssram_base = ssram_pcidev->resource[0].start; + tmp_ssram = ioremap(ssram_base, SSRAM_HDR_SIZE); + if (pmc_idx != PMC_IDX_MAIN) { +/* +* The secondary PMC BARS (which are behind hidden PCI devices) +* are read from fixed offsets in MMIO of the primary PMC BAR. +*/ + ssram_base =get_base (tmp_ssram, offset); ssram =ioremap (ssram_base,SSRAM_HDR_SIZE );if (!ssram) -return ; +return -ENOMEM ; + + } else { + ssram =no_free_ptr (tmp_ssram); } pwrm_base =get_base (ssram,SSRAM_PWRM_OFFSET ); devid =readw (ssram +SSRAM_DEVID_OFFSET ); -if (pmcdev->regmap_list) { -const struct pmc_reg_map *map; + map =pmc_core_find_regmap (pmcdev->regmap_list, devid); +if (!map) +return -ENODEV ; - map =pmc_core_find_regmap (pmcdev->regmap_list, devid); -if (map) -pmc_core_pmc_add (pmcdev, pwrm_base, map, pmc_idx); - } - -if (pmc_idx !=PMC_IDX_SOC ) -iounmap (ssram); +return pmc_core_pmc_add (pmcdev, pwrm_base, map,PMC_IDX_MAIN ); }int pmc_core_ssram_init (struct pmc_dev *pmcdev) { -void __iomem *ssram;struct pci_dev *pcidev; -u64 ssram_base;int ret; pcidev =pci_get_domain_bus_and_slot (0 ,0 ,PCI_DEVFN (20 ,2 ));
@@ -113,18 +119,14 @@ int pmc_core_ssram_init(struct pmc_dev *pmcdev)if (ret) goto release_dev; - ssram_base = pcidev->resource[0 ].start; - ssram =ioremap (ssram_base,SSRAM_HDR_SIZE ); -if (!ssram) - goto disable_dev; - pmcdev->ssram_pcidev = pcidev; -pmc_core_ssram_get_pmc (pmcdev, ssram,0 ,PMC_IDX_SOC ); -pmc_core_ssram_get_pmc (pmcdev, ssram,SSRAM_IOE_OFFSET ,PMC_IDX_IOE ); -pmc_core_ssram_get_pmc (pmcdev, ssram,SSRAM_PCH_OFFSET ,PMC_IDX_PCH ); + ret =pmc_core_ssram_get_pmc (pmcdev,PMC_IDX_MAIN ,0 ); +if (ret) + goto disable_dev; -iounmap (ssram); +pmc_core_ssram_get_pmc (pmcdev,PMC_IDX_IOE ,SSRAM_IOE_OFFSET ); +pmc_core_ssram_get_pmc (pmcdev,PMC_IDX_PCH ,SSRAM_PCH_OFFSET );return 0 ;
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 18/20 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.
---
V5 - no change
V4 - no change
V3 - directly return value from pmc_core_ssram_get_lpm_reqs()
V2 - fixed unused return value
drivers/platform/x86/intel/pmc/mtl.c | 39 +++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 7 deletions(-)
drivers/platform/x86/intel/pmc/mtl.c +32 -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 }, {} };
@@ -1014,5 +1039,5 @@ 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 ; +return pmc_core_ssram_get_lpm_reqs (pmcdev); }
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 19/20 platform/x86/intel/pmc: Add debug attribute for Die C6 counter
In reply to David E. BoxAdd a "die_c6_us_show" debugfs attribute. 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. Also adds a missing forward declaration for punit_ep which was declared in an earlier upstream commit but only used for the first time in this one.
---
V5 - Change comment for crystal error and return value
V4 - no change
V3 - Split previous PATCH V2 13. Separates implementation (this patch) from
platform specific use (next patch)
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 ++ 2 files changed, 59 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[] = {
@@ -817,6 +819,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,"Crystal frequency unavailable\n" ); +return -ENXIO ; + } + + 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;
@@ -1113,6 +1156,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[] = {
@@ -1207,6 +1256,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); }
@@ -1227,6 +1280,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 */
Signature · 1 line
2.34.1
David E. Box
maintainerPATCH v5 20/20 platform/x86/intel/pmc: Show Die C6 counter on Meteor Lake
In reply to David E. BoxExpose the Die C6 counter on Meteor Lake.
---
V5 - no change
V4 - no change
V3 - Split PATCH V2 13. Separates implementation (previous patch)
from platform specific use (this patch)
drivers/platform/x86/intel/pmc/mtl.c | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
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
@@ -1032,6 +1063,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
Ilpo Järvinen
maintainerRe: [PATCH V5 01/20] platform/x86/intel/vsec: Fix xa_alloc memory leak
In reply to David E. BoxQuoted 4 lines · David E. Box
Fixes memory leak, caught be kmemleak, due to failure to erase auxiliary device entries from an xarray on removal.
Signed-off-by David E. Box <[email protected]>
Changelog is quite terse, please improve ;-).
Missing Fixes tag.
Quoted 29 lines
---
V5 - New patchdrivers/platform/x86/intel/vsec.c | 24 ++++++++++++++++-------- drivers/platform/x86/intel/vsec.h | 1 + 2 files changed, 17 insertions(+), 8 deletions(-)drivers/platform/x86/intel/vsec.c +5
-1@@ -120,6 +120,8 @@ static void intel_vsec_dev_release(struct device *dev) {struct intel_vsec_device *intel_vsec_dev =dev_to_ivdev (dev); +xa_erase (&auxdev_array, intel_vsec_dev->id); +mutex_lock (&vsec_ida_lock);ida_free (intel_vsec_dev->ida, intel_vsec_dev->auxdev.id);mutex_unlock (&vsec_ida_lock);@@ -136,9 +138,21 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,int ret, id;mutex_lock (&vsec_ida_lock); - ret =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL ); + id =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL );mutex_unlock (&vsec_ida_lock); +if (id <0 ) { +kfree (intel_vsec_dev->resource);
drivers/platform/x86/intel/vsec.c int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, · line 154
Quoted 10 lines
drivers/platform/x86/intel/vsec.c +9
-0+kfree (intel_vsec_dev); +return ret; + } + + ret =xa_alloc (&auxdev_array, &intel_vsec_dev->id, intel_vsec_dev, +PMT_XA_LIMIT ,GFP_KERNEL );if (ret <0 ) { +mutex_lock (&vsec_ida_lock); +ida_free (intel_vsec_dev->ida, id); +mutex_unlock (&vsec_ida_lock);
Can't order of xa_alloc() and ida_alloc() be reversed such that you don't need to do this double mutex dance?
Signature · 1 line
i.
Quoted 39 lines
drivers/platform/x86/intel/vsec.c +2
-7+kfree (intel_vsec_dev->resource);kfree (intel_vsec_dev);return ret;@@ -147,7 +161,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,if (!parent) parent = &pdev->dev; - auxdev->id = ret; + auxdev->id = id; auxdev->name = name; auxdev->dev.parent = parent; auxdev->dev.release = intel_vsec_dev_release;@@ -169,12 +183,6 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,if (ret <0 )return ret; -/* Add auxdev to list */ - ret =xa_alloc (&auxdev_array, &id, intel_vsec_dev,PMT_XA_LIMIT , -GFP_KERNEL ); -if (ret) -return ret; -return 0 ; }EXPORT_SYMBOL_NS_GPL (intel_vsec_add_aux,INTEL_VSEC );drivers/platform/x86/intel/vsec.h +1
-0@@ -45,6 +45,7 @@ struct intel_vsec_device {struct ida *ida;struct intel_vsec_platform_info *info;int num_resources; +int id;/* xa */ void *priv_data;size_t priv_data_size; };
Re: [PATCH V5 05/20] platform/x86/intel/vsec: Assign auxdev parent by argument
In reply to David E. BoxQuoted 37 lines · David E. Box
Instead of checking for a NULL parent argument in
intel_vsec_add_aux()and then assigning it to the probed device, remove this check and just pass the device in the call. Since this function is exported, return-EINVALif the parent is not specified.Signed-off-by David E. Box <[email protected]>---
V5 - New patchdrivers/platform/x86/intel/vsec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/platform/x86/intel/vsec.c +3
-3@@ -103,6 +103,9 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,struct auxiliary_device *auxdev = &intel_vsec_dev->auxdev;int ret, id; +if (!parent) +return -EINVAL ; +mutex_lock (&vsec_ida_lock); id =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL );mutex_unlock (&vsec_ida_lock);@@ -124,9 +127,6 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,return ret; } -if (!parent) - parent = &pdev->dev; - auxdev->id = id; auxdev->name = name; auxdev->dev.parent = parent;
drivers/platform/x86/intel/vsec.c static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he · line 217
Quoted 7 lines
drivers/platform/x86/intel/vsec.c +1
-1@@ -212,7 +212,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he* Pass the ownership of intel_vsec_dev and resource within it to * intel_vsec_add_aux() */ -return intel_vsec_add_aux (pdev,NULL ,no_free_ptr (intel_vsec_dev), +return intel_vsec_add_aux (pdev, &pdev->dev,no_free_ptr (intel_vsec_dev),intel_vsec_name (header->id)); }
Signature · 1 line
i.
Ilpo Järvinen
maintainerRe: [PATCH V5 19/20] platform/x86/intel/pmc: Add debug attribute for Die C6 counter
In reply to David E. BoxQuoted 28 lines · David E. Box
Add a "
die_c6_us_show" debugfs attribute. 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. Also adds a missing forward declaration forpunit_epwhich was declared in an earlier upstream commit but only used for the first time in this one.Signed-off-by David E. Box <[email protected]>---
V5 - Change comment for crystal error and return valueV4 - no change
V3 - Split previous PATCH V2 13. Separates implementation (this patch) from
platform specific use (next patch)V2 - Remove use of
__func__
- UseHZ_PER_MHZ
- Fix missing newlines in printksdrivers/platform/x86/intel/pmc/core.c | 55 +++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 4 ++ 2 files changed, 59 insertions(+)drivers/platform/x86/intel/pmc/core.c +0
-0
drivers/platform/x86/intel/pmc/core.c static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused) · line 849
Quoted 10 lines
drivers/platform/x86/intel/pmc/core.c +10
-0+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,"Crystal frequency unavailable\n" ); +return -ENXIO ; + }
I actually started to wonder whether it would be better to just not show the file in this case (using .is_visible())? (I'm sorry I forgot to send the note about that earlier.)
Signature · 1 line
i.
Re: [PATCH V5 19/20] platform/x86/intel/pmc: Add debug attribute for Die C6 counter
Quoted 30 lines · Ilpo Järvinen
Quoted 27 lines · David E. Box
Add a "
die_c6_us_show" debugfs attribute. 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. Also adds a missing forward declaration forpunit_epwhich was declared in an earlier upstream commit but only used for the first time in this one.Signed-off-by David E. Box <[email protected]>---
V5 - Change comment for crystal error and return valueV4 - no change
V3 - Split previous PATCH V2 13. Separates implementation (this patch) from
platform specific use (next patch)V2 - Remove use of
__func__
- UseHZ_PER_MHZ
- Fix missing newlines in printksdrivers/platform/x86/intel/pmc/core.c | 55 +++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 4 ++ 2 files changed, 59 insertions(+)drivers/platform/x86/intel/pmc/core.c +0
-0
Quoted 14 lines
drivers/platform/x86/intel/pmc/core.c static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused) · line 849
Quoted 10 lines
drivers/platform/x86/intel/pmc/core.c +10
-0+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,"Crystal frequency unavailable\n" ); +return -ENXIO ; + }I actually started to wonder whether it would be better to just not show the file in this case (using .is_visible())? (I'm sorry I forgot to send the note about that earlier.)
Ah, sorry, this was actually a debugfs file, not a sysfs one (and that's why I didn't end up noting it earlier).
Signature · 1 line
i.
Re: [PATCH V5 16/20] platform/x86/intel/pmc: Display LPM requirements for multiple PMCs
In reply to David E. BoxQuoted 8 lines · David E. Box
From: Rajvi Jingar <[email protected]>
Update the
substate_requirementsattribute to display the requirements for all the PMCs on a package.Signed-off-by Rajvi Jingar <[email protected]>Signed-off-by David E. Box <[email protected]>---
This change looked fine.
However, I spent considerable time in figuring out the addition of lpm_req_regs NULL check so it would be nice to mention it in the commit message that since the caller's primary_pmc->lpm_req_regs check no longer covers all pmcs, it has to checked within the loop. It's was far from obvious whether it was a bugfix accidently mixed together with this patch or required by this change itself but I managed to finally convince myself it's the latter.
With that noted down for the benefit of the next unfortunate victim who has to read this change from the git history, :-)
Signature · 1 line
i.
Re: [PATCH V5 13/20] platform/x86/intel/pmc: Cleanup SSRAM discovery
In reply to David E. BoxQuoted 5 lines · David E. Box
Clean up the code handling SSRAM discovery. Handle all resource allocation and cleanup in
pmc_core_ssram_get_pmc(). Return the error status from this function but only fail the init if we fail to discover the primary PMC.Signed-off-by David E. Box <[email protected]>
Very easy to follow, thanks for making it this way (in fact so easy I started to doubt my eyes as I didn't find any flaws in it :-)).
Signature · 1 line
i.
Re: [PATCH V5 14/20] platform/x86/intel/pmc/mtl: Use return value from pmc_core_ssram_init()
In reply to David E. BoxQuoted 5 lines · David E. Box
Instead of checking for a NULL regbase, use the return value from
pmc_core_ssram_init()to check if PMC discovery was successful. If not, use the legacy enumeration method (which only works for the primary PMC).Signed-off-by David E. Box <[email protected]>
Signature · 1 line
i.
Ilpo Järvinen
maintainerRe: [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support
In reply to David E. BoxQuoted 36 lines · David E. Box
Add auto-release cleanups for
iounmap()andioport_unmap().Signed-off-by David E. Box <[email protected]>Suggested-by Ilpo Järvinen <[email protected]>---
V2 - Move fromlinux/io.htoasm-generic/io.h. Adds iounmap cleanup if
iounmap()is defined. Addsioport_unmapcleanup ifCONFIG_IOPORT_MAPis defined.include/asm-generic/io.h | 6 ++++++ 1 file changed, 6 insertions(+)include/asm-generic/io.h +5
-0@@ -8,6 +8,7 @@#define __ASM_GENERIC_IO_H#include <asm/page.h> /* I/O is all done through memory accesses */ +#include <linux/cleanup.h> #include <linux/string.h> /* for memset() and memcpy() */ #include <linux/types.h> #include <linux/instruction_pointer.h> @@ -1065,6 +1066,10 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size)#endif #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */ +#ifdef iounmap +DEFINE_FREE(iounmap, void __iomem *, iounmap(_T)); +#endif +#ifndef ioremap_wc#define ioremap_wc ioremap#endif
include/asm-generic/io.h static inline void ioport_unmap(void __iomem *p) · line 1138
Quoted 7 lines
include/asm-generic/io.h +1
-0@@ -1127,6 +1132,7 @@ static inline void ioport_unmap(void __iomem *p)extern void __iomem *ioport_map (unsigned long port,unsigned int nr);extern void ioport_unmap (void __iomem *p);#endif /* CONFIG_GENERIC_IOMAP */ +DEFINE_FREE(ioport_unmap, void __iomem *, ioport_unmap(_T));#endif /* CONFIG_HAS_IOPORT_MAP */ #ifndef CONFIG_GENERIC_IOMAP
Has this now built successfully with LKP? (I don't think we get success notifications from LKP for patch submissions, only failures).
There were some odd errors last time but I think all they were unrelated to this change (besides the checkpatch false positive, I mean).
Signature · 1 line
i.
Ilpo Järvinen
maintainerRe: [PATCH V5 06/20] platform/x86/intel/vsec: Add intel_vsec_register
In reply to David E. BoxQuoted 7 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.
Please also explain here why the usual parent relationships are not enough in this case and you need to store it.
Quoted 12 lines
drivers/platform/x86/intel/vsec.h +1
-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;
Signature · 1 line
i.
Ilpo Järvinen
maintainerRe: [PATCH V5 01/20] platform/x86/intel/vsec: Fix xa_alloc memory leak
In reply to David E. BoxQuoted 57 lines · David E. Box
Fixes memory leak, caught be kmemleak, due to failure to erase auxiliary device entries from an xarray on removal.
Signed-off-by David E. Box <[email protected]>---
V5 - New patchdrivers/platform/x86/intel/vsec.c | 24 ++++++++++++++++-------- drivers/platform/x86/intel/vsec.h | 1 + 2 files changed, 17 insertions(+), 8 deletions(-)drivers/platform/x86/intel/vsec.c +16
-2@@ -120,6 +120,8 @@ static void intel_vsec_dev_release(struct device *dev) {struct intel_vsec_device *intel_vsec_dev =dev_to_ivdev (dev); +xa_erase (&auxdev_array, intel_vsec_dev->id); +mutex_lock (&vsec_ida_lock);ida_free (intel_vsec_dev->ida, intel_vsec_dev->auxdev.id);mutex_unlock (&vsec_ida_lock);@@ -136,9 +138,21 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,int ret, id;mutex_lock (&vsec_ida_lock); - ret =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL ); + id =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL );mutex_unlock (&vsec_ida_lock); +if (id <0 ) { +kfree (intel_vsec_dev->resource); +kfree (intel_vsec_dev); +return ret; + } + + ret =xa_alloc (&auxdev_array, &intel_vsec_dev->id, intel_vsec_dev, +PMT_XA_LIMIT ,GFP_KERNEL );if (ret <0 ) { +mutex_lock (&vsec_ida_lock); +ida_free (intel_vsec_dev->ida, id); +mutex_unlock (&vsec_ida_lock); +kfree (intel_vsec_dev->resource);kfree (intel_vsec_dev);return ret;@@ -147,7 +161,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,if (!parent) parent = &pdev->dev; - auxdev->id = ret; + auxdev->id = id; auxdev->name = name; auxdev->dev.parent = parent; auxdev->dev.release = intel_vsec_dev_release;
drivers/platform/x86/intel/vsec.c int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, · line 186
Quoted 10 lines
drivers/platform/x86/intel/vsec.c +0
-6@@ -169,12 +183,6 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,if (ret <0 )return ret; -/* Add auxdev to list */ - ret =xa_alloc (&auxdev_array, &id, intel_vsec_dev,PMT_XA_LIMIT , -GFP_KERNEL ); -if (ret) -return ret; -return 0 ;
BTW, there's also another unnecessary return construct around this which remains after this removal. The devm_add_Action_or_reset() value can be returned directly (maybe make another patch from that cleanup though since this is a Fixes patch).
Signature · 1 line
i.
David E. Box
maintainerRe: [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support
In reply to Ilpo JärvinenQuoted 41 lines · Ilpo Järvinen
Quoted 39 lines · David E. Box
Add auto-release cleanups for
iounmap()andioport_unmap().Signed-off-by David E. Box <[email protected]>Suggested-by Ilpo Järvinen <[email protected]>---
V2 - Move fromlinux/io.htoasm-generic/io.h. Adds iounmap cleanup ifiounmap()is defined. Addsioport_unmapcleanup ifCONFIG_IOPORT_MAPis defined.include/asm-generic/io.h | 6 ++++++
1 file changed, 6 insertions(+)include/asm-generic/io.h +0
-0@@ -8,6 +8,7 @@ #define __ASM_GENERIC_IO_H
#include <asm/page.h> /* I/O is all done through memory accesses */ +#include <linux/cleanup.h>
#include <linux/string.h> /* formemset()andmemcpy()*/ #include <linux/types.h>
#include <linux/instruction_pointer.h>include/asm-generic/io.h +0
-0@@ -1065,6 +1066,10 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size) #endif #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */include/asm-generic/io.h +4
-0+#ifdef iounmap +DEFINE_FREE(iounmap, void __iomem *, iounmap(_T)); +#endif +#ifndef
ioremap_wc
#defineioremap_wcioremap
#endifinclude/asm-generic/io.h +0
-0@@ -1127,6 +1132,7 @@ static inline void ioport_unmap(void __iomem *p) extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *p);
Quoted 8 lines
Quoted 5 lines
include/asm-generic/io.h +1
-0#endif /* CONFIG_GENERIC_IOMAP */ +DEFINE_FREE(ioport_unmap, void __iomem *, ioport_unmap(_T)); #endif /* CONFIG_HAS_IOPORT_MAP */
#ifndefCONFIG_GENERIC_IOMAPHas this now built successfully with LKP? (I don't think we get success notifications from LKP for patch submissions, only failures).
I haven't received it yet and don't know when or if I will. The build instructions are provided so I can attempt to check it myself.
Quoted 3 lines
There were some odd errors last time but I think all they were unrelated to this change (besides the checkpatch false positive, I mean).
Indeed. I couldn't explain them either except to think maybe it was related to the implicit declaration warning. The implicit declaration warning was one that I did see in my build after rerunning with W=1 C=1. I usually always run with this but on V4 had done so only on the modules and forgot the bzImage.
David
Quoted 1 line
kernel test robot
build botRe: [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support
In reply to David E. Boxkernel test robot noticed the following build errors:
Hi David,
kernel test robot noticed the following build errors:
[auto build test ERROR on b85ea95d086471afb4ad062012a4d73cd328fa86]
url: https://github.com/intel-lab-lkp/linux/commits/David-E-Box/platform-x86-intel-vsec-Fix-xa_alloc-memory-leak/20231123-120726 base: b85ea95d086471afb4ad062012a4d73cd328fa86 patch link: https://lore.kernel.org/r/20231123040355.82139-13-david.e.box%40linux.intel.com patch subject: [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support config: s390-randconfig-001-20231123 (https://download.01.org/0day-ci/archive/20231124/[email protected]/config) compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231124/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:27:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/s390/include/asm/io.h:78:
include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __raw_readb(PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:37:59: note: expanded from macro '__le16_to_cpu'
#define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x))
^
include/uapi/linux/swab.h:102:54: note: expanded from macro '__swab16'
#define __swab16(x) (__u16)__builtin_bswap16((__u16)(x))
^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:27:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/s390/include/asm/io.h:78:
include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:35:59: note: expanded from macro '__le32_to_cpu'
#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
^
include/uapi/linux/swab.h:115:54: note: expanded from macro '__swab32'
#define __swab32(x) (__u32)__builtin_bswap32((__u32)(x))
^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:27:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/s390/include/asm/io.h:78:
include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writeb(value, PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:693:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
readsb(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:701:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
readsw(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:709:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
readsl(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:718:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
writesb(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:727:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
writesw(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:736:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
writesl(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
>> include/asm-generic/io.h:1070:38: error: call to undeclared function 'iounmap'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
DEFINE_FREE(iounmap, void __iomem *, iounmap(_T));
^
arch/s390/include/asm/io.h:29:17: note: expanded from macro 'iounmap'
#define iounmap iounmap
^
include/asm-generic/io.h:1070:38: note: did you mean 'vunmap'?
arch/s390/include/asm/io.h:29:17: note: expanded from macro 'iounmap'
#define iounmap iounmap
^
include/linux/vmalloc.h:167:13: note: 'vunmap' declared here
extern void vunmap(const void *addr);
^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:27:
In file included from include/linux/irq.h:591:
In file included from arch/s390/include/asm/hw_irq.h:6:
In file included from include/linux/pci.h:37:
In file included from include/linux/device.h:32:
In file included from include/linux/device/driver.h:21:
In file included from include/linux/module.h:19:
In file included from include/linux/elf.h:6:
In file included from arch/s390/include/asm/elf.h:160:
include/linux/compat.h:454:22: warning: array index 3 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
case 4: v.sig[7] = (set->sig[3] >> 32); v.sig[6] = set->sig[3];
^ ~
arch/s390/include/asm/signal.h:22:9: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:27:
In file included from include/linux/irq.h:591:
In file included from arch/s390/include/asm/hw_irq.h:6:
In file included from include/linux/pci.h:37:
In file included from include/linux/device.h:32:
In file included from include/linux/device/driver.h:21:
In file included from include/linux/module.h:19:
In file included from include/linux/elf.h:6:
In file included from arch/s390/include/asm/elf.h:160:
include/linux/compat.h:454:10: warning: array index 7 is past the end of the array (that has type 'compat_sigset_word[2]' (aka 'unsigned int[2]')) [-Warray-bounds]
case 4: v.sig[7] = (set->sig[3] >> 32); v.sig[6] = set->sig[3];
^ ~
include/linux/compat.h:130:2: note: array 'sig' declared here
compat_sigset_word sig[_COMPAT_NSIG_WORDS];
^
include/linux/compat.h:454:42: warning: array index 6 is past the end of the array (that has type 'compat_sigset_word[2]' (aka 'unsigned int[2]')) [-Warray-bounds]
case 4: v.sig[7] = (set->sig[3] >> 32); v.sig[6] = set->sig[3];
^ ~
include/linux/compat.h:130:2: note: array 'sig' declared here
compat_sigset_word sig[_COMPAT_NSIG_WORDS];
^
include/linux/compat.h:454:53: warning: array index 3 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
case 4: v.sig[7] = (set->sig[3] >> 32); v.sig[6] = set->sig[3];
^ ~
arch/s390/include/asm/signal.h:22:9: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:27:
In file included from include/linux/irq.h:591:
In file included from arch/s390/include/asm/hw_irq.h:6:
In file included from include/linux/pci.h:37:
In file included from include/linux/device.h:32:
In file included from include/linux/device/driver.h:21:
In file included from include/linux/module.h:19:
In file included from include/linux/elf.h:6:
In file included from arch/s390/include/asm/elf.h:160:
include/linux/compat.h:456:22: warning: array index 2 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
case 3: v.sig[5] = (set->sig[2] >> 32); v.sig[4] = set->sig[2];
^ ~
arch/s390/include/asm/signal.h:22:9: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:27:
In file included from include/linux/irq.h:591:
In file included from arch/s390/include/asm/hw_irq.h:6:
In file included from include/linux/pci.h:37:
In file included from include/linux/device.h:32:
In file included from include/linux/device/driver.h:21:
In file included from include/linux/module.h:19:
In file included from include/linux/elf.h:6:
In file included from arch/s390/include/asm/elf.h:160:
include/linux/compat.h:456:10: warning: array index 5 is past the end of the array (that has type 'compat_sigset_word[2]' (aka 'unsigned int[2]')) [-Warray-bounds]
case 3: v.sig[5] = (set->sig[2] >> 32); v.sig[4] = set->sig[2];
^ ~
include/linux/compat.h:130:2: note: array 'sig' declared here
compat_sigset_word sig[_COMPAT_NSIG_WORDS];
^
include/linux/compat.h:456:42: warning: array index 4 is past the end of the array (that has type 'compat_sigset_word[2]' (aka 'unsigned int[2]')) [-Warray-bounds]
case 3: v.sig[5] = (set->sig[2] >> 32); v.sig[4] = set->sig[2];
^ ~
include/linux/compat.h:130:2: note: array 'sig' declared here
compat_sigset_word sig[_COMPAT_NSIG_WORDS];
^
include/linux/compat.h:456:53: warning: array index 2 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
case 3: v.sig[5] = (set->sig[2] >> 32); v.sig[4] = set->sig[2];vim +/iounmap +1070 include/asm-generic/io.h
1068
1069 #ifdef iounmap
> 1070 DEFINE_FREE(iounmap, void __iomem *, iounmap(_T));
1071 #endif
1072
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
David E. Box
maintainerRe: [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support
In reply to Ilpo Järvinen+Baoquan for ioremap question.
Quoted 26 lines · Ilpo Järvinen
Quoted 24 lines · David E. Box
Add auto-release cleanups for
iounmap()andioport_unmap().Signed-off-by David E. Box <[email protected]>Suggested-by Ilpo Järvinen <[email protected]>---
V2 - Move fromlinux/io.htoasm-generic/io.h. Adds iounmap cleanup ifiounmap()is defined. Addsioport_unmapcleanup ifCONFIG_IOPORT_MAPis defined.include/asm-generic/io.h | 6 ++++++
1 file changed, 6 insertions(+)include/asm-generic/io.h +0
-0@@ -8,6 +8,7 @@ #define __ASM_GENERIC_IO_H
#include <asm/page.h> /* I/O is all done through memory accesses */ +#include <linux/cleanup.h>
#include <linux/string.h> /* formemset()andmemcpy()*/ #include <linux/types.h>
#include <linux/instruction_pointer.h>
Quoted 8 lines
include/asm-generic/io.h static inline void __iomem *ioremap(phys_addr_t addr, size_t size) · line 1071
Quoted 8 lines
include/asm-generic/io.h +0
-0@@ -1065,6 +1066,10 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size) #endif #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */include/asm-generic/io.h +3
-0+#ifdef iounmap +DEFINE_FREE(iounmap, void __iomem *, iounmap(_T)); +#endif
Baoquan, LKP is reporting an undeclared function 'iounmap' error with the above change from this patch when building for s390 with PCI disabled. The ioremap defines in arch/s390/include/asm/io.h are not wrapped under the #ifdef CONFIG_PCI block. Shouldn't they be since the s390 Kconfig only adds GENERIC_IOREMAP if PCI?
https://lore.kernel.org/oe-kbuild-all/[email protected]
Note that the report includes pointer arithmetic warnings that are not related to this patch. Those warnings occur in mainline as well.
David
Quoted 19 lines
Quoted 10 lines
+
#ifndefioremap_wc
#defineioremap_wcioremap
#endifinclude/asm-generic/io.h +1
-0@@ -1127,6 +1132,7 @@ static inline void ioport_unmap(void __iomem *p) extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ +DEFINE_FREE(ioport_unmap, void __iomem *, ioport_unmap(_T)); #endif /* CONFIG_HAS_IOPORT_MAP */Quoted 2 lines
#ifndefCONFIG_GENERIC_IOMAPHas this now built successfully with LKP? (I don't think we get success notifications from LKP for patch submissions, only failures).
There were some odd errors last time but I think all they were unrelated to this change (besides the checkpatch false positive, I mean).
Re: [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support
Quoted 35 lines · David E. Box
+Baoquan for ioremap question.
Quoted 32 lines · Ilpo Järvinen
Quoted 30 lines · David E. Box
Add auto-release cleanups for
iounmap()andioport_unmap().Signed-off-by David E. Box <[email protected]>Suggested-by Ilpo Järvinen <[email protected]>---
V2 - Move fromlinux/io.htoasm-generic/io.h. Adds iounmap cleanup ifiounmap()is defined. Addsioport_unmapcleanup ifCONFIG_IOPORT_MAPis defined.include/asm-generic/io.h | 6 ++++++
1 file changed, 6 insertions(+)include/asm-generic/io.h +0
-0@@ -8,6 +8,7 @@ #define __ASM_GENERIC_IO_H
#include <asm/page.h> /* I/O is all done through memory accesses */ +#include <linux/cleanup.h>
#include <linux/string.h> /* formemset()andmemcpy()*/ #include <linux/types.h>
#include <linux/instruction_pointer.h>include/asm-generic/io.h +0
-0@@ -1065,6 +1066,10 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size) #endif #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */
+#ifdef iounmap
Quoted 8 lines
Quoted 2 lines
include/asm-generic/io.h static inline void __iomem *ioremap(phys_addr_t addr, size_t size) · line 1071
Quoted 2 lines
include/asm-generic/io.h +2
-0+DEFINE_FREE(iounmap, void __iomem *, iounmap(_T)); +#endif Baoquan, LKP is reporting an undeclared function 'iounmap' error with the above change from this patch when building for s390 with PCI disabled. The ioremap defines in
arch/s390/include/asm/io.hare not wrapped under the #ifdefCONFIG_PCIblock. Shouldn't they be since the s390Kconfigonly addsGENERIC_IOREMAPif PCI?
Sorry, almost forget this mail. Will check and reply later.
Quoted 29 lines
https://lore.kernel.org/oe-kbuild-all/[email protected]
Note that the report includes pointer arithmetic warnings that are not related to this patch. Those warnings occur in mainline as well.
David
Quoted 19 lines
Quoted 10 lines
+
#ifndefioremap_wc
#defineioremap_wcioremap
#endifinclude/asm-generic/io.h +1
-0@@ -1127,6 +1132,7 @@ static inline void ioport_unmap(void __iomem *p) extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ +DEFINE_FREE(ioport_unmap, void __iomem *, ioport_unmap(_T)); #endif /* CONFIG_HAS_IOPORT_MAP */Quoted 2 lines
#ifndefCONFIG_GENERIC_IOMAPHas this now built successfully with LKP? (I don't think we get success notifications from LKP for patch submissions, only failures).
There were some odd errors last time but I think all they were unrelated to this change (besides the checkpatch false positive, I mean).
Re: [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support
In reply to David E. BoxQuoted 44 lines · David E. Box
+Baoquan for ioremap question.
Quoted 26 lines · Ilpo Järvinen
Quoted 24 lines · David E. Box
Add auto-release cleanups for
iounmap()andioport_unmap().Signed-off-by David E. Box <[email protected]>Suggested-by Ilpo Järvinen <[email protected]>---
V2 - Move fromlinux/io.htoasm-generic/io.h. Adds iounmap cleanup ifiounmap()is defined. Addsioport_unmapcleanup ifCONFIG_IOPORT_MAPis defined.include/asm-generic/io.h | 6 ++++++
1 file changed, 6 insertions(+)include/asm-generic/io.h +0
-0@@ -8,6 +8,7 @@ #define __ASM_GENERIC_IO_H
#include <asm/page.h> /* I/O is all done through memory accesses */ +#include <linux/cleanup.h>
#include <linux/string.h> /* formemset()andmemcpy()*/ #include <linux/types.h>
#include <linux/instruction_pointer.h>Quoted 8 lines
include/asm-generic/io.h static inline void __iomem *ioremap(phys_addr_t addr, size_t size) · line 1071
Quoted 8 lines
include/asm-generic/io.h +0
-0@@ -1065,6 +1066,10 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size) #endif #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */include/asm-generic/io.h +3
-0+#ifdef iounmap +DEFINE_FREE(iounmap, void __iomem *, iounmap(_T)); +#endif Baoquan, LKP is reporting an undeclared function 'iounmap' error with the above change from this patch when building for s390 with PCI disabled. The ioremap defines in
arch/s390/include/asm/io.hare not wrapped under the #ifdefCONFIG_PCIblock. Shouldn't they be since the s390Kconfigonly addsGENERIC_IOREMAPif PCI?
I tried to reproduce the error, while I got failure as below. I will find a s390x machine to try again.
---------------------------------------------------------
[root@ linux]# COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang-16 ~/lkp-tests/kbuild/make.cross W=1 O=build_dir ARCH=s390 olddefconfig
Compiler will be installed in /root/0day
PATH=/root/0day/llvm-16.0.6-x86_64/bin:/root/.local/bin:/root/bin:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
make --keep-going HOSTCC=/root/0day/llvm-16.0.6-x86_64/bin/clang CC=/root/0day/llvm-16.0.6-x86_64/bin/clang OBJCOPY=/usr/s390x-linux-gnu/bin/objcopy AR=llvm-ar NM=llvm-nm STRIP=llvm-strip OBJDUMP=llvm-objdump OBJSIZE=llvm-size READELF=llvm-readelf HOSTCXX=clang++ HOSTAR=llvm-ar CROSS_COMPILE=s390x-linux-gnu- --jobs=128 KCFLAGS= -Wtautological-compare -Wno-error=return-type -Wreturn-type -Wcast-function-type -funsigned-char -Wundef -fstrict-flex-arrays=3 -Wenum-conversion W=1 O=build_dir ARCH=s390 olddefconfig make[1]: Entering directory '/root/linux/build_dir'
GEN Makefilescripts/Kconfig.include:40: linker 's390x-linux-gnu-ld' not found
make[3]: *** [../scripts/kconfig/Makefile:77: olddefconfig] Error 1
make[2]: *** [/root/linux/Makefile:685: olddefconfig] Error 2
make[1]: *** [/root/linux/Makefile:234: __sub-make] Error 2
make[1]: Target 'olddefconfig' not remade because of errors.
make[1]: Leaving directory '/root/linux/build_dir'
make: *** [Makefile:234: __sub-make] Error 2
make: Target 'olddefconfig' not remade because of errors.
------------------------------------------------------------------
And when I execute the 3rd step of reproducer to apply the required patch series, I never succeed. Don't know why.
----------------------------------------------------------------
[root@intel-knightslanding-lb-02 linux]# b4 shazam https://lore.kernel.org/r/[email protected]
Grabbing thread from lore.kernel.org/all/[email protected]/t.mbox.gz Checking for newer revisions
Grabbing search results from lore.kernel.org
Added from v6: 21 patches
Analyzing 63 messages in the thread
Will use the latest revision: v6
You can pick other revisions using the -vN flag
Checking attestation on all messages, may take a moment...
---
✓ [PATCH v6 1/20] platform/x86/intel/vsec: Fix xa_alloc memory leak
----------------------------------------------------------------
Quoted 27 lines
Note that the report includes pointer arithmetic warnings that are not related to this patch. Those warnings occur in mainline as well.
David
Quoted 19 lines
Quoted 10 lines
+
#ifndefioremap_wc
#defineioremap_wcioremap
#endifinclude/asm-generic/io.h +1
-0@@ -1127,6 +1132,7 @@ static inline void ioport_unmap(void __iomem *p) extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ +DEFINE_FREE(ioport_unmap, void __iomem *, ioport_unmap(_T)); #endif /* CONFIG_HAS_IOPORT_MAP */Quoted 2 lines
#ifndefCONFIG_GENERIC_IOMAPHas this now built successfully with LKP? (I don't think we get success notifications from LKP for patch submissions, only failures).
There were some odd errors last time but I think all they were unrelated to this change (besides the checkpatch false positive, I mean).