tools/testing/nvdimm: Prepare nfit_ctl_test() for ND_CMD_CALL emulation

In preparation for adding a mocked implementation of the
firmware-activate bus-info command, rework nfit_ctl_test() to operate on
a local command payload wrapped in a 'struct nd_cmd_pkg'.

Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index 9c6f475..2b0bfbf 100644 (file)
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -2726,14 +2726,17 @@ static int nfit_ctl_test(struct device *dev)
        struct acpi_nfit_desc *acpi_desc;
        const u64 test_val = 0x0123456789abcdefULL;
        unsigned long mask, cmd_size, offset;
-       union {
-               struct nd_cmd_get_config_size cfg_size;
-               struct nd_cmd_clear_error clear_err;
-               struct nd_cmd_ars_status ars_stat;
-               struct nd_cmd_ars_cap ars_cap;
-               char buf[sizeof(struct nd_cmd_ars_status)
-                       + sizeof(struct nd_ars_record)];
-       } cmds;
+       struct nfit_ctl_test_cmd {
+               struct nd_cmd_pkg pkg;
+               union {
+                       struct nd_cmd_get_config_size cfg_size;
+                       struct nd_cmd_clear_error clear_err;
+                       struct nd_cmd_ars_status ars_stat;
+                       struct nd_cmd_ars_cap ars_cap;
+                       char buf[sizeof(struct nd_cmd_ars_status)
+                               + sizeof(struct nd_ars_record)];
+               };
+       } cmd;
 
        adev = devm_kzalloc(dev, sizeof(*adev), GFP_KERNEL);
        if (!adev)
@@ -2793,21 +2796,21 @@ static int nfit_ctl_test(struct device *dev)
 
 
        /* basic checkout of a typical 'get config size' command */
-       cmd_size = sizeof(cmds.cfg_size);
-       cmds.cfg_size = (struct nd_cmd_get_config_size) {
+       cmd_size = sizeof(cmd.cfg_size);
+       cmd.cfg_size = (struct nd_cmd_get_config_size) {
                .status = 0,
                .config_size = SZ_128K,
                .max_xfer = SZ_4K,
        };
-       rc = setup_result(cmds.buf, cmd_size);
+       rc = setup_result(cmd.buf, cmd_size);
        if (rc)
                return rc;
        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, nvdimm, ND_CMD_GET_CONFIG_SIZE,
-                       cmds.buf, cmd_size, &cmd_rc);
+                       cmd.buf, cmd_size, &cmd_rc);
 
-       if (rc < 0 || cmd_rc || cmds.cfg_size.status != 0
-                       || cmds.cfg_size.config_size != SZ_128K
-                       || cmds.cfg_size.max_xfer != SZ_4K) {
+       if (rc < 0 || cmd_rc || cmd.cfg_size.status != 0
+                       || cmd.cfg_size.config_size != SZ_128K
+                       || cmd.cfg_size.max_xfer != SZ_4K) {
                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
                                __func__, __LINE__, rc, cmd_rc);
                return -EIO;
@@ -2816,14 +2819,14 @@ static int nfit_ctl_test(struct device *dev)
 
        /* test ars_status with zero output */
        cmd_size = offsetof(struct nd_cmd_ars_status, address);
-       cmds.ars_stat = (struct nd_cmd_ars_status) {
+       cmd.ars_stat = (struct nd_cmd_ars_status) {
                .out_length = 0,
        };
-       rc = setup_result(cmds.buf, cmd_size);
+       rc = setup_result(cmd.buf, cmd_size);
        if (rc)
                return rc;
        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_STATUS,
-                       cmds.buf, cmd_size, &cmd_rc);
+                       cmd.buf, cmd_size, &cmd_rc);
 
        if (rc < 0 || cmd_rc) {
                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
@@ -2833,16 +2836,16 @@ static int nfit_ctl_test(struct device *dev)
 
 
        /* test ars_cap with benign extended status */
-       cmd_size = sizeof(cmds.ars_cap);
-       cmds.ars_cap = (struct nd_cmd_ars_cap) {
+       cmd_size = sizeof(cmd.ars_cap);
+       cmd.ars_cap = (struct nd_cmd_ars_cap) {
                .status = ND_ARS_PERSISTENT << 16,
        };
        offset = offsetof(struct nd_cmd_ars_cap, status);
-       rc = setup_result(cmds.buf + offset, cmd_size - offset);
+       rc = setup_result(cmd.buf + offset, cmd_size - offset);
        if (rc)
                return rc;
        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_CAP,
-                       cmds.buf, cmd_size, &cmd_rc);
+                       cmd.buf, cmd_size, &cmd_rc);
 
        if (rc < 0 || cmd_rc) {
                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
@@ -2852,19 +2855,19 @@ static int nfit_ctl_test(struct device *dev)
 
 
        /* test ars_status with 'status' trimmed from 'out_length' */
-       cmd_size = sizeof(cmds.ars_stat) + sizeof(struct nd_ars_record);
-       cmds.ars_stat = (struct nd_cmd_ars_status) {
+       cmd_size = sizeof(cmd.ars_stat) + sizeof(struct nd_ars_record);
+       cmd.ars_stat = (struct nd_cmd_ars_status) {
                .out_length = cmd_size - 4,
        };
-       record = &cmds.ars_stat.records[0];
+       record = &cmd.ars_stat.records[0];
        *record = (struct nd_ars_record) {
                .length = test_val,
        };
-       rc = setup_result(cmds.buf, cmd_size);
+       rc = setup_result(cmd.buf, cmd_size);
        if (rc)
                return rc;
        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_STATUS,
-                       cmds.buf, cmd_size, &cmd_rc);
+                       cmd.buf, cmd_size, &cmd_rc);
 
        if (rc < 0 || cmd_rc || record->length != test_val) {
                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
@@ -2874,19 +2877,19 @@ static int nfit_ctl_test(struct device *dev)
 
 
        /* test ars_status with 'Output (Size)' including 'status' */
-       cmd_size = sizeof(cmds.ars_stat) + sizeof(struct nd_ars_record);
-       cmds.ars_stat = (struct nd_cmd_ars_status) {
+       cmd_size = sizeof(cmd.ars_stat) + sizeof(struct nd_ars_record);
+       cmd.ars_stat = (struct nd_cmd_ars_status) {
                .out_length = cmd_size,
        };
-       record = &cmds.ars_stat.records[0];
+       record = &cmd.ars_stat.records[0];
        *record = (struct nd_ars_record) {
                .length = test_val,
        };
-       rc = setup_result(cmds.buf, cmd_size);
+       rc = setup_result(cmd.buf, cmd_size);
        if (rc)
                return rc;
        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_STATUS,
-                       cmds.buf, cmd_size, &cmd_rc);
+                       cmd.buf, cmd_size, &cmd_rc);
 
        if (rc < 0 || cmd_rc || record->length != test_val) {
                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
@@ -2896,15 +2899,15 @@ static int nfit_ctl_test(struct device *dev)
 
 
        /* test extended status for get_config_size results in failure */
-       cmd_size = sizeof(cmds.cfg_size);
-       cmds.cfg_size = (struct nd_cmd_get_config_size) {
+       cmd_size = sizeof(cmd.cfg_size);
+       cmd.cfg_size = (struct nd_cmd_get_config_size) {
                .status = 1 << 16,
        };
-       rc = setup_result(cmds.buf, cmd_size);
+       rc = setup_result(cmd.buf, cmd_size);
        if (rc)
                return rc;
        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, nvdimm, ND_CMD_GET_CONFIG_SIZE,
-                       cmds.buf, cmd_size, &cmd_rc);
+                       cmd.buf, cmd_size, &cmd_rc);
 
        if (rc < 0 || cmd_rc >= 0) {
                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
@@ -2913,16 +2916,16 @@ static int nfit_ctl_test(struct device *dev)
        }
 
        /* test clear error */
-       cmd_size = sizeof(cmds.clear_err);
-       cmds.clear_err = (struct nd_cmd_clear_error) {
+       cmd_size = sizeof(cmd.clear_err);
+       cmd.clear_err = (struct nd_cmd_clear_error) {
                .length = 512,
                .cleared = 512,
        };
-       rc = setup_result(cmds.buf, cmd_size);
+       rc = setup_result(cmd.buf, cmd_size);
        if (rc)
                return rc;
        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_CLEAR_ERROR,
-                       cmds.buf, cmd_size, &cmd_rc);
+                       cmd.buf, cmd_size, &cmd_rc);
        if (rc < 0 || cmd_rc) {
                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
                                __func__, __LINE__, rc, cmd_rc);