From nobody Sun Feb 8 13:39:46 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 E4466C77B75 for ; Tue, 23 May 2023 18:37:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233463AbjEWShb (ORCPT ); Tue, 23 May 2023 14:37:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237843AbjEWSh2 (ORCPT ); Tue, 23 May 2023 14:37:28 -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 50E89130 for ; Tue, 23 May 2023 11:37:16 -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 8DDE462F33 for ; Tue, 23 May 2023 18:37:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9DF1C4339B; Tue, 23 May 2023 18:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684867035; bh=NuUDB+s2fxCd02gyUF/+pz6UWNHOrX4UeDzZX2n8uUc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jb64CtckOVDO9vFs6WnqaZNl5WT+Qk31uMGRTBE5NG4XbLqcg2VG7UhusOLZ7Tusd /g8OQKZzSBIYWCJWNZGhHdP6/UNtZqQwVewFDbqIrI424d8BMRRD+Eo+uhP+L/SwpY uIJJb0MLnLoqERU8oCLVmZ54DrQNskMghgo8PELsQjq+MZL8UhtFx81bbVe32WRFP3 pseL7ICbga8zpP/qjIojbk5P/wQfI8xTJphHVT7yaMoiKJ4I2zcgQvkUBaNATYfU9o 0f5mH1wsJ+zIG+f33S2Pi0AijRxOagw2Kb4FNwUPR9TrxBfksUv0FBlN6Y4Ja5xd6U CSfqh6j/9iYpQ== From: Mark Brown Date: Tue, 23 May 2023 19:36:59 +0100 Subject: [PATCH v2 1/7] 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-v2-1-4c6add1f6257@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@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 , Anshuman Khandual , Shaoqin Huang X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1459; i=broonie@kernel.org; h=from:subject:message-id; bh=NuUDB+s2fxCd02gyUF/+pz6UWNHOrX4UeDzZX2n8uUc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkbQfQZoWKoFheLxPnfIx0K0In9gctV14ESDTvug+4 yW9j8NCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0H0AAKCRAk1otyXVSH0KyOB/ 9t1lYVk2E7tat2LWCSzqMBwPHuDyPWfJk6jeFbFVyx1RGf2WnE0upBMjfaV9i21kg2WSw4Jt8/uaiy bldL02V6xo8mOz1afM2YEs48cACz0bRdvckQSiAtSKZeKkhFotgM/iFQIQlg7vnvB3l4UaBF5aHacN hLFH5CnMXqlvdz28y9pR6DiI/05iPunQEe+JOpHkjr5/+q/cWNsEhL24cFE5V0jHibvhBYxBw2gfA8 G+J7OZXmTbPoMDWZLwnwhctD/Wjh+M0LUI3c6C9wMyoC/a5fAlVvWd1GCrUqhJ5btQJ9RuSM03OM/f QQy/5rnvIA6L2Mw9j9N3eMjDxTi3bi 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. Reviewed-by: Anshuman Khandual Reviewed-by: Shaoqin Huang Signed-off-by: Mark Brown Reviewed-by: Oliver Upton --- 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 e72d9aaab6b1..3d69bda0e608 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -135,7 +135,6 @@ #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) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index c9a0d1fa3209..df7a7ba97b43 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 13:39:46 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 D31BDC77B75 for ; Tue, 23 May 2023 18:37:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238029AbjEWShk (ORCPT ); Tue, 23 May 2023 14:37:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237876AbjEWShb (ORCPT ); Tue, 23 May 2023 14:37:31 -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 D408818F for ; Tue, 23 May 2023 11:37:19 -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 313F5635B7 for ; Tue, 23 May 2023 18:37:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FA98C433A1; Tue, 23 May 2023 18:37:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684867037; bh=Dx+cWy0dcqpkMVnXLdbKAeKzPOC7O9mGntVnbrrmpd4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Yld0PyatutKZheV5HR/xOZVi3li7NRfOrOSw1EC1fuKElOQVSGmPonvZ4Yc78dxfO CkCAU/ygvsSbTPUxqOsRIXMwtEPA7zXwCSJ3jd2TqfvpR8JlznJjZvIq68MBvn20+f zGPMdesQrxK+VPAAWEqZwBeNECQgRhyUqjp471m0ktDer0NMx9LZUHcwUGQyKNPIzc NJf1PU5XDxtoGQSXxYlANmFjd5JCe5kxxSMopCG80lowoScR2f6PR0XBkPhY41k/7r 3yHv9qdXwi/KCCKfTy3ox40/XcmkLNT5WJlsDVjGGVHbU8kZCkcrQxzgpSpR0nVdxH tGFCPKh54Iz2Q== From: Mark Brown Date: Tue, 23 May 2023 19:37:00 +0100 Subject: [PATCH v2 2/7] 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-v2-2-4c6add1f6257@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@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 , Shaoqin Huang X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1623; i=broonie@kernel.org; h=from:subject:message-id; bh=Dx+cWy0dcqpkMVnXLdbKAeKzPOC7O9mGntVnbrrmpd4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkbQfQEOsIM7sSRKGUU9M0sMYE/zC2hQ8ElSX0dynF BkK5NNWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0H0AAKCRAk1otyXVSH0KrFB/ 9KVYryXKJ0Q9v9gHbJocpaeLjfSllAbDBNZN7H/2WcAncEaUYEbYJUNwtDbdKXx6IUAHKhzj+2IT7L E/bee4jUOy9lWi1e0iqSViHoIROUk8cOrjvcEwkDFmpLxpU9mG/nC2FPDjX4kjkTY6U2MPLLTLa9Sw /Zlef1nSW9RLbxItSc5fVBH9mDjKdnXFd6ByIR2J7NSzMfik3cOX04a9nk60pMtQqWLl622mI9d7H8 /Y+SI6MVRIMzist2gaDZ9xoAhfKA2bdLGveYBecR1VYj74C7RLNqIKE/EHgGjSLFTLfTm/jTXGWlM0 cn3TdCw/j5OwSpdKi7+yk+pZkxTetM 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. Reviewed-by: Shaoqin Huang Signed-off-by: Mark Brown Reviewed-by: Oliver Upton --- 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 3d69bda0e608..95de1aaee0e9 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -135,7 +135,6 @@ #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_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) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index df7a7ba97b43..601cc8024734 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 13:39:46 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 4B8CDC77B75 for ; Tue, 23 May 2023 18:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238121AbjEWSiB (ORCPT ); Tue, 23 May 2023 14:38:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238062AbjEWShh (ORCPT ); Tue, 23 May 2023 14:37:37 -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 DD15C196 for ; Tue, 23 May 2023 11:37:21 -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 B199D62DAB for ; Tue, 23 May 2023 18:37:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B2BAC433EF; Tue, 23 May 2023 18:37:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684867040; bh=gSxLCAUCV6RPVUE1Qap7EtWP0tdGJ920xLzGkpNf2Hk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TtQNdJkKcOkYN/D3Tet3X9vgiR2Ib6t/ImwmhszFWSqVGE6ZiWuP3xKugYWH8Z83p 2ncIBUgRX1bphSViWKScGmFzeScIHb8UQszkuC/wbTkP+0qwpmtnfVMu3IFMpvF7Pp ocNZf+v4Hjt6O4UvoBrzexW3vOuUoOy0JXnIqwrwZHHOeROKrjf4H4b5UTkdl3LCIg B0dAxboH/99SbnrGNKJ847kvw8twTvjItwGTTjy+r00CmCYHkM4XOOMpCZENAvDg4N 2/duVdiAm+maenT394UIFqbanr889KVxP6jZ42XPW8lkgPupj6vrPr2Re8HNjGIjOZ MvWjEujxbc8tA== From: Mark Brown Date: Tue, 23 May 2023 19:37:01 +0100 Subject: [PATCH v2 3/7] 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-v2-3-4c6add1f6257@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@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 , Shaoqin Huang X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=3514; i=broonie@kernel.org; h=from:subject:message-id; bh=gSxLCAUCV6RPVUE1Qap7EtWP0tdGJ920xLzGkpNf2Hk=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkbQfR73/Q0St/2vaw/RMqWlwmOA3S+gAyS3FBlhZG K9J+/JiJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0H0QAKCRAk1otyXVSH0M3CB/ 9+txif1N+MGKDLaN9BFPGWrdZxbUIRED1gGJYEDM24XqcUF9PZXpFy+ipzgL47TIAsL5eEo4cItgHI Tkv4bedJSXZF5j5jfd/a6LewgCWeHX1uOlbvWbWyxki8i/UiibyFN753sFpfZBBzWwvTdpMIcC+oGY PYZW1uSXpYlfaDUVoAj13DFJTezqJ2T8gRqpX26JPvJZxtfrmHcM5rD82hLV911akcDbRWj9/o61DY dntc97hs9Oy7tFbQK8GctGgCT9ipt8QX2VGWqZzGrrrkLUBw9v+STBgQm8+JhXS5NQj5pV5WGHan+J p+q+FikGQp8J56R7AT+aQ8AGDRr0Ef 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. Reviewed-by: Shaoqin Huang Signed-off-by: Mark Brown Reviewed-by: Oliver Upton --- 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 7e7e19ef6993..e759e6b0cd02 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -1031,7 +1031,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 95de1aaee0e9..979975c8be2c 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -144,13 +144,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 71b12094d613..e834d8897843 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; @@ -1781,7 +1781,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 13:39:46 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 857F6C7EE2E for ; Tue, 23 May 2023 18:37:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229759AbjEWShq (ORCPT ); Tue, 23 May 2023 14:37:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238051AbjEWShh (ORCPT ); Tue, 23 May 2023 14:37:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCF1819D for ; Tue, 23 May 2023 11:37:23 -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 47B636307F for ; Tue, 23 May 2023 18:37:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94914C4339B; Tue, 23 May 2023 18:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684867042; bh=1trlKZwAecGTqrKD0iQKq5crYO5E8+VYUNMVFUR5Ei0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ym0dc8yUIAwLtVciJM2MzxVMG0yzR/5UPKUTB1zWXIsKeHiFpV3C7HrrKOLBG4yuK VHQ6pKC0q1COD6oRYRuauXEQmW52k8e9GKNunRPlvnm8kfaEcsyeebNGDEr9Za35BI uYpJT2zMx6sVIQAhK4zYtO95c7PhpsXc1hRcINuWSdIFI9AAFhvOxPiIC24OFQv1rY cXSECHIMatt44kr+Naf08sa2xfP2Ulx4gaXpAvjOl0PYWQINChFDoGfYLsCrECYE6t Hr3uEQsXneRxKHT48V3R9Nh5xUUvHBf23HnqMvSwtbWEmwetRAW7LBZqNQYIn2+hMB ojWE4na+wQHTA== From: Mark Brown Date: Tue, 23 May 2023 19:37:02 +0100 Subject: [PATCH v2 4/7] 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-v2-4-4c6add1f6257@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@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 , Shaoqin Huang X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1253; i=broonie@kernel.org; h=from:subject:message-id; bh=1trlKZwAecGTqrKD0iQKq5crYO5E8+VYUNMVFUR5Ei0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkbQfS5ksRXV7nYrRmjLnuyk3eVXlUsp5+ShKKTNMV ylPvfsqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0H0gAKCRAk1otyXVSH0HuIB/ sF4syN3KUBqKtlaK7e0YFcn7RqUfrMctSb2rSPXQhpqid8LkyQqHnfkf7yXW8V7/PoGAYW8rwHDcpt XjkuGxswb9Ywc3tMw8cGdVkXuw0HCAp4c6GQTREEOC7Gg58+IUUG8RRKF3BIjkPJEK01zrbPxgbd8q Eh804cru5Mtmub53E0F8Gxile9nWd1zyhMk37KgOSm6elVlc1XsgKCMsVKfLqm3E7n+ZzPCKyx2gdV cW4GNN8XewJXIXeWia2wqRkmokk3NRQh0+mrMQSJVFm4kKtQWQO4YYqrFd8q5+ZoHL85hZZDNNyuXi I17E0E6yImQDJadcEaj+P4A5Uda6+7 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. Reviewed-by: Shaoqin Huang Signed-off-by: Mark Brown Reviewed-by: Oliver Upton --- 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 979975c8be2c..1901b676d7c6 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -143,9 +143,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 601cc8024734..b0aefdf9ed34 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 From nobody Sun Feb 8 13:39:46 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 2634DC7EE26 for ; Tue, 23 May 2023 18:37:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238145AbjEWShs (ORCPT ); Tue, 23 May 2023 14:37:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238095AbjEWShi (ORCPT ); Tue, 23 May 2023 14:37:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E36A1A8 for ; Tue, 23 May 2023 11:37:26 -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 A042E635B8 for ; Tue, 23 May 2023 18:37:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25917C433A0; Tue, 23 May 2023 18:37:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684867045; bh=/s3OQTPaAeFaaX+KplVvFWg8KQWTQaJvzEWKqMGEZfI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lzWx708XdMcMIBFAfAjaCDpv8AXJojFYtc/b4O3Lshk9/rbPb9LRKGBuZRyT1gYjN cP9lfVPJhOsx5B6gGZ40qBjUA/1VbZg9UaAqVJ1h/4JMmjK1xQFreWsA72JfiPe3Sl 74ufths48YYWtR8i3I+8zk354P9ZeHqALthxu3vHaXOQNWCBtkEjtIXXXInLlkI+Eb h3hddxPmN/M88lI+OHu/oEe6qxxOvvnJd7JIJmzIJXpgUAQxEguRGSgkWoK1qlvmJF NjrAJgjHxNvF49eymBXt4NUqhUOhjQr5s1Z0XaU1UUy7J8b25stx5IzSvh8IVIWSIW iIG3cexsgAs4Q== From: Mark Brown Date: Tue, 23 May 2023 19:37:03 +0100 Subject: [PATCH v2 5/7] arm64/sysreg: Convert OSDTRRX_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-v2-5-4c6add1f6257@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@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=1318; i=broonie@kernel.org; h=from:subject:message-id; bh=/s3OQTPaAeFaaX+KplVvFWg8KQWTQaJvzEWKqMGEZfI=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkbQfTB1M/2bseR8N2orKJ9G+SAdLnH2a1tarpQwb8 sSf36EGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0H0wAKCRAk1otyXVSH0FPcB/ 47DuFiRTIw6y2n5Jq305ETHwbabH9R5dvMNpLkxDbppQBDP86ElXKCoXKJVoUS6GOVag1Q4ZaCD1th snGutLUzqDS7Bpl4/cpndLGtsL+9002ERd5t2j4D6kp9GId++aWd1VjkL//FZ4OP6FQY8z41MCN7cG ORPow87qGFlQxus7865kyFeVE5B6v4yuDVQs/rSYz7kwDjqz+AeTnw7q2iT2XwK0PZozSlvJ246JBX NufCnF1rvm2ZVsy03vegEpM+HAMwm27ifQavRe7zIqP2M1GpfXnaxo2GxI3nM1Kk9TPLHIwbQGH5+G uSHvuvlgLotwBIs2hDC1toUpLVdLcr X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert OSDTRRX_EL1 to automatic generation as per DDI0601 2023-03, no functional changes. Signed-off-by: Mark Brown Reviewed-by: Oliver Upton Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 1901b676d7c6..da954a6eba24 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_OSDTRRX_EL1 sys_reg(2, 0, 0, 0, 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) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index b0aefdf9ed34..e4653248dcac 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -48,6 +48,11 @@ # 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 OSDTRRX_EL1 2 0 0 0 2 +Res0 63:32 +Field 31:0 DTRRX +EndSysreg + Sysreg MDCCINT_EL1 2 0 0 2 0 Res0 63:31 Field 30 RX --=20 2.30.2 From nobody Sun Feb 8 13:39:46 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 3CB2BC7EE26 for ; Tue, 23 May 2023 18:37:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238156AbjEWShu (ORCPT ); Tue, 23 May 2023 14:37:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238102AbjEWShj (ORCPT ); Tue, 23 May 2023 14:37:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 698E31AD for ; Tue, 23 May 2023 11:37:28 -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 00AE862DA4 for ; Tue, 23 May 2023 18:37:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D185C433EF; Tue, 23 May 2023 18:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684867047; bh=WK7ajXHkshIT2cOizJwNF0MX+jkQcIMOaAmOWZ9YM08=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=X0J0hoAOI+mQtU86NdXRvyVCrQz5lDUXLN1KillYIPUJpl15lrRHZXlwW3zYwNShP vcN4ZXrJ652h+T0jpTUSW++qfMMdp70WE0eP3LjNcGZX4I/RyTbVUho/0NFThWEmjJ m9k7KAWggZ5kUQDTsNwBBscqKdkiRYRzUWV2n0zH1l0WyAQaku3/sZjttnyHLPMa8M R1Y9x/jH6cwPgBOw/X3ln73/7aqzBZFDZGVKXz7xIDasNluOA8KP8t2MnDMr659NIP NWBWOkCv83TSf0KUE3lL+a6k5voBiJOFJ8VfGqhr10JUrwyCHwA5AULVyKlIU1XxQI KG+dAzxGbIpSw== From: Mark Brown Date: Tue, 23 May 2023 19:37:04 +0100 Subject: [PATCH v2 6/7] arm64/sysreg: Convert OSDTRTX_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-v2-6-4c6add1f6257@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@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=WK7ajXHkshIT2cOizJwNF0MX+jkQcIMOaAmOWZ9YM08=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkbQfUYotb+cQ5vS7NvwCSEEnSIHrRSOWrQhBBCd70 VTDcRXeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0H1AAKCRAk1otyXVSH0P4pB/ 4+zPNevkMYJ8xrH7uzKGC7X671Y3/qsTMh5asBKrJ03vJEaNoYW2rnXy+TnmbZmyja+LINaIMP/pTJ secNe84xPmwDF/EjY8V5gR2zcouUyJdg7wLrmXnUh1dfaYatasSjsl8sEKix42x3xXkfcDS+Vf/ydZ uNYNIDi0GqTgn5G/C9CmNfnMRnGz7Fgwett1IQN4hhS5q+HPzEWsKclsehhQ152YAjpFssLm7ImSQI 9yj9Am2E45X6J5PTh3UV2c+5sgGyN4cvv5jpv9IvGOSMae8QSIVc6D/qiJjkW/4080lwAyuF0gbD01 yDiqzkOUEEGxC/uVFnty7KwOj3ry87 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert OSDTRTX_EL1 to automatic generation as per DDI0601 2023-03. No functional changes. Signed-off-by: Mark Brown Reviewed-by: Oliver Upton Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index da954a6eba24..d9711f1e47b2 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_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) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index e4653248dcac..e18ae1df41f4 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -88,6 +88,11 @@ Res0 5:1 Field 0 SS EndSysreg =20 +Sysreg OSDTRTX_EL1 2 0 0 3 2 +Res0 63:32 +Field 31:0 DTRTX +EndSysreg + Sysreg OSLAR_EL1 2 0 1 0 4 Res0 63:1 Field 0 OSLK --=20 2.30.2 From nobody Sun Feb 8 13:39:46 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 42127C77B75 for ; Tue, 23 May 2023 18:37:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238070AbjEWSh4 (ORCPT ); Tue, 23 May 2023 14:37:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238050AbjEWShk (ORCPT ); Tue, 23 May 2023 14:37:40 -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 D1FC71B1 for ; Tue, 23 May 2023 11:37:30 -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 59C4962DAD for ; Tue, 23 May 2023 18:37:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5B48C4339C; Tue, 23 May 2023 18:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684867049; bh=EQ00lv5/W8EGFC0nJWEZGEzEXY5+IAnxZI57QWN4yuQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mv1sJt9juz0nueQ4tDJU9sjLCGuhvRj9F0PESg1tOvIPTmHgTps7t/2+lzMrc9z0i Uv0CmzSW+4Pi2xr8YTqHZCKgcC0vXYMdNZcb0PnGuIM06hURR9ds8eBnOGDLoduUS5 V9wZoKX4uyVFM7UP16iNoxj0M9NeYDP1rN59MHQ+gsDR2Yx60WjH4QGZBL6ix2CB1A Od6oydfa/oCqqNZ7sBcC7Yukjc2ZU64voPVSrzg6RaxhdqdzWdcp/mmrxzQSnvSWvI qS8183nq5XbbhiE3Eb6r9clDxc0wxBIDUQAiq7TsaiRp0hemnu1wYeQT5rRPZHTF9O Yzo7XpamKm1iw== From: Mark Brown Date: Tue, 23 May 2023 19:37:05 +0100 Subject: [PATCH v2 7/7] arm64/sysreg: Convert OSECCR_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-v2-7-4c6add1f6257@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-4c6add1f6257@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=1212; i=broonie@kernel.org; h=from:subject:message-id; bh=EQ00lv5/W8EGFC0nJWEZGEzEXY5+IAnxZI57QWN4yuQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkbQfUOJFmOLMG7nJxW7pEg75iGvryikvlRYKtIemc CBFf1hOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0H1AAKCRAk1otyXVSH0EX8B/ 4v1es9OfIXLT09KjiU20Tkupvd1plG9Rims05p7rLWOxpxgbadoRH674jh8V5NI4UG29CFDXLvLbn1 kpt3UZBJllP3xkrHvn13T8mlSwrbscjeMD8HA/oCh1IW2AJBAcRUj/ZZA17nQ9bbE7cAh6ZAc9M+OV wI8JGyfdrmzI6DPdqQdGTdAMWh4Zcg90hxeYLirC/v97qpb83TGCcC6EZX+yZ7+jj6zEnNTR8vtJY0 6rovWvaJG6P+eG8/N7lcwvVsFnjzlwQwqDTlwZ/xfErv3aWGD+gNnTcY9kGqhRIlFhGXf3iIIdkgU2 uklhKKnA5ruLtjPCHfeA2ICnzgaoqU X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert OSECCR_EL1 to automatic generation as per DDI0601 2023-03, no functional changes. Signed-off-by: Mark Brown Reviewed-by: Oliver Upton --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index d9711f1e47b2..23a17da500a4 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_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) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index e18ae1df41f4..41462785020b 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -93,6 +93,11 @@ Res0 63:32 Field 31:0 DTRTX EndSysreg =20 +Sysreg OSECCR_EL1 2 0 0 6 2 +Res0 63:32 +Field 31:0 EDECCR +EndSysreg + Sysreg OSLAR_EL1 2 0 1 0 4 Res0 63:1 Field 0 OSLK --=20 2.30.2