efi: Add NV memory attribute (c016ca08) · Commits · 戴 / test

Add the NV memory attribute introduced in UEFI 2.5 and add a column for it in the types and attributes string used when printing the UEFI memory map. old: efi: mem61: [type=14 | | | | | | | |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c7fffffff) (16384MB) new: efi: mem61: [type=14 | | |NV| | | | | |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c7fffffff) (16384MB) Signed-off-by:

Robert Elliott <elliott@hpe.com> Signed-off-by:

Matt Fleming <matt@codeblueprint.co.uk> Reviewed-by:

Laszlo Ersek <lersek@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Taku Izumi <izumi.taku@jp.fujitsu.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1454364428-494-13-git-send-email-matt@codeblueprint.co.uk Signed-off-by:

Ingo Molnar <mingo@kernel.org>

drivers/firmware/efi/efi.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -582,13 +582,16 @@ char * __init efi_md_typeattr_format(char *buf, size_t size,
		if (attr & ~(EFI_MEMORY_UC \| EFI_MEMORY_WC \| EFI_MEMORY_WT \|
		EFI_MEMORY_WB \| EFI_MEMORY_UCE \| EFI_MEMORY_RO \|
		EFI_MEMORY_WP \| EFI_MEMORY_RP \| EFI_MEMORY_XP \|
		EFI_MEMORY_NV \|
		EFI_MEMORY_RUNTIME \| EFI_MEMORY_MORE_RELIABLE))
		snprintf(pos, size, "\|attr=0x%016llx]",
		(unsigned long long)attr);
		else
		snprintf(pos, size, "\|%3s\|%2s\|%2s\|%2s\|%2s\|%2s\|%3s\|%2s\|%2s\|%2s\|%2s]",
		snprintf(pos, size,
		"\|%3s\|%2s\|%2s\|%2s\|%2s\|%2s\|%2s\|%3s\|%2s\|%2s\|%2s\|%2s]",
		attr & EFI_MEMORY_RUNTIME ? "RUN" : "",
		attr & EFI_MEMORY_MORE_RELIABLE ? "MR" : "",
		attr & EFI_MEMORY_NV ? "NV" : "",
		attr & EFI_MEMORY_XP ? "XP" : "",
		attr & EFI_MEMORY_RP ? "RP" : "",
		attr & EFI_MEMORY_WP ? "WP" : "",

include/linux/efi.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ typedef struct {
		#define EFI_MEMORY_WP ((u64)0x0000000000001000ULL) /* write-protect */
		#define EFI_MEMORY_RP ((u64)0x0000000000002000ULL) /* read-protect */
		#define EFI_MEMORY_XP ((u64)0x0000000000004000ULL) /* execute-protect */
		#define EFI_MEMORY_NV ((u64)0x0000000000008000ULL) /* non-volatile */
		#define EFI_MEMORY_MORE_RELIABLE \
		((u64)0x0000000000010000ULL) /* higher reliability */
		#define EFI_MEMORY_RO ((u64)0x0000000000020000ULL) /* read-only */

Admin message