[PATCH 0/4] platform/x86/intel/vsec: Prep for ACPI PMT discovery

[PATCH 0/4] platform/x86/intel/vsec: Prep for ACPI PMT discovery

[David E. Box]

This series updates intel_vsec to decouple helper APIs from PCI, clean up
error handling, and plumb ACPI‑based Intel Platform Monitoring Technology
(PMT) discovery through the vsec layer.  It is preparatory infrastructure
for the follow‑on PMT core/telemetry and PMC/SSRAM series that add ACPI
discovery and new platforms.

Highlights

  -- Decouple add/link helpers from PCI so users need only a struct device.
  -- Switch exported helpers from struct pci_dev to struct device.
  -- Return real error codes from the registration path.
  -- Carry ACPI PMT discovery tables through vsec.


David E. Box (4):
  platform/x86/intel/vsec: Decouple add/link helpers from PCI
  platform/x86/intel/vsec: Switch exported helpers from pci_dev to
    device
  platform/x86/intel/vsec: Return real error codes from registration
    path
  platform/x86/intel/vsec: Plumb ACPI PMT discovery tables through vsec

 drivers/gpu/drm/xe/xe_debugfs.c               |   2 +-
 drivers/gpu/drm/xe/xe_hwmon.c                 |   2 +-
 drivers/gpu/drm/xe/xe_vsec.c                  |   7 +-
 drivers/gpu/drm/xe/xe_vsec.h                  |   2 +-
 drivers/platform/x86/intel/pmc/core.c         |   4 +-
 .../platform/x86/intel/pmc/ssram_telemetry.c  |   2 +-
 drivers/platform/x86/intel/pmt/class.c        |   8 +-
 drivers/platform/x86/intel/pmt/class.h        |   4 +-
 drivers/platform/x86/intel/pmt/discovery.c    |   4 +-
 drivers/platform/x86/intel/pmt/telemetry.c    |  13 +-
 drivers/platform/x86/intel/pmt/telemetry.h    |  11 +-
 drivers/platform/x86/intel/sdsi.c             |   5 +-
 drivers/platform/x86/intel/vsec.c             | 115 +++++++++++-------
 drivers/platform/x86/intel/vsec_tpmi.c        |   8 +-
 include/linux/intel_vsec.h                    |  40 ++++--
 15 files changed, 136 insertions(+), 91 deletions(-)


base-commit: 8f0b4cce4481fb22653697cced8d0d04027cb1e8
-- 
2.43.0

[PATCH 1/4] platform/x86/intel/vsec: Decouple add/link helpers from PCI

[David E. Box]

This refactor is preparatory for ACPI-enumerated PMT endpoints. While
intel_vsec is bound to PCI today, some helpers are used by code that will
also register PMT endpoints from non-PCI (ACPI) paths. Clean up
PCI-specific plumbing where it isn’t strictly required and rely on
generic struct device where possible.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
 drivers/platform/x86/intel/vsec.c      | 13 +++++++++----
 drivers/platform/x86/intel/vsec_tpmi.c |  2 +-
 include/linux/intel_vsec.h             |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index ecfc7703f201..130577061a51 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -158,18 +158,23 @@ static bool vsec_driver_present(int cap_id)
  */
 static const struct pci_device_id intel_vsec_pci_ids[];
 
-static int intel_vsec_link_devices(struct pci_dev *pdev, struct device *dev,
+static int intel_vsec_link_devices(struct device *parent, struct device *dev,
 				   int consumer_id)
 {
 	const struct vsec_feature_dependency *deps;
 	enum vsec_device_state *state;
 	struct device **suppliers;
 	struct vsec_priv *priv;
+	struct pci_dev *pdev;
 	int supplier_id;
 
 	if (!consumer_id)
 		return 0;
 
+	if (!dev_is_pci(parent))
+		return 0;
+
+	pdev = to_pci_dev(parent);
 	if (!pci_match_id(intel_vsec_pci_ids, pdev))
 		return 0;
 
@@ -204,7 +209,7 @@ static int intel_vsec_link_devices(struct pci_dev *pdev, struct device *dev,
 	return 0;
 }
 
-int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
+int intel_vsec_add_aux(struct device *parent,
 		       struct intel_vsec_device *intel_vsec_dev,
 		       const char *name)
 {
@@ -252,7 +257,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
 	if (ret)
 		goto cleanup_aux;
 
-	ret = intel_vsec_link_devices(pdev, &auxdev->dev, intel_vsec_dev->cap_id);
+	ret = intel_vsec_link_devices(parent, &auxdev->dev, intel_vsec_dev->cap_id);
 	if (ret)
 		goto cleanup_aux;
 
@@ -349,7 +354,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, parent, no_free_ptr(intel_vsec_dev),
+	return intel_vsec_add_aux(parent, no_free_ptr(intel_vsec_dev),
 				  intel_vsec_name(header->id));
 }
 
diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/intel/vsec_tpmi.c
index 7748b5557a18..2ccde86c529f 100644
--- a/drivers/platform/x86/intel/vsec_tpmi.c
+++ b/drivers/platform/x86/intel/vsec_tpmi.c
@@ -655,7 +655,7 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
 	 * feature_vsec_dev and res memory are also freed as part of
 	 * device deletion.
 	 */
-	return intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev,
+	return intel_vsec_add_aux(&vsec_dev->auxdev.dev,
 				  feature_vsec_dev, feature_id_name);
 }
 
diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h
index 53f6fe88e369..28c2f5855a11 100644
--- a/include/linux/intel_vsec.h
+++ b/include/linux/intel_vsec.h
@@ -183,7 +183,7 @@ struct pmt_feature_group {
 	struct telemetry_region	regions[];
 };
 
-int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
+int intel_vsec_add_aux(struct device *parent,
 		       struct intel_vsec_device *intel_vsec_dev,
 		       const char *name);
 
-- 
2.43.0

Re: [PATCH 1/4] platform/x86/intel/vsec: Decouple add/link helpers from PCI

[Ilpo Järvinen]

[-- Attachment #1: Type: text/plain, Size: 3891 bytes --]

On Tue, 6 Jan 2026, David E. Box wrote:

> This refactor is preparatory for ACPI-enumerated PMT endpoints. While
> intel_vsec is bound to PCI today, some helpers are used by code that will
> also register PMT endpoints from non-PCI (ACPI) paths. Clean up
> PCI-specific plumbing where it isn’t strictly required and rely on
> generic struct device where possible.
> 
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

--
 i.

> ---
>  drivers/platform/x86/intel/vsec.c      | 13 +++++++++----
>  drivers/platform/x86/intel/vsec_tpmi.c |  2 +-
>  include/linux/intel_vsec.h             |  2 +-
>  3 files changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
> index ecfc7703f201..130577061a51 100644
> --- a/drivers/platform/x86/intel/vsec.c
> +++ b/drivers/platform/x86/intel/vsec.c
> @@ -158,18 +158,23 @@ static bool vsec_driver_present(int cap_id)
>   */
>  static const struct pci_device_id intel_vsec_pci_ids[];
>  
> -static int intel_vsec_link_devices(struct pci_dev *pdev, struct device *dev,
> +static int intel_vsec_link_devices(struct device *parent, struct device *dev,
>  				   int consumer_id)
>  {
>  	const struct vsec_feature_dependency *deps;
>  	enum vsec_device_state *state;
>  	struct device **suppliers;
>  	struct vsec_priv *priv;
> +	struct pci_dev *pdev;
>  	int supplier_id;
>  
>  	if (!consumer_id)
>  		return 0;
>  
> +	if (!dev_is_pci(parent))
> +		return 0;
> +
> +	pdev = to_pci_dev(parent);
>  	if (!pci_match_id(intel_vsec_pci_ids, pdev))
>  		return 0;
>  
> @@ -204,7 +209,7 @@ static int intel_vsec_link_devices(struct pci_dev *pdev, struct device *dev,
>  	return 0;
>  }
>  
> -int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
> +int intel_vsec_add_aux(struct device *parent,
>  		       struct intel_vsec_device *intel_vsec_dev,
>  		       const char *name)
>  {
> @@ -252,7 +257,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
>  	if (ret)
>  		goto cleanup_aux;
>  
> -	ret = intel_vsec_link_devices(pdev, &auxdev->dev, intel_vsec_dev->cap_id);
> +	ret = intel_vsec_link_devices(parent, &auxdev->dev, intel_vsec_dev->cap_id);
>  	if (ret)
>  		goto cleanup_aux;
>  
> @@ -349,7 +354,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, parent, no_free_ptr(intel_vsec_dev),
> +	return intel_vsec_add_aux(parent, no_free_ptr(intel_vsec_dev),
>  				  intel_vsec_name(header->id));
>  }
>  
> diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/intel/vsec_tpmi.c
> index 7748b5557a18..2ccde86c529f 100644
> --- a/drivers/platform/x86/intel/vsec_tpmi.c
> +++ b/drivers/platform/x86/intel/vsec_tpmi.c
> @@ -655,7 +655,7 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
>  	 * feature_vsec_dev and res memory are also freed as part of
>  	 * device deletion.
>  	 */
> -	return intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev,
> +	return intel_vsec_add_aux(&vsec_dev->auxdev.dev,
>  				  feature_vsec_dev, feature_id_name);
>  }
>  
> diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h
> index 53f6fe88e369..28c2f5855a11 100644
> --- a/include/linux/intel_vsec.h
> +++ b/include/linux/intel_vsec.h
> @@ -183,7 +183,7 @@ struct pmt_feature_group {
>  	struct telemetry_region	regions[];
>  };
>  
> -int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
> +int intel_vsec_add_aux(struct device *parent,
>  		       struct intel_vsec_device *intel_vsec_dev,
>  		       const char *name);
>  
> 

[PATCH 2/4] platform/x86/intel/vsec: Switch exported helpers from pci_dev to device

[David E. Box]

Preparatory refactor for ACPI-enumerated PMT endpoints. Several exported
PMT/VSEC interfaces and structs carried struct pci_dev * even though
callers only need a generic struct device. Move those to struct device * so
the same APIs work for PCI and ACPI parents.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
 drivers/gpu/drm/xe/xe_debugfs.c               |  2 +-
 drivers/gpu/drm/xe/xe_hwmon.c                 |  2 +-
 drivers/gpu/drm/xe/xe_vsec.c                  |  7 +-
 drivers/gpu/drm/xe/xe_vsec.h                  |  2 +-
 drivers/platform/x86/intel/pmc/core.c         |  4 +-
 .../platform/x86/intel/pmc/ssram_telemetry.c  |  2 +-
 drivers/platform/x86/intel/pmt/class.c        |  8 +-
 drivers/platform/x86/intel/pmt/class.h        |  4 +-
 drivers/platform/x86/intel/pmt/discovery.c    |  4 +-
 drivers/platform/x86/intel/pmt/telemetry.c    | 13 ++--
 drivers/platform/x86/intel/pmt/telemetry.h    | 11 ++-
 drivers/platform/x86/intel/sdsi.c             |  5 +-
 drivers/platform/x86/intel/vsec.c             | 74 +++++++++++--------
 drivers/platform/x86/intel/vsec_tpmi.c        |  6 +-
 include/linux/intel_vsec.h                    | 18 ++---
 15 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
index e91da9589c5f..d07b2aad300f 100644
--- a/drivers/gpu/drm/xe/xe_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_debugfs.c
@@ -45,7 +45,7 @@ static void read_residency_counter(struct xe_device *xe, struct xe_mmio *mmio,
 	u64 residency = 0;
 	int ret;
 
-	ret = xe_pmt_telem_read(to_pci_dev(xe->drm.dev),
+	ret = xe_pmt_telem_read(xe->drm.dev,
 				xe_mmio_read32(mmio, PUNIT_TELEMETRY_GUID),
 				&residency, offset, sizeof(residency));
 	if (ret != sizeof(residency)) {
diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c
index 97879daeefc1..556072a0ac10 100644
--- a/drivers/gpu/drm/xe/xe_hwmon.c
+++ b/drivers/gpu/drm/xe/xe_hwmon.c
@@ -464,7 +464,7 @@ xe_hwmon_energy_get(struct xe_hwmon *hwmon, int channel, long *energy)
 	if (hwmon->xe->info.platform == XE_BATTLEMAGE) {
 		u64 pmt_val;
 
-		ret = xe_pmt_telem_read(to_pci_dev(hwmon->xe->drm.dev),
+		ret = xe_pmt_telem_read(hwmon->xe->drm.dev,
 					xe_mmio_read32(mmio, PUNIT_TELEMETRY_GUID),
 					&pmt_val, BMG_ENERGY_STATUS_PMT_OFFSET,	sizeof(pmt_val));
 		if (ret != sizeof(pmt_val)) {
diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
index 8f23a27871b6..997fe0c8858e 100644
--- a/drivers/gpu/drm/xe/xe_vsec.c
+++ b/drivers/gpu/drm/xe/xe_vsec.c
@@ -141,10 +141,10 @@ static int xe_guid_decode(u32 guid, int *index, u32 *offset)
 	return 0;
 }
 
-int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_offset,
+int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offset,
 		      u32 count)
 {
-	struct xe_device *xe = pdev_to_xe_device(pdev);
+	struct xe_device *xe = kdev_to_xe_device(dev);
 	void __iomem *telem_addr = xe->mmio.regs + BMG_TELEMETRY_OFFSET;
 	u32 mem_region;
 	u32 offset;
@@ -197,7 +197,6 @@ void xe_vsec_init(struct xe_device *xe)
 {
 	struct intel_vsec_platform_info *info;
 	struct device *dev = xe->drm.dev;
-	struct pci_dev *pdev = to_pci_dev(dev);
 	enum xe_vsec platform;
 
 	platform = get_platform_info(xe);
@@ -220,6 +219,6 @@ void xe_vsec_init(struct xe_device *xe)
 	 * Register a VSEC. Cleanup is handled using device managed
 	 * resources.
 	 */
-	intel_vsec_register(pdev, info);
+	intel_vsec_register(dev, info);
 }
 MODULE_IMPORT_NS("INTEL_VSEC");
diff --git a/drivers/gpu/drm/xe/xe_vsec.h b/drivers/gpu/drm/xe/xe_vsec.h
index dabfb4e02d70..74ac575cd68c 100644
--- a/drivers/gpu/drm/xe/xe_vsec.h
+++ b/drivers/gpu/drm/xe/xe_vsec.h
@@ -10,6 +10,6 @@ struct pci_dev;
 struct xe_device;
 
 void xe_vsec_init(struct xe_device *xe);
-int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_offset, u32 count);
+int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offset, u32 count);
 
 #endif
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index 7d7ae8a40b0e..4abe5e1f574d 100644
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -1288,7 +1288,7 @@ static struct telem_endpoint *pmc_core_register_endpoint(struct pci_dev *pcidev,
 	unsigned int i;
 
 	for (i = 0; guids[i]; i++) {
-		ep = pmt_telem_find_and_register_endpoint(pcidev, guids[i], 0);
+		ep = pmt_telem_find_and_register_endpoint(&pcidev->dev, guids[i], 0);
 		if (!IS_ERR(ep))
 			return ep;
 	}
@@ -1573,7 +1573,7 @@ static int pmc_core_get_telem_info(struct pmc_dev *pmcdev, struct pmc_dev_info *
 		if (!pmc->map->lpm_req_guid)
 			return -ENXIO;
 
-		ep = pmt_telem_find_and_register_endpoint(pcidev, pmc->map->lpm_req_guid, 0);
+		ep = pmt_telem_find_and_register_endpoint(&pcidev->dev, pmc->map->lpm_req_guid, 0);
 		if (IS_ERR(ep)) {
 			dev_dbg(&pmcdev->pdev->dev, "couldn't get telem endpoint %pe", ep);
 			return -EPROBE_DEFER;
diff --git a/drivers/platform/x86/intel/pmc/ssram_telemetry.c b/drivers/platform/x86/intel/pmc/ssram_telemetry.c
index 03fad9331fc0..6f6e83e70fc5 100644
--- a/drivers/platform/x86/intel/pmc/ssram_telemetry.c
+++ b/drivers/platform/x86/intel/pmc/ssram_telemetry.c
@@ -60,7 +60,7 @@ pmc_ssram_telemetry_add_pmt(struct pci_dev *pcidev, u64 ssram_base, void __iomem
 	info.base_addr = ssram_base;
 	info.parent = &pcidev->dev;
 
-	return intel_vsec_register(pcidev, &info);
+	return intel_vsec_register(&pcidev->dev, &info);
 }
 
 static inline u64 get_base(void __iomem *addr, u32 offset)
diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/intel/pmt/class.c
index 7c3023d5d91d..8077274726b5 100644
--- a/drivers/platform/x86/intel/pmt/class.c
+++ b/drivers/platform/x86/intel/pmt/class.c
@@ -60,11 +60,11 @@ pmt_memcpy64_fromio(void *to, const u64 __iomem *from, size_t count)
 	return count;
 }
 
-int pmt_telem_read_mmio(struct pci_dev *pdev, struct pmt_callbacks *cb, u32 guid, void *buf,
+int pmt_telem_read_mmio(struct device *dev, struct pmt_callbacks *cb, u32 guid, void *buf,
 			void __iomem *addr, loff_t off, u32 count)
 {
 	if (cb && cb->read_telem)
-		return cb->read_telem(pdev, guid, buf, off, count);
+		return cb->read_telem(dev, guid, buf, off, count);
 
 	addr += off;
 
@@ -99,7 +99,7 @@ intel_pmt_read(struct file *filp, struct kobject *kobj,
 	if (count > entry->size - off)
 		count = entry->size - off;
 
-	count = pmt_telem_read_mmio(entry->pcidev, entry->cb, entry->header.guid, buf,
+	count = pmt_telem_read_mmio(entry->ep->dev, entry->cb, entry->header.guid, buf,
 				    entry->base, off, count);
 
 	return count;
@@ -208,7 +208,7 @@ static int intel_pmt_populate_entry(struct intel_pmt_entry *entry,
 				    struct intel_vsec_device *ivdev,
 				    struct resource *disc_res)
 {
-	struct pci_dev *pci_dev = ivdev->pcidev;
+	struct pci_dev *pci_dev = to_pci_dev(ivdev->dev);
 	struct device *dev = &ivdev->auxdev.dev;
 	struct intel_pmt_header *header = &entry->header;
 	u8 bir;
diff --git a/drivers/platform/x86/intel/pmt/class.h b/drivers/platform/x86/intel/pmt/class.h
index 3c5ad5f52bca..3eb8ab97dd87 100644
--- a/drivers/platform/x86/intel/pmt/class.h
+++ b/drivers/platform/x86/intel/pmt/class.h
@@ -23,7 +23,7 @@ struct pci_dev;
 extern struct class intel_pmt_class;
 
 struct telem_endpoint {
-	struct pci_dev		*pcidev;
+	struct device		*dev;
 	struct telem_header	header;
 	struct pmt_callbacks	*cb;
 	void __iomem		*base;
@@ -65,7 +65,7 @@ struct intel_pmt_namespace {
 				struct intel_pmt_entry *entry);
 };
 
-int pmt_telem_read_mmio(struct pci_dev *pdev, struct pmt_callbacks *cb, u32 guid, void *buf,
+int pmt_telem_read_mmio(struct device *dev, struct pmt_callbacks *cb, u32 guid, void *buf,
 			void __iomem *addr, loff_t off, u32 count);
 bool intel_pmt_is_early_client_hw(struct device *dev);
 int intel_pmt_dev_create(struct intel_pmt_entry *entry,
diff --git a/drivers/platform/x86/intel/pmt/discovery.c b/drivers/platform/x86/intel/pmt/discovery.c
index 32713a194a55..66f1ae931e05 100644
--- a/drivers/platform/x86/intel/pmt/discovery.c
+++ b/drivers/platform/x86/intel/pmt/discovery.c
@@ -540,7 +540,7 @@ static int pmt_features_probe(struct auxiliary_device *auxdev, const struct auxi
 	if (!priv)
 		return -ENOMEM;
 
-	priv->parent = &ivdev->pcidev->dev;
+	priv->parent = ivdev->dev;
 	auxiliary_set_drvdata(auxdev, priv);
 
 	priv->dev = device_create(&intel_pmt_class, &auxdev->dev, MKDEV(0, 0), priv,
@@ -607,7 +607,7 @@ void intel_pmt_get_features(struct intel_pmt_entry *entry)
 
 	mutex_lock(&feature_list_lock);
 	list_for_each_entry(feature, &pmt_feature_list, list) {
-		if (feature->priv->parent != &entry->ep->pcidev->dev)
+		if (feature->priv->parent != entry->ep->dev)
 			continue;
 
 		pmt_get_features(entry, feature);
diff --git a/drivers/platform/x86/intel/pmt/telemetry.c b/drivers/platform/x86/intel/pmt/telemetry.c
index a4dfca6cac19..e11f7bde41b2 100644
--- a/drivers/platform/x86/intel/pmt/telemetry.c
+++ b/drivers/platform/x86/intel/pmt/telemetry.c
@@ -112,7 +112,7 @@ static int pmt_telem_add_endpoint(struct intel_vsec_device *ivdev,
 		return -ENOMEM;
 
 	ep = entry->ep;
-	ep->pcidev = ivdev->pcidev;
+	ep->dev = ivdev->dev;
 	ep->header.access_type = entry->header.access_type;
 	ep->header.guid = entry->header.guid;
 	ep->header.base_offset = entry->header.base_offset;
@@ -204,7 +204,7 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info)
 		goto unlock;
 	}
 
-	info->pdev = entry->ep->pcidev;
+	info->dev = entry->ep->dev;
 	info->header = entry->ep->header;
 
 unlock:
@@ -218,9 +218,10 @@ static int pmt_copy_region(struct telemetry_region *region,
 			   struct intel_pmt_entry *entry)
 {
 
+	struct pci_dev *pdev = to_pci_dev(entry->ep->dev);
 	struct oobmsm_plat_info *plat_info;
 
-	plat_info = intel_vsec_get_mapping(entry->ep->pcidev);
+	plat_info = intel_vsec_get_mapping(pdev);
 	if (IS_ERR(plat_info))
 		return PTR_ERR(plat_info);
 
@@ -308,7 +309,7 @@ int pmt_telem_read(struct telem_endpoint *ep, u32 id, u64 *data, u32 count)
 	if (offset + NUM_BYTES_QWORD(count) > size)
 		return -EINVAL;
 
-	pmt_telem_read_mmio(ep->pcidev, ep->cb, ep->header.guid, data, ep->base, offset,
+	pmt_telem_read_mmio(ep->dev, ep->cb, ep->header.guid, data, ep->base, offset,
 			    NUM_BYTES_QWORD(count));
 
 	return ep->present ? 0 : -EPIPE;
@@ -335,7 +336,7 @@ int pmt_telem_read32(struct telem_endpoint *ep, u32 id, u32 *data, u32 count)
 EXPORT_SYMBOL_NS_GPL(pmt_telem_read32, "INTEL_PMT_TELEMETRY");
 
 struct telem_endpoint *
-pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev, u32 guid, u16 pos)
+pmt_telem_find_and_register_endpoint(struct device *dev, u32 guid, u16 pos)
 {
 	int devid = 0;
 	int inst = 0;
@@ -348,7 +349,7 @@ pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev, u32 guid, u16 pos)
 		if (err)
 			return ERR_PTR(err);
 
-		if (ep_info.header.guid == guid && ep_info.pdev == pcidev) {
+		if (ep_info.header.guid == guid && ep_info.dev == dev) {
 			if (inst == pos)
 				return pmt_telem_register_endpoint(devid);
 			++inst;
diff --git a/drivers/platform/x86/intel/pmt/telemetry.h b/drivers/platform/x86/intel/pmt/telemetry.h
index d45af5512b4e..a4fa2178adef 100644
--- a/drivers/platform/x86/intel/pmt/telemetry.h
+++ b/drivers/platform/x86/intel/pmt/telemetry.h
@@ -7,7 +7,6 @@
 #define PMT_TELEM_CRASHLOG	1
 
 struct telem_endpoint;
-struct pci_dev;
 
 struct telem_header {
 	u8	access_type;
@@ -17,7 +16,7 @@ struct telem_header {
 };
 
 struct telem_endpoint_info {
-	struct pci_dev		*pdev;
+	struct device		*dev;
 	struct telem_header	header;
 };
 
@@ -71,8 +70,8 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info);
 
 /**
  * pmt_telem_find_and_register_endpoint() - Get a telemetry endpoint from
- * pci_dev device, guid and pos
- * @pdev:   PCI device inside the Intel vsec
+ * device, guid and pos
+ * @dev:    device inside the Intel vsec
  * @guid:   GUID of the telemetry space
  * @pos:    Instance of the guid
  *
@@ -80,8 +79,8 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info);
  * * endpoint    - On success returns pointer to the telemetry endpoint
  * * -ENXIO      - telemetry endpoint not found
  */
-struct telem_endpoint *pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev,
-				u32 guid, u16 pos);
+struct telem_endpoint *
+pmt_telem_find_and_register_endpoint(struct device *dev, u32 guid, u16 pos);
 
 /**
  * pmt_telem_read() - Read qwords from counter sram using sample id
diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
index da75f53d0bcc..d7e37d4ace23 100644
--- a/drivers/platform/x86/intel/sdsi.c
+++ b/drivers/platform/x86/intel/sdsi.c
@@ -599,13 +599,14 @@ static int sdsi_get_layout(struct sdsi_priv *priv, struct disc_table *table)
 	return 0;
 }
 
-static int sdsi_map_mbox_registers(struct sdsi_priv *priv, struct pci_dev *parent,
+static int sdsi_map_mbox_registers(struct sdsi_priv *priv, struct device *dev,
 				   struct disc_table *disc_table, struct resource *disc_res)
 {
 	u32 access_type = FIELD_GET(DT_ACCESS_TYPE, disc_table->access_info);
 	u32 size = FIELD_GET(DT_SIZE, disc_table->access_info);
 	u32 tbir = FIELD_GET(DT_TBIR, disc_table->offset);
 	u32 offset = DT_OFFSET(disc_table->offset);
+	struct pci_dev *parent = to_pci_dev(dev);
 	struct resource res = {};
 
 	/* Starting location of SDSi MMIO region based on access type */
@@ -681,7 +682,7 @@ static int sdsi_probe(struct auxiliary_device *auxdev, const struct auxiliary_de
 		return ret;
 
 	/* Map the SDSi mailbox registers */
-	ret = sdsi_map_mbox_registers(priv, intel_cap_dev->pcidev, &disc_table, disc_res);
+	ret = sdsi_map_mbox_registers(priv, intel_cap_dev->dev, &disc_table, disc_res);
 	if (ret)
 		return ret;
 
diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index 130577061a51..b84bb92624ef 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -274,7 +274,7 @@ int intel_vsec_add_aux(struct device *parent,
 }
 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,
+static int intel_vsec_add_dev(struct device *dev, struct intel_vsec_header *header,
 			      struct intel_vsec_platform_info *info,
 			      unsigned long cap_id)
 {
@@ -283,24 +283,24 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
 	struct resource *tmp;
 	struct device *parent;
 	unsigned long quirks = info->quirks;
-	u64 base_addr;
+	u64 base_addr = info->base_addr;
 	int i;
 
 	if (info->parent)
 		parent = info->parent;
 	else
-		parent = &pdev->dev;
+		parent = dev;
 
 	if (!intel_vsec_supported(header->id, info->caps))
 		return -EINVAL;
 
 	if (!header->num_entries) {
-		dev_dbg(&pdev->dev, "Invalid 0 entry count for header id %d\n", header->id);
+		dev_dbg(dev, "Invalid 0 entry count for header id %d\n", header->id);
 		return -EINVAL;
 	}
 
 	if (!header->entry_size) {
-		dev_dbg(&pdev->dev, "Invalid 0 entry size for header id %d\n", header->id);
+		dev_dbg(dev, "Invalid 0 entry size for header id %d\n", header->id);
 		return -EINVAL;
 	}
 
@@ -315,11 +315,6 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
 	if (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
@@ -337,7 +332,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
 		release_mem_region(tmp->start, resource_size(tmp));
 	}
 
-	intel_vsec_dev->pcidev = pdev;
+	intel_vsec_dev->dev = dev;
 	intel_vsec_dev->resource = no_free_ptr(res);
 	intel_vsec_dev->num_resources = header->num_entries;
 	intel_vsec_dev->quirks = info->quirks;
@@ -415,12 +410,13 @@ static int get_cap_id(u32 header_id, unsigned long *cap_id)
 	return 0;
 }
 
-static int intel_vsec_register_device(struct pci_dev *pdev,
+static int intel_vsec_register_device(struct device *dev,
 				      struct intel_vsec_header *header,
 				      struct intel_vsec_platform_info *info)
 {
 	const struct vsec_feature_dependency *consumer_deps;
 	struct vsec_priv *priv;
+	struct pci_dev *pdev;
 	unsigned long cap_id;
 	int ret;
 
@@ -432,8 +428,12 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
 	 * Only track dependencies for devices probed by the VSEC driver.
 	 * For others using the exported APIs, add the device directly.
 	 */
+	if (!dev_is_pci(dev))
+		return intel_vsec_add_dev(dev, header, info, cap_id);
+
+	pdev = to_pci_dev(dev);
 	if (!pci_match_id(intel_vsec_pci_ids, pdev))
-		return intel_vsec_add_dev(pdev, header, info, cap_id);
+		return intel_vsec_add_dev(dev, header, info, cap_id);
 
 	priv = pci_get_drvdata(pdev);
 	if (priv->state[cap_id] == STATE_REGISTERED ||
@@ -449,7 +449,7 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
 
 	consumer_deps = get_consumer_dependencies(priv, cap_id);
 	if (!consumer_deps || suppliers_ready(priv, consumer_deps, cap_id)) {
-		ret = intel_vsec_add_dev(pdev, header, info, cap_id);
+		ret = intel_vsec_add_dev(dev, header, info, cap_id);
 		if (ret)
 			priv->state[cap_id] = STATE_SKIP;
 		else
@@ -461,7 +461,7 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
 	return -EAGAIN;
 }
 
-static bool intel_vsec_walk_header(struct pci_dev *pdev,
+static bool intel_vsec_walk_header(struct device *dev,
 				   struct intel_vsec_platform_info *info)
 {
 	struct intel_vsec_header **header = info->headers;
@@ -469,7 +469,7 @@ static bool intel_vsec_walk_header(struct pci_dev *pdev,
 	int ret;
 
 	for ( ; *header; header++) {
-		ret = intel_vsec_register_device(pdev, *header, info);
+		ret = intel_vsec_register_device(dev, *header, info);
 		if (!ret)
 			have_devices = true;
 	}
@@ -517,7 +517,9 @@ static bool intel_vsec_walk_dvsec(struct pci_dev *pdev,
 		pci_read_config_dword(pdev, pos + PCI_DVSEC_HEADER2, &hdr);
 		header.id = PCI_DVSEC_HEADER2_ID(hdr);
 
-		ret = intel_vsec_register_device(pdev, &header, info);
+		info->base_addr = pdev->resource[header.tbir].start;
+
+		ret = intel_vsec_register_device(&pdev->dev, &header, info);
 		if (ret)
 			continue;
 
@@ -562,7 +564,9 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,
 		header.tbir = INTEL_DVSEC_TABLE_BAR(table);
 		header.offset = INTEL_DVSEC_TABLE_OFFSET(table);
 
-		ret = intel_vsec_register_device(pdev, &header, info);
+		info->base_addr = pdev->resource[header.tbir].start;
+
+		ret = intel_vsec_register_device(&pdev->dev, &header, info);
 		if (ret)
 			continue;
 
@@ -572,13 +576,13 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,
 	return have_devices;
 }
 
-int intel_vsec_register(struct pci_dev *pdev,
-			 struct intel_vsec_platform_info *info)
+int intel_vsec_register(struct device *dev,
+			struct intel_vsec_platform_info *info)
 {
-	if (!pdev || !info || !info->headers)
+	if (!dev || !info || !info->headers)
 		return -EINVAL;
 
-	if (!intel_vsec_walk_header(pdev, info))
+	if (!intel_vsec_walk_header(dev, info))
 		return -ENODEV;
 	else
 		return 0;
@@ -604,7 +608,7 @@ static bool intel_vsec_get_features(struct pci_dev *pdev,
 		found = true;
 
 	if (info && (info->quirks & VSEC_QUIRK_NO_DVSEC) &&
-	    intel_vsec_walk_header(pdev, info))
+	    intel_vsec_walk_header(&pdev->dev, info))
 		found = true;
 
 	return found;
@@ -630,7 +634,7 @@ static void intel_vsec_skip_missing_dependencies(struct pci_dev *pdev)
 
 static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-	struct intel_vsec_platform_info *info;
+	struct intel_vsec_platform_info info, *info_temp;
 	struct vsec_priv *priv;
 	int num_caps, ret;
 	int run_once = 0;
@@ -641,22 +645,25 @@ static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id
 		return ret;
 
 	pci_save_state(pdev);
-	info = (struct intel_vsec_platform_info *)id->driver_data;
-	if (!info)
+	info_temp = (struct intel_vsec_platform_info *)id->driver_data;
+	if (!info_temp)
 		return -EINVAL;
 
+	/* XXX: Needs better fix */
+	info = *info_temp;
+
 	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
 
-	priv->info = info;
+	priv->info = &info;
 	pci_set_drvdata(pdev, priv);
 
-	num_caps = hweight_long(info->caps);
+	num_caps = hweight_long(info.caps);
 	while (num_caps--) {
-		found_any |= intel_vsec_get_features(pdev, info);
+		found_any |= intel_vsec_get_features(pdev, &info);
 
-		if (priv->found_caps == info->caps)
+		if (priv->found_caps == info.caps)
 			break;
 
 		if (!run_once) {
@@ -676,7 +683,10 @@ int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,
 {
 	struct vsec_priv *priv;
 
-	priv = pci_get_drvdata(vsec_dev->pcidev);
+	if (!dev_is_pci(vsec_dev->dev))
+		return -ENODEV;
+
+	priv = pci_get_drvdata(to_pci_dev(vsec_dev->dev));
 	if (!priv)
 		return -EINVAL;
 
@@ -822,7 +832,7 @@ static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
 
 	xa_for_each(&auxdev_array, index, intel_vsec_dev) {
 		/* check if pdev doesn't match */
-		if (pdev != intel_vsec_dev->pcidev)
+		if (&pdev->dev != intel_vsec_dev->dev)
 			continue;
 		devm_release_action(&pdev->dev, intel_vsec_remove_aux,
 				    &intel_vsec_dev->auxdev);
diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/intel/vsec_tpmi.c
index 2ccde86c529f..254273392639 100644
--- a/drivers/platform/x86/intel/vsec_tpmi.c
+++ b/drivers/platform/x86/intel/vsec_tpmi.c
@@ -530,7 +530,7 @@ static const struct file_operations mem_write_ops = {
 	.release        = single_release,
 };
 
-#define tpmi_to_dev(info)	(&info->vsec_dev->pcidev->dev)
+#define tpmi_to_dev(info)	((info)->vsec_dev->dev)
 
 static void tpmi_dbgfs_register(struct intel_tpmi_info *tpmi_info)
 {
@@ -642,7 +642,7 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
 		tmp->flags = IORESOURCE_MEM;
 	}
 
-	feature_vsec_dev->pcidev = vsec_dev->pcidev;
+	feature_vsec_dev->dev = vsec_dev->dev;
 	feature_vsec_dev->resource = res;
 	feature_vsec_dev->num_resources = pfs->pfs_header.num_entries;
 	feature_vsec_dev->priv_data = &tpmi_info->plat_info;
@@ -742,7 +742,7 @@ static int tpmi_fetch_pfs_header(struct intel_tpmi_pm_feature *pfs, u64 start, i
 static int intel_vsec_tpmi_init(struct auxiliary_device *auxdev)
 {
 	struct intel_vsec_device *vsec_dev = auxdev_to_ivdev(auxdev);
-	struct pci_dev *pci_dev = vsec_dev->pcidev;
+	struct pci_dev *pci_dev = to_pci_dev(vsec_dev->dev);
 	struct intel_tpmi_info *tpmi_info;
 	u64 pfs_start = 0;
 	int ret, i;
diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h
index 28c2f5855a11..931ff42361a9 100644
--- a/include/linux/intel_vsec.h
+++ b/include/linux/intel_vsec.h
@@ -29,8 +29,8 @@
 #define INTEL_DVSEC_TABLE_OFFSET(x)	((x) & GENMASK(31, 3))
 #define TABLE_OFFSET_SHIFT		3
 
-struct pci_dev;
 struct resource;
+struct pci_dev;
 
 enum intel_vsec_id {
 	VSEC_ID_TELEMETRY	= 2,
@@ -82,14 +82,14 @@ enum intel_vsec_quirks {
  * struct pmt_callbacks - Callback infrastructure for PMT devices
  * ->read_telem() when specified, called by client driver to access PMT data (instead
  * of direct copy).
- * @pdev:  PCI device reference for the callback's use
+ * @dev:   device reference for the callback's use
  * @guid:  ID of data to acccss
  * @data:  buffer for the data to be copied
  * @off:   offset into the requested buffer
  * @count: size of buffer
  */
 struct pmt_callbacks {
-	int (*read_telem)(struct pci_dev *pdev, u32 guid, u64 *data, loff_t off, u32 count);
+	int (*read_telem)(struct device *dev, u32 guid, u64 *data, loff_t off, u32 count);
 };
 
 struct vsec_feature_dependency {
@@ -122,7 +122,7 @@ struct intel_vsec_platform_info {
 /**
  * struct intel_sec_device - Auxbus specific device information
  * @auxdev:        auxbus device struct for auxbus access
- * @pcidev:        pci device associated with the device
+ * @dev:           struct device associated with the device
  * @resource:      any resources shared by the parent
  * @ida:           id reference
  * @num_resources: number of resources
@@ -134,7 +134,7 @@ struct intel_vsec_platform_info {
  */
 struct intel_vsec_device {
 	struct auxiliary_device auxdev;
-	struct pci_dev *pcidev;
+	struct device *dev;
 	struct resource *resource;
 	struct ida *ida;
 	int num_resources;
@@ -198,14 +198,14 @@ static inline struct intel_vsec_device *auxdev_to_ivdev(struct auxiliary_device
 }
 
 #if IS_ENABLED(CONFIG_INTEL_VSEC)
-int intel_vsec_register(struct pci_dev *pdev,
-			 struct intel_vsec_platform_info *info);
+int intel_vsec_register(struct device *dev,
+			struct intel_vsec_platform_info *info);
 int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,
 			   struct intel_vsec_device *vsec_dev);
 struct oobmsm_plat_info *intel_vsec_get_mapping(struct pci_dev *pdev);
 #else
-static inline int intel_vsec_register(struct pci_dev *pdev,
-				       struct intel_vsec_platform_info *info)
+static inline int intel_vsec_register(struct device *dev,
+				      struct intel_vsec_platform_info *info)
 {
 	return -ENODEV;
 }
-- 
2.43.0

Re: [PATCH 2/4] platform/x86/intel/vsec: Switch exported helpers from pci_dev to device

[Rodrigo Vivi]

On Tue, Jan 06, 2026 at 04:21:49PM -0800, David E. Box wrote:
> Preparatory refactor for ACPI-enumerated PMT endpoints. Several exported
> PMT/VSEC interfaces and structs carried struct pci_dev * even though
> callers only need a generic struct device. Move those to struct device * so
> the same APIs work for PCI and ACPI parents.
> 
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> ---
>  drivers/gpu/drm/xe/xe_debugfs.c               |  2 +-
>  drivers/gpu/drm/xe/xe_hwmon.c                 |  2 +-
>  drivers/gpu/drm/xe/xe_vsec.c                  |  7 +-
>  drivers/gpu/drm/xe/xe_vsec.h                  |  2 +-


Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

feel free to take these xe changes through any branch

>  drivers/platform/x86/intel/pmc/core.c         |  4 +-
>  .../platform/x86/intel/pmc/ssram_telemetry.c  |  2 +-
>  drivers/platform/x86/intel/pmt/class.c        |  8 +-
>  drivers/platform/x86/intel/pmt/class.h        |  4 +-
>  drivers/platform/x86/intel/pmt/discovery.c    |  4 +-
>  drivers/platform/x86/intel/pmt/telemetry.c    | 13 ++--
>  drivers/platform/x86/intel/pmt/telemetry.h    | 11 ++-
>  drivers/platform/x86/intel/sdsi.c             |  5 +-
>  drivers/platform/x86/intel/vsec.c             | 74 +++++++++++--------
>  drivers/platform/x86/intel/vsec_tpmi.c        |  6 +-
>  include/linux/intel_vsec.h                    | 18 ++---
>  15 files changed, 86 insertions(+), 76 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> index e91da9589c5f..d07b2aad300f 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> @@ -45,7 +45,7 @@ static void read_residency_counter(struct xe_device *xe, struct xe_mmio *mmio,
>  	u64 residency = 0;
>  	int ret;
>  
> -	ret = xe_pmt_telem_read(to_pci_dev(xe->drm.dev),
> +	ret = xe_pmt_telem_read(xe->drm.dev,
>  				xe_mmio_read32(mmio, PUNIT_TELEMETRY_GUID),
>  				&residency, offset, sizeof(residency));
>  	if (ret != sizeof(residency)) {
> diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c
> index 97879daeefc1..556072a0ac10 100644
> --- a/drivers/gpu/drm/xe/xe_hwmon.c
> +++ b/drivers/gpu/drm/xe/xe_hwmon.c
> @@ -464,7 +464,7 @@ xe_hwmon_energy_get(struct xe_hwmon *hwmon, int channel, long *energy)
>  	if (hwmon->xe->info.platform == XE_BATTLEMAGE) {
>  		u64 pmt_val;
>  
> -		ret = xe_pmt_telem_read(to_pci_dev(hwmon->xe->drm.dev),
> +		ret = xe_pmt_telem_read(hwmon->xe->drm.dev,
>  					xe_mmio_read32(mmio, PUNIT_TELEMETRY_GUID),
>  					&pmt_val, BMG_ENERGY_STATUS_PMT_OFFSET,	sizeof(pmt_val));
>  		if (ret != sizeof(pmt_val)) {
> diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
> index 8f23a27871b6..997fe0c8858e 100644
> --- a/drivers/gpu/drm/xe/xe_vsec.c
> +++ b/drivers/gpu/drm/xe/xe_vsec.c
> @@ -141,10 +141,10 @@ static int xe_guid_decode(u32 guid, int *index, u32 *offset)
>  	return 0;
>  }
>  
> -int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_offset,
> +int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offset,
>  		      u32 count)
>  {
> -	struct xe_device *xe = pdev_to_xe_device(pdev);
> +	struct xe_device *xe = kdev_to_xe_device(dev);
>  	void __iomem *telem_addr = xe->mmio.regs + BMG_TELEMETRY_OFFSET;
>  	u32 mem_region;
>  	u32 offset;
> @@ -197,7 +197,6 @@ void xe_vsec_init(struct xe_device *xe)
>  {
>  	struct intel_vsec_platform_info *info;
>  	struct device *dev = xe->drm.dev;
> -	struct pci_dev *pdev = to_pci_dev(dev);
>  	enum xe_vsec platform;
>  
>  	platform = get_platform_info(xe);
> @@ -220,6 +219,6 @@ void xe_vsec_init(struct xe_device *xe)
>  	 * Register a VSEC. Cleanup is handled using device managed
>  	 * resources.
>  	 */
> -	intel_vsec_register(pdev, info);
> +	intel_vsec_register(dev, info);
>  }
>  MODULE_IMPORT_NS("INTEL_VSEC");
> diff --git a/drivers/gpu/drm/xe/xe_vsec.h b/drivers/gpu/drm/xe/xe_vsec.h
> index dabfb4e02d70..74ac575cd68c 100644
> --- a/drivers/gpu/drm/xe/xe_vsec.h
> +++ b/drivers/gpu/drm/xe/xe_vsec.h
> @@ -10,6 +10,6 @@ struct pci_dev;
>  struct xe_device;
>  
>  void xe_vsec_init(struct xe_device *xe);
> -int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_offset, u32 count);
> +int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offset, u32 count);
>  
>  #endif
> diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
> index 7d7ae8a40b0e..4abe5e1f574d 100644
> --- a/drivers/platform/x86/intel/pmc/core.c
> +++ b/drivers/platform/x86/intel/pmc/core.c
> @@ -1288,7 +1288,7 @@ static struct telem_endpoint *pmc_core_register_endpoint(struct pci_dev *pcidev,
>  	unsigned int i;
>  
>  	for (i = 0; guids[i]; i++) {
> -		ep = pmt_telem_find_and_register_endpoint(pcidev, guids[i], 0);
> +		ep = pmt_telem_find_and_register_endpoint(&pcidev->dev, guids[i], 0);
>  		if (!IS_ERR(ep))
>  			return ep;
>  	}
> @@ -1573,7 +1573,7 @@ static int pmc_core_get_telem_info(struct pmc_dev *pmcdev, struct pmc_dev_info *
>  		if (!pmc->map->lpm_req_guid)
>  			return -ENXIO;
>  
> -		ep = pmt_telem_find_and_register_endpoint(pcidev, pmc->map->lpm_req_guid, 0);
> +		ep = pmt_telem_find_and_register_endpoint(&pcidev->dev, pmc->map->lpm_req_guid, 0);
>  		if (IS_ERR(ep)) {
>  			dev_dbg(&pmcdev->pdev->dev, "couldn't get telem endpoint %pe", ep);
>  			return -EPROBE_DEFER;
> diff --git a/drivers/platform/x86/intel/pmc/ssram_telemetry.c b/drivers/platform/x86/intel/pmc/ssram_telemetry.c
> index 03fad9331fc0..6f6e83e70fc5 100644
> --- a/drivers/platform/x86/intel/pmc/ssram_telemetry.c
> +++ b/drivers/platform/x86/intel/pmc/ssram_telemetry.c
> @@ -60,7 +60,7 @@ pmc_ssram_telemetry_add_pmt(struct pci_dev *pcidev, u64 ssram_base, void __iomem
>  	info.base_addr = ssram_base;
>  	info.parent = &pcidev->dev;
>  
> -	return intel_vsec_register(pcidev, &info);
> +	return intel_vsec_register(&pcidev->dev, &info);
>  }
>  
>  static inline u64 get_base(void __iomem *addr, u32 offset)
> diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/intel/pmt/class.c
> index 7c3023d5d91d..8077274726b5 100644
> --- a/drivers/platform/x86/intel/pmt/class.c
> +++ b/drivers/platform/x86/intel/pmt/class.c
> @@ -60,11 +60,11 @@ pmt_memcpy64_fromio(void *to, const u64 __iomem *from, size_t count)
>  	return count;
>  }
>  
> -int pmt_telem_read_mmio(struct pci_dev *pdev, struct pmt_callbacks *cb, u32 guid, void *buf,
> +int pmt_telem_read_mmio(struct device *dev, struct pmt_callbacks *cb, u32 guid, void *buf,
>  			void __iomem *addr, loff_t off, u32 count)
>  {
>  	if (cb && cb->read_telem)
> -		return cb->read_telem(pdev, guid, buf, off, count);
> +		return cb->read_telem(dev, guid, buf, off, count);
>  
>  	addr += off;
>  
> @@ -99,7 +99,7 @@ intel_pmt_read(struct file *filp, struct kobject *kobj,
>  	if (count > entry->size - off)
>  		count = entry->size - off;
>  
> -	count = pmt_telem_read_mmio(entry->pcidev, entry->cb, entry->header.guid, buf,
> +	count = pmt_telem_read_mmio(entry->ep->dev, entry->cb, entry->header.guid, buf,
>  				    entry->base, off, count);
>  
>  	return count;
> @@ -208,7 +208,7 @@ static int intel_pmt_populate_entry(struct intel_pmt_entry *entry,
>  				    struct intel_vsec_device *ivdev,
>  				    struct resource *disc_res)
>  {
> -	struct pci_dev *pci_dev = ivdev->pcidev;
> +	struct pci_dev *pci_dev = to_pci_dev(ivdev->dev);
>  	struct device *dev = &ivdev->auxdev.dev;
>  	struct intel_pmt_header *header = &entry->header;
>  	u8 bir;
> diff --git a/drivers/platform/x86/intel/pmt/class.h b/drivers/platform/x86/intel/pmt/class.h
> index 3c5ad5f52bca..3eb8ab97dd87 100644
> --- a/drivers/platform/x86/intel/pmt/class.h
> +++ b/drivers/platform/x86/intel/pmt/class.h
> @@ -23,7 +23,7 @@ struct pci_dev;
>  extern struct class intel_pmt_class;
>  
>  struct telem_endpoint {
> -	struct pci_dev		*pcidev;
> +	struct device		*dev;
>  	struct telem_header	header;
>  	struct pmt_callbacks	*cb;
>  	void __iomem		*base;
> @@ -65,7 +65,7 @@ struct intel_pmt_namespace {
>  				struct intel_pmt_entry *entry);
>  };
>  
> -int pmt_telem_read_mmio(struct pci_dev *pdev, struct pmt_callbacks *cb, u32 guid, void *buf,
> +int pmt_telem_read_mmio(struct device *dev, struct pmt_callbacks *cb, u32 guid, void *buf,
>  			void __iomem *addr, loff_t off, u32 count);
>  bool intel_pmt_is_early_client_hw(struct device *dev);
>  int intel_pmt_dev_create(struct intel_pmt_entry *entry,
> diff --git a/drivers/platform/x86/intel/pmt/discovery.c b/drivers/platform/x86/intel/pmt/discovery.c
> index 32713a194a55..66f1ae931e05 100644
> --- a/drivers/platform/x86/intel/pmt/discovery.c
> +++ b/drivers/platform/x86/intel/pmt/discovery.c
> @@ -540,7 +540,7 @@ static int pmt_features_probe(struct auxiliary_device *auxdev, const struct auxi
>  	if (!priv)
>  		return -ENOMEM;
>  
> -	priv->parent = &ivdev->pcidev->dev;
> +	priv->parent = ivdev->dev;
>  	auxiliary_set_drvdata(auxdev, priv);
>  
>  	priv->dev = device_create(&intel_pmt_class, &auxdev->dev, MKDEV(0, 0), priv,
> @@ -607,7 +607,7 @@ void intel_pmt_get_features(struct intel_pmt_entry *entry)
>  
>  	mutex_lock(&feature_list_lock);
>  	list_for_each_entry(feature, &pmt_feature_list, list) {
> -		if (feature->priv->parent != &entry->ep->pcidev->dev)
> +		if (feature->priv->parent != entry->ep->dev)
>  			continue;
>  
>  		pmt_get_features(entry, feature);
> diff --git a/drivers/platform/x86/intel/pmt/telemetry.c b/drivers/platform/x86/intel/pmt/telemetry.c
> index a4dfca6cac19..e11f7bde41b2 100644
> --- a/drivers/platform/x86/intel/pmt/telemetry.c
> +++ b/drivers/platform/x86/intel/pmt/telemetry.c
> @@ -112,7 +112,7 @@ static int pmt_telem_add_endpoint(struct intel_vsec_device *ivdev,
>  		return -ENOMEM;
>  
>  	ep = entry->ep;
> -	ep->pcidev = ivdev->pcidev;
> +	ep->dev = ivdev->dev;
>  	ep->header.access_type = entry->header.access_type;
>  	ep->header.guid = entry->header.guid;
>  	ep->header.base_offset = entry->header.base_offset;
> @@ -204,7 +204,7 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info)
>  		goto unlock;
>  	}
>  
> -	info->pdev = entry->ep->pcidev;
> +	info->dev = entry->ep->dev;
>  	info->header = entry->ep->header;
>  
>  unlock:
> @@ -218,9 +218,10 @@ static int pmt_copy_region(struct telemetry_region *region,
>  			   struct intel_pmt_entry *entry)
>  {
>  
> +	struct pci_dev *pdev = to_pci_dev(entry->ep->dev);
>  	struct oobmsm_plat_info *plat_info;
>  
> -	plat_info = intel_vsec_get_mapping(entry->ep->pcidev);
> +	plat_info = intel_vsec_get_mapping(pdev);
>  	if (IS_ERR(plat_info))
>  		return PTR_ERR(plat_info);
>  
> @@ -308,7 +309,7 @@ int pmt_telem_read(struct telem_endpoint *ep, u32 id, u64 *data, u32 count)
>  	if (offset + NUM_BYTES_QWORD(count) > size)
>  		return -EINVAL;
>  
> -	pmt_telem_read_mmio(ep->pcidev, ep->cb, ep->header.guid, data, ep->base, offset,
> +	pmt_telem_read_mmio(ep->dev, ep->cb, ep->header.guid, data, ep->base, offset,
>  			    NUM_BYTES_QWORD(count));
>  
>  	return ep->present ? 0 : -EPIPE;
> @@ -335,7 +336,7 @@ int pmt_telem_read32(struct telem_endpoint *ep, u32 id, u32 *data, u32 count)
>  EXPORT_SYMBOL_NS_GPL(pmt_telem_read32, "INTEL_PMT_TELEMETRY");
>  
>  struct telem_endpoint *
> -pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev, u32 guid, u16 pos)
> +pmt_telem_find_and_register_endpoint(struct device *dev, u32 guid, u16 pos)
>  {
>  	int devid = 0;
>  	int inst = 0;
> @@ -348,7 +349,7 @@ pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev, u32 guid, u16 pos)
>  		if (err)
>  			return ERR_PTR(err);
>  
> -		if (ep_info.header.guid == guid && ep_info.pdev == pcidev) {
> +		if (ep_info.header.guid == guid && ep_info.dev == dev) {
>  			if (inst == pos)
>  				return pmt_telem_register_endpoint(devid);
>  			++inst;
> diff --git a/drivers/platform/x86/intel/pmt/telemetry.h b/drivers/platform/x86/intel/pmt/telemetry.h
> index d45af5512b4e..a4fa2178adef 100644
> --- a/drivers/platform/x86/intel/pmt/telemetry.h
> +++ b/drivers/platform/x86/intel/pmt/telemetry.h
> @@ -7,7 +7,6 @@
>  #define PMT_TELEM_CRASHLOG	1
>  
>  struct telem_endpoint;
> -struct pci_dev;
>  
>  struct telem_header {
>  	u8	access_type;
> @@ -17,7 +16,7 @@ struct telem_header {
>  };
>  
>  struct telem_endpoint_info {
> -	struct pci_dev		*pdev;
> +	struct device		*dev;
>  	struct telem_header	header;
>  };
>  
> @@ -71,8 +70,8 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info);
>  
>  /**
>   * pmt_telem_find_and_register_endpoint() - Get a telemetry endpoint from
> - * pci_dev device, guid and pos
> - * @pdev:   PCI device inside the Intel vsec
> + * device, guid and pos
> + * @dev:    device inside the Intel vsec
>   * @guid:   GUID of the telemetry space
>   * @pos:    Instance of the guid
>   *
> @@ -80,8 +79,8 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info);
>   * * endpoint    - On success returns pointer to the telemetry endpoint
>   * * -ENXIO      - telemetry endpoint not found
>   */
> -struct telem_endpoint *pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev,
> -				u32 guid, u16 pos);
> +struct telem_endpoint *
> +pmt_telem_find_and_register_endpoint(struct device *dev, u32 guid, u16 pos);
>  
>  /**
>   * pmt_telem_read() - Read qwords from counter sram using sample id
> diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
> index da75f53d0bcc..d7e37d4ace23 100644
> --- a/drivers/platform/x86/intel/sdsi.c
> +++ b/drivers/platform/x86/intel/sdsi.c
> @@ -599,13 +599,14 @@ static int sdsi_get_layout(struct sdsi_priv *priv, struct disc_table *table)
>  	return 0;
>  }
>  
> -static int sdsi_map_mbox_registers(struct sdsi_priv *priv, struct pci_dev *parent,
> +static int sdsi_map_mbox_registers(struct sdsi_priv *priv, struct device *dev,
>  				   struct disc_table *disc_table, struct resource *disc_res)
>  {
>  	u32 access_type = FIELD_GET(DT_ACCESS_TYPE, disc_table->access_info);
>  	u32 size = FIELD_GET(DT_SIZE, disc_table->access_info);
>  	u32 tbir = FIELD_GET(DT_TBIR, disc_table->offset);
>  	u32 offset = DT_OFFSET(disc_table->offset);
> +	struct pci_dev *parent = to_pci_dev(dev);
>  	struct resource res = {};
>  
>  	/* Starting location of SDSi MMIO region based on access type */
> @@ -681,7 +682,7 @@ static int sdsi_probe(struct auxiliary_device *auxdev, const struct auxiliary_de
>  		return ret;
>  
>  	/* Map the SDSi mailbox registers */
> -	ret = sdsi_map_mbox_registers(priv, intel_cap_dev->pcidev, &disc_table, disc_res);
> +	ret = sdsi_map_mbox_registers(priv, intel_cap_dev->dev, &disc_table, disc_res);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
> index 130577061a51..b84bb92624ef 100644
> --- a/drivers/platform/x86/intel/vsec.c
> +++ b/drivers/platform/x86/intel/vsec.c
> @@ -274,7 +274,7 @@ int intel_vsec_add_aux(struct device *parent,
>  }
>  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,
> +static int intel_vsec_add_dev(struct device *dev, struct intel_vsec_header *header,
>  			      struct intel_vsec_platform_info *info,
>  			      unsigned long cap_id)
>  {
> @@ -283,24 +283,24 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
>  	struct resource *tmp;
>  	struct device *parent;
>  	unsigned long quirks = info->quirks;
> -	u64 base_addr;
> +	u64 base_addr = info->base_addr;
>  	int i;
>  
>  	if (info->parent)
>  		parent = info->parent;
>  	else
> -		parent = &pdev->dev;
> +		parent = dev;
>  
>  	if (!intel_vsec_supported(header->id, info->caps))
>  		return -EINVAL;
>  
>  	if (!header->num_entries) {
> -		dev_dbg(&pdev->dev, "Invalid 0 entry count for header id %d\n", header->id);
> +		dev_dbg(dev, "Invalid 0 entry count for header id %d\n", header->id);
>  		return -EINVAL;
>  	}
>  
>  	if (!header->entry_size) {
> -		dev_dbg(&pdev->dev, "Invalid 0 entry size for header id %d\n", header->id);
> +		dev_dbg(dev, "Invalid 0 entry size for header id %d\n", header->id);
>  		return -EINVAL;
>  	}
>  
> @@ -315,11 +315,6 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
>  	if (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
> @@ -337,7 +332,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
>  		release_mem_region(tmp->start, resource_size(tmp));
>  	}
>  
> -	intel_vsec_dev->pcidev = pdev;
> +	intel_vsec_dev->dev = dev;
>  	intel_vsec_dev->resource = no_free_ptr(res);
>  	intel_vsec_dev->num_resources = header->num_entries;
>  	intel_vsec_dev->quirks = info->quirks;
> @@ -415,12 +410,13 @@ static int get_cap_id(u32 header_id, unsigned long *cap_id)
>  	return 0;
>  }
>  
> -static int intel_vsec_register_device(struct pci_dev *pdev,
> +static int intel_vsec_register_device(struct device *dev,
>  				      struct intel_vsec_header *header,
>  				      struct intel_vsec_platform_info *info)
>  {
>  	const struct vsec_feature_dependency *consumer_deps;
>  	struct vsec_priv *priv;
> +	struct pci_dev *pdev;
>  	unsigned long cap_id;
>  	int ret;
>  
> @@ -432,8 +428,12 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
>  	 * Only track dependencies for devices probed by the VSEC driver.
>  	 * For others using the exported APIs, add the device directly.
>  	 */
> +	if (!dev_is_pci(dev))
> +		return intel_vsec_add_dev(dev, header, info, cap_id);
> +
> +	pdev = to_pci_dev(dev);
>  	if (!pci_match_id(intel_vsec_pci_ids, pdev))
> -		return intel_vsec_add_dev(pdev, header, info, cap_id);
> +		return intel_vsec_add_dev(dev, header, info, cap_id);
>  
>  	priv = pci_get_drvdata(pdev);
>  	if (priv->state[cap_id] == STATE_REGISTERED ||
> @@ -449,7 +449,7 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
>  
>  	consumer_deps = get_consumer_dependencies(priv, cap_id);
>  	if (!consumer_deps || suppliers_ready(priv, consumer_deps, cap_id)) {
> -		ret = intel_vsec_add_dev(pdev, header, info, cap_id);
> +		ret = intel_vsec_add_dev(dev, header, info, cap_id);
>  		if (ret)
>  			priv->state[cap_id] = STATE_SKIP;
>  		else
> @@ -461,7 +461,7 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
>  	return -EAGAIN;
>  }
>  
> -static bool intel_vsec_walk_header(struct pci_dev *pdev,
> +static bool intel_vsec_walk_header(struct device *dev,
>  				   struct intel_vsec_platform_info *info)
>  {
>  	struct intel_vsec_header **header = info->headers;
> @@ -469,7 +469,7 @@ static bool intel_vsec_walk_header(struct pci_dev *pdev,
>  	int ret;
>  
>  	for ( ; *header; header++) {
> -		ret = intel_vsec_register_device(pdev, *header, info);
> +		ret = intel_vsec_register_device(dev, *header, info);
>  		if (!ret)
>  			have_devices = true;
>  	}
> @@ -517,7 +517,9 @@ static bool intel_vsec_walk_dvsec(struct pci_dev *pdev,
>  		pci_read_config_dword(pdev, pos + PCI_DVSEC_HEADER2, &hdr);
>  		header.id = PCI_DVSEC_HEADER2_ID(hdr);
>  
> -		ret = intel_vsec_register_device(pdev, &header, info);
> +		info->base_addr = pdev->resource[header.tbir].start;
> +
> +		ret = intel_vsec_register_device(&pdev->dev, &header, info);
>  		if (ret)
>  			continue;
>  
> @@ -562,7 +564,9 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,
>  		header.tbir = INTEL_DVSEC_TABLE_BAR(table);
>  		header.offset = INTEL_DVSEC_TABLE_OFFSET(table);
>  
> -		ret = intel_vsec_register_device(pdev, &header, info);
> +		info->base_addr = pdev->resource[header.tbir].start;
> +
> +		ret = intel_vsec_register_device(&pdev->dev, &header, info);
>  		if (ret)
>  			continue;
>  
> @@ -572,13 +576,13 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,
>  	return have_devices;
>  }
>  
> -int intel_vsec_register(struct pci_dev *pdev,
> -			 struct intel_vsec_platform_info *info)
> +int intel_vsec_register(struct device *dev,
> +			struct intel_vsec_platform_info *info)
>  {
> -	if (!pdev || !info || !info->headers)
> +	if (!dev || !info || !info->headers)
>  		return -EINVAL;
>  
> -	if (!intel_vsec_walk_header(pdev, info))
> +	if (!intel_vsec_walk_header(dev, info))
>  		return -ENODEV;
>  	else
>  		return 0;
> @@ -604,7 +608,7 @@ static bool intel_vsec_get_features(struct pci_dev *pdev,
>  		found = true;
>  
>  	if (info && (info->quirks & VSEC_QUIRK_NO_DVSEC) &&
> -	    intel_vsec_walk_header(pdev, info))
> +	    intel_vsec_walk_header(&pdev->dev, info))
>  		found = true;
>  
>  	return found;
> @@ -630,7 +634,7 @@ static void intel_vsec_skip_missing_dependencies(struct pci_dev *pdev)
>  
>  static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  {
> -	struct intel_vsec_platform_info *info;
> +	struct intel_vsec_platform_info info, *info_temp;
>  	struct vsec_priv *priv;
>  	int num_caps, ret;
>  	int run_once = 0;
> @@ -641,22 +645,25 @@ static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id
>  		return ret;
>  
>  	pci_save_state(pdev);
> -	info = (struct intel_vsec_platform_info *)id->driver_data;
> -	if (!info)
> +	info_temp = (struct intel_vsec_platform_info *)id->driver_data;
> +	if (!info_temp)
>  		return -EINVAL;
>  
> +	/* XXX: Needs better fix */
> +	info = *info_temp;
> +
>  	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
>  	if (!priv)
>  		return -ENOMEM;
>  
> -	priv->info = info;
> +	priv->info = &info;
>  	pci_set_drvdata(pdev, priv);
>  
> -	num_caps = hweight_long(info->caps);
> +	num_caps = hweight_long(info.caps);
>  	while (num_caps--) {
> -		found_any |= intel_vsec_get_features(pdev, info);
> +		found_any |= intel_vsec_get_features(pdev, &info);
>  
> -		if (priv->found_caps == info->caps)
> +		if (priv->found_caps == info.caps)
>  			break;
>  
>  		if (!run_once) {
> @@ -676,7 +683,10 @@ int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,
>  {
>  	struct vsec_priv *priv;
>  
> -	priv = pci_get_drvdata(vsec_dev->pcidev);
> +	if (!dev_is_pci(vsec_dev->dev))
> +		return -ENODEV;
> +
> +	priv = pci_get_drvdata(to_pci_dev(vsec_dev->dev));
>  	if (!priv)
>  		return -EINVAL;
>  
> @@ -822,7 +832,7 @@ static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
>  
>  	xa_for_each(&auxdev_array, index, intel_vsec_dev) {
>  		/* check if pdev doesn't match */
> -		if (pdev != intel_vsec_dev->pcidev)
> +		if (&pdev->dev != intel_vsec_dev->dev)
>  			continue;
>  		devm_release_action(&pdev->dev, intel_vsec_remove_aux,
>  				    &intel_vsec_dev->auxdev);
> diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/intel/vsec_tpmi.c
> index 2ccde86c529f..254273392639 100644
> --- a/drivers/platform/x86/intel/vsec_tpmi.c
> +++ b/drivers/platform/x86/intel/vsec_tpmi.c
> @@ -530,7 +530,7 @@ static const struct file_operations mem_write_ops = {
>  	.release        = single_release,
>  };
>  
> -#define tpmi_to_dev(info)	(&info->vsec_dev->pcidev->dev)
> +#define tpmi_to_dev(info)	((info)->vsec_dev->dev)
>  
>  static void tpmi_dbgfs_register(struct intel_tpmi_info *tpmi_info)
>  {
> @@ -642,7 +642,7 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
>  		tmp->flags = IORESOURCE_MEM;
>  	}
>  
> -	feature_vsec_dev->pcidev = vsec_dev->pcidev;
> +	feature_vsec_dev->dev = vsec_dev->dev;
>  	feature_vsec_dev->resource = res;
>  	feature_vsec_dev->num_resources = pfs->pfs_header.num_entries;
>  	feature_vsec_dev->priv_data = &tpmi_info->plat_info;
> @@ -742,7 +742,7 @@ static int tpmi_fetch_pfs_header(struct intel_tpmi_pm_feature *pfs, u64 start, i
>  static int intel_vsec_tpmi_init(struct auxiliary_device *auxdev)
>  {
>  	struct intel_vsec_device *vsec_dev = auxdev_to_ivdev(auxdev);
> -	struct pci_dev *pci_dev = vsec_dev->pcidev;
> +	struct pci_dev *pci_dev = to_pci_dev(vsec_dev->dev);
>  	struct intel_tpmi_info *tpmi_info;
>  	u64 pfs_start = 0;
>  	int ret, i;
> diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h
> index 28c2f5855a11..931ff42361a9 100644
> --- a/include/linux/intel_vsec.h
> +++ b/include/linux/intel_vsec.h
> @@ -29,8 +29,8 @@
>  #define INTEL_DVSEC_TABLE_OFFSET(x)	((x) & GENMASK(31, 3))
>  #define TABLE_OFFSET_SHIFT		3
>  
> -struct pci_dev;
>  struct resource;
> +struct pci_dev;
>  
>  enum intel_vsec_id {
>  	VSEC_ID_TELEMETRY	= 2,
> @@ -82,14 +82,14 @@ enum intel_vsec_quirks {
>   * struct pmt_callbacks - Callback infrastructure for PMT devices
>   * ->read_telem() when specified, called by client driver to access PMT data (instead
>   * of direct copy).
> - * @pdev:  PCI device reference for the callback's use
> + * @dev:   device reference for the callback's use
>   * @guid:  ID of data to acccss
>   * @data:  buffer for the data to be copied
>   * @off:   offset into the requested buffer
>   * @count: size of buffer
>   */
>  struct pmt_callbacks {
> -	int (*read_telem)(struct pci_dev *pdev, u32 guid, u64 *data, loff_t off, u32 count);
> +	int (*read_telem)(struct device *dev, u32 guid, u64 *data, loff_t off, u32 count);
>  };
>  
>  struct vsec_feature_dependency {
> @@ -122,7 +122,7 @@ struct intel_vsec_platform_info {
>  /**
>   * struct intel_sec_device - Auxbus specific device information
>   * @auxdev:        auxbus device struct for auxbus access
> - * @pcidev:        pci device associated with the device
> + * @dev:           struct device associated with the device
>   * @resource:      any resources shared by the parent
>   * @ida:           id reference
>   * @num_resources: number of resources
> @@ -134,7 +134,7 @@ struct intel_vsec_platform_info {
>   */
>  struct intel_vsec_device {
>  	struct auxiliary_device auxdev;
> -	struct pci_dev *pcidev;
> +	struct device *dev;
>  	struct resource *resource;
>  	struct ida *ida;
>  	int num_resources;
> @@ -198,14 +198,14 @@ static inline struct intel_vsec_device *auxdev_to_ivdev(struct auxiliary_device
>  }
>  
>  #if IS_ENABLED(CONFIG_INTEL_VSEC)
> -int intel_vsec_register(struct pci_dev *pdev,
> -			 struct intel_vsec_platform_info *info);
> +int intel_vsec_register(struct device *dev,
> +			struct intel_vsec_platform_info *info);
>  int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,
>  			   struct intel_vsec_device *vsec_dev);
>  struct oobmsm_plat_info *intel_vsec_get_mapping(struct pci_dev *pdev);
>  #else
> -static inline int intel_vsec_register(struct pci_dev *pdev,
> -				       struct intel_vsec_platform_info *info)
> +static inline int intel_vsec_register(struct device *dev,
> +				      struct intel_vsec_platform_info *info)
>  {
>  	return -ENODEV;
>  }
> -- 
> 2.43.0
> 

Re: [PATCH 2/4] platform/x86/intel/vsec: Switch exported helpers from pci_dev to device

[Ilpo Järvinen]

On Tue, 6 Jan 2026, David E. Box wrote:

> Preparatory refactor for ACPI-enumerated PMT endpoints. Several exported
> PMT/VSEC interfaces and structs carried struct pci_dev * even though
> callers only need a generic struct device. Move those to struct device * so
> the same APIs work for PCI and ACPI parents.
> 
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> ---
>  drivers/gpu/drm/xe/xe_debugfs.c               |  2 +-
>  drivers/gpu/drm/xe/xe_hwmon.c                 |  2 +-
>  drivers/gpu/drm/xe/xe_vsec.c                  |  7 +-
>  drivers/gpu/drm/xe/xe_vsec.h                  |  2 +-
>  drivers/platform/x86/intel/pmc/core.c         |  4 +-
>  .../platform/x86/intel/pmc/ssram_telemetry.c  |  2 +-
>  drivers/platform/x86/intel/pmt/class.c        |  8 +-
>  drivers/platform/x86/intel/pmt/class.h        |  4 +-
>  drivers/platform/x86/intel/pmt/discovery.c    |  4 +-
>  drivers/platform/x86/intel/pmt/telemetry.c    | 13 ++--
>  drivers/platform/x86/intel/pmt/telemetry.h    | 11 ++-
>  drivers/platform/x86/intel/sdsi.c             |  5 +-
>  drivers/platform/x86/intel/vsec.c             | 74 +++++++++++--------
>  drivers/platform/x86/intel/vsec_tpmi.c        |  6 +-
>  include/linux/intel_vsec.h                    | 18 ++---
>  15 files changed, 86 insertions(+), 76 deletions(-)
> 

> diff --git a/drivers/platform/x86/intel/pmt/class.h b/drivers/platform/x86/intel/pmt/class.h
> index 3c5ad5f52bca..3eb8ab97dd87 100644
> --- a/drivers/platform/x86/intel/pmt/class.h
> +++ b/drivers/platform/x86/intel/pmt/class.h
> @@ -23,7 +23,7 @@ struct pci_dev;
>  extern struct class intel_pmt_class;
>  
>  struct telem_endpoint {
> -	struct pci_dev		*pcidev;
> +	struct device		*dev;

Not guaranteed to have struct device introduced at this point.

>  	struct telem_header	header;
>  	struct pmt_callbacks	*cb;
>  	void __iomem		*base;
> @@ -65,7 +65,7 @@ struct intel_pmt_namespace {
>  				struct intel_pmt_entry *entry);
>  };
>  
> -int pmt_telem_read_mmio(struct pci_dev *pdev, struct pmt_callbacks *cb, u32 guid, void *buf,
> +int pmt_telem_read_mmio(struct device *dev, struct pmt_callbacks *cb, u32 guid, void *buf,
>  			void __iomem *addr, loff_t off, u32 count);
>  bool intel_pmt_is_early_client_hw(struct device *dev);
>  int intel_pmt_dev_create(struct intel_pmt_entry *entry,
> diff --git a/drivers/platform/x86/intel/pmt/discovery.c b/drivers/platform/x86/intel/pmt/discovery.c
> index 32713a194a55..66f1ae931e05 100644
> --- a/drivers/platform/x86/intel/pmt/discovery.c
> +++ b/drivers/platform/x86/intel/pmt/discovery.c
> @@ -540,7 +540,7 @@ static int pmt_features_probe(struct auxiliary_device *auxdev, const struct auxi
>  	if (!priv)
>  		return -ENOMEM;
>  
> -	priv->parent = &ivdev->pcidev->dev;
> +	priv->parent = ivdev->dev;
>  	auxiliary_set_drvdata(auxdev, priv);
>  
>  	priv->dev = device_create(&intel_pmt_class, &auxdev->dev, MKDEV(0, 0), priv,
> @@ -607,7 +607,7 @@ void intel_pmt_get_features(struct intel_pmt_entry *entry)
>  
>  	mutex_lock(&feature_list_lock);
>  	list_for_each_entry(feature, &pmt_feature_list, list) {
> -		if (feature->priv->parent != &entry->ep->pcidev->dev)
> +		if (feature->priv->parent != entry->ep->dev)
>  			continue;
>  
>  		pmt_get_features(entry, feature);
> diff --git a/drivers/platform/x86/intel/pmt/telemetry.c b/drivers/platform/x86/intel/pmt/telemetry.c
> index a4dfca6cac19..e11f7bde41b2 100644
> --- a/drivers/platform/x86/intel/pmt/telemetry.c
> +++ b/drivers/platform/x86/intel/pmt/telemetry.c
> @@ -112,7 +112,7 @@ static int pmt_telem_add_endpoint(struct intel_vsec_device *ivdev,
>  		return -ENOMEM;
>  
>  	ep = entry->ep;
> -	ep->pcidev = ivdev->pcidev;
> +	ep->dev = ivdev->dev;
>  	ep->header.access_type = entry->header.access_type;
>  	ep->header.guid = entry->header.guid;
>  	ep->header.base_offset = entry->header.base_offset;
> @@ -204,7 +204,7 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info)
>  		goto unlock;
>  	}
>  
> -	info->pdev = entry->ep->pcidev;
> +	info->dev = entry->ep->dev;
>  	info->header = entry->ep->header;
>  
>  unlock:
> @@ -218,9 +218,10 @@ static int pmt_copy_region(struct telemetry_region *region,
>  			   struct intel_pmt_entry *entry)
>  {
>  
> +	struct pci_dev *pdev = to_pci_dev(entry->ep->dev);
>  	struct oobmsm_plat_info *plat_info;
>  
> -	plat_info = intel_vsec_get_mapping(entry->ep->pcidev);
> +	plat_info = intel_vsec_get_mapping(pdev);
>  	if (IS_ERR(plat_info))
>  		return PTR_ERR(plat_info);
>  
> @@ -308,7 +309,7 @@ int pmt_telem_read(struct telem_endpoint *ep, u32 id, u64 *data, u32 count)
>  	if (offset + NUM_BYTES_QWORD(count) > size)
>  		return -EINVAL;
>  
> -	pmt_telem_read_mmio(ep->pcidev, ep->cb, ep->header.guid, data, ep->base, offset,
> +	pmt_telem_read_mmio(ep->dev, ep->cb, ep->header.guid, data, ep->base, offset,
>  			    NUM_BYTES_QWORD(count));
>  
>  	return ep->present ? 0 : -EPIPE;
> @@ -335,7 +336,7 @@ int pmt_telem_read32(struct telem_endpoint *ep, u32 id, u32 *data, u32 count)
>  EXPORT_SYMBOL_NS_GPL(pmt_telem_read32, "INTEL_PMT_TELEMETRY");
>  
>  struct telem_endpoint *
> -pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev, u32 guid, u16 pos)
> +pmt_telem_find_and_register_endpoint(struct device *dev, u32 guid, u16 pos)
>  {
>  	int devid = 0;
>  	int inst = 0;
> @@ -348,7 +349,7 @@ pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev, u32 guid, u16 pos)
>  		if (err)
>  			return ERR_PTR(err);
>  
> -		if (ep_info.header.guid == guid && ep_info.pdev == pcidev) {
> +		if (ep_info.header.guid == guid && ep_info.dev == dev) {
>  			if (inst == pos)
>  				return pmt_telem_register_endpoint(devid);
>  			++inst;
> diff --git a/drivers/platform/x86/intel/pmt/telemetry.h b/drivers/platform/x86/intel/pmt/telemetry.h
> index d45af5512b4e..a4fa2178adef 100644
> --- a/drivers/platform/x86/intel/pmt/telemetry.h
> +++ b/drivers/platform/x86/intel/pmt/telemetry.h
> @@ -7,7 +7,6 @@
>  #define PMT_TELEM_CRASHLOG	1
>  
>  struct telem_endpoint;
> -struct pci_dev;
>  struct telem_header {
>  	u8	access_type;
> @@ -17,7 +16,7 @@ struct telem_header {
>  };
>  
>  struct telem_endpoint_info {
> -	struct pci_dev		*pdev;
> +	struct device		*dev;

The same issue here.

>  	struct telem_header	header;
>  };
>  
> @@ -71,8 +70,8 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info);
>  
>  /**
>   * pmt_telem_find_and_register_endpoint() - Get a telemetry endpoint from
> - * pci_dev device, guid and pos
> - * @pdev:   PCI device inside the Intel vsec
> + * device, guid and pos
> + * @dev:    device inside the Intel vsec
>   * @guid:   GUID of the telemetry space
>   * @pos:    Instance of the guid
>   *
> @@ -80,8 +79,8 @@ int pmt_telem_get_endpoint_info(int devid, struct telem_endpoint_info *info);
>   * * endpoint    - On success returns pointer to the telemetry endpoint
>   * * -ENXIO      - telemetry endpoint not found
>   */
> -struct telem_endpoint *pmt_telem_find_and_register_endpoint(struct pci_dev *pcidev,
> -				u32 guid, u16 pos);
> +struct telem_endpoint *
> +pmt_telem_find_and_register_endpoint(struct device *dev, u32 guid, u16 pos);
>  
>  /**
>   * pmt_telem_read() - Read qwords from counter sram using sample id
> diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
> index da75f53d0bcc..d7e37d4ace23 100644
> --- a/drivers/platform/x86/intel/sdsi.c
> +++ b/drivers/platform/x86/intel/sdsi.c
> @@ -599,13 +599,14 @@ static int sdsi_get_layout(struct sdsi_priv *priv, struct disc_table *table)
>  	return 0;
>  }
>  
> -static int sdsi_map_mbox_registers(struct sdsi_priv *priv, struct pci_dev *parent,
> +static int sdsi_map_mbox_registers(struct sdsi_priv *priv, struct device *dev,
>  				   struct disc_table *disc_table, struct resource *disc_res)
>  {
>  	u32 access_type = FIELD_GET(DT_ACCESS_TYPE, disc_table->access_info);
>  	u32 size = FIELD_GET(DT_SIZE, disc_table->access_info);
>  	u32 tbir = FIELD_GET(DT_TBIR, disc_table->offset);
>  	u32 offset = DT_OFFSET(disc_table->offset);
> +	struct pci_dev *parent = to_pci_dev(dev);
>  	struct resource res = {};
>  
>  	/* Starting location of SDSi MMIO region based on access type */
> @@ -681,7 +682,7 @@ static int sdsi_probe(struct auxiliary_device *auxdev, const struct auxiliary_de
>  		return ret;
>  
>  	/* Map the SDSi mailbox registers */
> -	ret = sdsi_map_mbox_registers(priv, intel_cap_dev->pcidev, &disc_table, disc_res);
> +	ret = sdsi_map_mbox_registers(priv, intel_cap_dev->dev, &disc_table, disc_res);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
> index 130577061a51..b84bb92624ef 100644
> --- a/drivers/platform/x86/intel/vsec.c
> +++ b/drivers/platform/x86/intel/vsec.c
> @@ -274,7 +274,7 @@ int intel_vsec_add_aux(struct device *parent,
>  }
>  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,
> +static int intel_vsec_add_dev(struct device *dev, struct intel_vsec_header *header,
>  			      struct intel_vsec_platform_info *info,
>  			      unsigned long cap_id)
>  {
> @@ -283,24 +283,24 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
>  	struct resource *tmp;
>  	struct device *parent;
>  	unsigned long quirks = info->quirks;
> -	u64 base_addr;
> +	u64 base_addr = info->base_addr;
>  	int i;
>  
>  	if (info->parent)
>  		parent = info->parent;
>  	else
> -		parent = &pdev->dev;
> +		parent = dev;
>  
>  	if (!intel_vsec_supported(header->id, info->caps))
>  		return -EINVAL;
>  
>  	if (!header->num_entries) {
> -		dev_dbg(&pdev->dev, "Invalid 0 entry count for header id %d\n", header->id);
> +		dev_dbg(dev, "Invalid 0 entry count for header id %d\n", header->id);
>  		return -EINVAL;
>  	}
>  
>  	if (!header->entry_size) {
> -		dev_dbg(&pdev->dev, "Invalid 0 entry size for header id %d\n", header->id);
> +		dev_dbg(dev, "Invalid 0 entry size for header id %d\n", header->id);
>  		return -EINVAL;
>  	}
>  
> @@ -315,11 +315,6 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
>  	if (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
> @@ -337,7 +332,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
>  		release_mem_region(tmp->start, resource_size(tmp));
>  	}
>  
> -	intel_vsec_dev->pcidev = pdev;
> +	intel_vsec_dev->dev = dev;
>  	intel_vsec_dev->resource = no_free_ptr(res);
>  	intel_vsec_dev->num_resources = header->num_entries;
>  	intel_vsec_dev->quirks = info->quirks;
> @@ -415,12 +410,13 @@ static int get_cap_id(u32 header_id, unsigned long *cap_id)
>  	return 0;
>  }
>  
> -static int intel_vsec_register_device(struct pci_dev *pdev,
> +static int intel_vsec_register_device(struct device *dev,
>  				      struct intel_vsec_header *header,
>  				      struct intel_vsec_platform_info *info)
>  {
>  	const struct vsec_feature_dependency *consumer_deps;
>  	struct vsec_priv *priv;
> +	struct pci_dev *pdev;
>  	unsigned long cap_id;
>  	int ret;
>  
> @@ -432,8 +428,12 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
>  	 * Only track dependencies for devices probed by the VSEC driver.
>  	 * For others using the exported APIs, add the device directly.
>  	 */
> +	if (!dev_is_pci(dev))
> +		return intel_vsec_add_dev(dev, header, info, cap_id);
> +
> +	pdev = to_pci_dev(dev);
>  	if (!pci_match_id(intel_vsec_pci_ids, pdev))
> -		return intel_vsec_add_dev(pdev, header, info, cap_id);
> +		return intel_vsec_add_dev(dev, header, info, cap_id);
>  
>  	priv = pci_get_drvdata(pdev);
>  	if (priv->state[cap_id] == STATE_REGISTERED ||
> @@ -449,7 +449,7 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
>  
>  	consumer_deps = get_consumer_dependencies(priv, cap_id);
>  	if (!consumer_deps || suppliers_ready(priv, consumer_deps, cap_id)) {
> -		ret = intel_vsec_add_dev(pdev, header, info, cap_id);
> +		ret = intel_vsec_add_dev(dev, header, info, cap_id);
>  		if (ret)
>  			priv->state[cap_id] = STATE_SKIP;
>  		else
> @@ -461,7 +461,7 @@ static int intel_vsec_register_device(struct pci_dev *pdev,
>  	return -EAGAIN;
>  }
>  
> -static bool intel_vsec_walk_header(struct pci_dev *pdev,
> +static bool intel_vsec_walk_header(struct device *dev,
>  				   struct intel_vsec_platform_info *info)
>  {
>  	struct intel_vsec_header **header = info->headers;
> @@ -469,7 +469,7 @@ static bool intel_vsec_walk_header(struct pci_dev *pdev,
>  	int ret;
>  
>  	for ( ; *header; header++) {
> -		ret = intel_vsec_register_device(pdev, *header, info);
> +		ret = intel_vsec_register_device(dev, *header, info);
>  		if (!ret)
>  			have_devices = true;
>  	}
> @@ -517,7 +517,9 @@ static bool intel_vsec_walk_dvsec(struct pci_dev *pdev,
>  		pci_read_config_dword(pdev, pos + PCI_DVSEC_HEADER2, &hdr);
>  		header.id = PCI_DVSEC_HEADER2_ID(hdr);
>  
> -		ret = intel_vsec_register_device(pdev, &header, info);
> +		info->base_addr = pdev->resource[header.tbir].start;
> +
> +		ret = intel_vsec_register_device(&pdev->dev, &header, info);
>  		if (ret)
>  			continue;
>  
> @@ -562,7 +564,9 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,
>  		header.tbir = INTEL_DVSEC_TABLE_BAR(table);
>  		header.offset = INTEL_DVSEC_TABLE_OFFSET(table);
>  
> -		ret = intel_vsec_register_device(pdev, &header, info);
> +		info->base_addr = pdev->resource[header.tbir].start;

pci_resource_start()

> +
> +		ret = intel_vsec_register_device(&pdev->dev, &header, info);
>  		if (ret)
>  			continue;
>  
> @@ -572,13 +576,13 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,
>  	return have_devices;
>  }
>  
> -int intel_vsec_register(struct pci_dev *pdev,
> -			 struct intel_vsec_platform_info *info)
> +int intel_vsec_register(struct device *dev,
> +			struct intel_vsec_platform_info *info)
>  {
> -	if (!pdev || !info || !info->headers)
> +	if (!dev || !info || !info->headers)
>  		return -EINVAL;
>  
> -	if (!intel_vsec_walk_header(pdev, info))
> +	if (!intel_vsec_walk_header(dev, info))
>  		return -ENODEV;
>  	else
>  		return 0;
> @@ -604,7 +608,7 @@ static bool intel_vsec_get_features(struct pci_dev *pdev,
>  		found = true;
>  
>  	if (info && (info->quirks & VSEC_QUIRK_NO_DVSEC) &&
> -	    intel_vsec_walk_header(pdev, info))
> +	    intel_vsec_walk_header(&pdev->dev, info))
>  		found = true;
>  
>  	return found;
> @@ -630,7 +634,7 @@ static void intel_vsec_skip_missing_dependencies(struct pci_dev *pdev)
>  
>  static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  {
> -	struct intel_vsec_platform_info *info;
> +	struct intel_vsec_platform_info info, *info_temp;
>  	struct vsec_priv *priv;
>  	int num_caps, ret;
>  	int run_once = 0;
> @@ -641,22 +645,25 @@ static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id
>  		return ret;
>  
>  	pci_save_state(pdev);
> -	info = (struct intel_vsec_platform_info *)id->driver_data;
> -	if (!info)
> +	info_temp = (struct intel_vsec_platform_info *)id->driver_data;
> +	if (!info_temp)
>  		return -EINVAL;
>  
> +	/* XXX: Needs better fix */
> +	info = *info_temp;
> +
>  	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
>  	if (!priv)
>  		return -ENOMEM;
>  
> -	priv->info = info;
> +	priv->info = &info;
>  	pci_set_drvdata(pdev, priv);

What's going on here??? 'info' is a stack variable and you're taking 
a pointer of it into priv/drvdata??

> -	num_caps = hweight_long(info->caps);
> +	num_caps = hweight_long(info.caps);
>  	while (num_caps--) {
> -		found_any |= intel_vsec_get_features(pdev, info);
> +		found_any |= intel_vsec_get_features(pdev, &info);
>  
> -		if (priv->found_caps == info->caps)
> +		if (priv->found_caps == info.caps)
>  			break;
>  
>  		if (!run_once) {
> @@ -676,7 +683,10 @@ int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,
>  {
>  	struct vsec_priv *priv;
>  
> -	priv = pci_get_drvdata(vsec_dev->pcidev);
> +	if (!dev_is_pci(vsec_dev->dev))
> +		return -ENODEV;
> +
> +	priv = pci_get_drvdata(to_pci_dev(vsec_dev->dev));
>  	if (!priv)
>  		return -EINVAL;
>  
> @@ -822,7 +832,7 @@ static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
>  
>  	xa_for_each(&auxdev_array, index, intel_vsec_dev) {
>  		/* check if pdev doesn't match */
> -		if (pdev != intel_vsec_dev->pcidev)
> +		if (&pdev->dev != intel_vsec_dev->dev)
>  			continue;
>  		devm_release_action(&pdev->dev, intel_vsec_remove_aux,
>  				    &intel_vsec_dev->auxdev);
> diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/intel/vsec_tpmi.c
> index 2ccde86c529f..254273392639 100644
> --- a/drivers/platform/x86/intel/vsec_tpmi.c
> +++ b/drivers/platform/x86/intel/vsec_tpmi.c
> @@ -530,7 +530,7 @@ static const struct file_operations mem_write_ops = {
>  	.release        = single_release,
>  };
>  
> -#define tpmi_to_dev(info)	(&info->vsec_dev->pcidev->dev)
> +#define tpmi_to_dev(info)	((info)->vsec_dev->dev)
>  
>  static void tpmi_dbgfs_register(struct intel_tpmi_info *tpmi_info)
>  {
> @@ -642,7 +642,7 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
>  		tmp->flags = IORESOURCE_MEM;
>  	}
>  
> -	feature_vsec_dev->pcidev = vsec_dev->pcidev;
> +	feature_vsec_dev->dev = vsec_dev->dev;
>  	feature_vsec_dev->resource = res;
>  	feature_vsec_dev->num_resources = pfs->pfs_header.num_entries;
>  	feature_vsec_dev->priv_data = &tpmi_info->plat_info;
> @@ -742,7 +742,7 @@ static int tpmi_fetch_pfs_header(struct intel_tpmi_pm_feature *pfs, u64 start, i
>  static int intel_vsec_tpmi_init(struct auxiliary_device *auxdev)
>  {
>  	struct intel_vsec_device *vsec_dev = auxdev_to_ivdev(auxdev);
> -	struct pci_dev *pci_dev = vsec_dev->pcidev;
> +	struct pci_dev *pci_dev = to_pci_dev(vsec_dev->dev);
>  	struct intel_tpmi_info *tpmi_info;
>  	u64 pfs_start = 0;
>  	int ret, i;
> diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h
> index 28c2f5855a11..931ff42361a9 100644
> --- a/include/linux/intel_vsec.h
> +++ b/include/linux/intel_vsec.h
> @@ -29,8 +29,8 @@
>  #define INTEL_DVSEC_TABLE_OFFSET(x)	((x) & GENMASK(31, 3))
>  #define TABLE_OFFSET_SHIFT		3
>  
> -struct pci_dev;
>  struct resource;
> +struct pci_dev;

???? :-D

+ struct device;

(into alphabetical order).

>  enum intel_vsec_id {
>  	VSEC_ID_TELEMETRY	= 2,
> @@ -82,14 +82,14 @@ enum intel_vsec_quirks {
>   * struct pmt_callbacks - Callback infrastructure for PMT devices
>   * ->read_telem() when specified, called by client driver to access PMT data (instead
>   * of direct copy).
> - * @pdev:  PCI device reference for the callback's use
> + * @dev:   device reference for the callback's use
>   * @guid:  ID of data to acccss
>   * @data:  buffer for the data to be copied
>   * @off:   offset into the requested buffer
>   * @count: size of buffer
>   */
>  struct pmt_callbacks {
> -	int (*read_telem)(struct pci_dev *pdev, u32 guid, u64 *data, loff_t off, u32 count);
> +	int (*read_telem)(struct device *dev, u32 guid, u64 *data, loff_t off, u32 count);
>  };
>  
>  struct vsec_feature_dependency {
> @@ -122,7 +122,7 @@ struct intel_vsec_platform_info {
>  /**
>   * struct intel_sec_device - Auxbus specific device information
>   * @auxdev:        auxbus device struct for auxbus access
> - * @pcidev:        pci device associated with the device
> + * @dev:           struct device associated with the device
>   * @resource:      any resources shared by the parent
>   * @ida:           id reference
>   * @num_resources: number of resources
> @@ -134,7 +134,7 @@ struct intel_vsec_platform_info {
>   */
>  struct intel_vsec_device {
>  	struct auxiliary_device auxdev;
> -	struct pci_dev *pcidev;
> +	struct device *dev;
>  	struct resource *resource;
>  	struct ida *ida;
>  	int num_resources;
> @@ -198,14 +198,14 @@ static inline struct intel_vsec_device *auxdev_to_ivdev(struct auxiliary_device
>  }
>  
>  #if IS_ENABLED(CONFIG_INTEL_VSEC)
> -int intel_vsec_register(struct pci_dev *pdev,
> -			 struct intel_vsec_platform_info *info);
> +int intel_vsec_register(struct device *dev,
> +			struct intel_vsec_platform_info *info);
>  int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,
>  			   struct intel_vsec_device *vsec_dev);
>  struct oobmsm_plat_info *intel_vsec_get_mapping(struct pci_dev *pdev);
>  #else
> -static inline int intel_vsec_register(struct pci_dev *pdev,
> -				       struct intel_vsec_platform_info *info)
> +static inline int intel_vsec_register(struct device *dev,
> +				      struct intel_vsec_platform_info *info)
>  {
>  	return -ENODEV;
>  }
> 

-- 
 i.

Re: [PATCH 2/4] platform/x86/intel/vsec: Switch exported helpers from pci_dev to device

[David Box]

On Thu, Jan 15, 2026 at 03:08:09PM +0200, Ilpo Järvinen wrote:
> On Tue, 6 Jan 2026, David E. Box wrote:
> 
> > Preparatory refactor for ACPI-enumerated PMT endpoints. Several exported
> > PMT/VSEC interfaces and structs carried struct pci_dev * even though
> > callers only need a generic struct device. Move those to struct device * so
> > the same APIs work for PCI and ACPI parents.
> > 
> > Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> > ---
> >  drivers/gpu/drm/xe/xe_debugfs.c               |  2 +-
> >  drivers/gpu/drm/xe/xe_hwmon.c                 |  2 +-
> >  drivers/gpu/drm/xe/xe_vsec.c                  |  7 +-
> >  drivers/gpu/drm/xe/xe_vsec.h                  |  2 +-
> >  drivers/platform/x86/intel/pmc/core.c         |  4 +-
> >  .../platform/x86/intel/pmc/ssram_telemetry.c  |  2 +-
> >  drivers/platform/x86/intel/pmt/class.c        |  8 +-
> >  drivers/platform/x86/intel/pmt/class.h        |  4 +-
> >  drivers/platform/x86/intel/pmt/discovery.c    |  4 +-
> >  drivers/platform/x86/intel/pmt/telemetry.c    | 13 ++--
> >  drivers/platform/x86/intel/pmt/telemetry.h    | 11 ++-
> >  drivers/platform/x86/intel/sdsi.c             |  5 +-
> >  drivers/platform/x86/intel/vsec.c             | 74 +++++++++++--------
> >  drivers/platform/x86/intel/vsec_tpmi.c        |  6 +-
> >  include/linux/intel_vsec.h                    | 18 ++---
> >  15 files changed, 86 insertions(+), 76 deletions(-)
> > 
> 

...

> > @@ -630,7 +634,7 @@ static void intel_vsec_skip_missing_dependencies(struct pci_dev *pdev)
> >  
> >  static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> >  {
> > -	struct intel_vsec_platform_info *info;
> > +	struct intel_vsec_platform_info info, *info_temp;
> >  	struct vsec_priv *priv;
> >  	int num_caps, ret;
> >  	int run_once = 0;
> > @@ -641,22 +645,25 @@ static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id
> >  		return ret;
> >  
> >  	pci_save_state(pdev);
> > -	info = (struct intel_vsec_platform_info *)id->driver_data;
> > -	if (!info)
> > +	info_temp = (struct intel_vsec_platform_info *)id->driver_data;
> > +	if (!info_temp)
> >  		return -EINVAL;
> >  
> > +	/* XXX: Needs better fix */
> > +	info = *info_temp;
> > +
> >  	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
> >  	if (!priv)
> >  		return -ENOMEM;
> >  
> > -	priv->info = info;
> > +	priv->info = &info;
> >  	pci_set_drvdata(pdev, priv);
> 
> What's going on here??? 'info' is a stack variable and you're taking 
> a pointer of it into priv/drvdata??

Oy vey. This chunk shouldn't even be here. It was part of an incomplete
refactor of code from heap to stack that I ended up dropping anyway.
Sorry for the noise. Ack on everything else. Thanks Ilpo.

David

[PATCH 3/4] platform/x86/intel/vsec: Return real error codes from registration path

[David E. Box]

Stop collapsing registration results into booleans. Make
intel_vsec_walk_header() return int and propagate the first non-zero error
from intel_vsec_register_device(). intel_vsec_register() now returns that
error directly and 0 on success.

This preserves success behavior while surfacing meaningful errors instead
of hiding them behind a bool/-ENODEV, which makes debugging and probe
ordering issues clearer.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
 drivers/platform/x86/intel/vsec.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index b84bb92624ef..42471fd609b1 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -461,20 +461,19 @@ static int intel_vsec_register_device(struct device *dev,
 	return -EAGAIN;
 }
 
-static bool intel_vsec_walk_header(struct device *dev,
-				   struct intel_vsec_platform_info *info)
+static int intel_vsec_walk_header(struct device *dev,
+				  struct intel_vsec_platform_info *info)
 {
 	struct intel_vsec_header **header = info->headers;
-	bool have_devices = false;
 	int ret;
 
 	for ( ; *header; header++) {
 		ret = intel_vsec_register_device(dev, *header, info);
-		if (!ret)
-			have_devices = true;
+		if (ret)
+			return ret;
 	}
 
-	return have_devices;
+	return 0;
 }
 
 static bool intel_vsec_walk_dvsec(struct pci_dev *pdev,
@@ -582,10 +581,7 @@ int intel_vsec_register(struct device *dev,
 	if (!dev || !info || !info->headers)
 		return -EINVAL;
 
-	if (!intel_vsec_walk_header(dev, info))
-		return -ENODEV;
-	else
-		return 0;
+	return intel_vsec_walk_header(dev, info);
 }
 EXPORT_SYMBOL_NS_GPL(intel_vsec_register, "INTEL_VSEC");
 
-- 
2.43.0

Re: [PATCH 3/4] platform/x86/intel/vsec: Return real error codes from registration path

[Ilpo Järvinen]

[-- Attachment #1: Type: text/plain, Size: 2047 bytes --]

On Tue, 6 Jan 2026, David E. Box wrote:

> Stop collapsing registration results into booleans. Make
> intel_vsec_walk_header() return int and propagate the first non-zero error
> from intel_vsec_register_device(). intel_vsec_register() now returns that
> error directly and 0 on success.
> 
> This preserves success behavior while surfacing meaningful errors instead
> of hiding them behind a bool/-ENODEV, which makes debugging and probe
> ordering issues clearer.
> 
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> ---
>  drivers/platform/x86/intel/vsec.c | 16 ++++++----------
>  1 file changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
> index b84bb92624ef..42471fd609b1 100644
> --- a/drivers/platform/x86/intel/vsec.c
> +++ b/drivers/platform/x86/intel/vsec.c
> @@ -461,20 +461,19 @@ static int intel_vsec_register_device(struct device *dev,
>  	return -EAGAIN;
>  }
>  
> -static bool intel_vsec_walk_header(struct device *dev,
> -				   struct intel_vsec_platform_info *info)
> +static int intel_vsec_walk_header(struct device *dev,
> +				  struct intel_vsec_platform_info *info)
>  {
>  	struct intel_vsec_header **header = info->headers;
> -	bool have_devices = false;
>  	int ret;
>  
>  	for ( ; *header; header++) {
>  		ret = intel_vsec_register_device(dev, *header, info);
> -		if (!ret)
> -			have_devices = true;
> +		if (ret)
> +			return ret;
>  	}
>  
> -	return have_devices;
> +	return 0;
>  }
>  
>  static bool intel_vsec_walk_dvsec(struct pci_dev *pdev,
> @@ -582,10 +581,7 @@ int intel_vsec_register(struct device *dev,
>  	if (!dev || !info || !info->headers)
>  		return -EINVAL;
>  
> -	if (!intel_vsec_walk_header(dev, info))
> -		return -ENODEV;
> -	else
> -		return 0;
> +	return intel_vsec_walk_header(dev, info);
>  }
>  EXPORT_SYMBOL_NS_GPL(intel_vsec_register, "INTEL_VSEC");
>  
> 

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

-- 
 i.

[PATCH 4/4] platform/x86/intel/vsec: Plumb ACPI PMT discovery tables through vsec

[David E. Box]

Newer platform will optionally expose PMT discovery via ACPI instead of PCI
BARs. Add a generic discovery source flag and carry ACPI discovery entries
alongside the existing PCI resource path so PMT clients can consume either.

Changes:
  - Add enum intel_vsec_disc_source { _PCI, _ACPI }.
  - Extend intel_vsec_platform_info and intel_vsec_device with source enum
    and ACPI discovery table pointer/
  - When src==ACPI, skip BAR resource setup and copy the ACPI discovery
    entries into the aux device.

No user-visible behavior change yet; this only wires ACPI data through vsec
in preparation for ACPI-enumerated PMT clients.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
 drivers/platform/x86/intel/vsec.c | 16 ++++++++++++++++
 include/linux/intel_vsec.h        | 20 +++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index 42471fd609b1..705672dcdd11 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -109,6 +109,7 @@ static void intel_vsec_dev_release(struct device *dev)
 
 	ida_free(intel_vsec_dev->ida, intel_vsec_dev->auxdev.id);
 
+	kfree(intel_vsec_dev->acpi_disc);
 	kfree(intel_vsec_dev->resource);
 	kfree(intel_vsec_dev);
 }
@@ -321,6 +322,10 @@ static int intel_vsec_add_dev(struct device *dev, struct intel_vsec_header *head
 	 * auxiliary device driver.
 	 */
 	for (i = 0, tmp = res; i < header->num_entries; i++, tmp++) {
+		/* This check doesn't apply to ACPI based discovery */
+		if (info->src == INTEL_VSEC_DISC_ACPI)
+			break;
+
 		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;
@@ -339,6 +344,17 @@ static int intel_vsec_add_dev(struct device *dev, struct intel_vsec_header *head
 	intel_vsec_dev->base_addr = info->base_addr;
 	intel_vsec_dev->priv_data = info->priv_data;
 	intel_vsec_dev->cap_id = cap_id;
+	intel_vsec_dev->src = info->src;
+
+	if (info->src == INTEL_VSEC_DISC_ACPI) {
+		size_t bytes;
+
+		bytes = intel_vsec_dev->num_resources * sizeof(info->acpi_disc[0]);
+
+		intel_vsec_dev->acpi_disc = kmemdup(info->acpi_disc, bytes, GFP_KERNEL);
+		if (!intel_vsec_dev->acpi_disc)
+			return -ENOMEM;
+	}
 
 	if (header->id == VSEC_ID_SDSI)
 		intel_vsec_dev->ida = &intel_vsec_sdsi_ida;
diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h
index 931ff42361a9..9d7795480c49 100644
--- a/include/linux/intel_vsec.h
+++ b/include/linux/intel_vsec.h
@@ -32,6 +32,11 @@
 struct resource;
 struct pci_dev;
 
+enum intel_vsec_disc_source {
+	INTEL_VSEC_DISC_PCI,	/* PCI, default */
+	INTEL_VSEC_DISC_ACPI,	/* ACPI */
+};
+
 enum intel_vsec_id {
 	VSEC_ID_TELEMETRY	= 2,
 	VSEC_ID_WATCHER		= 3,
@@ -102,6 +107,10 @@ struct vsec_feature_dependency {
  * @parent:    parent device in the auxbus chain
  * @headers:   list of headers to define the PMT client devices to create
  * @deps:      array of feature dependencies
+ * @acpi_disc: ACPI discovery tables, each entry is two QWORDs
+ *             in little-endian format as defined by the PMT ACPI spec.
+ *             Valid only when @provider == INTEL_VSEC_PROV_ACPI.
+ * @src:       source of discovery table data
  * @priv_data: private data, usable by parent devices, currently a callback
  * @caps:      bitmask of PMT capabilities for the given headers
  * @quirks:    bitmask of VSEC device quirks
@@ -112,6 +121,8 @@ struct intel_vsec_platform_info {
 	struct device *parent;
 	struct intel_vsec_header **headers;
 	const struct vsec_feature_dependency *deps;
+	u32 (*acpi_disc)[4];
+	enum intel_vsec_disc_source src;
 	void *priv_data;
 	unsigned long caps;
 	unsigned long quirks;
@@ -123,7 +134,12 @@ struct intel_vsec_platform_info {
  * struct intel_sec_device - Auxbus specific device information
  * @auxdev:        auxbus device struct for auxbus access
  * @dev:           struct device associated with the device
- * @resource:      any resources shared by the parent
+ * @resource:      PCI discovery resources (BAR windows), one per discovery
+ *                 instance. Valid only when @src == INTEL_VSEC_PROV_PCI
+ * @acpi_disc:     ACPI discovery tables, each entry is two QWORDs
+ *                 in little-endian format as defined by the PMT ACPI spec.
+ *                 Valid only when @src == INTEL_VSEC_PROV_ACPI.
+ * @src:           source of discovery table data
  * @ida:           id reference
  * @num_resources: number of resources
  * @id:            xarray id
@@ -136,6 +152,8 @@ struct intel_vsec_device {
 	struct auxiliary_device auxdev;
 	struct device *dev;
 	struct resource *resource;
+	u32 (*acpi_disc)[4];
+	enum intel_vsec_disc_source src;
 	struct ida *ida;
 	int num_resources;
 	int id; /* xa */
-- 
2.43.0

Re: [PATCH 4/4] platform/x86/intel/vsec: Plumb ACPI PMT discovery tables through vsec

[Ilpo Järvinen]

On Tue, 6 Jan 2026, David E. Box wrote:

> Newer platform will optionally expose PMT discovery via ACPI instead of PCI
> BARs. Add a generic discovery source flag and carry ACPI discovery entries
> alongside the existing PCI resource path so PMT clients can consume either.
> 
> Changes:
>   - Add enum intel_vsec_disc_source { _PCI, _ACPI }.
>   - Extend intel_vsec_platform_info and intel_vsec_device with source enum
>     and ACPI discovery table pointer/
>   - When src==ACPI, skip BAR resource setup and copy the ACPI discovery
>     entries into the aux device.
> 
> No user-visible behavior change yet; this only wires ACPI data through vsec
> in preparation for ACPI-enumerated PMT clients.
> 
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> ---
>  drivers/platform/x86/intel/vsec.c | 16 ++++++++++++++++
>  include/linux/intel_vsec.h        | 20 +++++++++++++++++++-
>  2 files changed, 35 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
> index 42471fd609b1..705672dcdd11 100644
> --- a/drivers/platform/x86/intel/vsec.c
> +++ b/drivers/platform/x86/intel/vsec.c
> @@ -109,6 +109,7 @@ static void intel_vsec_dev_release(struct device *dev)
>  
>  	ida_free(intel_vsec_dev->ida, intel_vsec_dev->auxdev.id);
>  
> +	kfree(intel_vsec_dev->acpi_disc);
>  	kfree(intel_vsec_dev->resource);
>  	kfree(intel_vsec_dev);
>  }
> @@ -321,6 +322,10 @@ static int intel_vsec_add_dev(struct device *dev, struct intel_vsec_header *head
>  	 * auxiliary device driver.
>  	 */
>  	for (i = 0, tmp = res; i < header->num_entries; i++, tmp++) {
> +		/* This check doesn't apply to ACPI based discovery */

"This check" is somewhat vague, if it doesn't require a novel, it would be 
better to write out what check.

> +		if (info->src == INTEL_VSEC_DISC_ACPI)
> +			break;
> +
>  		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;
> @@ -339,6 +344,17 @@ static int intel_vsec_add_dev(struct device *dev, struct intel_vsec_header *head
>  	intel_vsec_dev->base_addr = info->base_addr;
>  	intel_vsec_dev->priv_data = info->priv_data;
>  	intel_vsec_dev->cap_id = cap_id;
> +	intel_vsec_dev->src = info->src;
> +
> +	if (info->src == INTEL_VSEC_DISC_ACPI) {
> +		size_t bytes;
> +
> +		bytes = intel_vsec_dev->num_resources * sizeof(info->acpi_disc[0]);

Should this use some overflow.h helper?

> +
> +		intel_vsec_dev->acpi_disc = kmemdup(info->acpi_disc, bytes, GFP_KERNEL);

include for kmemdup() seems missing.

> +		if (!intel_vsec_dev->acpi_disc)
> +			return -ENOMEM;
> +	}
>  
>  	if (header->id == VSEC_ID_SDSI)
>  		intel_vsec_dev->ida = &intel_vsec_sdsi_ida;
> diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h
> index 931ff42361a9..9d7795480c49 100644
> --- a/include/linux/intel_vsec.h
> +++ b/include/linux/intel_vsec.h
> @@ -32,6 +32,11 @@
>  struct resource;
>  struct pci_dev;
>  
> +enum intel_vsec_disc_source {
> +	INTEL_VSEC_DISC_PCI,	/* PCI, default */
> +	INTEL_VSEC_DISC_ACPI,	/* ACPI */
> +};
> +
>  enum intel_vsec_id {
>  	VSEC_ID_TELEMETRY	= 2,
>  	VSEC_ID_WATCHER		= 3,
> @@ -102,6 +107,10 @@ struct vsec_feature_dependency {
>   * @parent:    parent device in the auxbus chain
>   * @headers:   list of headers to define the PMT client devices to create
>   * @deps:      array of feature dependencies
> + * @acpi_disc: ACPI discovery tables, each entry is two QWORDs
> + *             in little-endian format as defined by the PMT ACPI spec.
> + *             Valid only when @provider == INTEL_VSEC_PROV_ACPI.
> + * @src:       source of discovery table data
>   * @priv_data: private data, usable by parent devices, currently a callback
>   * @caps:      bitmask of PMT capabilities for the given headers
>   * @quirks:    bitmask of VSEC device quirks
> @@ -112,6 +121,8 @@ struct intel_vsec_platform_info {
>  	struct device *parent;
>  	struct intel_vsec_header **headers;
>  	const struct vsec_feature_dependency *deps;
> +	u32 (*acpi_disc)[4];
> +	enum intel_vsec_disc_source src;
>  	void *priv_data;
>  	unsigned long caps;
>  	unsigned long quirks;
> @@ -123,7 +134,12 @@ struct intel_vsec_platform_info {
>   * struct intel_sec_device - Auxbus specific device information
>   * @auxdev:        auxbus device struct for auxbus access
>   * @dev:           struct device associated with the device
> - * @resource:      any resources shared by the parent
> + * @resource:      PCI discovery resources (BAR windows), one per discovery
> + *                 instance. Valid only when @src == INTEL_VSEC_PROV_PCI
> + * @acpi_disc:     ACPI discovery tables, each entry is two QWORDs
> + *                 in little-endian format as defined by the PMT ACPI spec.
> + *                 Valid only when @src == INTEL_VSEC_PROV_ACPI.
> + * @src:           source of discovery table data
>   * @ida:           id reference
>   * @num_resources: number of resources
>   * @id:            xarray id
> @@ -136,6 +152,8 @@ struct intel_vsec_device {
>  	struct auxiliary_device auxdev;
>  	struct device *dev;
>  	struct resource *resource;
> +	u32 (*acpi_disc)[4];
> +	enum intel_vsec_disc_source src;
>  	struct ida *ida;
>  	int num_resources;
>  	int id; /* xa */
> 

-- 
 i.