nfit, libnvdimm: clarify "commands" vs "_DSMs"

Clarify the distinction between "commands", the ioctls userspace calls
to request the kernel take some action on a given dimm device, and
"_DSMs", the actual function numbers used in the firmware interface to
the DIMM.  _DSMs are ACPI specific whereas commands are Linux kernel
generic.

This is in preparation for breaking the 1:1 implicit relationship
between the kernel ioctl number space and the firmware specific function
numbers.

Cc: Jerry Hoemann <jerry.hoemann@hpe.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

2 files changed, 15 insertions, 10 deletions

diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index d0f35e63640b..1b98e9dc6138 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -175,7 +175,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
         union acpi_object in_obj, in_buf, *out_obj;
         struct device *dev = acpi_desc->dev;
         const char *cmd_name, *dimm_name;
-        unsigned long dsm_mask;
+        unsigned long cmd_mask;
         acpi_handle handle;
         const u8 *uuid;
         u32 offset;
@@ -189,7 +189,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
                         return -ENOTTY;
                 dimm_name = nvdimm_name(nvdimm);
                 cmd_name = nvdimm_cmd_name(cmd);
-                dsm_mask = nfit_mem->dsm_mask;
+                cmd_mask = nvdimm_cmd_mask(nvdimm);
                 desc = nd_cmd_dimm_desc(cmd);
                 uuid = to_nfit_uuid(NFIT_DEV_DIMM);
                 handle = adev->handle;
@@ -197,7 +197,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
                 struct acpi_device *adev = to_acpi_dev(acpi_desc);
 
                 cmd_name = nvdimm_bus_cmd_name(cmd);
-                dsm_mask = nd_desc->dsm_mask;
+                cmd_mask = nd_desc->cmd_mask;
                 desc = nd_cmd_bus_desc(cmd);
                 uuid = to_nfit_uuid(NFIT_DEV_BUS);
                 handle = adev->handle;
@@ -207,7 +207,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
         if (!desc || (cmd && (desc->out_num + desc->in_num == 0)))
                 return -ENOTTY;
 
-        if (!test_bit(cmd, &dsm_mask))
+        if (!test_bit(cmd, &cmd_mask))
                 return -ENOTTY;
 
         in_obj.type = ACPI_TYPE_PACKAGE;
@@ -926,7 +926,8 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc,
         const u8 *uuid = to_nfit_uuid(NFIT_DEV_DIMM);
         int i;
 
-        nfit_mem->dsm_mask = acpi_desc->dimm_dsm_force_en;
+        /* nfit test assumes 1:1 relationship between commands and dsms */
+        nfit_mem->dsm_mask = acpi_desc->dimm_cmd_force_en;
         adev = to_acpi_dev(acpi_desc);
         if (!adev)
                 return 0;
@@ -976,9 +977,13 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)
                 if (rc)
                         continue;
 
+                /*
+                 * For now there is 1:1 relationship between cmd_mask and
+                 * dsm_mask.
+                 */
                 nvdimm = nvdimm_create(acpi_desc->nvdimm_bus, nfit_mem,
                                 acpi_nfit_dimm_attribute_groups,
-                                flags, &nfit_mem->dsm_mask);
+                                flags, nfit_mem->dsm_mask);
                 if (!nvdimm)
                         return -ENOMEM;
 
@@ -1007,14 +1012,14 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc)
         struct acpi_device *adev;
         int i;
 
-        nd_desc->dsm_mask = acpi_desc->bus_dsm_force_en;
+        nd_desc->cmd_mask = acpi_desc->bus_cmd_force_en;
         adev = to_acpi_dev(acpi_desc);
         if (!adev)
                 return;
 
         for (i = ND_CMD_ARS_CAP; i <= ND_CMD_CLEAR_ERROR; i++)
                 if (acpi_check_dsm(adev->handle, uuid, 1, 1ULL << i))
-                        set_bit(i, &nd_desc->dsm_mask);
+                        set_bit(i, &nd_desc->cmd_mask);
 }
 
 static ssize_t range_index_show(struct device *dev,
diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h
index c75576b2d50e..332ee6f01662 100644
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
@@ -132,8 +132,8 @@ struct acpi_nfit_desc {
         size_t ars_status_size;
         struct work_struct work;
         unsigned int cancel:1;
-        unsigned long dimm_dsm_force_en;
-        unsigned long bus_dsm_force_en;
+        unsigned long dimm_cmd_force_en;
+        unsigned long bus_cmd_force_en;
         int (*blk_do_io)(struct nd_blk_region *ndbr, resource_size_t dpa,
                         void *iobuf, u64 len, int rw);
 };