Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: improve support for 64-bit EFI #94

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

kernel: improve support for 64-bit EFI #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da1b6db
kernel: Don't truncate 64-bit config table addresses
phcoder Feb 27, 2025
ba53c79
kernel: Don't attempt to print an unreachable EFI vendor name
phcoder Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions usr/src/uts/i86pc/dboot/dboot_startkern.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1818,22 +1818,22 @@ process_efi64(EFI_SYSTEM_TABLE64 *efi)
(void) memcpy(&VendorGuid, &config[i].VendorGuid,
sizeof (VendorGuid));
if (dboot_same_guids(&VendorGuid, &smbios3)) {
bi->bi_smbios = (native_ptr_t)(uintptr_t)
bi->bi_smbios = (native_ptr_t)
config[i].VendorTable;
}
if (bi->bi_smbios == 0 &&
dboot_same_guids(&VendorGuid, &smbios)) {
bi->bi_smbios = (native_ptr_t)(uintptr_t)
bi->bi_smbios = (native_ptr_t)
config[i].VendorTable;
}
/* Prefer acpi v2+ over v1. */
if (dboot_same_guids(&VendorGuid, &acpi2)) {
bi->bi_acpi_rsdp = (native_ptr_t)(uintptr_t)
bi->bi_acpi_rsdp = (native_ptr_t)
config[i].VendorTable;
}
if (bi->bi_acpi_rsdp == 0 &&
dboot_same_guids(&VendorGuid, &acpi1)) {
bi->bi_acpi_rsdp = (native_ptr_t)(uintptr_t)
bi->bi_acpi_rsdp = (native_ptr_t)
config[i].VendorTable;
}
}
Expand Down Expand Up @@ -1947,7 +1947,6 @@ print_efi32(EFI_SYSTEM_TABLE32 *efi)
static void
print_efi64(EFI_SYSTEM_TABLE64 *efi)
{
uint16_t *data;
EFI_CONFIGURATION_TABLE64 *conf;
int i;

Expand All @@ -1956,9 +1955,13 @@ print_efi64(EFI_SYSTEM_TABLE64 *efi)
dboot_printf("EFI system version: ");
dboot_print_efi_version(efi->Hdr.Revision);
dboot_printf("EFI system vendor: ");
data = (uint16_t *)(uintptr_t)efi->FirmwareVendor;
for (i = 0; data[i] != 0; i++)
dboot_printf("%c", (char)data[i]);
if (efi->FirmwareVendor > ~(uintptr_t)0) {
dboot_printf("<unreachable>");
} else {
uint16_t *data = (uint16_t *)(uintptr_t)efi->FirmwareVendor;
for (i = 0; data[i] != 0; i++)
dboot_printf("%c", (char)data[i]);
}
dboot_printf("\nEFI firmware revision: ");
dboot_print_efi_version(efi->FirmwareRevision);
dboot_printf("EFI system table number of entries: %" PRIu64 "\n",
Expand Down