Skip to content

Commit bbc4578

Browse files
committed
efi: Use BIT_ULL() constants for memory attributes
For legibility, use the existing BIT_ULL() to generate the u64 type EFI memory attribute macros. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
1 parent ba69e07 commit bbc4578

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

include/linux/efi.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@ typedef struct {
114114
#define EFI_MAX_MEMORY_TYPE 16
115115

116116
/* Attribute values: */
117-
#define EFI_MEMORY_UC ((u64)0x0000000000000001ULL) /* uncached */
118-
#define EFI_MEMORY_WC ((u64)0x0000000000000002ULL) /* write-coalescing */
119-
#define EFI_MEMORY_WT ((u64)0x0000000000000004ULL) /* write-through */
120-
#define EFI_MEMORY_WB ((u64)0x0000000000000008ULL) /* write-back */
121-
#define EFI_MEMORY_UCE ((u64)0x0000000000000010ULL) /* uncached, exported */
122-
#define EFI_MEMORY_WP ((u64)0x0000000000001000ULL) /* write-protect */
123-
#define EFI_MEMORY_RP ((u64)0x0000000000002000ULL) /* read-protect */
124-
#define EFI_MEMORY_XP ((u64)0x0000000000004000ULL) /* execute-protect */
125-
#define EFI_MEMORY_NV ((u64)0x0000000000008000ULL) /* non-volatile */
126-
#define EFI_MEMORY_MORE_RELIABLE \
127-
((u64)0x0000000000010000ULL) /* higher reliability */
128-
#define EFI_MEMORY_RO ((u64)0x0000000000020000ULL) /* read-only */
129-
#define EFI_MEMORY_SP ((u64)0x0000000000040000ULL) /* soft reserved */
130-
#define EFI_MEMORY_CPU_CRYPTO ((u64)0x0000000000080000ULL) /* supports encryption */
117+
#define EFI_MEMORY_UC BIT_ULL(0) /* uncached */
118+
#define EFI_MEMORY_WC BIT_ULL(1) /* write-coalescing */
119+
#define EFI_MEMORY_WT BIT_ULL(2) /* write-through */
120+
#define EFI_MEMORY_WB BIT_ULL(3) /* write-back */
121+
#define EFI_MEMORY_UCE BIT_ULL(4) /* uncached, exported */
122+
#define EFI_MEMORY_WP BIT_ULL(12) /* write-protect */
123+
#define EFI_MEMORY_RP BIT_ULL(13) /* read-protect */
124+
#define EFI_MEMORY_XP BIT_ULL(14) /* execute-protect */
125+
#define EFI_MEMORY_NV BIT_ULL(15) /* non-volatile */
126+
#define EFI_MEMORY_MORE_RELIABLE BIT_ULL(16) /* higher reliability */
127+
#define EFI_MEMORY_RO BIT_ULL(17) /* read-only */
128+
#define EFI_MEMORY_SP BIT_ULL(18) /* soft reserved */
129+
#define EFI_MEMORY_CPU_CRYPTO BIT_ULL(19) /* supports encryption */
131130
#define EFI_MEMORY_HOT_PLUGGABLE BIT_ULL(20) /* supports unplugging at runtime */
132-
#define EFI_MEMORY_RUNTIME ((u64)0x8000000000000000ULL) /* range requires runtime mapping */
131+
#define EFI_MEMORY_RUNTIME BIT_ULL(63) /* range requires runtime mapping */
132+
133133
#define EFI_MEMORY_DESCRIPTOR_VERSION 1
134134

135135
#define EFI_PAGE_SHIFT 12

0 commit comments

Comments
 (0)