From patchwork Thu Jun 6 13:36:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Fancellu X-Patchwork-Id: 13688519 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 60269C27C5F for ; Thu, 6 Jun 2024 13:37:05 +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=OI1RJycisca69YMiyLY77JG3QMB1QBfGJOB+K/pfhSE=; b=WEqc31FDXy9Ivx rBOsRuPD01LRHdtBYHKPt/mYR4sE8zW59FhlPEYVngYhvmEosY/lwCJ0hdHOOAsI7nkXJQlF4a/jl 3t33bShUi/815340/kRtXystRIfKyrWvW46DzMs0U5Lb1+guwWaUsPUYD3Em/JybwNUrdYCngJ3t3 nuiSC/9qR97aq18xqS1lw1wzZE3IKVUOu5472/2smCLzqLjsrrcAbMp5HOPFBUw5B81AwCFeLWuhw OkKolKROsNdyTawt6sFQS3ZTuTZr/d+DTcfyNydIDkeIP0fgvbHq3PzTxb7ueiPD3eeocCA8fXg9i ztAwqOP6x/HL5yVKnbfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sFDIQ-00000009vYp-3DLL; Thu, 06 Jun 2024 13:36:50 +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 1sFDIK-00000009vT4-0XqM for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 13:36:45 +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 B712A1042; Thu, 6 Jun 2024 06:37:05 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.arm.com [10.1.199.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E72093F792; Thu, 6 Jun 2024 06:36:40 -0700 (PDT) From: Luca Fancellu To: linux-arm-kernel@lists.infradead.org Cc: diego.sueiro@arm.com Subject: [boot-wrapper 3/7] aarch64: Remove TSCXT bit set from SCTLR_EL2_RESET Date: Thu, 6 Jun 2024 14:36:24 +0100 Message-Id: <20240606133628.3330423-4-luca.fancellu@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240606133628.3330423-1-luca.fancellu@arm.com> References: <20240606133628.3330423-1-luca.fancellu@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_063644_291213_A8185155 X-CRM114-Status: GOOD ( 11.17 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From the specification SCTLR_EL2.TSCXT is RES1 only "When FEAT_CSV2_2 is not implemented, FEAT_CSV2_1p2 is not implemented, HCR_EL2.E2H == 1 and HCR_EL2.TGE == 1", so given that HCR_EL2.E2H is set by bootwrapper before to a value of zero, the condition above can't happen and from the specification the bit is RES0. Fix the macro removing the bit. Signed-off-by: Luca Fancellu Reviewed-by: Andre Przywara --- arch/aarch64/include/asm/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h index 124ef916ddfc..846b89f8405d 100644 --- a/arch/aarch64/include/asm/cpu.h +++ b/arch/aarch64/include/asm/cpu.h @@ -30,8 +30,8 @@ BIT(11) | BIT(5) | BIT(4)) #define SCTLR_EL2_RES1 \ - (BIT(29) | BIT(28) | BIT(23) | BIT(22) | BIT(20) | BIT(18) | \ - BIT(16) | BIT(11) | BIT(5) | BIT(4)) + (BIT(29) | BIT(28) | BIT(23) | BIT(22) | BIT(18) | BIT(16) | \ + BIT(11) | BIT(5) | BIT(4)) #define SCTLR_EL1_RES1 \ (BIT(29) | BIT(28) | BIT(23) | BIT(22) | BIT(20) | BIT(11) | \