From 9cf15aefb9d6f97687ae4a497917be36ac125558 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Wed, 9 Mar 2022 12:59:01 +0000 Subject: [PATCH] Fix the spelling of EFI_PAGE_SIZE We assume EFI_PAGE_SIZE is the same as PAGE_SIZE, however this may not be the case. Use the former when working with a list of pages from the UEFI firmware so the correct size is used. This will be needed on arm64 where PAGE_SIZE could be 16k or 64k in the future. The other architectures have been updated to be consistent. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34510 --- sys/amd64/amd64/machdep.c | 2 +- sys/arm/arm/machdep_boot.c | 2 +- sys/arm64/arm64/machdep.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 22a3eecbbb3..b7810440a55 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -816,7 +816,7 @@ add_efi_map_entries(struct efi_map_header *efihdr, vm_paddr_t *physmap, continue; } - if (!add_physmap_entry(p->md_phys, (p->md_pages * PAGE_SIZE), + if (!add_physmap_entry(p->md_phys, p->md_pages * EFI_PAGE_SIZE, physmap, physmap_idx)) break; } diff --git a/sys/arm/arm/machdep_boot.c b/sys/arm/arm/machdep_boot.c index 332e9beb091..ebdd761bfed 100644 --- a/sys/arm/arm/machdep_boot.c +++ b/sys/arm/arm/machdep_boot.c @@ -490,7 +490,7 @@ arm_add_efi_map_entries(struct efi_map_header *efihdr, struct mem_region *mr, break; mr[j].mr_start = p->md_phys; - mr[j].mr_size = p->md_pages * PAGE_SIZE; + mr[j].mr_size = p->md_pages * EFI_PAGE_SIZE; memory_size += mr[j].mr_size; } diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 0e4aa657bb1..b673a38ee38 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -469,7 +469,7 @@ exclude_efi_map_entry(struct efi_md *p) */ break; default: - physmem_exclude_region(p->md_phys, p->md_pages * PAGE_SIZE, + physmem_exclude_region(p->md_phys, p->md_pages * EFI_PAGE_SIZE, EXFLAG_NOALLOC); } } @@ -501,7 +501,7 @@ add_efi_map_entry(struct efi_md *p) * We're allowed to use any entry with these types. */ physmem_hardware_region(p->md_phys, - p->md_pages * PAGE_SIZE); + p->md_pages * EFI_PAGE_SIZE); break; } }