acpi: nfit: add persistent memory control flag for nd_region

Propagate the ADR attribute flag from the NFIT platform capabilities
sub-table to nd_region.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index dc775823aea0d4f03f8e83e1e021b846989cfeba..aa9d00db763a2383663e36f20a3a8509c08907da 100644 (file)
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2675,6 +2675,9 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,
        if(acpi_desc->platform_cap & ACPI_NFIT_CAPABILITY_CACHE_FLUSH)
                set_bit(ND_REGION_PERSIST_CACHE, &ndr_desc->flags);
 
+       if (acpi_desc->platform_cap & ACPI_NFIT_CAPABILITY_MEM_FLUSH)
+               set_bit(ND_REGION_PERSIST_MEMCTRL, &ndr_desc->flags);
+
        list_for_each_entry(nfit_memdev, &acpi_desc->memdevs, list) {
                struct acpi_nfit_memory_map *memdev = nfit_memdev->memdev;
                struct nd_mapping_desc *mapping;

diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index f2fc0da4da0433c8a03e3db32922f99aadc0ed7e..ff855ed965fb9d0100c0964f82dd9c4a91a9e32a 100644 (file)
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -52,6 +52,12 @@ enum {
         * system power loss.
         */
        ND_REGION_PERSIST_CACHE = 1,
+       /*
+        * Platform provides mechanisms to automatically flush outstanding
+        * write data from memory controler to pmem on system power loss.
+        * (ADR)
+        */
+       ND_REGION_PERSIST_MEMCTRL = 2,
 
        /* mark newly adjusted resources as requiring a label update */
        DPA_RESOURCE_ADJUSTED = 1 << 0,