From nobody Sun Sep 18 06:27:12 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 4MVdBm2XrHz4c3DB; Sun, 18 Sep 2022 06:27:12 +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 4MVdBm1rQPz3Yd9; Sun, 18 Sep 2022 06:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482432; 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=CNmx73br7FE7qK0TFOlDG/NW/W4yWM8MtcigDPdjtF8=; b=ZNTrx6F599wRNQdmqwzzjR5nDI18KKSpLV4MIe+sfGwNX73M27BEFtiLWCI/TXpH5dhjfl QRVz2cHQYUwW3fhBPAS+NV+6jVwIDW60mtJrcAm1iifrEHBFcM15KGttUHk8+X+l1VnWQ6 g9i8zJbnrmVwu3CVSpQIl68/6OB0t1A6rteWVcwyLZ67diNgLLccvHW7VmHMGoNdWfTRtq mJ5ZsDXpdJfNVEAtKPU8jJZrEkt4PkhoNnPd4TBiwsxt83+dZSmKCwmWLVZvz1sDNZThl2 PPnamHsdeTvPB2cigqLlzH3PPV03G/57maK8n6HKhilh8F5tRvG0bjqoCRZXrA== 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 4MVdBm0wYBzxgv; Sun, 18 Sep 2022 06:27:12 +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 28I6RCc0068142; Sun, 18 Sep 2022 06:27:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28I6RC8x068141; Sun, 18 Sep 2022 06:27:12 GMT (envelope-from git) Date: Sun, 18 Sep 2022 06:27:12 GMT Message-Id: <202209180627.28I6RC8x068141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f086a0afe0c9 - stable/12 - arm64: disable the EL2 MMU before dropping to EL1 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f086a0afe0c90c5a0a24a3d1a5dc2501181ce837 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482432; 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=CNmx73br7FE7qK0TFOlDG/NW/W4yWM8MtcigDPdjtF8=; b=CmYSppViJK7mpaS2ENsvTtPRZNd0LgXo4X06WFdYhHxTwgkFLUQrXbJ7/Fth9eDFCdz5UY 29S//A2ZYgfssKWycIVM+i8EFORcTvBGU9txUkN0Erkze25UO9jRdJlZzM6/myPaDJejbA CoU+OPRzq7hXQ1CvZpQIslHyAvjs4Ecfw3UrnF3azm9As85Vw0A0LLr4eNBjOSgBfHwguI qyAlAM103/msY4yyetJn7e6RpgdEb5t4mVlh5Gk6e+pohXBcNzPWikDN5cFDNP8VSaajv2 Oo9LIfA/B2SuVpTJeouR/fh1DAAui3ILo+sJxg0NlcFL0kJJwqvMpl/iAlo3Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663482432; a=rsa-sha256; cv=none; b=cevy1L9M2gHGbrViv4ukDsQbg8v7kkGKRC9/bUliWjwrm+0F5X94eak/zcAkYFYGlmuNJt vwTBEG4MYvYBgQjwHoDfeQsMrrsMXbP0hUMovO9Yfa8A+eu1weM+KR5xfGIK/6Ap6oR6eX Tb5lke5rszulOsAK3h/NVaCyFB0ougwyLf2d/Y/CIfBrb/3wc8X1jBKg/yhW3FCw2mdUCr en+MVXdj83328oiUpokqBmho0edhCXwwOe5tLMm8CsmHAxG6xqaBIgDxAHewwwmBc1WRBE zu/ZZGOnjtkDi+vbIYfiOMB3gNtAahWZGT3FpP0yIf13WxMAJ8f19VCnVTtaTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f086a0afe0c90c5a0a24a3d1a5dc2501181ce837 commit f086a0afe0c90c5a0a24a3d1a5dc2501181ce837 Author: Kyle Evans AuthorDate: 2022-05-13 03:03:32 +0000 Commit: Kyle Evans CommitDate: 2022-09-17 19:29:39 +0000 arm64: disable the EL2 MMU before dropping to EL1 An earlier stage may have set HCR_EL2.E2H, the clearing of which may break address translation. We don't need the EL2 MMU at this point, so we can avoid re-enabling it for now and just drop to EL1 as usual. Suggested by: andrew Reviewed by: andrew (cherry picked from commit 51adf913e8815bdc928cb72dd378c596b8b15336) --- sys/arm64/arm64/locore.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 74b1d3609b89..ffa28a136ec5 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -202,6 +202,16 @@ drop_to_el1: b.eq 1f ret 1: + /* + * Disable the MMU. If the HCR_EL2.E2H field is set we will clear it + * which may break address translation. + */ + dsb sy + mrs x2, sctlr_el2 + bic x2, x2, SCTLR_M + msr sctlr_el2, x2 + isb + /* Configure the Hypervisor */ mov x2, #(HCR_RW) msr hcr_el2, x2