Merge tag 'libnvdimm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm updates from Dan Williams:

 - Replace pcommit with ADR / directed-flushing.

   The pcommit instruction, which has not shipped on any product, is
   deprecated.  Instead, the requirement is that platforms implement
   either ADR, or provide one or more flush addresses per nvdimm.

   ADR (Asynchronous DRAM Refresh) flushes data in posted write buffers
   to the memory controller on a power-fail event.

   Flush addresses are defined in ACPI 6.x as an NVDIMM Firmware
   Interface Table (NFIT) sub-structure: "Flush Hint Address Structure".
   A flush hint is an mmio address that when written and fenced assures
   that all previous posted writes targeting a given dimm have been
   flushed to media.

 - On-demand ARS (address range scrub).

   Linux uses the results of the ACPI ARS commands to track bad blocks
   in pmem devices.  When latent errors are detected we re-scrub the
   media to refresh the bad block list, userspace can also request a
   re-scrub at any time.

 - Support for the Microsoft DSM (device specific method) command
   format.

 - Support for EDK2/OVMF virtual disk device memory ranges.

 - Various fixes and cleanups across the subsystem.

* tag 'libnvdimm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (41 commits)
  libnvdimm-btt: Delete an unnecessary check before the function call "__nd_device_register"
  nfit: do an ARS scrub on hitting a latent media error
  nfit: move to nfit/ sub-directory
  nfit, libnvdimm: allow an ARS scrub to be triggered on demand
  libnvdimm: register nvdimm_bus devices with an nd_bus driver
  pmem: clarify a debug print in pmem_clear_poison
  x86/insn: remove pcommit
  Revert "KVM: x86: add pcommit support"
  nfit, tools/testing/nvdimm/: unify shutdown paths
  libnvdimm: move ->module to struct nvdimm_bus_descriptor
  nfit: cleanup acpi_nfit_init calling convention
  nfit: fix _FIT evaluation memory leak + use after free
  tools/testing/nvdimm: add manufacturing_{date|location} dimm properties
  tools/testing/nvdimm: add virtual ramdisk range
  acpi, nfit: treat virtual ramdisk SPA as pmem region
  pmem: kill __pmem address space
  pmem: kill wmb_pmem()
  libnvdimm, pmem: use nvdimm_flush() for namespace I/O writes
  fs/dax: remove wmb_pmem()
  libnvdimm, pmem: flush posted-write queues on shutdown
  ...

12 files changed, 170 insertions, 148 deletions

diff --git a/tools/objtool/arch/x86/insn/x86-opcode-map.txt b/tools/objtool/arch/x86/insn/x86-opcode-map.txt
index d388de72eaca..28632ee68377 100644
--- a/tools/objtool/arch/x86/insn/x86-opcode-map.txt
+++ b/tools/objtool/arch/x86/insn/x86-opcode-map.txt
@@ -947,7 +947,7 @@ GrpTable: Grp15
 4: XSAVE
 5: XRSTOR | lfence (11B)
 6: XSAVEOPT | clwb (66) | mfence (11B)
-7: clflush | clflushopt (66) | sfence (11B) | pcommit (66),(11B)
+7: clflush | clflushopt (66) | sfence (11B)
 EndTable
 
 GrpTable: Grp16
diff --git a/tools/perf/arch/x86/tests/insn-x86-dat-32.c b/tools/perf/arch/x86/tests/insn-x86-dat-32.c
index 3918dd52e903..0f196eec9f48 100644
--- a/tools/perf/arch/x86/tests/insn-x86-dat-32.c
+++ b/tools/perf/arch/x86/tests/insn-x86-dat-32.c
@@ -1664,5 +1664,3 @@
 "0f c7 1d 78 56 34 12 \txrstors 0x12345678",},
 {{0x0f, 0xc7, 0x9c, 0xc8, 0x78, 0x56, 0x34, 0x12, }, 8, 0, "", "",
 "0f c7 9c c8 78 56 34 12 \txrstors 0x12345678(%eax,%ecx,8)",},
-{{0x66, 0x0f, 0xae, 0xf8, }, 4, 0, "", "",
-"66 0f ae f8          \tpcommit ",},
diff --git a/tools/perf/arch/x86/tests/insn-x86-dat-64.c b/tools/perf/arch/x86/tests/insn-x86-dat-64.c
index 9c8c61e06d5a..af25bc8240d0 100644
--- a/tools/perf/arch/x86/tests/insn-x86-dat-64.c
+++ b/tools/perf/arch/x86/tests/insn-x86-dat-64.c
@@ -1696,5 +1696,3 @@
 "0f c7 9c c8 78 56 34 12 \txrstors 0x12345678(%rax,%rcx,8)",},
 {{0x41, 0x0f, 0xc7, 0x9c, 0xc8, 0x78, 0x56, 0x34, 0x12, }, 9, 0, "", "",
 "41 0f c7 9c c8 78 56 34 12 \txrstors 0x12345678(%r8,%rcx,8)",},
-{{0x66, 0x0f, 0xae, 0xf8, }, 4, 0, "", "",
-"66 0f ae f8          \tpcommit ",},
diff --git a/tools/perf/arch/x86/tests/insn-x86-dat-src.c b/tools/perf/arch/x86/tests/insn-x86-dat-src.c
index 76e0ec379c8b..979487dae8d4 100644
--- a/tools/perf/arch/x86/tests/insn-x86-dat-src.c
+++ b/tools/perf/arch/x86/tests/insn-x86-dat-src.c
@@ -2655,10 +2655,6 @@ int main(void)
 
 #endif /* #ifndef __x86_64__ */
 
-        /* pcommit */
-
-        asm volatile("pcommit");
-
         /* Following line is a marker for the awk script - do not change */
         asm volatile("rdtsc"); /* Stop here */
 
diff --git a/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt b/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt
index ec378cd7b71e..767be7c76034 100644
--- a/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt
+++ b/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt
@@ -1012,7 +1012,7 @@ GrpTable: Grp15
 4: XSAVE
 5: XRSTOR | lfence (11B)
 6: XSAVEOPT | clwb (66) | mfence (11B)
-7: clflush | clflushopt (66) | sfence (11B) | pcommit (66),(11B)
+7: clflush | clflushopt (66) | sfence (11B)
 EndTable
 
 GrpTable: Grp16
diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild
index 785985677159..ad6dd0543019 100644
--- a/tools/testing/nvdimm/Kbuild
+++ b/tools/testing/nvdimm/Kbuild
@@ -11,12 +11,14 @@ ldflags-y += --wrap=__devm_release_region
 ldflags-y += --wrap=__request_region
 ldflags-y += --wrap=__release_region
 ldflags-y += --wrap=devm_memremap_pages
-ldflags-y += --wrap=phys_to_pfn_t
+ldflags-y += --wrap=insert_resource
+ldflags-y += --wrap=remove_resource
 
 DRIVERS := ../../../drivers
 NVDIMM_SRC := $(DRIVERS)/nvdimm
-ACPI_SRC := $(DRIVERS)/acpi
+ACPI_SRC := $(DRIVERS)/acpi/nfit
 DAX_SRC := $(DRIVERS)/dax
+ccflags-y := -I$(src)/$(NVDIMM_SRC)/
 
 obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
 obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
@@ -27,10 +29,12 @@ obj-$(CONFIG_ACPI_NFIT) += nfit.o
 obj-$(CONFIG_DEV_DAX) += dax.o
 obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o
 
-nfit-y := $(ACPI_SRC)/nfit.o
+nfit-y := $(ACPI_SRC)/core.o
+nfit-$(CONFIG_X86_MCE) += $(ACPI_SRC)/mce.o
 nfit-y += config_check.o
 
 nd_pmem-y := $(NVDIMM_SRC)/pmem.o
+nd_pmem-y += pmem-dax.o
 nd_pmem-y += config_check.o
 
 nd_btt-y := $(NVDIMM_SRC)/btt.o
diff --git a/tools/testing/nvdimm/config_check.c b/tools/testing/nvdimm/config_check.c
index adf18bfeca00..878daf3429e8 100644
--- a/tools/testing/nvdimm/config_check.c
+++ b/tools/testing/nvdimm/config_check.c
@@ -10,6 +10,7 @@ void check(void)
         BUILD_BUG_ON(!IS_MODULE(CONFIG_LIBNVDIMM));
         BUILD_BUG_ON(!IS_MODULE(CONFIG_BLK_DEV_PMEM));
         BUILD_BUG_ON(!IS_MODULE(CONFIG_ND_BTT));
+        BUILD_BUG_ON(!IS_MODULE(CONFIG_ND_PFN));
         BUILD_BUG_ON(!IS_MODULE(CONFIG_ND_BLK));
         BUILD_BUG_ON(!IS_MODULE(CONFIG_ACPI_NFIT));
         BUILD_BUG_ON(!IS_MODULE(CONFIG_DEV_DAX));
diff --git a/tools/testing/nvdimm/pmem-dax.c b/tools/testing/nvdimm/pmem-dax.c
new file mode 100644
index 000000000000..c9b8c48f85fc
--- /dev/null
+++ b/tools/testing/nvdimm/pmem-dax.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2014-2016, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#include "test/nfit_test.h"
+#include <linux/blkdev.h>
+#include <pmem.h>
+#include <nd.h>
+
+long pmem_direct_access(struct block_device *bdev, sector_t sector,
+                void **kaddr, pfn_t *pfn, long size)
+{
+        struct pmem_device *pmem = bdev->bd_queue->queuedata;
+        resource_size_t offset = sector * 512 + pmem->data_offset;
+
+        if (unlikely(is_bad_pmem(&pmem->bb, sector, size)))
+                return -EIO;
+
+        /*
+         * Limit dax to a single page at a time given vmalloc()-backed
+         * in the nfit_test case.
+         */
+        if (get_nfit_res(pmem->phys_addr + offset)) {
+                struct page *page;
+
+                *kaddr = pmem->virt_addr + offset;
+                page = vmalloc_to_page(pmem->virt_addr + offset);
+                *pfn = page_to_pfn_t(page);
+                dev_dbg_ratelimited(disk_to_dev(bdev->bd_disk)->parent,
+                                "%s: sector: %#llx pfn: %#lx\n", __func__,
+                                (unsigned long long) sector, page_to_pfn(page));
+
+                return PAGE_SIZE;
+        }
+
+        *kaddr = pmem->virt_addr + offset;
+        *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
+
+        /*
+         * If badblocks are present, limit known good range to the
+         * requested range.
+         */
+        if (unlikely(pmem->bb.count))
+                return size;
+        return pmem->size - pmem->pfn_pad - offset;
+}
diff --git a/tools/testing/nvdimm/test/Kbuild b/tools/testing/nvdimm/test/Kbuild
index 9241064970fe..d32f25bba42a 100644
--- a/tools/testing/nvdimm/test/Kbuild
+++ b/tools/testing/nvdimm/test/Kbuild
@@ -1,5 +1,5 @@
 ccflags-y := -I$(src)/../../../../drivers/nvdimm/
-ccflags-y += -I$(src)/../../../../drivers/acpi/
+ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/
 
 obj-m += nfit_test.o
 obj-m += nfit_test_iomap.o
diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index c842095f2801..c29f8dca9e67 100644
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -10,11 +10,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  */
+#include <linux/memremap.h>
 #include <linux/rculist.h>
 #include <linux/export.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/types.h>
+#include <linux/pfn_t.h>
 #include <linux/io.h>
 #include <linux/mm.h>
 #include "nfit_test.h"
@@ -52,7 +54,7 @@ static struct nfit_test_resource *__get_nfit_res(resource_size_t resource)
         return NULL;
 }
 
-static struct nfit_test_resource *get_nfit_res(resource_size_t resource)
+struct nfit_test_resource *get_nfit_res(resource_size_t resource)
 {
         struct nfit_test_resource *res;
 
@@ -62,6 +64,7 @@ static struct nfit_test_resource *get_nfit_res(resource_size_t resource)
 
         return res;
 }
+EXPORT_SYMBOL(get_nfit_res);
 
 void __iomem *__nfit_test_ioremap(resource_size_t offset, unsigned long size,
                 void __iomem *(*fallback_fn)(resource_size_t, unsigned long))
@@ -97,10 +100,6 @@ void *__wrap_devm_memremap(struct device *dev, resource_size_t offset,
 }
 EXPORT_SYMBOL(__wrap_devm_memremap);
 
-#ifdef __HAVE_ARCH_PTE_DEVMAP
-#include <linux/memremap.h>
-#include <linux/pfn_t.h>
-
 void *__wrap_devm_memremap_pages(struct device *dev, struct resource *res,
                 struct percpu_ref *ref, struct vmem_altmap *altmap)
 {
@@ -122,19 +121,6 @@ pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
         return phys_to_pfn_t(addr, flags);
 }
 EXPORT_SYMBOL(__wrap_phys_to_pfn_t);
-#else
-/* to be removed post 4.5-rc1 */
-void *__wrap_devm_memremap_pages(struct device *dev, struct resource *res)
-{
-        resource_size_t offset = res->start;
-        struct nfit_test_resource *nfit_res = get_nfit_res(offset);
-
-        if (nfit_res)
-                return nfit_res->buf + offset - nfit_res->res->start;
-        return devm_memremap_pages(dev, res);
-}
-EXPORT_SYMBOL(__wrap_devm_memremap_pages);
-#endif
 
 void *__wrap_memremap(resource_size_t offset, size_t size,
                 unsigned long flags)
@@ -229,6 +215,22 @@ struct resource *__wrap___request_region(struct resource *parent,
 }
 EXPORT_SYMBOL(__wrap___request_region);
 
+int __wrap_insert_resource(struct resource *parent, struct resource *res)
+{
+        if (get_nfit_res(res->start))
+                return 0;
+        return insert_resource(parent, res);
+}
+EXPORT_SYMBOL(__wrap_insert_resource);
+
+int __wrap_remove_resource(struct resource *res)
+{
+        if (get_nfit_res(res->start))
+                return 0;
+        return remove_resource(res);
+}
+EXPORT_SYMBOL(__wrap_remove_resource);
+
 struct resource *__wrap___devm_request_region(struct device *dev,
                 struct resource *parent, resource_size_t start,
                 resource_size_t n, const char *name)
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index c919866853a0..5404efa578a3 100644
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -98,11 +98,13 @@
 enum {
         NUM_PM  = 3,
         NUM_DCR = 5,
+        NUM_HINTS = 8,
         NUM_BDW = NUM_DCR,
         NUM_SPA = NUM_PM + NUM_DCR + NUM_BDW,
         NUM_MEM = NUM_DCR + NUM_BDW + 2 /* spa0 iset */ + 4 /* spa1 iset */,
         DIMM_SIZE = SZ_32M,
         LABEL_SIZE = SZ_128K,
+        SPA_VCD_SIZE = SZ_4M,
         SPA0_SIZE = DIMM_SIZE,
         SPA1_SIZE = DIMM_SIZE*2,
         SPA2_SIZE = DIMM_SIZE,
@@ -470,11 +472,7 @@ static void release_nfit_res(void *data)
         list_del(&nfit_res->list);
         spin_unlock(&nfit_test_lock);
 
-        if (is_vmalloc_addr(nfit_res->buf))
-                vfree(nfit_res->buf);
-        else
-                dma_free_coherent(nfit_res->dev, resource_size(res),
-                                nfit_res->buf, res->start);
+        vfree(nfit_res->buf);
         kfree(res);
         kfree(nfit_res);
 }
@@ -507,9 +505,7 @@ static void *__test_alloc(struct nfit_test *t, size_t size, dma_addr_t *dma,
 
         return nfit_res->buf;
  err:
-        if (buf && !is_vmalloc_addr(buf))
-                dma_free_coherent(dev, size, buf, *dma);
-        else if (buf)
+        if (buf)
                 vfree(buf);
         kfree(res);
         kfree(nfit_res);
@@ -524,15 +520,6 @@ static void *test_alloc(struct nfit_test *t, size_t size, dma_addr_t *dma)
         return __test_alloc(t, size, dma, buf);
 }
 
-static void *test_alloc_coherent(struct nfit_test *t, size_t size,
-                dma_addr_t *dma)
-{
-        struct device *dev = &t->pdev.dev;
-        void *buf = dma_alloc_coherent(dev, size, dma, GFP_KERNEL);
-
-        return __test_alloc(t, size, dma, buf);
-}
-
 static struct nfit_test_resource *nfit_test_lookup(resource_size_t addr)
 {
         int i;
@@ -584,7 +571,8 @@ static int nfit_test0_alloc(struct nfit_test *t)
                         + offsetof(struct acpi_nfit_control_region,
                                         window_size) * NUM_DCR
                         + sizeof(struct acpi_nfit_data_region) * NUM_BDW
-                        + sizeof(struct acpi_nfit_flush_address) * NUM_DCR;
+                        + (sizeof(struct acpi_nfit_flush_address)
+                                        + sizeof(u64) * NUM_HINTS) * NUM_DCR;
         int i;
 
         t->nfit_buf = test_alloc(t, nfit_size, &t->nfit_dma);
@@ -592,15 +580,15 @@ static int nfit_test0_alloc(struct nfit_test *t)
                 return -ENOMEM;
         t->nfit_size = nfit_size;
 
-        t->spa_set[0] = test_alloc_coherent(t, SPA0_SIZE, &t->spa_set_dma[0]);
+        t->spa_set[0] = test_alloc(t, SPA0_SIZE, &t->spa_set_dma[0]);
         if (!t->spa_set[0])
                 return -ENOMEM;
 
-        t->spa_set[1] = test_alloc_coherent(t, SPA1_SIZE, &t->spa_set_dma[1]);
+        t->spa_set[1] = test_alloc(t, SPA1_SIZE, &t->spa_set_dma[1]);
         if (!t->spa_set[1])
                 return -ENOMEM;
 
-        t->spa_set[2] = test_alloc_coherent(t, SPA0_SIZE, &t->spa_set_dma[2]);
+        t->spa_set[2] = test_alloc(t, SPA0_SIZE, &t->spa_set_dma[2]);
         if (!t->spa_set[2])
                 return -ENOMEM;
 
@@ -614,7 +602,8 @@ static int nfit_test0_alloc(struct nfit_test *t)
                         return -ENOMEM;
                 sprintf(t->label[i], "label%d", i);
 
-                t->flush[i] = test_alloc(t, 8, &t->flush_dma[i]);
+                t->flush[i] = test_alloc(t, sizeof(u64) * NUM_HINTS,
+                                &t->flush_dma[i]);
                 if (!t->flush[i])
                         return -ENOMEM;
         }
@@ -630,7 +619,7 @@ static int nfit_test0_alloc(struct nfit_test *t)
 
 static int nfit_test1_alloc(struct nfit_test *t)
 {
-        size_t nfit_size = sizeof(struct acpi_nfit_system_address)
+        size_t nfit_size = sizeof(struct acpi_nfit_system_address) * 2
                 + sizeof(struct acpi_nfit_memory_map)
                 + offsetof(struct acpi_nfit_control_region, window_size);
 
@@ -639,15 +628,31 @@ static int nfit_test1_alloc(struct nfit_test *t)
                 return -ENOMEM;
         t->nfit_size = nfit_size;
 
-        t->spa_set[0] = test_alloc_coherent(t, SPA2_SIZE, &t->spa_set_dma[0]);
+        t->spa_set[0] = test_alloc(t, SPA2_SIZE, &t->spa_set_dma[0]);
         if (!t->spa_set[0])
                 return -ENOMEM;
 
+        t->spa_set[1] = test_alloc(t, SPA_VCD_SIZE, &t->spa_set_dma[1]);
+        if (!t->spa_set[1])
+                return -ENOMEM;
+
         return ars_state_init(&t->pdev.dev, &t->ars_state);
 }
 
+static void dcr_common_init(struct acpi_nfit_control_region *dcr)
+{
+        dcr->vendor_id = 0xabcd;
+        dcr->device_id = 0;
+        dcr->revision_id = 1;
+        dcr->valid_fields = 1;
+        dcr->manufacturing_location = 0xa;
+        dcr->manufacturing_date = cpu_to_be16(2016);
+}
+
 static void nfit_test0_setup(struct nfit_test *t)
 {
+        const int flush_hint_size = sizeof(struct acpi_nfit_flush_address)
+                + (sizeof(u64) * NUM_HINTS);
         struct acpi_nfit_desc *acpi_desc;
         struct acpi_nfit_memory_map *memdev;
         void *nfit_buf = t->nfit_buf;
@@ -655,7 +660,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         struct acpi_nfit_control_region *dcr;
         struct acpi_nfit_data_region *bdw;
         struct acpi_nfit_flush_address *flush;
-        unsigned int offset;
+        unsigned int offset, i;
 
         /*
          * spa0 (interleave first half of dimm0 and dimm1, note storage
@@ -972,9 +977,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.type = ACPI_NFIT_TYPE_CONTROL_REGION;
         dcr->header.length = sizeof(struct acpi_nfit_control_region);
         dcr->region_index = 0+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[0];
         dcr->code = NFIT_FIC_BLK;
         dcr->windows = 1;
@@ -989,9 +992,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.type = ACPI_NFIT_TYPE_CONTROL_REGION;
         dcr->header.length = sizeof(struct acpi_nfit_control_region);
         dcr->region_index = 1+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[1];
         dcr->code = NFIT_FIC_BLK;
         dcr->windows = 1;
@@ -1006,9 +1007,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.type = ACPI_NFIT_TYPE_CONTROL_REGION;
         dcr->header.length = sizeof(struct acpi_nfit_control_region);
         dcr->region_index = 2+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[2];
         dcr->code = NFIT_FIC_BLK;
         dcr->windows = 1;
@@ -1023,9 +1022,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.type = ACPI_NFIT_TYPE_CONTROL_REGION;
         dcr->header.length = sizeof(struct acpi_nfit_control_region);
         dcr->region_index = 3+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[3];
         dcr->code = NFIT_FIC_BLK;
         dcr->windows = 1;
@@ -1042,9 +1039,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.length = offsetof(struct acpi_nfit_control_region,
                         window_size);
         dcr->region_index = 4+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[0];
         dcr->code = NFIT_FIC_BYTEN;
         dcr->windows = 0;
@@ -1056,9 +1051,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.length = offsetof(struct acpi_nfit_control_region,
                         window_size);
         dcr->region_index = 5+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[1];
         dcr->code = NFIT_FIC_BYTEN;
         dcr->windows = 0;
@@ -1070,9 +1063,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.length = offsetof(struct acpi_nfit_control_region,
                         window_size);
         dcr->region_index = 6+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[2];
         dcr->code = NFIT_FIC_BYTEN;
         dcr->windows = 0;
@@ -1084,9 +1075,7 @@ static void nfit_test0_setup(struct nfit_test *t)
         dcr->header.length = offsetof(struct acpi_nfit_control_region,
                         window_size);
         dcr->region_index = 7+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~handle[3];
         dcr->code = NFIT_FIC_BYTEN;
         dcr->windows = 0;
@@ -1141,45 +1130,47 @@ static void nfit_test0_setup(struct nfit_test *t)
         /* flush0 (dimm0) */
         flush = nfit_buf + offset;
         flush->header.type = ACPI_NFIT_TYPE_FLUSH_ADDRESS;
-        flush->header.length = sizeof(struct acpi_nfit_flush_address);
+        flush->header.length = flush_hint_size;
         flush->device_handle = handle[0];
-        flush->hint_count = 1;
-        flush->hint_address[0] = t->flush_dma[0];
+        flush->hint_count = NUM_HINTS;
+        for (i = 0; i < NUM_HINTS; i++)
+                flush->hint_address[i] = t->flush_dma[0] + i * sizeof(u64);
 
         /* flush1 (dimm1) */
-        flush = nfit_buf + offset + sizeof(struct acpi_nfit_flush_address) * 1;
+        flush = nfit_buf + offset + flush_hint_size * 1;
         flush->header.type = ACPI_NFIT_TYPE_FLUSH_ADDRESS;
-        flush->header.length = sizeof(struct acpi_nfit_flush_address);
+        flush->header.length = flush_hint_size;
         flush->device_handle = handle[1];
-        flush->hint_count = 1;
-        flush->hint_address[0] = t->flush_dma[1];
+        flush->hint_count = NUM_HINTS;
+        for (i = 0; i < NUM_HINTS; i++)
+                flush->hint_address[i] = t->flush_dma[1] + i * sizeof(u64);
 
         /* flush2 (dimm2) */
-        flush = nfit_buf + offset + sizeof(struct acpi_nfit_flush_address) * 2;
+        flush = nfit_buf + offset + flush_hint_size  * 2;
         flush->header.type = ACPI_NFIT_TYPE_FLUSH_ADDRESS;
-        flush->header.length = sizeof(struct acpi_nfit_flush_address);
+        flush->header.length = flush_hint_size;
         flush->device_handle = handle[2];
-        flush->hint_count = 1;
-        flush->hint_address[0] = t->flush_dma[2];
+        flush->hint_count = NUM_HINTS;
+        for (i = 0; i < NUM_HINTS; i++)
+                flush->hint_address[i] = t->flush_dma[2] + i * sizeof(u64);
 
         /* flush3 (dimm3) */
-        flush = nfit_buf + offset + sizeof(struct acpi_nfit_flush_address) * 3;
+        flush = nfit_buf + offset + flush_hint_size * 3;
         flush->header.type = ACPI_NFIT_TYPE_FLUSH_ADDRESS;
-        flush->header.length = sizeof(struct acpi_nfit_flush_address);
+        flush->header.length = flush_hint_size;
         flush->device_handle = handle[3];
-        flush->hint_count = 1;
-        flush->hint_address[0] = t->flush_dma[3];
+        flush->hint_count = NUM_HINTS;
+        for (i = 0; i < NUM_HINTS; i++)
+                flush->hint_address[i] = t->flush_dma[3] + i * sizeof(u64);
 
         if (t->setup_hotplug) {
-                offset = offset + sizeof(struct acpi_nfit_flush_address) * 4;
+                offset = offset + flush_hint_size * 4;
                 /* dcr-descriptor4: blk */
                 dcr = nfit_buf + offset;
                 dcr->header.type = ACPI_NFIT_TYPE_CONTROL_REGION;
                 dcr->header.length = sizeof(struct acpi_nfit_control_region);
                 dcr->region_index = 8+1;
-                dcr->vendor_id = 0xabcd;
-                dcr->device_id = 0;
-                dcr->revision_id = 1;
+                dcr_common_init(dcr);
                 dcr->serial_number = ~handle[4];
                 dcr->code = NFIT_FIC_BLK;
                 dcr->windows = 1;
@@ -1196,9 +1187,7 @@ static void nfit_test0_setup(struct nfit_test *t)
                 dcr->header.length = offsetof(struct acpi_nfit_control_region,
                                 window_size);
                 dcr->region_index = 9+1;
-                dcr->vendor_id = 0xabcd;
-                dcr->device_id = 0;
-                dcr->revision_id = 1;
+                dcr_common_init(dcr);
                 dcr->serial_number = ~handle[4];
                 dcr->code = NFIT_FIC_BYTEN;
                 dcr->windows = 0;
@@ -1300,10 +1289,12 @@ static void nfit_test0_setup(struct nfit_test *t)
                 /* flush3 (dimm4) */
                 flush = nfit_buf + offset;
                 flush->header.type = ACPI_NFIT_TYPE_FLUSH_ADDRESS;
-                flush->header.length = sizeof(struct acpi_nfit_flush_address);
+                flush->header.length = flush_hint_size;
                 flush->device_handle = handle[4];
-                flush->hint_count = 1;
-                flush->hint_address[0] = t->flush_dma[4];
+                flush->hint_count = NUM_HINTS;
+                for (i = 0; i < NUM_HINTS; i++)
+                        flush->hint_address[i] = t->flush_dma[4]
+                                + i * sizeof(u64);
         }
 
         post_ars_status(&t->ars_state, t->spa_set_dma[0], SPA0_SIZE);
@@ -1339,7 +1330,16 @@ static void nfit_test1_setup(struct nfit_test *t)
         spa->address = t->spa_set_dma[0];
         spa->length = SPA2_SIZE;
 
-        offset += sizeof(*spa);
+        /* virtual cd region */
+        spa = nfit_buf + sizeof(*spa);
+        spa->header.type = ACPI_NFIT_TYPE_SYSTEM_ADDRESS;
+        spa->header.length = sizeof(*spa);
+        memcpy(spa->range_guid, to_nfit_uuid(NFIT_SPA_VCD), 16);
+        spa->range_index = 0;
+        spa->address = t->spa_set_dma[1];
+        spa->length = SPA_VCD_SIZE;
+
+        offset += sizeof(*spa) * 2;
         /* mem-region0 (spa0, dimm0) */
         memdev = nfit_buf + offset;
         memdev->header.type = ACPI_NFIT_TYPE_MEMORY_MAP;
@@ -1365,9 +1365,7 @@ static void nfit_test1_setup(struct nfit_test *t)
         dcr->header.length = offsetof(struct acpi_nfit_control_region,
                         window_size);
         dcr->region_index = 0+1;
-        dcr->vendor_id = 0xabcd;
-        dcr->device_id = 0;
-        dcr->revision_id = 1;
+        dcr_common_init(dcr);
         dcr->serial_number = ~0;
         dcr->code = NFIT_FIC_BYTE;
         dcr->windows = 0;
@@ -1462,20 +1460,16 @@ static int nfit_test_probe(struct platform_device *pdev)
         nfit_test->setup(nfit_test);
         acpi_desc = &nfit_test->acpi_desc;
         acpi_nfit_desc_init(acpi_desc, &pdev->dev);
-        acpi_desc->nfit = nfit_test->nfit_buf;
         acpi_desc->blk_do_io = nfit_test_blk_do_io;
         nd_desc = &acpi_desc->nd_desc;
         nd_desc->provider_name = NULL;
+        nd_desc->module = THIS_MODULE;
         nd_desc->ndctl = nfit_test_ctl;
-        acpi_desc->nvdimm_bus = nvdimm_bus_register(&pdev->dev, nd_desc);
-        if (!acpi_desc->nvdimm_bus)
-                return -ENXIO;
 
-        rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_size);
-        if (rc) {
-                nvdimm_bus_unregister(acpi_desc->nvdimm_bus);
+        rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf,
+                        nfit_test->nfit_size);
+        if (rc)
                 return rc;
-        }
 
         if (nfit_test->setup != nfit_test0_setup)
                 return 0;
@@ -1483,22 +1477,16 @@ static int nfit_test_probe(struct platform_device *pdev)
         nfit_test->setup_hotplug = 1;
         nfit_test->setup(nfit_test);
 
-        rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_size);
-        if (rc) {
-                nvdimm_bus_unregister(acpi_desc->nvdimm_bus);
+        rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf,
+                        nfit_test->nfit_size);
+        if (rc)
                 return rc;
-        }
 
         return 0;
 }
 
 static int nfit_test_remove(struct platform_device *pdev)
 {
-        struct nfit_test *nfit_test = to_nfit_test(&pdev->dev);
-        struct acpi_nfit_desc *acpi_desc = &nfit_test->acpi_desc;
-
-        nvdimm_bus_unregister(acpi_desc->nvdimm_bus);
-
         return 0;
 }
 
@@ -1523,12 +1511,6 @@ static struct platform_driver nfit_test_driver = {
         .id_table = nfit_test_id,
 };
 
-#ifdef CONFIG_CMA_SIZE_MBYTES
-#define CMA_SIZE_MBYTES CONFIG_CMA_SIZE_MBYTES
-#else
-#define CMA_SIZE_MBYTES 0
-#endif
-
 static __init int nfit_test_init(void)
 {
         int rc, i;
@@ -1538,7 +1520,6 @@ static __init int nfit_test_init(void)
         for (i = 0; i < NUM_NFITS; i++) {
                 struct nfit_test *nfit_test;
                 struct platform_device *pdev;
-                static int once;
 
                 nfit_test = kzalloc(sizeof(*nfit_test), GFP_KERNEL);
                 if (!nfit_test) {
@@ -1577,20 +1558,6 @@ static __init int nfit_test_init(void)
                         goto err_register;
 
                 instances[i] = nfit_test;
-
-                if (!once++) {
-                        dma_addr_t dma;
-                        void *buf;
-
-                        buf = dma_alloc_coherent(&pdev->dev, SZ_128M, &dma,
-                                        GFP_KERNEL);
-                        if (!buf) {
-                                rc = -ENOMEM;
-                                dev_warn(&pdev->dev, "need 128M of free cma\n");
-                                goto err_register;
-                        }
-                        dma_free_coherent(&pdev->dev, SZ_128M, buf, dma);
-                }
         }
 
         rc = platform_driver_register(&nfit_test_driver);
diff --git a/tools/testing/nvdimm/test/nfit_test.h b/tools/testing/nvdimm/test/nfit_test.h
index 96c5e16d7db9..9f18e2a4a862 100644
--- a/tools/testing/nvdimm/test/nfit_test.h
+++ b/tools/testing/nvdimm/test/nfit_test.h
@@ -12,6 +12,7 @@
  */
 #ifndef __NFIT_TEST_H__
 #define __NFIT_TEST_H__
+#include <linux/list.h>
 
 struct nfit_test_resource {
         struct list_head list;
@@ -26,4 +27,5 @@ void __iomem *__wrap_ioremap_nocache(resource_size_t offset,
 void __wrap_iounmap(volatile void __iomem *addr);
 void nfit_test_setup(nfit_test_lookup_fn lookup);
 void nfit_test_teardown(void);
+struct nfit_test_resource *get_nfit_res(resource_size_t resource);
 #endif