From nobody Sun Feb 8 06:49:52 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE5DEC7EE23 for ; Mon, 22 May 2023 16:23:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231332AbjEVQW7 (ORCPT ); Mon, 22 May 2023 12:22:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230237AbjEVQWy (ORCPT ); Mon, 22 May 2023 12:22:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 570CBBF for ; Mon, 22 May 2023 09:22:53 -0700 (PDT) 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 E3047620C9 for ; Mon, 22 May 2023 16:22:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EA37C433A0; Mon, 22 May 2023 16:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772572; bh=FzovtixhHyDID3RroFvdlMrjlo2vz33VqdnD5NENejY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cc3Z97YKNg9nXngLP2sbbY40prIgld1TqJJLJJQ1h5FJxvhRKtbX2YpDmhus3lI// ej5d0Mub4gRxJLqJUKU8Q1TW35JxK/o48MT+xZniufv4QEZ2EGJ1jsDDdQwPges5XD ObUGMVPsl6D0p8oTuzWWKukDLOs22Ds06nvDnJydnxo4vxqXJgy+K+sfgkwBkxDNaV O+YrIPpycJ7fuEvivUrcWqWiNWQyEfeYoRIzjBEsteqaXkJZYHL/qeoVGL1hMqNnZ1 A2tS/gcN52SjgwBkFmVqHEq+XIL18G56tBzKMsMbAFl1SShpj5o2129CBNxRggfujG f3k7ZKWKHM01w== From: Mark Brown Date: Mon, 22 May 2023 17:22:40 +0100 Subject: [PATCH 1/5] arm64/sysreg: Remove some unused sysreg definitions MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230419-arm64-syreg-gen-v1-1-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1048; i=broonie@kernel.org; h=from:subject:message-id; bh=FzovtixhHyDID3RroFvdlMrjlo2vz33VqdnD5NENejY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bTOQmh6YBm5GAIe6KOw4KLzrietdti5W4movm2 oPdkxQ6JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW0wAKCRAk1otyXVSH0Fp4B/ 96RE12Zk9Ru9IsJVSTKjxckaPNIMmsFnTa+lIHqkiha1EUClzNtahah2XEkhufQX8RQrPe/eWGmiD/ nhs1vN3pgP55NpP1J4DKCrCYYdRbLpdDru4wwi365uuW/6qBLeCFkzDisv5d45d9XlgUs+fO1FTtSv BUdtR1c0NFUgKuAhW2MgB4tJmTPLxGGx/uG19rktS5b55Z83NZdWHapOSyxX3TONlRnVli42DP4iIn cs2gGPnER3qGV479EeN25lyzdvtinRZJQbRjSVpM3zaThBwb4yd9SPTo4doldIk12z6XejKACVLN3v cAPK4grUJseHoNSo1E/KurhTWZVHlL X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since there are no references to OSDTRRX_EL1 or OSECCR_EL1 in the code just remove the definitions rather than converting to automatic generation. Signed-off-by: Mark Brown Reviewed-by: Anshuman Khandual Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 9e3ecba3c4e6..6505665624d4 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -134,11 +134,8 @@ #define SYS_SVCR_SMSTART_SM_EL0 sys_reg(0, 3, 4, 3, 3) #define SYS_SVCR_SMSTOP_SMZA_EL0 sys_reg(0, 3, 4, 6, 3) =20 -#define SYS_OSDTRRX_EL1 sys_reg(2, 0, 0, 0, 2) #define SYS_MDCCINT_EL1 sys_reg(2, 0, 0, 2, 0) #define SYS_MDSCR_EL1 sys_reg(2, 0, 0, 2, 2) -#define SYS_OSDTRTX_EL1 sys_reg(2, 0, 0, 3, 2) -#define SYS_OSECCR_EL1 sys_reg(2, 0, 0, 6, 2) #define SYS_DBGBVRn_EL1(n) sys_reg(2, 0, 0, n, 4) #define SYS_DBGBCRn_EL1(n) sys_reg(2, 0, 0, n, 5) #define SYS_DBGWVRn_EL1(n) sys_reg(2, 0, 0, n, 6) --=20 2.30.2 From nobody Sun Feb 8 06:49:52 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F388C7EE23 for ; Mon, 22 May 2023 16:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231479AbjEVQXB (ORCPT ); Mon, 22 May 2023 12:23:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231266AbjEVQW4 (ORCPT ); Mon, 22 May 2023 12:22:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAC68F1 for ; Mon, 22 May 2023 09:22:55 -0700 (PDT) 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 4355760C67 for ; Mon, 22 May 2023 16:22:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBEACC433EF; Mon, 22 May 2023 16:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772574; bh=G/fe6roSUXDmM2/KNg6p2UkocZaL5qbzAOdEZ818tv0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qKM79+nZdmX7gHlPPtIfSPENp3MVLRrLVU0VHDxtxdnnzTYDSNY1rtyL1w9es3oF2 5+sNrvULuU2S5n/rXS8al1M2hRKCMF56QE51q+toooVFjAhYl6R6g9qrGXZw/Lz1oF LSN54S71OVuK3rjsILEPVI1mrMbAgO0F4ITHMqUMWeQz+yaMr+AoHRJKJYXMfWd52O Zuqiv2K4MWmQ3aH9LjE8pxd3DNET5YVWZHoErU5/murnd50g9GybMi+eRWAK4ePa2A Xul1nlgcMiRmBgR6JOBRw1ilKTDQz0/pjyGu2Pp1+iluW2MrTSCWcbGyPuWT2HMze3 H5+mwEVZxuXsQ== From: Mark Brown Date: Mon, 22 May 2023 17:22:41 +0100 Subject: [PATCH 2/5] arm64/sysreg: Convert MDCCINT_EL1 to automatic register generation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230419-arm64-syreg-gen-v1-2-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1361; i=broonie@kernel.org; h=from:subject:message-id; bh=G/fe6roSUXDmM2/KNg6p2UkocZaL5qbzAOdEZ818tv0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bUO+I3Gj34AOYEKcMicgGKQTnFUZWH7GfRFe+U UjbRnwWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1AAKCRAk1otyXVSH0AiYB/ 0TrUSU8JZfIsTuOruidRVPHGcPEuHeophKStHYETANcwfKYqxw19PiYdFbWpIy1FMx78ezCXSZjhzh ucOKh/QkmTRpdbV9pJo5ruJEzrvoBwPEzsLWEq1G+Fc6wkBbtHGGIM9dsOMIZ1Ry9Ql6oC9UmvKaAK UPSwJ4hYZ7bRbkWFbQtDp6GPqJ913SPR8Nei1sAZ50dpSyZ+JtV3l/KdJujWInQTtyaII54GQeNd6b ZHmevprX3hbgv5z9q/dDVkHpNA6xK1TaogrTyeK78LdkXBgcnInqtY7IYVy+6mYDk9eeyStmm3Bzl/ JhoAHv8rPDhz472V6SwUB+/BnCXt2P X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert MDCCINT_EL1 to automatic register generation as per DDI0616 2023-03. No functional change. Signed-off-by: Mark Brown Reviewed-by: Anshuman Khandual Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 6505665624d4..4e48bb4dca6a 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -134,7 +134,6 @@ #define SYS_SVCR_SMSTART_SM_EL0 sys_reg(0, 3, 4, 3, 3) #define SYS_SVCR_SMSTOP_SMZA_EL0 sys_reg(0, 3, 4, 6, 3) =20 -#define SYS_MDCCINT_EL1 sys_reg(2, 0, 0, 2, 0) #define SYS_MDSCR_EL1 sys_reg(2, 0, 0, 2, 2) #define SYS_DBGBVRn_EL1(n) sys_reg(2, 0, 0, n, 4) #define SYS_DBGBCRn_EL1(n) sys_reg(2, 0, 0, n, 5) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index dd5a9c7e310f..1699e87bc0b4 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -48,6 +48,13 @@ # feature that introduces them (eg, FEAT_LS64_ACCDATA introduces enumerati= on # item ACCDATA) though it may be more taseful to do something else. =20 +Sysreg MDCCINT_EL1 2 0 0 2 0 +Res0 63:31 +Field 30 RX +Field 29 TX +Res0 28:0 +EndSysreg + Sysreg ID_PFR0_EL1 3 0 0 1 0 Res0 63:32 UnsignedEnum 31:28 RAS --=20 2.30.2 From nobody Sun Feb 8 06:49:52 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91AF0C77B75 for ; Mon, 22 May 2023 16:23:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231492AbjEVQXE (ORCPT ); Mon, 22 May 2023 12:23:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231397AbjEVQW7 (ORCPT ); Mon, 22 May 2023 12:22:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25E22E9 for ; Mon, 22 May 2023 09:22:58 -0700 (PDT) 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 A77F660C67 for ; Mon, 22 May 2023 16:22:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22169C4339E; Mon, 22 May 2023 16:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772577; bh=69OmJkjw4vz6UuLeKe32At8mP5D9dT1Jr6f+G95j73U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=P0oRwEQgpRkPdhBxHeu7agzbs74NOm5xgfmcQuhrQ6W4Iw2JMQAEdXxvApnhT2rfr 6clQw4CzU34F3feic7LgFg8TOtm9yco78HkqnIeM6UHiWrr9PI/Aw4IpgGZuWmoYHS dl/Up09B9J5wxDZxmEeDGtnMdnJM10kq3UiecQAJdf+/oCl7GjcaesXfMVyjtHOyVo ryzvYxJpnFVdAVPBDQduNefFDoCAWLvcExKicHhex8fxH3fHGK9mShJiYqAhNd8VSh /KyF4fiWG54fFSEbYAWbnU1iynqA56rnQ5n8Vb/Tj5aKgmuQgvbBzEU77OfLeVswxj zBtpshvPYU+lg== From: Mark Brown Date: Mon, 22 May 2023 17:22:42 +0100 Subject: [PATCH 3/5] arm64/sysreg: Convert MDSCR_EL1 to automatic register generation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230419-arm64-syreg-gen-v1-3-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1585; i=broonie@kernel.org; h=from:subject:message-id; bh=69OmJkjw4vz6UuLeKe32At8mP5D9dT1Jr6f+G95j73U=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bVL7ffvgZ5ePbP2LQRm/DpBM5HR4e0vEsXs6NJ Yu3gJ8CJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1QAKCRAk1otyXVSH0CtMB/ 40R9+nP6xmrfk5WVeaHV8vDixBon2zV1jf6yvfeZ8vy6iK2bTeIh635o0cvT6cw7TAU+A39yem3PU8 advcTbZL5hUL2frw9DLpla4ccORKZkDea8BxjDzjIy75yXzJttgqM6TI13qq5XpNuvtDsAqJ91Gcfu fG5S+KG2mM2/MrfRGBmlb+ReqOY53AVShGH7OGHepGqbwBaosvsRXciodx9NMHbQZYA82gfxskLJ4u Px3PeFek0SCY9epF4euSZk6/l1A/KYkrjLZW7QvVxG+cHuQZhoDn4GqwEhbD/JyYoTaRtXKXW06Oxu ozL4j526nmNm6ii9nx0cWnpiFJDQ8v X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert MDSCR_EL1 to automatic register generation as per DDI0616 2023-03. No functional change. Signed-off-by: Mark Brown Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 4e48bb4dca6a..4ecae92b56b5 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -134,7 +134,6 @@ #define SYS_SVCR_SMSTART_SM_EL0 sys_reg(0, 3, 4, 3, 3) #define SYS_SVCR_SMSTOP_SMZA_EL0 sys_reg(0, 3, 4, 6, 3) =20 -#define SYS_MDSCR_EL1 sys_reg(2, 0, 0, 2, 2) #define SYS_DBGBVRn_EL1(n) sys_reg(2, 0, 0, n, 4) #define SYS_DBGBCRn_EL1(n) sys_reg(2, 0, 0, n, 5) #define SYS_DBGWVRn_EL1(n) sys_reg(2, 0, 0, n, 6) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 1699e87bc0b4..a5ae0e19fc9f 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -55,6 +55,34 @@ Field 29 TX Res0 28:0 EndSysreg =20 +Sysreg MDSCR_EL1 2 0 0 2 2 +Res0 63:36 +Field 35 EHBWE +Field 34 EnSPM +Field 33 TTA +Field 32 EMBWE +Field 31 TFO +Field 30 RXfull +Field 29 TXfull +Res0 28 +Field 27 RXO +Field 26 TXU +Res0 25:24 +Field 23:22 INTdis +Field 21 TDA +Res0 20 +Field 19 SC2 +Res0 18:16 +Field 15 MDE +Field 14 HDE +Field 13 KDE +Field 12 TDCC +Res0 11:7 +Field 6 ERR +Res0 5:1 +Field 0 SS +EndSysreg + Sysreg ID_PFR0_EL1 3 0 0 1 0 Res0 63:32 UnsignedEnum 31:28 RAS --=20 2.30.2 From nobody Sun Feb 8 06:49:52 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A141C7EE23 for ; Mon, 22 May 2023 16:23:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231650AbjEVQXH (ORCPT ); Mon, 22 May 2023 12:23:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231448AbjEVQXB (ORCPT ); Mon, 22 May 2023 12:23:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84A96F4 for ; Mon, 22 May 2023 09:23:00 -0700 (PDT) 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 0BD1462018 for ; Mon, 22 May 2023 16:23:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FE98C433A1; Mon, 22 May 2023 16:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772579; bh=CbUz/yoL9PyMSTqsbEC82EZry/1wdlsepwx6fDSgjrY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bToiEcu0XHJRGSZDIG9qg2M0S+uaKB7rLa6MAcB9huIBJf0mtmUlJ5xUcRW0cV1HO EP7cIAMwNiCRtYB+O/cd0yOrgfsuj9AvH6srqd4Lga0xdgoojtmCLcRf8m+siFhn3O DTa0gF+ZAFc0j2Rve5Al6elICn3sJKz3lTZUc4X+4ePlxquBkxbFARhfpRruqglYow dd0WrAztZd373eMd5mnhUlzAihvzh1d2ysU3s5Kizr+v59PTifjE05KQ2k7M1rwQ3e xIpB+Amyx8tNlbKmxbIyHOm7UAG2WLOKmiKAz+YKtr0qsalgV9wtfZFl0H6rHJ++8P RcWpiYxxmIpOg== From: Mark Brown Date: Mon, 22 May 2023 17:22:43 +0100 Subject: [PATCH 4/5] arm64/sysreg: Standardise naming of bitfield constants in OSL[AS]R_EL1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230419-arm64-syreg-gen-v1-4-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=3462; i=broonie@kernel.org; h=from:subject:message-id; bh=CbUz/yoL9PyMSTqsbEC82EZry/1wdlsepwx6fDSgjrY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bWSbm537iErZkk8Xr8ZgULfL2Xb94AV4jb1wRM zEBp0XKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1gAKCRAk1otyXVSH0HyhB/ 9Bo7sZXLklp6xHD7EhcM1apRk517eVTUbCt4PPAb5ng28+IiHaLcmt2Dsx8JOpYT7iS9xvtiM2qLKz 7yEEUh4uNXOb3ooFqdubs1dzLBvNy/3jQTZzwzqm+BwMkUMQTtmQg81B99j61lkyJHETRfEPiPmDAL 7fTrLW43BoRCbUJe4hp+6D4K3ZO/qta6SdBVfTU2Hz3CAl5OexaF+MMw1WgQCkYDaqfGxuhP0oVXUy cKNbABwcFjQ/YQ80g2CK7gMwFL0mWVwpo2wde+di9YxbluhMLIIKmwlNMJ4PsVHB2Uq4j45zIHQVJK jWPvX07eAvb2BfuV5MBTV9a2e1EcsI X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Our standard scheme for naming the constants for bitfields in system registers includes _ELx in the name but not the SYS_, update the constants for OSL[AS]R_EL1 to follow this convention. Signed-off-by: Mark Brown Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/include/asm/sysreg.h | 10 +++++----- arch/arm64/kvm/sys_regs.c | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index bcd774d74f34..cde4ad590f8c 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -996,7 +996,7 @@ void kvm_arm_clear_debug(struct kvm_vcpu *vcpu); void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu); =20 #define kvm_vcpu_os_lock_enabled(vcpu) \ - (!!(__vcpu_sys_reg(vcpu, OSLSR_EL1) & SYS_OSLSR_OSLK)) + (!!(__vcpu_sys_reg(vcpu, OSLSR_EL1) & OSLSR_EL1_OSLK)) =20 int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 4ecae92b56b5..09de958e79ed 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -141,13 +141,13 @@ #define SYS_MDRAR_EL1 sys_reg(2, 0, 1, 0, 0) =20 #define SYS_OSLAR_EL1 sys_reg(2, 0, 1, 0, 4) -#define SYS_OSLAR_OSLK BIT(0) +#define OSLAR_EL1_OSLK BIT(0) =20 #define SYS_OSLSR_EL1 sys_reg(2, 0, 1, 1, 4) -#define SYS_OSLSR_OSLM_MASK (BIT(3) | BIT(0)) -#define SYS_OSLSR_OSLM_NI 0 -#define SYS_OSLSR_OSLM_IMPLEMENTED BIT(3) -#define SYS_OSLSR_OSLK BIT(1) +#define OSLSR_EL1_OSLM_MASK (BIT(3) | BIT(0)) +#define OSLSR_EL1_OSLM_NI 0 +#define OSLSR_EL1_OSLM_IMPLEMENTED BIT(3) +#define OSLSR_EL1_OSLK BIT(1) =20 #define SYS_OSDLR_EL1 sys_reg(2, 0, 1, 3, 4) #define SYS_DBGPRCR_EL1 sys_reg(2, 0, 1, 4, 4) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 53749d3a0996..8a5160a90d3c 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -388,9 +388,9 @@ static bool trap_oslar_el1(struct kvm_vcpu *vcpu, return read_from_write_only(vcpu, p, r); =20 /* Forward the OSLK bit to OSLSR */ - oslsr =3D __vcpu_sys_reg(vcpu, OSLSR_EL1) & ~SYS_OSLSR_OSLK; - if (p->regval & SYS_OSLAR_OSLK) - oslsr |=3D SYS_OSLSR_OSLK; + oslsr =3D __vcpu_sys_reg(vcpu, OSLSR_EL1) & ~OSLSR_EL1_OSLK; + if (p->regval & OSLAR_EL1_OSLK) + oslsr |=3D OSLSR_EL1_OSLK; =20 __vcpu_sys_reg(vcpu, OSLSR_EL1) =3D oslsr; return true; @@ -414,7 +414,7 @@ static int set_oslsr_el1(struct kvm_vcpu *vcpu, const s= truct sys_reg_desc *rd, * The only modifiable bit is the OSLK bit. Refuse the write if * userspace attempts to change any other bit in the register. */ - if ((val ^ rd->val) & ~SYS_OSLSR_OSLK) + if ((val ^ rd->val) & ~OSLSR_EL1_OSLK) return -EINVAL; =20 __vcpu_sys_reg(vcpu, rd->reg) =3D val; @@ -1760,7 +1760,7 @@ static const struct sys_reg_desc sys_reg_descs[] =3D { { SYS_DESC(SYS_MDRAR_EL1), trap_raz_wi }, { SYS_DESC(SYS_OSLAR_EL1), trap_oslar_el1 }, { SYS_DESC(SYS_OSLSR_EL1), trap_oslsr_el1, reset_val, OSLSR_EL1, - SYS_OSLSR_OSLM_IMPLEMENTED, .set_user =3D set_oslsr_el1, }, + OSLSR_EL1_OSLM_IMPLEMENTED, .set_user =3D set_oslsr_el1, }, { SYS_DESC(SYS_OSDLR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGPRCR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGCLAIMSET_EL1), trap_raz_wi }, --=20 2.30.2 From nobody Sun Feb 8 06:49:52 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C05CBC7EE26 for ; Mon, 22 May 2023 16:23:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232192AbjEVQXM (ORCPT ); Mon, 22 May 2023 12:23:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231538AbjEVQXF (ORCPT ); Mon, 22 May 2023 12:23:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBD3CE9 for ; Mon, 22 May 2023 09:23:02 -0700 (PDT) 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 6B51E60C67 for ; Mon, 22 May 2023 16:23:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD2F3C4339B; Mon, 22 May 2023 16:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772581; bh=8nGdHG41Sq+2pYzY75ll3lCjhbxICW46NC3itOTILLg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=R7TlZ/swN6n9ZdujR7/eUkEGWnPXfR/m/fUSJnjfMkjNX/d3U8JJpVB3QG9UQ+18b 3ChwfHMDcb8My8rVJ8qPc540VZ5I6CluEX2qZY7i7YDRZWdpP9BCHG9aEysn2br4W0 pNQbXsJgg65YokDFndYFNZWBtcVaQd6suT2aqrHroiLUfFclM6JYPd/QMuIbff8/UD u5li13IJZknuBpczlaQBQUT+h5ubO2XVRZhU/ZzFDxtpw2OPLBnzGiN0jXqYVMjuS1 MBB7WM/MQvIrIxRKWLjTHF0q6Ovt8lLWjeUsN0qvDHW/JsKuLDv4biFXOT/VC5rEwH HoH5B+n7e7M5Q== From: Mark Brown Date: Mon, 22 May 2023 17:22:44 +0100 Subject: [PATCH 5/5] arm64/sysreg: Convert OSLAR_EL1 to automatic generation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230419-arm64-syreg-gen-v1-5-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1203; i=broonie@kernel.org; h=from:subject:message-id; bh=8nGdHG41Sq+2pYzY75ll3lCjhbxICW46NC3itOTILLg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bWlBIlzvv8r7RXpM0eD5xKcfN7tXnKCuoI4k4T HPI1ahOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1gAKCRAk1otyXVSH0NhaB/ 9bdRaqARex0WH59AXvDsCZC9s+erjBaqknoy800EVrUq6jyDkxJnG8NPir0O99TAJk7pXmDX/sjD73 tQ7eOF0pbUEWTlS/qnLeOXqvoOOpAb1aWnDACpAIujz+TDao8NnngqH5qgyPm1Xv7uBKGJ7+3hEoid /uCgcmtDO1KXNWH9hx2gb3nlEppBon/Fq321i9iU5xQicecw1a8yC5VyIKC+gprcPPH512TYXTM2wO 6vajE1NAtcvXxkyUwIAnPAaRxsQxuq2EMNuIucHwI0HzN6hIWTOJo/sTe5Cfu1G0ATadTMiNSrNwbf 3Qk0aJDyBXy27TnWbPPeJdbyIl9w7V X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No functional change. Signed-off-by: Mark Brown Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 3 --- arch/arm64/tools/sysreg | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 09de958e79ed..3b51e532caa9 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -140,9 +140,6 @@ #define SYS_DBGWCRn_EL1(n) sys_reg(2, 0, 0, n, 7) #define SYS_MDRAR_EL1 sys_reg(2, 0, 1, 0, 0) =20 -#define SYS_OSLAR_EL1 sys_reg(2, 0, 1, 0, 4) -#define OSLAR_EL1_OSLK BIT(0) - #define SYS_OSLSR_EL1 sys_reg(2, 0, 1, 1, 4) #define OSLSR_EL1_OSLM_MASK (BIT(3) | BIT(0)) #define OSLSR_EL1_OSLM_NI 0 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index a5ae0e19fc9f..84df0b7feb45 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -83,6 +83,11 @@ Res0 5:1 Field 0 SS EndSysreg =20 +Sysreg OSLAR_EL1 2 0 1 0 4 +Res0 63:1 +Field 0 OSLK +EndSysreg + Sysreg ID_PFR0_EL1 3 0 0 1 0 Res0 63:32 UnsignedEnum 31:28 RAS --=20 2.30.2