Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED72C43462 for ; Thu, 1 Apr 2021 18:13:24 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B43760232 for ; Thu, 1 Apr 2021 18:13:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B43760232 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5K0ssLIi4oif6P3ctv/dctM6cxNSNrj/AGPOjFfPk+0=; b=X3U4jOo6i2v/dqlwp9ZOmkpGm jruTG0fY7o8eH8DPYKGt79d4YHMBmTzQnMeeQGit7sQENTyxlTb/CBAlx9uhLLIM6A9Xp06PapbE6 BC5hIw9FRyvEyqqI2iNr2jSlY/uTsrGyIN0cq8MUMz74HNrB8KRuByyIZAkjoEcm7HsE8tK6laA8S OjiSgk4rWzt/z87K1gnS5sOZbVGRA8i18CeazzUewkgFkG8yOLE2+8xpnbdG+wrD7Xil2OYlu1tl+ 9RTbkO0b3szr2H84yOG/pT24kGZtJI233TTB30LRFhImaDBlNmFPxeGmKyPHUojgXzKfGLmnP5BJ7 Gui8/KRqA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lS1nj-00Acxu-VM; Thu, 01 Apr 2021 18:12:16 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lS1nX-00Acvo-Ct for linux-arm-kernel@lists.infradead.org; Thu, 01 Apr 2021 18:12:05 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id AC9646044F; Thu, 1 Apr 2021 18:12:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617300721; bh=KZ4pu5BwWWLnKvuDZ5qn0qXizelZGHv6LCSi2iNSdyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nCpK3DAQH4o49fbwDu5Ajd1UbUqN4nbl+g8vJye7hLKCTXhNTbMSlXnmhZTXP46Ly PuWnOb0QydnXSEut+C8361RcN+er4EW0ir4bKr2tIZ49mopQci0ZG/4bKJRu+IYok4 +neIsLebp3cd2UOSwqNZDqrkD5oYMsKHyrnwkrtGoAEGVjP91LWYC/LMb5lhAeqQ2Y ENT8Vk2Omr0aTJQJPZEPD0rk4jdF1aOXutd6rz3syOJBTPjzj14MWisFnaNtkyUnZR dSF4yYYoUVfO6lpwbIRWoEQCbLDZC7Kn5NCtnJBkccaZmQUjxikZkPqnB+pq8QblBr luLgtSGYoxRTA== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Marc Zyngier , Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v2 2/4] arm64: Disable fine grained traps on boot Date: Thu, 1 Apr 2021 19:09:40 +0100 Message-Id: <20210401180942.35815-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401180942.35815-1-broonie@kernel.org> References: <20210401180942.35815-1-broonie@kernel.org> MIME-Version: 1.0 X-Patch-Hashes: v=1; h=sha256; i=3nIiidMJl3iIaQu9f503jaZbO0y0VfZEe4sTB8jQvSE=; m=8SE9RiZ79FHVybRNuUgxw6S83hSx7d+/hDEZcQg+wvw=; p=YGJZuTUfajUcXKodTflgxuJlQsCBSvU3jHSOych6LNI=; g=d0102ebe202f3c05acb6fba041939123e395b92b X-Patch-Sig: m=pgp; i=broonie@kernel.org; s=0xC3F436CA30F5D8EB; b=iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmBmDGQACgkQJNaLcl1Uh9DAFgf9HSE GtYLfJNWtlRwHDtXFCkhPSGCygFwFmOND8h4bM74LiOoCQWV2xiJGLOZVil7D3vZ1DpFjSkx9xe6o YQ1mbHYKknzBY6qifOVr6BmfHYlT/i50u8v5rqw8+QH21ZIaD9t4QuGb7AAoZkelTxOGScMIQpNRl 67ELl2xbuXssFPf9icmmEhljhv4c/oVDHfOcsm5MRvKHvcAi4yftAXoISQsqv3IxmWnFxhmKZFgli pLiuO5iYAc8W7mPFSOVqdZuauW4gI+l5eptyEUEVGizGtfr4JlUjcBUqBoYmyKEQ32eHhM1RlkzlZ zHNSMFpUQv06Ra8r/mzLApIkAlqz56w== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210401_191203_872043_61CF056A X-CRM114-Status: UNSURE ( 8.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The arm64 FEAT_FGT extension introduces a set of traps to EL2 for accesses to small sets of registers and instructions from EL1 and EL0. Currently Linux makes no use of this feature, ensure that it is not active at boot by disabling the traps during EL2 setup. Signed-off-by: Mark Brown --- arch/arm64/include/asm/el2_setup.h | 21 +++++++++++++++++++++ arch/arm64/include/asm/sysreg.h | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h index d77d358f9395..b3f2d3bb0938 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -131,6 +131,26 @@ .Lskip_sve_\@: .endm +/* Disable any fine grained traps */ +.macro __init_el2_fgt + mrs x1, id_aa64mmfr0_el1 + ubfx x1, x1, #ID_AA64MMFR0_FGT_SHIFT, #4 + cbz x1, .Lskip_fgt_\@ + + msr_s SYS_HDFGRTR_EL2, xzr + msr_s SYS_HDFGWTR_EL2, xzr + msr_s SYS_HFGRTR_EL2, xzr + msr_s SYS_HFGWTR_EL2, xzr + msr_s SYS_HFGITR_EL2, xzr + + mrs x1, id_aa64pfr0_el1 // AMU traps UNDEF without AMU + ubfx x1, x1, #ID_AA64PFR0_AMU_SHIFT, #4 + cbz x1, .Lskip_fgt_\@ + + msr_s SYS_HAFGRTR_EL2, xzr +.Lskip_fgt_\@: +.endm + .macro __init_el2_nvhe_prepare_eret mov x0, #INIT_PSTATE_EL1 msr spsr_el2, x0 @@ -155,6 +175,7 @@ __init_el2_nvhe_idregs __init_el2_nvhe_cptr __init_el2_nvhe_sve + __init_el2_fgt __init_el2_nvhe_prepare_eret .endm diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index d4a5fca984c3..b35468927363 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -475,9 +475,15 @@ #define SYS_PMCCFILTR_EL0 sys_reg(3, 3, 14, 15, 7) #define SYS_SCTLR_EL2 sys_reg(3, 4, 1, 0, 0) +#define SYS_HFGRTR_EL2 sys_reg(3, 4, 1, 1, 4) +#define SYS_HFGWTR_EL2 sys_reg(3, 4, 1, 1, 5) +#define SYS_HFGITR_EL2 sys_reg(3, 4, 1, 1, 6) #define SYS_ZCR_EL2 sys_reg(3, 4, 1, 2, 0) #define SYS_TRFCR_EL2 sys_reg(3, 4, 1, 2, 1) #define SYS_DACR32_EL2 sys_reg(3, 4, 3, 0, 0) +#define SYS_HDFGRTR_EL2 sys_reg(3, 4, 3, 1, 4) +#define SYS_HDFGWTR_EL2 sys_reg(3, 4, 3, 1, 5) +#define SYS_HAFGRTR_EL2 sys_reg(3, 4, 3, 1, 6) #define SYS_SPSR_EL2 sys_reg(3, 4, 4, 0, 0) #define SYS_ELR_EL2 sys_reg(3, 4, 4, 0, 1) #define SYS_IFSR32_EL2 sys_reg(3, 4, 5, 0, 1) -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel