Enable DSM pass thru for root functions

The new ACPI 6.2 spec has added new NVDIMM root DSM functions that managibility and test software needs to call.

This patch set enables the calling root functions DSM via the pass thru mechanism.

Changes v2
----------
1. Add bus_dsm_mask to filter root pass thru calls.

2. Add bus_dsm_mask_show to display bus_dsm_mask in sysfs

3. Extend override_dsm_mask to be used for bus_dms_mask also.

Details v1
----------

__nd_ioctl:
Check pass thru functions against nd_cmd_clear_to_send.

acpi_nfit_init_dsms:
Set additional bits in cmd_mask for new functions.

ndctl.h:
Define data structure for the new 6.2 functions.
Add new function names to nvdimm_bus_cmd_name.

Jerry Hoemann (7):
libnvdimm: passthru functions clear to send acpi, nfit: Enable DSM pass thru for root functions.
libnvdimm: Add bus level dsm mask.
acpi, nfit: Use bus_dsm_mask for passthru acpi, nfit: Show bus_dsm_mask
libnvdimm: New ACPI 6.2 DSM functions
acpi, nfit: override mask

 drivers/acpi/nfit/core.c   | 20 ++++++++++++++++++++
 drivers/nvdimm/bus.c       |  4 +++-
 include/linux/libnvdimm.h  |  1 +
 include/uapi/linux/ndctl.h | 41 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 64 insertions(+), 2 deletions(-)

Signature · 1 line

1.8.5.6

Add bus_dsm_mask to sysfs display under /sys/bus/nd/devices/ndbusX/nfit.

Signed-off-by Jerry Hoemann <[email protected]>

---
 drivers/acpi/nfit/core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

drivers/acpi/nfit/core.c +9 -0

index 9d281a4..f133b3e 100644
@@ -928,6 +928,15 @@ static int nfit_mem_init(struct acpi_nfit_desc *acpi_desc)
        return 0;
 }
 
+static ssize_t bus_dsm_mask_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev);
+       struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);
+       return sprintf(buf, "%#lx\n", nd_desc->bus_dsm_mask);
+}
+static DEVICE_ATTR_RO(bus_dsm_mask);
+
 static ssize_t revision_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {

Populate bus_dsm_mask and use it to filter dsm calls that user can make through the pass thru interface.

Signed-off-by Jerry Hoemann <[email protected]>

---
 drivers/acpi/nfit/core.c | 4 ++++
 1 file changed, 4 insertions(+)

drivers/acpi/nfit/core.c +0 -0

index b46fca2..9d281a4 100644

ACPI 6.2 added new NVDIMM root DSM functions. Define their data structures.

Update the definition of nd_cmd_ars_cap to match the 6.2 spec.

Add the new 6.2 functions names to nvdimm_bus_cmd_name.

Quoted 32 lines · Jerry Hoemann

Add bus_dsm_mask to sysfs display under /sys/bus/nd/devices/ndbusX/nfit.

Signed-off-by Jerry Hoemann <[email protected]>

---
 drivers/acpi/nfit/core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

drivers/acpi/nfit/core.c +10 -0

index 9d281a4..f133b3e 100644
@@ -928,6 +928,15 @@ static int nfit_mem_init(struct acpi_nfit_desc *acpi_desc)
        return 0;
 }
 
+static ssize_t bus_dsm_mask_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev);
+       struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);
+       return sprintf(buf, "%#lx\n", nd_desc->bus_dsm_mask);
+}
+static DEVICE_ATTR_RO(bus_dsm_mask);
+
 static ssize_t revision_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {

@@ -1064,6 +1073,7 @@ static umode_t nfit_visible(struct kobject *kobj, struct attribute *a, int n)
        &dev_attr_revision.attr,
        &dev_attr_scrub.attr,
        &dev_attr_hw_error_scrub.attr,
+       &dev_attr_bus_dsm_mask.attr,

drivers/acpi/nfit/core.c static umode_t nfit_visible(struct kobject *kobj, struct attribute *a, int n) · line 1078

Quoted 2 lines

drivers/acpi/nfit/core.c +0 -0

        NULL,
 };

I think it's redundant to keep 'bus_' in the name of the attribute since 'bus' is included in the sysfs path. You can use DEVICE_ATTR() instead of DEVICE_ATTR_RO() to specify the attribute name manually, and get around the collision with the existing dsm_mash_show() routine.

Quoted 33 lines · Dan Williams

Quoted 32 lines · Jerry Hoemann

Add bus_dsm_mask to sysfs display under /sys/bus/nd/devices/ndbusX/nfit.

Signed-off-by Jerry Hoemann <[email protected]>

---
 drivers/acpi/nfit/core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

drivers/acpi/nfit/core.c +10 -0

index 9d281a4..f133b3e 100644
@@ -928,6 +928,15 @@ static int nfit_mem_init(struct acpi_nfit_desc *acpi_desc)
        return 0;
 }
 
+static ssize_t bus_dsm_mask_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev);
+       struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);
+       return sprintf(buf, "%#lx\n", nd_desc->bus_dsm_mask);
+}
+static DEVICE_ATTR_RO(bus_dsm_mask);
+
 static ssize_t revision_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {

@@ -1064,6 +1073,7 @@ static umode_t nfit_visible(struct kobject *kobj, struct attribute *a, int n)
        &dev_attr_revision.attr,
        &dev_attr_scrub.attr,
        &dev_attr_hw_error_scrub.attr,
+       &dev_attr_bus_dsm_mask.attr,

Quoted 8 lines

drivers/acpi/nfit/core.c static umode_t nfit_visible(struct kobject *kobj, struct attribute *a, int n) · line 1078

Quoted 2 lines

drivers/acpi/nfit/core.c +0 -0

        NULL,
 };

I think it's redundant to keep 'bus_' in the name of the attribute since 'bus' is included in the sysfs path. You can use DEVICE_ATTR() instead of DEVICE_ATTR_RO() to specify the attribute name manually, and get around the collision with the existing dsm_mash_show() routine.

DEVICE_ATTR and DEVICE_ATTR_RO uses the same tokenization & stringification schemes, so that doesn't disambiguate. They need to be different case sensitive names if they are to be in same source file.

Do you want me to change name to root_dsm_mask? or change case: DSM_MASK?

Quoted 47 lines · Jerry Hoemann

Quoted 33 lines · Dan Williams

Quoted 32 lines · Jerry Hoemann

Add bus_dsm_mask to sysfs display under /sys/bus/nd/devices/ndbusX/nfit.

Signed-off-by Jerry Hoemann <[email protected]>

---
 drivers/acpi/nfit/core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

drivers/acpi/nfit/core.c +10 -0

index 9d281a4..f133b3e 100644
@@ -928,6 +928,15 @@ static int nfit_mem_init(struct acpi_nfit_desc *acpi_desc)
        return 0;
 }
 
+static ssize_t bus_dsm_mask_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev);
+       struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);
+       return sprintf(buf, "%#lx\n", nd_desc->bus_dsm_mask);
+}
+static DEVICE_ATTR_RO(bus_dsm_mask);
+
 static ssize_t revision_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {

@@ -1064,6 +1073,7 @@ static umode_t nfit_visible(struct kobject *kobj, struct attribute *a, int n)
        &dev_attr_revision.attr,
        &dev_attr_scrub.attr,
        &dev_attr_hw_error_scrub.attr,
+       &dev_attr_bus_dsm_mask.attr,

Quoted 8 lines

drivers/acpi/nfit/core.c static umode_t nfit_visible(struct kobject *kobj, struct attribute *a, int n) · line 1078

Quoted 2 lines

drivers/acpi/nfit/core.c +0 -0

        NULL,
 };

I think it's redundant to keep 'bus_' in the name of the attribute since 'bus' is included in the sysfs path. You can use DEVICE_ATTR() instead of DEVICE_ATTR_RO() to specify the attribute name manually, and get around the collision with the existing dsm_mash_show() routine.

DEVICE_ATTR and DEVICE_ATTR_RO uses the same tokenization & stringification schemes, so that doesn't disambiguate. They need to be different case sensitive names if they are to be in same source file.

Quoted 1 line

Do you want me to change name to root_dsm_mask? or change case: DSM_MASK?

I'm saying do something like this:

   DEVICE_ATTR(dsm_mask, 0444, bus_dsm_mask_show, NULL)

...so that the attribute name in sysfs is just 'dsm_mask'.