mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-30 07:34:12 +08:00
First set of EFI fixes for v5.17
- avoid UEFI v2.00+ runtime services on Apple Mac systems, as they have been reported to cause crashes, and most Macs claim to be EFI v1.10 anyway - avoid a spurious boot time warning on arm64 systems with 64k pages -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEE+9lifEBpyUIVN1cpw08iOZLZjyQFAmHz/PkACgkQw08iOZLZ jyRYQQwAmEnSEhImauWiuFUVSuoWQfTfWrER2QKrnWFujFgsYOH8RRa/Qhmy/mvb s3I3Gzkc0rwojI+0jxZj9EUZonS4v6U7RVLL3ixbTFknts+5MicDtYsPv/WTKZ+q pqdIwha+wXpXQKOTxKqiAnmma9vg8CgNLIkSG4ICYfaOprzPGCwjD/be/UGLZYbF aaIGQDqtMmvr6FKqN5ByTlQRpFZX7QVp6HySnuzRlvSjhzcuxmT21AW99egzcUDN uT/4l0Anwj/Zc2l6d7LG+ZzqmeuRzBvZNBQeENj7J7CqNLm8ArWl71CUTSHEZXw4 Jw5evPosn3W2JZnns0eR42GHn/ZA5iM1ac01RhNAoy8JDgGwvVPrIN8y92lUT10W Ivd7A50H1yppNcwD2d7TwNZgXVO+dbrF+ic2sWHRsQPXijK/XRceoiLxytuF9tcy vfFraoxma4/DFG1LLsqMK/SEzLTM0sYmiLHs6OCNaNQkvHponz/SJ/jpdgv27S0v /LiUbwNI =aqa8 -----END PGP SIGNATURE----- Merge tag 'efi-urgent-for-v5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi Pull EFI fixes from Ard Biesheuvel: - avoid UEFI v2.00+ runtime services on Apple Mac systems, as they have been reported to cause crashes, and most Macs claim to be EFI v1.10 anyway - avoid a spurious boot time warning on arm64 systems with 64k pages * tag 'efi-urgent-for-v5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: efi: runtime: avoid EFIv2 runtime services on Apple x86 machines efi/libstub: arm64: Fix image check alignment at entry
This commit is contained in:
commit
073819e0ff
@ -722,6 +722,13 @@ void __init efi_systab_report_header(const efi_table_hdr_t *systab_hdr,
|
||||
systab_hdr->revision >> 16,
|
||||
systab_hdr->revision & 0xffff,
|
||||
vendor);
|
||||
|
||||
if (IS_ENABLED(CONFIG_X86_64) &&
|
||||
systab_hdr->revision > EFI_1_10_SYSTEM_TABLE_REVISION &&
|
||||
!strcmp(vendor, "Apple")) {
|
||||
pr_info("Apple Mac detected, using EFI v1.10 runtime services only\n");
|
||||
efi.runtime_version = EFI_1_10_SYSTEM_TABLE_REVISION;
|
||||
}
|
||||
}
|
||||
|
||||
static __initdata char memory_type_name[][13] = {
|
||||
|
@ -119,9 +119,9 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
|
||||
if (image->image_base != _text)
|
||||
efi_err("FIRMWARE BUG: efi_loaded_image_t::image_base has bogus value\n");
|
||||
|
||||
if (!IS_ALIGNED((u64)_text, EFI_KIMG_ALIGN))
|
||||
efi_err("FIRMWARE BUG: kernel image not aligned on %ldk boundary\n",
|
||||
EFI_KIMG_ALIGN >> 10);
|
||||
if (!IS_ALIGNED((u64)_text, SEGMENT_ALIGN))
|
||||
efi_err("FIRMWARE BUG: kernel image not aligned on %dk boundary\n",
|
||||
SEGMENT_ALIGN >> 10);
|
||||
|
||||
kernel_size = _edata - _text;
|
||||
kernel_memsize = kernel_size + (_end - _edata);
|
||||
|
Loading…
Reference in New Issue
Block a user