Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ACPICA: Update NFIT table to rename a flags field 

ACPICA commit 534deab97fb416a13bfede15c538e2c9eac9384a

Updated one of the memory subtable flags to clarify.

Link: https://github.com/acpica/acpica/commit/534deab9


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cd64bbf8

drivers/acpi/nfit.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -706,7 +706,7 @@ static ssize_t flags_show(struct device *dev, 
		flags & ACPI_NFIT_MEM_SAVE_FAILED ? "save_fail " : "",

		flags & ACPI_NFIT_MEM_SAVE_FAILED ? "save_fail " : "",

		flags & ACPI_NFIT_MEM_RESTORE_FAILED ? "restore_fail " : "",

		flags & ACPI_NFIT_MEM_RESTORE_FAILED ? "restore_fail " : "",

		flags & ACPI_NFIT_MEM_FLUSH_FAILED ? "flush_fail " : "",

		flags & ACPI_NFIT_MEM_FLUSH_FAILED ? "flush_fail " : "",

		flags & ACPI_NFIT_MEM_ARMED ? "not_armed " : "",

		flags & ACPI_NFIT_MEM_NOT_ARMED ? "not_armed " : "",

		flags & ACPI_NFIT_MEM_HEALTH_OBSERVED ? "smart_event " : "");

		flags & ACPI_NFIT_MEM_HEALTH_OBSERVED ? "smart_event " : "");

}

}

static DEVICE_ATTR_RO(flags);

static DEVICE_ATTR_RO(flags);
@@ -815,7 +815,7 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc) 
			flags |= NDD_ALIASING;

			flags |= NDD_ALIASING;





		mem_flags = __to_nfit_memdev(nfit_mem)->flags;

		mem_flags = __to_nfit_memdev(nfit_mem)->flags;

		if (mem_flags & ACPI_NFIT_MEM_ARMED)

		if (mem_flags & ACPI_NFIT_MEM_NOT_ARMED)

			flags |= NDD_UNARMED;

			flags |= NDD_UNARMED;





		rc = acpi_nfit_add_dimm(acpi_desc, nfit_mem, device_handle);

		rc = acpi_nfit_add_dimm(acpi_desc, nfit_mem, device_handle);
@@ -839,7 +839,7 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc) 
		  mem_flags & ACPI_NFIT_MEM_SAVE_FAILED ? " save_fail" : "",

		  mem_flags & ACPI_NFIT_MEM_SAVE_FAILED ? " save_fail" : "",

		  mem_flags & ACPI_NFIT_MEM_RESTORE_FAILED ? " restore_fail":"",

		  mem_flags & ACPI_NFIT_MEM_RESTORE_FAILED ? " restore_fail":"",

		  mem_flags & ACPI_NFIT_MEM_FLUSH_FAILED ? " flush_fail" : "",

		  mem_flags & ACPI_NFIT_MEM_FLUSH_FAILED ? " flush_fail" : "",

		  mem_flags & ACPI_NFIT_MEM_ARMED ? " not_armed" : "");

		  mem_flags & ACPI_NFIT_MEM_NOT_ARMED ? " not_armed" : "");





	}

	}

drivers/acpi/nfit.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define UUID_NFIT_DIMM "4309ac30-0d11-11e4-9191-0800200c9a66"

#define UUID_NFIT_DIMM "4309ac30-0d11-11e4-9191-0800200c9a66"

#define ACPI_NFIT_MEM_FAILED_MASK (ACPI_NFIT_MEM_SAVE_FAILED \

#define ACPI_NFIT_MEM_FAILED_MASK (ACPI_NFIT_MEM_SAVE_FAILED \

		| ACPI_NFIT_MEM_RESTORE_FAILED | ACPI_NFIT_MEM_FLUSH_FAILED \

		| ACPI_NFIT_MEM_RESTORE_FAILED | ACPI_NFIT_MEM_FLUSH_FAILED \

		| ACPI_NFIT_MEM_ARMED)

		| ACPI_NFIT_MEM_NOT_ARMED)





enum nfit_uuids {

enum nfit_uuids {

	NFIT_SPA_VOLATILE,

	NFIT_SPA_VOLATILE,

include/acpi/actbl1.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1012,7 +1012,7 @@ struct acpi_nfit_memory_map { 
#define ACPI_NFIT_MEM_SAVE_FAILED       (1)	/* 00: Last SAVE to Memory Device failed */

#define ACPI_NFIT_MEM_SAVE_FAILED       (1)	/* 00: Last SAVE to Memory Device failed */

#define ACPI_NFIT_MEM_RESTORE_FAILED    (1<<1)	/* 01: Last RESTORE from Memory Device failed */

#define ACPI_NFIT_MEM_RESTORE_FAILED    (1<<1)	/* 01: Last RESTORE from Memory Device failed */

#define ACPI_NFIT_MEM_FLUSH_FAILED      (1<<2)	/* 02: Platform flush failed */

#define ACPI_NFIT_MEM_FLUSH_FAILED      (1<<2)	/* 02: Platform flush failed */

#define ACPI_NFIT_MEM_ARMED             (1<<3)	/* 03: Memory Device observed to be not armed */

#define ACPI_NFIT_MEM_NOT_ARMED         (1<<3)	/* 03: Memory Device is not armed */

#define ACPI_NFIT_MEM_HEALTH_OBSERVED   (1<<4)	/* 04: Memory Device observed SMART/health events */

#define ACPI_NFIT_MEM_HEALTH_OBSERVED   (1<<4)	/* 04: Memory Device observed SMART/health events */

#define ACPI_NFIT_MEM_HEALTH_ENABLED    (1<<5)	/* 05: SMART/health events enabled */

#define ACPI_NFIT_MEM_HEALTH_ENABLED    (1<<5)	/* 05: SMART/health events enabled */