Commit cf16b05c authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: ACPI 6.4: NFIT: add Location Cookie field 

Also, update struct size to reflect these changes in nfit core driver.

ACPICA commit af60199a9a1de9e6844929fd4cc22334522ed195

Link: https://github.com/acpica/acpica/commit/af60199a


Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Kaneda <erik.kaneda@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e527db8f

drivers/acpi/nfit/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3831,7 +3831,7 @@ static __init int nfit_init(void) 
	int ret;



	BUILD_BUG_ON(sizeof(struct acpi_table_nfit) != 40);

	BUILD_BUG_ON(sizeof(struct acpi_nfit_system_address) != 56);

	BUILD_BUG_ON(sizeof(struct acpi_nfit_system_address) != 64);

	BUILD_BUG_ON(sizeof(struct acpi_nfit_memory_map) != 48);

	BUILD_BUG_ON(sizeof(struct acpi_nfit_interleave) != 20);

	BUILD_BUG_ON(sizeof(struct acpi_nfit_smbios) != 9);

include/acpi/actbl2.h

+2 −0
Original line number Diff line number Diff line
@@ -1008,12 +1008,14 @@ struct acpi_nfit_system_address { 
	u64 address;

	u64 length;

	u64 memory_mapping;

	u64 location_cookie;	/* ACPI 6.4 */

};



/* Flags */



#define ACPI_NFIT_ADD_ONLINE_ONLY       (1)	/* 00: Add/Online Operation Only */

#define ACPI_NFIT_PROXIMITY_VALID       (1<<1)	/* 01: Proximity Domain Valid */

#define ACPI_NFIT_LOCATION_COOKIE_VALID (1<<2)	/* 02: SPA location cookie valid (ACPI 6.4) */



/* Range Type GUIDs appear in the include/acuuid.h file */