From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99D49CD1292 for ; Thu, 4 Apr 2024 07:37:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=1KHPJKN56SM/YlLue+ytU/IWMM4TcWqCKOn1b2QzOZc=; b=CYR8x3jO/4whlx LPFeoKokUgifFIzqeJam8FNrOuDQTUWJWOhmCFRMtHCRSCNFPblAUzK0tmCRZ/oAL+1hG660ZGZcH 0KVTQiLOdyEpzJbyMEDy0E/y1ss5zIEogGvalv5E0m77PrDvH2e6xbLtMzOIW8B1lN0IQ8r702O5B IyXAHfS0n7xQHGCmKyrPItzYJ2T13pP43n6iGI0SZ+x2UuDlxa88pJN1jl0q+JEkArB8g0WogdnQ8 sfrPyT9XL7IE3p3wcTYX892xlR1Rn1BDXUIe7O4Q4NZAgplpLAyNj7IZy2/BW/cAhmGwZL0yov5Yr EP3d9zdri9xtNEOzw/DQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsHfQ-00000001fCk-0RPa; Thu, 04 Apr 2024 07:37:48 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsHfJ-00000001fAX-1aPT for linux-arm-kernel@lists.infradead.org; Thu, 04 Apr 2024 07:37:43 +0000 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 287D8143D; Thu, 4 Apr 2024 00:38:08 -0700 (PDT) Received: from a077893.arm.com (unknown [10.163.56.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BE5F53F64C; Thu, 4 Apr 2024 00:37:35 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com Cc: Anshuman Khandual Subject: [bootwrapper PATCH 1/2] aarch64: Disable trapping into EL3 while accessing MDSELR_EL1 Date: Thu, 4 Apr 2024 13:07:25 +0530 Message-Id: <20240404073726.947215-2-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240404073726.947215-1-anshuman.khandual@arm.com> References: <20240404073726.947215-1-anshuman.khandual@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240404_003741_496983_E5BA0CAB X-CRM114-Status: UNSURE ( 7.71 ) 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 This disables trapping into EL3 while accessing MDSELR_EL1 either in EL1 or EL2 via setting MDCR_EL3.EBWE. But first ensure that FEAT_Debugv8p9 feature is implemented and enabled looking into ID_AA64DFR0_EL1. Signed-off-by: Anshuman Khandual --- arch/aarch64/include/asm/cpu.h | 2 ++ arch/aarch64/init.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h index d1f8fd9..124ef91 100644 --- a/arch/aarch64/include/asm/cpu.h +++ b/arch/aarch64/include/asm/cpu.h @@ -41,6 +41,7 @@ #define MDCR_EL3_NSTB_NS_NOTRAP (UL(3) << 24) #define MDCR_EL3_SBRBE_NOTRAP_NOPROHIBIT (UL(3) << 32) #define MDCR_EL3_ENPMSN BIT(36) +#define MDCR_EL3_EBWE BIT(43) #define SCR_EL3_RES1 BITS(5, 4) #define SCR_EL3_NS BIT(0) @@ -62,6 +63,7 @@ #define ID_AA64DFR0_EL1_PMSVER BITS(35, 32) #define ID_AA64DFR0_EL1_TRACEBUFFER BITS(47, 44) #define ID_AA64DFR0_EL1_BRBE BITS(55, 52) +#define ID_AA64DFR0_EL1_DEBUGVER BITS(3, 0) #define ID_AA64ISAR0_EL1_TME BITS(27, 24) diff --git a/arch/aarch64/init.c b/arch/aarch64/init.c index c4e91e4..37cb45f 100644 --- a/arch/aarch64/init.c +++ b/arch/aarch64/init.c @@ -105,6 +105,9 @@ void cpu_init_el3(void) if (mrs_field(ID_AA64DFR0_EL1, BRBE)) mdcr |= MDCR_EL3_SBRBE_NOTRAP_NOPROHIBIT; + if (mrs_field(ID_AA64DFR0_EL1, DEBUGVER) >= 11) + mdcr |= MDCR_EL3_EBWE; + msr(MDCR_EL3, mdcr); if (mrs_field(ID_AA64PFR0_EL1, SVE)) { -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel