platform/x86/intel/pmt: decouple sysfs and namespace

The PMT namespace includes the crashlog sysfs attribute information.
Other crashlog version/types may need different sysfs attributes.
Coupling the attributes with the namespace blocks this usage.

Decouple sysfs attributes from the name space and add them to the
specific entry.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Link: https://lore.kernel.org/r/20250713172943.7335-10-michael.j.ruhl@intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/intel/pmt/class.c
index 5dd80109f5917e30f5f4c2ee3e94343bd526a1b3..edcce340ea674a1fb8d9e0fea22dc37346798a2d 100644 (file)
--- a/drivers/platform/x86/intel/pmt/class.c
+++ b/drivers/platform/x86/intel/pmt/class.c
@@ -316,8 +316,8 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry,
 
        entry->kobj = &dev->kobj;
 
-       if (ns->attr_grp) {
-               ret = sysfs_create_group(entry->kobj, ns->attr_grp);
+       if (entry->attr_grp) {
+               ret = sysfs_create_group(entry->kobj, entry->attr_grp);
                if (ret)
                        goto fail_sysfs_create_group;
        }
@@ -358,8 +358,8 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry,
 fail_add_endpoint:
        sysfs_remove_bin_file(entry->kobj, &entry->pmt_bin_attr);
 fail_ioremap:
-       if (ns->attr_grp)
-               sysfs_remove_group(entry->kobj, ns->attr_grp);
+       if (entry->attr_grp)
+               sysfs_remove_group(entry->kobj, entry->attr_grp);
 fail_sysfs_create_group:
        device_unregister(dev);
 fail_dev_create:
@@ -401,8 +401,8 @@ void intel_pmt_dev_destroy(struct intel_pmt_entry *entry,
        if (entry->size)
                sysfs_remove_bin_file(entry->kobj, &entry->pmt_bin_attr);
 
-       if (ns->attr_grp)
-               sysfs_remove_group(entry->kobj, ns->attr_grp);
+       if (entry->attr_grp)
+               sysfs_remove_group(entry->kobj, entry->attr_grp);
 
        device_unregister(dev);
        xa_erase(ns->xa, entry->devid);

diff --git a/drivers/platform/x86/intel/pmt/class.h b/drivers/platform/x86/intel/pmt/class.h
index ebd49e2cb2d5730ed9b92862dad0f2c70c80e603..3c5ad5f52bca68350343a4b575d5232bf47a5c55 100644 (file)
--- a/drivers/platform/x86/intel/pmt/class.h
+++ b/drivers/platform/x86/intel/pmt/class.h
@@ -43,6 +43,7 @@ struct intel_pmt_entry {
        struct pci_dev          *pcidev;
        struct intel_pmt_header header;
        struct bin_attribute    pmt_bin_attr;
+       const struct attribute_group *attr_grp;
        struct kobject          *kobj;
        void __iomem            *disc_table;
        void __iomem            *base;
@@ -58,7 +59,6 @@ struct intel_pmt_entry {
 struct intel_pmt_namespace {
        const char *name;
        struct xarray *xa;
-       const struct attribute_group *attr_grp;
        int (*pmt_header_decode)(struct intel_pmt_entry *entry,
                                 struct device *dev);
        int (*pmt_add_endpoint)(struct intel_vsec_device *ivdev,

diff --git a/drivers/platform/x86/intel/pmt/crashlog.c b/drivers/platform/x86/intel/pmt/crashlog.c
index 881f4abdae14f205dbc5223d75c71a9efff14a1b..23b3971da40ac119a9586fa2fae472143dc7fabd 100644 (file)
--- a/drivers/platform/x86/intel/pmt/crashlog.c
+++ b/drivers/platform/x86/intel/pmt/crashlog.c
@@ -243,6 +243,8 @@ static int pmt_crashlog_header_decode(struct intel_pmt_entry *entry,
        /* Size is measured in DWORDS, but accessor returns bytes */
        header->size = GET_SIZE(readl(disc_table + SIZE_OFFSET));
 
+       entry->attr_grp = &pmt_crashlog_group;
+
        return 0;
 }
 
@@ -250,7 +252,6 @@ static DEFINE_XARRAY_ALLOC(crashlog_array);
 static struct intel_pmt_namespace pmt_crashlog_ns = {
        .name = "crashlog",
        .xa = &crashlog_array,
-       .attr_grp = &pmt_crashlog_group,
        .pmt_header_decode = pmt_crashlog_header_decode,
 };