From nobody Mon Apr 04 11:06:00 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 772781A970BB; Mon, 4 Apr 2022 11:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KX7HX58jkz3NNS; Mon, 4 Apr 2022 11:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoizWP9knK5N2WtHwjSb4GW5RZih44+h4NWFyE+swr8=; b=Xiua4iGhM2r1AkHZTkvX6/CiorQQDpyF6f+mmzzRfhDqiZlu+FSJhnVlbXWY1CmwlOmm6A D6TWZyzLbaR38cVN1s0iq8x3e3k9G6rlfIcqLXaqQZWlNbtGOEBPNvGLvROHwAoZnkMK1o t4kAKEI5ZyurAVt/tRTlZBqv+NpBQli9mkSyQ+wodgyPQa6NK/EYfzBjZ6sHIkOwGyfNfU VDQu6ggpOQU1RoxF1IBt4AgT13eF/SsGiCsKChF8vc0xtuVUupV7t1XIVoIFlN3EoDYJXD r6iRqUg87GRSy3eqVxc+B2JXsY9x4JgWiIAjz88h1sFZ+g8qa9dUl3SqEdzR6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D44210C99; Mon, 4 Apr 2022 11:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 234B60Af086494; Mon, 4 Apr 2022 11:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234B603h086493; Mon, 4 Apr 2022 11:06:00 GMT (envelope-from git) Date: Mon, 4 Apr 2022 11:06:00 GMT Message-Id: <202204041106.234B603h086493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 4366c226436b - stable/13 - Fix the spelling of EFI_PAGE_SIZE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4366c226436b0863c62b1dbcf8171479269b4d85 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoizWP9knK5N2WtHwjSb4GW5RZih44+h4NWFyE+swr8=; b=VQ14Ja6EBRQnECM64T+SR3jwmfAbTHnd3pIEU/xJ4ankgQhfzSPFstTb8fe1Hi2dbdFnw4 /7n0D8PZFTi7eWeNxshVcIaOcWHBtS5WjCI3OIYck0wNDYWa3FfPRZX7vmRlujokW5G+SL FfdgkK1Iqn84CFek+pAeNtg0zkP+IkQOoB9D2nsORvD/SSoPkqmezFgUWDgJuQwtHFQW94 9SvqMgNDtHgQ+GX5z6i/XxiVwQf+twL95RBV8ZMZayk0kpDBOaIjLcfyNmmcv/QVD7zOxO /6uDPE6ZjJ2v5pN9A4dl/Miz6tZ6OvhhC6H5JqQpbtKPJBccBrm+4u0hMRJCsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649070360; a=rsa-sha256; cv=none; b=XGe51BuCVMezaNqKD0XVP1AcWqgzbi6drSIwlliNL3aKGgDcSP9rirrw3iLoFfdF2fgf7a N6OnMhUrC+u3RazkH5pte+6A/8+W/vsRVdKKlneJkT4dVS0Wr/sbgUMyGg52Q6/ICrtoDC qD+LkrYPMdkPtTjuzOkpZjZcEHrS8XX/2wp7Zi2Nam/NqyEjL/WA01Mik5KYbYiTADh/Jv y9699C8+1sklrheOuFmecxAVOyE8eyBkjKagNSusiUYBw8iBCTZhnrJnPUpCeTvZFnwFWr VmjZIHAwq8a8RQY+1SFXLYNGXCwGR4SZ74q18A6FrWXHkyhJrM2wPOjkwaDHbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4366c226436b0863c62b1dbcf8171479269b4d85 commit 4366c226436b0863c62b1dbcf8171479269b4d85 Author: Andrew Turner AuthorDate: 2022-03-09 12:59:01 +0000 Commit: Andrew Turner CommitDate: 2022-04-04 09:37:06 +0000 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 (cherry picked from commit 9cf15aefb9d6f97687ae4a497917be36ac125558) --- 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 8fb65917f700..8a1da968cf02 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -822,7 +822,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 b13cf2ef23ea..88314935b82e 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 c3d725800fde..c4a2c48ff8ba 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -468,7 +468,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); } } @@ -500,7 +500,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; } }