| Message ID | 166863355850.80269.1180196889555844539.stgit@djiang5-desk3.ch.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce security commands for CXL pmem device | expand |
Dave Jiang wrote: > Add provider name in order to associate cxl test dimm from cxl_test to the > cxl pmem device when going through sysfs for security testing. > > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > Documentation/ABI/testing/sysfs-bus-nvdimm | 6 ++++++ > drivers/cxl/pmem.c | 10 ++++++++++ > 2 files changed, 16 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-bus-nvdimm b/Documentation/ABI/testing/sysfs-bus-nvdimm > index 91945211e53b..d78e4553d9af 100644 > --- a/Documentation/ABI/testing/sysfs-bus-nvdimm > +++ b/Documentation/ABI/testing/sysfs-bus-nvdimm > @@ -47,3 +47,9 @@ Date: November 2022 > KernelVersion: 6.2 > Contact: Dave Jiang <dave.jiang@intel.com> > Description: (RO) Show the id (serial) of the device. > + > +What: /sys/bus/nd/devices/nmemX/provider This is: /sys/bus/nd/devices/nmemX/cxl/provider > +Date: November 2022 > +KernelVersion: 6.2 > +Contact: Dave Jiang <dave.jiang@intel.com> > +Description: (RO) Shows the provider for the device. (i.e. ACPI.NFIT, ACPI.CXL) To make this more CXL specific I would say: """ Description: (RO) Shows the CXL bridge device that ties a CXL memory device to this NVDIMM device. I.e. the parent of the device returned is a /sys/bus/cxl/devices/memX instance. """ ...because there is no 'provider' attribute under: /sys/bus/nd/devices/nmemX/nfit > diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c > index 9209c7dd72d0..322f834cc27d 100644 > --- a/drivers/cxl/pmem.c > +++ b/drivers/cxl/pmem.c > @@ -48,6 +48,15 @@ static void unregister_nvdimm(void *nvdimm) > cxl_nvd->bridge = NULL; > } > > +static ssize_t provider_show(struct device *dev, struct device_attribute *attr, char *buf) > +{ > + struct nvdimm *nvdimm = to_nvdimm(dev); > + struct cxl_nvdimm *cxl_nvd = nvdimm_provider_data(nvdimm); > + > + return sysfs_emit(buf, "%s\n", dev_name(&cxl_nvd->dev)); > +} > +static DEVICE_ATTR_RO(provider); > + > static ssize_t id_show(struct device *dev, struct device_attribute *attr, char *buf) > { > struct nvdimm *nvdimm = to_nvdimm(dev); > @@ -60,6 +69,7 @@ static DEVICE_ATTR_RO(id); > > static struct attribute *cxl_dimm_attributes[] = { > &dev_attr_id.attr, > + &dev_attr_provider.attr, > NULL > }; > > >
diff --git a/Documentation/ABI/testing/sysfs-bus-nvdimm b/Documentation/ABI/testing/sysfs-bus-nvdimm index 91945211e53b..d78e4553d9af 100644 --- a/Documentation/ABI/testing/sysfs-bus-nvdimm +++ b/Documentation/ABI/testing/sysfs-bus-nvdimm @@ -47,3 +47,9 @@ Date: November 2022 KernelVersion: 6.2 Contact: Dave Jiang <dave.jiang@intel.com> Description: (RO) Show the id (serial) of the device. + +What: /sys/bus/nd/devices/nmemX/provider +Date: November 2022 +KernelVersion: 6.2 +Contact: Dave Jiang <dave.jiang@intel.com> +Description: (RO) Shows the provider for the device. (i.e. ACPI.NFIT, ACPI.CXL) diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index 9209c7dd72d0..322f834cc27d 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -48,6 +48,15 @@ static void unregister_nvdimm(void *nvdimm) cxl_nvd->bridge = NULL; } +static ssize_t provider_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct nvdimm *nvdimm = to_nvdimm(dev); + struct cxl_nvdimm *cxl_nvd = nvdimm_provider_data(nvdimm); + + return sysfs_emit(buf, "%s\n", dev_name(&cxl_nvd->dev)); +} +static DEVICE_ATTR_RO(provider); + static ssize_t id_show(struct device *dev, struct device_attribute *attr, char *buf) { struct nvdimm *nvdimm = to_nvdimm(dev); @@ -60,6 +69,7 @@ static DEVICE_ATTR_RO(id); static struct attribute *cxl_dimm_attributes[] = { &dev_attr_id.attr, + &dev_attr_provider.attr, NULL };