From nobody Tue Apr 19 10:05:30 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 63BCA5D2B17; Tue, 19 Apr 2022 10:05:31 +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 4KjKDq0lYsz4tZm; Tue, 19 Apr 2022 10:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650362731; 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=buiBXyCtexnYQdJgZqraQu6ktkYskapO1vPkFVjMG9c=; b=MciaH9DKtlrtTXTKYjcTRViAwb0bLh+D8FM8McXZDAk3wsUC6FoM4XYw7HNDD8/z0VYXzW W47feIgQmNCrxeihFF4kr8SuO+/EGsRUpHVtv7C5nap/tAjyGOCzVDQDneRCRqYrLikaVv gmW3p7diIDA29E7cPG1bKwjnZAgbE8FBRw8Cu+zRmhUJtrbpbnBocZWDx5aObb3xjO5t9+ wxPQK46rscRnD9hedZTloQG5QYWQywpRxxR3LGp7EMi0bWX+ibpm0ShvfDLwUAHZ+vuaru zT6SdVUORIJI/04dYyFwJXG2LSHwz8tkqizC4YAfKFQG+bWJtwOzeR3tEnO6kQ== 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 DF874253A7; Tue, 19 Apr 2022 10:05:30 +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 23JA5UoJ012860; Tue, 19 Apr 2022 10:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JA5UEC012859; Tue, 19 Apr 2022 10:05:30 GMT (envelope-from git) Date: Tue, 19 Apr 2022 10:05:30 GMT Message-Id: <202204191005.23JA5UEC012859@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: 8d1ea089800a - stable/13 - Support EFIRT on arm64 with a non 4k 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: 8d1ea089800a1fc61d18d75d6a7f46c94fa7626d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650362731; 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=buiBXyCtexnYQdJgZqraQu6ktkYskapO1vPkFVjMG9c=; b=m0e7nT367IxXl6ssdQ4jeAgsTHaAuSZ2w+94eC+VNtbearFey8OIHt8vP/N3w4yZNo3+Ee qUx/VXUXLXnySMb0XKXCrAuXoreWW66o1qh00WdSF1j7BkducGhtt2FKvAHussZRUN7AyN 3KNVvxWAT2gXL1mVYBohHxejVfdWeYjJGxG57QgUm6Fu14BUGSSANSgdU0qZiqQTmwRqID ZwzTWBnp8a3ImNRYM8zRTGrWVmIt0EisJnKQ4mZ/BqXnYRCb8zwFwxBTadlRRDBfuN3M2b Q3m5jCzGn0OA7fds4HN0OVMzvYHncQuAAuV2kMM5jdEQEY2U6VDVtpgWLIVblA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650362731; a=rsa-sha256; cv=none; b=n2wEdXXraY5qzcQbYBdhKvysSOlXrKai2V1z5e73k0IMMA/LNVF7mfAQ8gP1J7nqOxpBjl FabpWOzeVUOxtBtk+NxP/D9fxV/WWNGhod4uUWgGkJH/xITkrmCVfu6RZ3nq8UZPAIaExN 3fXkX9XtCpPv6MD4Eg+ntXY9YcI40kyYGpbjnnwH29y7U7AJddASEpcHoBE7AON3lMsMpv y2MDeOA8O/uGEGuKQxGOYTYnf7uMLK76KR/VDYnyjNUkHAQTr8EUMw/E1Ml5vHB1sTbRVP Ydkg4RgX+iYL2zZqfd603yYWRzulmMDG64ucCZrhQdDyW8hLXxBHoKtzVkqoOw== 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=8d1ea089800a1fc61d18d75d6a7f46c94fa7626d commit 8d1ea089800a1fc61d18d75d6a7f46c94fa7626d Author: Andrew Turner AuthorDate: 2022-03-23 15:18:30 +0000 Commit: Andrew Turner CommitDate: 2022-04-19 09:18:02 +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 (cherry picked from commit 863f3220d09716ea2e570fadc6b19dcb6e4c2191) --- 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 cd4e5d7bae00..717b6cc86e17 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; }