Page MenuHomeFreeBSD
Files F142017212

D38264.id116022.diff
No OneTemporary
Actions

D38264.id116022.diff
View Options

diff --git a/stand/kboot/arch/aarch64/load_addr.c b/stand/kboot/arch/aarch64/load_addr.c
--- a/stand/kboot/arch/aarch64/load_addr.c
+++ b/stand/kboot/arch/aarch64/load_addr.c
@@ -304,10 +304,10 @@
ver, esz, sz, mmap_pa);
/*
- * We have no ability to read the PA that this map is in, so
- * pass the address to FreeBSD via a rather odd flag entry as
- * the first map so early boot can copy the memory map into
- * this space and have the rest of the code cope.
+ * We may have no ability to read the PA that this map is in, so pass
+ * the address to FreeBSD via a rather odd flag entry as the first map
+ * so early boot can copy the memory map into this space and have the
+ * rest of the code cope.
*/
efisz = (sizeof(*efihdr) + 0xf) & ~0xf;
buf = malloc(sz + efisz);
@@ -319,11 +319,45 @@
efihdr->memory_size = sz;
efihdr->descriptor_size = esz;
efihdr->descriptor_version = ver;
- efi_map_phys_src = mmap_pa;
+
+ /*
+ * Save EFI table. Either this will be an empty table filled in by the trampiline,
+ * or we'll read it below. Either way, set these two variables so we share the best
+ * UEFI memory map with the kernel.
+ */
efi_map_hdr = efihdr;
efi_map_size = sz + efisz;
- return true;
+ /*
+ * Try to read in the actual UEFI map.
+ */
+ fd2 = open("host:/dev/mem", O_RDONLY);
+ if (fd2 < 0) {
+ printf("Will read UEFI mem map in tramp: no /dev/mem, need CONFIG_DEVMEM=y\n");
+ goto no_read;
+ }
+ if (lseek(fd2, mmap_pa, SEEK_SET) < 0) {
+ printf("Will read UEFI mem map in tramp: lseek failed\n");
+ goto no_read;
+ }
+ len = read(fd2, map, sz);
+ if (len != sz) {
+ if (len < 0 && errno == EPERM)
+ printf("Will read UEFI mem map in tramp: kernel needs CONFIG_STRICT_DEVMEM=n\n");
+ else
+ printf("Will read UEFI mem map in tramp: lean = %d errno = %d\n", len, errno);
+ goto no_read;
+ }
+ printf("Read UEFI mem map from physmem\n");
+ efi_map_phys_src = 0; /* Mark MODINFOMD_EFI_MAP as valid */
+ close(fd2);
+ return true; /* OK, we really have the memory map */
+
+no_read:
+ efi_map_phys_src = mmap_pa;
+ close(fd2);
+ return true; /* We can get it the trampoline */
+
errout:
close(fd2);
free(buf);
@@ -342,12 +376,10 @@
fd = open("host:/sys/firmware/fdt", O_RDONLY);
if (fd != -1) {
- printf("Doing trying to get UEFI from FDT -- fake\n");
rv = do_memory_from_fdt(fd);
close(fd);
- if (rv) {
- printf("Got it from /sys/firmware/fdt\n");
- }
+ if (rv)
+ printf("Found a physical memory for UEFI memory map\n");
/*
* So, we have physaddr to the memory table. However, we can't
* open /dev/mem on some platforms to get the actual table. So
@@ -355,7 +387,7 @@
*/
}
- printf("Falling back to iomem to find where to load\n");
+ printf("Also reading /proc/iomem to learn of reserved areas\n");
fd = open("host:/proc/iomem", O_RDONLY);
if (fd == -1) {
printf("Can't get memory map\n");
@@ -459,6 +491,9 @@
uint64_t sz, efisz, attr;
uint32_t type;
+ /*
+ * Make a note of a systbl. This is nearly mandatory on AARCH64.
+ */
if (efi_systbl_phys)
file_addmetadata(kfp, MODINFOMD_FW_HANDLE, sizeof(efi_systbl_phys), &efi_systbl_phys);

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 11:39 PM (10 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27655966
Default Alt Text
D38264.id116022.diff (3 KB)

Event Timeline