From patchwork Thu Mar 16 15:19:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13177789 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 1D9A5C6FD19 for ; Thu, 16 Mar 2023 15:20:44 +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:Cc:To:Message-Id:MIME-Version:Subject: Date:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=BHHYa4M8ozP8mtyxgkT0YpbjLJN893TX2P+HAjsuZXM=; b=iDWrdH+TKLwEj+ MVtBR2gIGNnDBrCem7gSqRqPiTo1kqCXmLx7idTYaBvOtgOGtNxXHlGcjCuepLecA6YIeP0OpjZTb 7lim1A+e8U8EQtEQyfpB48g6YYmkwyy0G6cM0QDhfGwdgS55J45g+RB/NuvjcYvfv3yUVJf5MXszR S8bXr5NteNsnGVTEEbQIhbtgwjIdw5+DzLUfYlB/Yw8TmcztzwD8KQwep1EKko9TlHFUM1im1s5vt b9EJUkRtPwJqL5ZipQTam7Rrv5li10GFGObo44BN48LoF5JOBYCJ9vyYJNmD9hvzFTPpRfH6IeLrX yTjq0fuXgaQ0GN8OgDdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcpOR-00GnWo-1N; Thu, 16 Mar 2023 15:19:51 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcpOJ-00GnUz-2R for linux-arm-kernel@lists.infradead.org; Thu, 16 Mar 2023 15:19:45 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 667B66207B; Thu, 16 Mar 2023 15:19:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEE4AC4339B; Thu, 16 Mar 2023 15:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678979981; bh=uDVUU6i/6lHIiY07bUkgjugG7T9rkZfosiQNaFl6c+M=; h=From:Date:Subject:To:Cc:From; b=ifIymlk7RBggU3Qsruu2XSjchN1nzz0WunoR6uuBPvbrcSKU7OQBNsdqejVIR5l98 dKW67chu2+qIgE/wFwcjHbqP8bAB9qC+g51Y5o1whgIA1UuvWl/+iycQNdrbuXOkO+ qIxxQtzP7x57hdkyvSFkwfuGLlUA1nVOl1MCUQQ5bdP8fCGfRSeRaCAAWZBc89rHD5 Te53cdSfwkdpjPQ5QT1vKzzTmc5zpesh7siddHcgvBPBk7GT7nZXRU91fvqqQ1GZB9 zEtUSdB4xANupIAdQ4z5NADb1aeGLKdVFEl8BZON5dqu/ARzmOdhTaxs2ns0JitHlK 3QGNfGbV8SL+Q== From: Mark Brown Date: Thu, 16 Mar 2023 15:19:20 +0000 Subject: [PATCH] arm64/idreg: Don't disable SME when disabling SME MIME-Version: 1.0 Message-Id: <20230315-arm64-override-sve-sme-v1-1-3514ad657548@kernel.org> X-B4-Tracking: v=1; b=H4sIAHgzE2QC/x2NSwrDMAxErxK0riCfJoRepXQh2UqihZ0iFVMIu XudLmbxZnjMAS6m4vBoDjAp6rrnCt2tgbBRXgU1Voa+7Yd26EYkS9Md9yJmGgW91CRBnsZljsw cWKDKTF5Loxy2S0/kH7FreJss+v0/Pl/n+QN+r4pJgQAAAA== To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, Mark Brown X-Mailer: b4 0.13-dev-bd1bf X-Developer-Signature: v=1; a=openpgp-sha256; l=1301; i=broonie@kernel.org; h=from:subject:message-id; bh=uDVUU6i/6lHIiY07bUkgjugG7T9rkZfosiQNaFl6c+M=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkEzOLfang43vWcX+WE4mZFompBFdDQtO8Y8S3aSJE 52uA2fSJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZBMziwAKCRAk1otyXVSH0AKAB/ 0fNXpcpCpDwES1UnJoNLozpIq9J/W6Jc+gUhpesblvsP1Otj51fIGR9CZqdG3Wh/YJMNf7W9Uueog8 dq/Z0Nuz6ohtBYMNPEfgDGRQqvyn18W2csETSFCycglDOeQ930zHUJS4aiRUJtIt+Xs7ekscWF4Cil Xw5wznkibA/mI5Z8SpeuZhk5QJtJeMJlaUlOVFrclwT+q5ETMITYvL9RlEZy8Y4dMWvO5C3LcLwaSg d0m8uA7YFKw5qKuu6U1oCJsbR6O/xRL71qqZBuOPbZkkYlMHWBTc/7QthJ1UfWWDwbBwbpKJhPPeDs ooKYmA/5mLhK7iWHMtfLr2BIH+UYYS X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230316_081943_853641_78E2C5C9 X-CRM114-Status: GOOD ( 12.84 ) 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 SVE and SME are separate features which can be implemented without each other but currently if the user specifies arm64.nosve then we disable SME as well as SVE. There is already a separate override for SME so remove the implicit disablement from the SVE override. One usecase for this would be testing SME only support on a system which implements both SVE and SME. Signed-off-by: Mark Brown --- arch/arm64/kernel/idreg-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: eeac8ede17557680855031c6f305ece2378af326 change-id: 20230315-arm64-override-sve-sme-b65f8dbbbcbe Best regards, diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index d833d78a7f31..9d8edeb6aa46 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -167,7 +167,7 @@ static const struct { } aliases[] __initconst = { { "kvm-arm.mode=nvhe", "id_aa64mmfr1.vh=0" }, { "kvm-arm.mode=protected", "id_aa64mmfr1.vh=0" }, - { "arm64.nosve", "id_aa64pfr0.sve=0 id_aa64pfr1.sme=0" }, + { "arm64.nosve", "id_aa64pfr0.sve=0" }, { "arm64.nosme", "id_aa64pfr1.sme=0" }, { "arm64.nobti", "id_aa64pfr1.bt=0" }, { "arm64.nopauth",