Page MenuHomeFreeBSD

D61615.1794920095.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61615.1794920095.diff

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -522,11 +522,12 @@
return;
if ((p->md_attr & EFI_MD_ATTR_RT) == 0)
return;
- s = p->md_virt;
- e = p->md_virt + p->md_pages * EFI_PAGE_SIZE;
+ /* Without SetVirtualAddressMap() the firmware runs with VA == PA. */
+ s = p->md_virt != 0 ? p->md_virt : p->md_phys;
+ e = s + p->md_pages * EFI_PAGE_SIZE;
if (emdp->va < s || emdp->va >= e)
return;
- emdp->pa = p->md_phys + (emdp->va - p->md_virt);
+ emdp->pa = p->md_phys + (emdp->va - s);
}
static void *
diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c
--- a/sys/dev/efidev/efirt.c
+++ b/sys/dev/efidev/efirt.c
@@ -142,6 +142,7 @@
efi_is_in_map(struct efi_md *map, int ndesc, int descsz, vm_offset_t addr)
{
struct efi_md *p;
+ vm_offset_t va;
int i;
for (i = 0, p = map; i < ndesc; i++, p = efi_next_descriptor(p,
@@ -149,8 +150,8 @@
if ((p->md_attr & EFI_MD_ATTR_RT) == 0)
continue;
- if (addr >= p->md_virt &&
- addr < p->md_virt + p->md_pages * EFI_PAGE_SIZE)
+ va = p->md_virt != 0 ? p->md_virt : p->md_phys;
+ if (addr >= va && addr < va + p->md_pages * EFI_PAGE_SIZE)
return (true);
}

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 17, 12:54 PM (16 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41800067
Default Alt Text
D61615.1794920095.diff (1 KB)

Event Timeline