diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-12-13 10:20:32 +0100 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2025-01-05 02:30:49 +0100 |
| commit | 6a87a5d0688491e7bd30b243adb6d67ea813d234 (patch) | |
| tree | cc607f2dd0dfc37d6fd7ff158785855c084733c2 | |
| parent | 60c9b794e71e2862a64e6e2a08fda20c4eb3befb (diff) | |
cmd: efidebug: update output of memory attributes
* add EFI_MEMORY_CPU_CRYPTO, EFI_MEMORY_HOT_PLUGGABLE
* correct output for EFI_MEMORY_XP
* remove duplicate list entry for EFI_MEMORY_UC
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
| -rw-r--r-- | cmd/efidebug.c | 5 | ||||
| -rw-r--r-- | include/efi.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 02f1e080e88..2461425e291 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -555,18 +555,19 @@ static const struct efi_mem_attrs { const char *text; } efi_mem_attrs[] = { {EFI_MEMORY_UC, "UC"}, - {EFI_MEMORY_UC, "UC"}, {EFI_MEMORY_WC, "WC"}, {EFI_MEMORY_WT, "WT"}, {EFI_MEMORY_WB, "WB"}, {EFI_MEMORY_UCE, "UCE"}, {EFI_MEMORY_WP, "WP"}, {EFI_MEMORY_RP, "RP"}, - {EFI_MEMORY_XP, "WP"}, + {EFI_MEMORY_XP, "XP"}, {EFI_MEMORY_NV, "NV"}, {EFI_MEMORY_MORE_RELIABLE, "REL"}, {EFI_MEMORY_RO, "RO"}, {EFI_MEMORY_SP, "SP"}, + {EFI_MEMORY_CPU_CRYPTO, "CRYPT"}, + {EFI_MEMORY_HOT_PLUGGABLE, "HOTPL"}, {EFI_MEMORY_RUNTIME, "RT"}, }; diff --git a/include/efi.h b/include/efi.h index d50b3d3cec9..d005cb6181e 100644 --- a/include/efi.h +++ b/include/efi.h @@ -266,6 +266,8 @@ enum efi_memory_type { #define EFI_MEMORY_RO ((u64)0x0000000000020000ULL) /* read-only */ #define EFI_MEMORY_SP ((u64)0x0000000000040000ULL) /* specific-purpose memory (SPM) */ #define EFI_MEMORY_CPU_CRYPTO ((u64)0x0000000000080000ULL) /* cryptographically protectable */ +#define EFI_MEMORY_HOT_PLUGGABLE \ + ((u64)0x0000000000100000ULL) /* hot pluggable */ #define EFI_MEMORY_RUNTIME ((u64)0x8000000000000000ULL) /* range requires runtime mapping */ #define EFI_MEM_DESC_VERSION 1 |