nfit, tools/testing/nvdimm: add format interface code definitions

ACPI 6.1 and JEDEC Annex L Release 3 formalize the format interface
code.  Add definitions and update their usage in the unit test.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h
index 3d549a3836590bb9dd55f6dd14dd8619698597ab..6689b0aaf194a38abf654ce66cf27fe47f65db06 100644 (file)
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
@@ -40,6 +40,12 @@ enum nfit_uuids {
        NFIT_UUID_MAX,
 };
 
+enum nfit_fic {
+       NFIT_FIC_BYTE = 0x101, /* byte-addressable energy backed */
+       NFIT_FIC_BLK = 0x201, /* block-addressable non-energy backed */
+       NFIT_FIC_BYTEN = 0x301, /* byte-addressable non-energy backed */
+};
+
 enum {
        ND_BLK_READ_FLUSH = 1,
        ND_BLK_DCR_LATCH = 2,

diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index b3281dcd4a5d5502af9f66720dfcdccb1aca4d58..6e831c4021ff38c0132cf278208f917a05557e79 100644 (file)
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -823,6 +823,7 @@ static void nfit_test0_setup(struct nfit_test *t)
        dcr->device_id = 0;
        dcr->revision_id = 1;
        dcr->serial_number = ~handle[0];
+       dcr->code = NFIT_FIC_BLK;
        dcr->windows = 1;
        dcr->window_size = DCR_SIZE;
        dcr->command_offset = 0;
@@ -839,6 +840,7 @@ static void nfit_test0_setup(struct nfit_test *t)
        dcr->device_id = 0;
        dcr->revision_id = 1;
        dcr->serial_number = ~handle[1];
+       dcr->code = NFIT_FIC_BLK;
        dcr->windows = 1;
        dcr->window_size = DCR_SIZE;
        dcr->command_offset = 0;
@@ -855,6 +857,7 @@ static void nfit_test0_setup(struct nfit_test *t)
        dcr->device_id = 0;
        dcr->revision_id = 1;
        dcr->serial_number = ~handle[2];
+       dcr->code = NFIT_FIC_BLK;
        dcr->windows = 1;
        dcr->window_size = DCR_SIZE;
        dcr->command_offset = 0;
@@ -871,6 +874,7 @@ static void nfit_test0_setup(struct nfit_test *t)
        dcr->device_id = 0;
        dcr->revision_id = 1;
        dcr->serial_number = ~handle[3];
+       dcr->code = NFIT_FIC_BLK;
        dcr->windows = 1;
        dcr->window_size = DCR_SIZE;
        dcr->command_offset = 0;
@@ -967,6 +971,7 @@ static void nfit_test0_setup(struct nfit_test *t)
                dcr->device_id = 0;
                dcr->revision_id = 1;
                dcr->serial_number = ~handle[4];
+               dcr->code = NFIT_FIC_BLK;
                dcr->windows = 1;
                dcr->window_size = DCR_SIZE;
                dcr->command_offset = 0;
@@ -1136,7 +1141,7 @@ static void nfit_test1_setup(struct nfit_test *t)
        dcr->device_id = 0;
        dcr->revision_id = 1;
        dcr->serial_number = ~0;
-       dcr->code = 0x201;
+       dcr->code = NFIT_FIC_BYTE;
        dcr->windows = 0;
        dcr->window_size = 0;
        dcr->command_offset = 0;