Commit 6277e374 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi: Add definition of EFI_MEMORY_CPU_CRYPTO and ability to report it 



Incorporate the definition of EFI_MEMORY_CPU_CRYPTO from the UEFI
specification v2.8, and wire it into our memory map dumping routine
as well.

To make a bit of space in the output buffer, which is provided by
the various callers, shorten the descriptive names of the memory
types.

Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 46908326

drivers/firmware/efi/efi.c

+24 −23
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ void __init efi_systab_report_header(const efi_table_hdr_t *systab_hdr, 
		vendor);

}



static __initdata char memory_type_name[][20] = {

static __initdata char memory_type_name[][13] = {

	"Reserved",

	"Loader Code",

	"Loader Data",
@@ -722,14 +722,14 @@ static __initdata char memory_type_name[][20] = { 
	"Boot Data",

	"Runtime Code",

	"Runtime Data",

	"Conventional Memory",

	"Unusable Memory",

	"ACPI Reclaim Memory",

	"ACPI Memory NVS",

	"Memory Mapped I/O",

	"MMIO Port Space",

	"Conventional",

	"Unusable",

	"ACPI Reclaim",

	"ACPI Mem NVS",

	"MMIO",

	"MMIO Port",

	"PAL Code",

	"Persistent Memory",

	"Persistent",

};



char * __init efi_md_typeattr_format(char *buf, size_t size,
@@ -756,15 +756,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_SP |

		     EFI_MEMORY_NV | EFI_MEMORY_SP | EFI_MEMORY_CPU_CRYPTO |

		     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|%2s|%2s|%3s|%2s|%2s|%2s|%2s]",

			 "|%3s|%2s|%2s|%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_CPU_CRYPTO   	? "CC"  : "",

			 attr & EFI_MEMORY_SP			? "SP"  : "",

			 attr & EFI_MEMORY_NV			? "NV"  : "",

			 attr & EFI_MEMORY_XP			? "XP"  : "",

include/linux/efi.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ typedef struct { 
				((u64)0x0000000000010000ULL)	/* higher reliability */

#define EFI_MEMORY_RO		((u64)0x0000000000020000ULL)	/* read-only */

#define EFI_MEMORY_SP		((u64)0x0000000000040000ULL)	/* soft reserved */

#define EFI_MEMORY_CPU_CRYPTO	((u64)0x0000000000080000ULL)	/* supports encryption */

#define EFI_MEMORY_RUNTIME	((u64)0x8000000000000000ULL)	/* range requires runtime mapping */

#define EFI_MEMORY_DESCRIPTOR_VERSION	1

CRA Git | Maintained and supported by SUSTech CRA and CCSE