From patchwork Fri May 3 13:01:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13652783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A33DC4345F for ; Fri, 3 May 2024 13:02:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2B166B0098; Fri, 3 May 2024 09:02:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB4076B0099; Fri, 3 May 2024 09:02:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7B6D6B009A; Fri, 3 May 2024 09:02:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9A4186B0098 for ; Fri, 3 May 2024 09:02:11 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 55DB91210AD for ; Fri, 3 May 2024 13:02:11 +0000 (UTC) X-FDA: 82077097662.05.11A200A Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf11.hostedemail.com (Postfix) with ESMTP id 9918F4000F for ; Fri, 3 May 2024 13:02:09 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714741329; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m1YNZzVNHUKXEqwCd6c41mepOkwzhluAkxFa5wlr4ak=; b=6d7w8tSkHKTVhLS4dB6tfwpb2DR1K/y97GXRxV2k7WBmtPm6RuyCQ1d0iMp0oIVxaSEVK1 FMDNDS3RcUD7lSHAbXcuiOkT6A34u4eJFRiMlda6jOxOMQWipdJYygd69X+2hApS6hVomg d5N0X0Pdev6Sekqjf9h9z1sWcEyXss0= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714741329; a=rsa-sha256; cv=none; b=nM+FYnU3bjmK5HRfMzR/PR1ixqpVbDgGriPVvmSABrrDjvNXtF1LBskrM9gfK9mQZT+RWU j70gEGlp0Lr8eib+zfn3oua50vzRQOy4FbbAf8stlihgL8X9NaeHc/HlCT2iLm+COn3iEA sWhfU8WmAmq7Mhgk5v7OvFJrLBJIpvg= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0CCDA1595; Fri, 3 May 2024 06:02:34 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B03A13F73F; Fri, 3 May 2024 06:02:05 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, joey.gouly@arm.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: [PATCH v4 04/29] arm64: disable trapping of POR_EL0 to EL2 Date: Fri, 3 May 2024 14:01:22 +0100 Message-Id: <20240503130147.1154804-5-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240503130147.1154804-1-joey.gouly@arm.com> References: <20240503130147.1154804-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9918F4000F X-Stat-Signature: 6c4rx156yysd4w4ec5p7cx4nmubhj8xm X-Rspam-User: X-HE-Tag: 1714741329-849384 X-HE-Meta: U2FsdGVkX1+mHzyHyKbtvvwR3Zt30iXltn+U7+RAvp9cqzSWAS28P8Ix/VXLv3jqFneoImZ+BP1UAf9EZyOoSMCEqaiOIfFOlCn7z2EZUoreDDVttAgExIQzxfzyYncfl/DANJHZZ8UiG3zVHxpOd8JR+vmq/yPjnp9XsQ2grL/isYZtGsOTBaBhdEbsulSD6vDsMZBfxvW4LAxRAa1h6xVv5bOPHQHIQI9LoE2B/QYwvZnHhNRJ6EMFAyDvAimQxHEVW7tva01siX3dQPPNkTDCHs8LKKv4mZpHQHNjNkdGn/gdMzrtRu3PNdZKWMvcOBQNFbdRI/Au8FkfY5wEeu/PCe5m6IFAQGHeSKSne9jW849BzpIstgDzyKpum/T9HdMp3A6pUxWy+DwDiEHHzNfI4Gl2ychfnB45lptaiAoWyGs/7BdPL7gIPS2xpvVOfiQmidZgrtF91wYkzy0Wg16JnO3+gTTmcsiTg0wFpLMWCwhtgnXSlR9BtwSDtdIUm0AhvQZIYOPCzE6Ea2Ssgr4BlIDtzOyZyD0Be693pyVifVaKpaOz0P070xjQr8bpyJQns1MohlJB2Q/ZwHOQzmP3MNUBfzQL8odj9THbqnjxv8LkjPU9uX4VsN4YCQWnYbiztuLI2mVKXpsI3QeSdnOKHUT7t1hnEYj8hjK7nJKxlX7MAdgKoTjE4e2YmUQq+pm0DMnscCg4yzF4fvW0BZ3Va2A9aVMHcOM+p2uDsR1ntJepYFu5IfasYmuUuGeCp8qba4jNyg4O+vhI8k32jKK8qerbXa21Mkvr4qK4myzgRL+Zf5qQtKo7j2x2zctp02478lklsnwbXOpgheb3uyE0TYt+mbdEMA4K79rE4Vx+LqKsSu8JYjGlQ66AONYbxP7Pj+xBeOCui+09kArHRtLHOF3E/uEb6hrNBXgUkmbxJYGWaT5fXyB+MNzg1xUygODjNgymW0uHVtcvyjA 0T2hesG0 RW77wefgul1alATZcR8/m+RH8H9dXMtjp0/rMasU16CUYmW/ehKPZN3nHPim0UGtgH6w5uSVGfpwbgduf9Iiuux0zWPGntHoCDgzBOCXqPvpIJGTsRcmQ0tGpHIAMFfWrYO09oHR42zirBBEVsc2+Zk7SdsIKsPmeWILimBL7Fh8x09oRo7sXrxJZ76InjfcUUaPCmKP859Mj6qqzRzoqyBIR+91corGxAc5cN1cs02OXqQq4W0MY0HRviRUJ4CKbvW90IgLXjWOvG9k= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Allow EL0 or EL1 to access POR_EL0 without being trapped to EL2. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Acked-by: Catalin Marinas --- arch/arm64/include/asm/el2_setup.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h index b7afaa026842..df5614be4b70 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -184,12 +184,20 @@ .Lset_pie_fgt_\@: mrs_s x1, SYS_ID_AA64MMFR3_EL1 ubfx x1, x1, #ID_AA64MMFR3_EL1_S1PIE_SHIFT, #4 - cbz x1, .Lset_fgt_\@ + cbz x1, .Lset_poe_fgt_\@ /* Disable trapping of PIR_EL1 / PIRE0_EL1 */ orr x0, x0, #HFGxTR_EL2_nPIR_EL1 orr x0, x0, #HFGxTR_EL2_nPIRE0_EL1 +.Lset_poe_fgt_\@: + mrs_s x1, SYS_ID_AA64MMFR3_EL1 + ubfx x1, x1, #ID_AA64MMFR3_EL1_S1POE_SHIFT, #4 + cbz x1, .Lset_fgt_\@ + + /* Disable trapping of POR_EL0 */ + orr x0, x0, #HFGxTR_EL2_nPOR_EL0 + .Lset_fgt_\@: msr_s SYS_HFGRTR_EL2, x0 msr_s SYS_HFGWTR_EL2, x0