Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Dan Williams 9 years ago
parent
6e2452dff4
commit
be26f9ae02
2 changed files with 12 additions and 1 deletions
Split View Show Diff Stats
  1. 6 0
      drivers/acpi/nfit.h
  2. 6 1
      tools/testing/nvdimm/test/nfit.c

+ 6 - 0
drivers/acpi/nfit.h
View File 

@@ -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,

+ 6 - 1
tools/testing/nvdimm/test/nfit.c
View File 

@@ -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;