From nobody Wed Mar 23 15:30:58 2022 X-Original-To: dev-commits-src-all@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 D6BD11A478D6; Wed, 23 Mar 2022 15:30:58 +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 4KNskp5Jtwz4tH5; Wed, 23 Mar 2022 15:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648049458; 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=JKFkX8qtT4klSqMvLiV3JSBxOWRZyqQL+hpZM/v3SkQ=; b=wClc3BT3ZHmC04PsMyj6Wbi15/eOw+TO9YhNNbrVGEd/ghne82n22jbok2pLS3aaaRP9UU SYM7MDXkw7/YI/g9N808RbR0OqUhfMjAj9mUIpJraov+jHWCpbFeTYSMM7d2hIeb6yX2HM OPrJ3tTFuQV83FDejyHHB2bRjhS1dw6PEi3wLr2h7yp4zOKK5VoZN+XwzwyWc8oaZXwxGu uZ81LrClCeoP8oTidHu8OcXGzMaND1m5VLpVaaA49K01dVVly+uN+t8682VB6XcjgZTyyK jeaa7afuX1SpW1W5jjYVrqwSQddXpdfZCMWsPr5yT4zkXwDwEq2I6itt3MyepQ== 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 93D4A26200; Wed, 23 Mar 2022 15:30:58 +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 22NFUwEn063884; Wed, 23 Mar 2022 15:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NFUwue063883; Wed, 23 Mar 2022 15:30:58 GMT (envelope-from git) Date: Wed, 23 Mar 2022 15:30:58 GMT Message-Id: <202203231530.22NFUwue063883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 863f3220d097 - main - Support EFIRT on arm64 with a non 4k page size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 863f3220d09716ea2e570fadc6b19dcb6e4c2191 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648049458; 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=JKFkX8qtT4klSqMvLiV3JSBxOWRZyqQL+hpZM/v3SkQ=; b=Oncu4iyNGm0IxxEjIINIktPgEdesztRtQ0kZmaGQmfcD5oKHo5rCYVl/yKA/Zs/4Nh4BAy 8awUq+nmRZB/E6Bq9XLwi9VES8+6pvCe197FCr6E6fOEhUtVrmN+u4t8eKjaOKfivaAS/t b7kq514ZOypj4Ay2/viFfXVvzgG6mcA7nJYXUARIpL6WaN3qc/Yr3k4FrxuSUnvu/WHb7q ckt0I7vbrEjcqFLUmpoKvyrtYu8icB6Vk7+ktNEMBSnZfS8tkJFOUKl/NA+AlUAogm6QCH 9QoTfzl5TzPnwgABA1tKnoRUq0C8obY/VtkwI8iqGMGJ8CE8B2B7yQUXE8YxmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648049458; a=rsa-sha256; cv=none; b=waCGnkIQhcACh2lLK5V2UscemvMCxY8ItBBG99ZaZVxSb/siSeY+4o6xVCO1Ftawi/9cPL DYBPkJeBOylrVXg+f8vdp/PBVcpnAOVn30ekkB8a9yRsRUwogKL9rbolaM3mZwOSP1AiUe hLdTgHQpijyVrrnzdEqf80bvrtUnLVnz2Q8bRqRpAHyBd7UjTquEs4CAHy9/+f5eYqjfGU Y4lTXmGlhskMCoBYhjdaNX+Jn9ASY1LZvGKrzQmSaD0ZlwBWjYMgveSacwKRw0PeQ7ZeLS BjvnuPgECwJ5I6Q6AKXMJYFcifJXcetaVzTlB0oVeUlNCT3dAQgELIEoVC+Jig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=863f3220d09716ea2e570fadc6b19dcb6e4c2191 commit 863f3220d09716ea2e570fadc6b19dcb6e4c2191 Author: Andrew Turner AuthorDate: 2022-03-23 15:18:30 +0000 Commit: Andrew Turner CommitDate: 2022-03-23 15:18:30 +0000 Support EFIRT on arm64 with a non 4k page size When the page size the kernel is built for is not the same as EFI_PAGE_SIZE we need to increment the page index at a faster rate. Add this adjustment to the arm64 EFIRT support in preperation for experimental 16k PAGE_SIZE support. Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/efirt_machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index a48fda6d02b8..6e6541900efb 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -221,8 +221,8 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) l3_attr |= ATTR_S1_XN; VM_OBJECT_WLOCK(obj_1t1_pt); - for (va = p->md_phys, idx = 0; idx < p->md_pages; idx++, - va += PAGE_SIZE) { + for (va = p->md_phys, idx = 0; idx < p->md_pages; + idx += (PAGE_SIZE / EFI_PAGE_SIZE), va += PAGE_SIZE) { l3 = efi_1t1_l3(va); *l3 = va | l3_attr; }