Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm

1 files changed, 11 insertions, 0 deletions

diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index 51cf8256c6cd..90bd2ea41032 100644
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -248,6 +248,8 @@ static int nfit_test_cmd_ars_status(struct nd_cmd_ars_status *nd_cmd,
 
         nd_cmd->out_length = 256;
         nd_cmd->num_records = 0;
+        nd_cmd->address = 0;
+        nd_cmd->length = -1ULL;
         nd_cmd->status = 0;
 
         return 0;
@@ -1088,6 +1090,8 @@ static void nfit_test1_setup(struct nfit_test *t)
         struct acpi_nfit_memory_map *memdev;
         struct acpi_nfit_control_region *dcr;
         struct acpi_nfit_system_address *spa;
+        struct nvdimm_bus_descriptor *nd_desc;
+        struct acpi_nfit_desc *acpi_desc;
 
         offset = 0;
         /* spa0 (flat range with no bdw aliasing) */
@@ -1135,6 +1139,13 @@ static void nfit_test1_setup(struct nfit_test *t)
         dcr->command_size = 0;
         dcr->status_offset = 0;
         dcr->status_size = 0;
+
+        acpi_desc = &t->acpi_desc;
+        set_bit(ND_CMD_ARS_CAP, &acpi_desc->bus_dsm_force_en);
+        set_bit(ND_CMD_ARS_START, &acpi_desc->bus_dsm_force_en);
+        set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_dsm_force_en);
+        nd_desc = &acpi_desc->nd_desc;
+        nd_desc->ndctl = nfit_test_ctl;
 }
 
 static int nfit_test_blk_do_io(struct nd_blk_region *ndbr, resource_size_t dpa,