Skip to content

Commit 8923d93

Browse files
andre4ik3bluca
authored andcommitted
boot: allocate cleanup pages below 4GiB only on x86
Outside of x86, some machines (e.g. Apple silicon, AMD Opteron A1100) have physical memory mapped above 4GiB, meaning this allocation will fail, causing the entire boot process to fail on these machines. This commit makes it so that the below-4GB address space allocation requirement is only set on x86 platforms, and not on other platforms (that don't have the specific Linux x86 boot protocol), thereby fixing boot on those that have no memory mapped below 4GiB in their address space. Tested on an Apple silicon M1 laptop and an AMD x86_64 desktop tower. Fixes: #35026 Manual backport of 6e207b3. (cherry picked from commit a9d9db7)
1 parent 39c2b7f commit 8923d93

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

src/boot/efi/stub.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,20 @@ static EFI_STATUS combine_initrd(
5050
n += extra_initrd_sizes[i];
5151
}
5252

53+
#if defined(__i386__) || defined(__x86_64__)
5354
_cleanup_pages_ Pages pages = xmalloc_pages(
5455
AllocateMaxAddress,
5556
EfiLoaderData,
5657
EFI_SIZE_TO_PAGES(n),
5758
UINT32_MAX /* Below 4G boundary. */);
59+
#else
60+
_cleanup_pages_ Pages pages = xmalloc_pages(
61+
AllocateAnyPages,
62+
EfiLoaderData,
63+
EFI_SIZE_TO_PAGES(n),
64+
0 /* Ignored. */);
65+
#endif
66+
5867
uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
5968
if (initrd_base != 0) {
6069
size_t pad;

0 commit comments

Comments
 (0)