From patchwork Tue May 23 18:35:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 98140 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2351922vqo; Tue, 23 May 2023 11:54:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7P7EmQ1S5o68+nmFo9fSUQAEqEg06oTDZeb11JaOzSS4oAEWSF75Jj0cA4XTrQ3ILadP+u X-Received: by 2002:a05:6a21:2d8c:b0:10a:e177:9e73 with SMTP id ty12-20020a056a212d8c00b0010ae1779e73mr10325904pzb.46.1684868094768; Tue, 23 May 2023 11:54:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684868094; cv=none; d=google.com; s=arc-20160816; b=UmtlmvKf14WtqBT/CbVDj9HPRqflZXLCU0L3JO6yikdaFuEBdkR2xjQJ/UazmjP52G FoI0IcvvmvxkBTJclfY0J33IYheqrJJrHEni+RT6GBI0IniE+qhIvX1z7s4MZqhntcFS g7khpfHELBwORKgDM6dBQFhjK3yTnzDzfe5jPRzoFzIAFH61yAZ79z4RvHw1nu7Q/REB 7pkssh+DMEUYnXQhKcsWkV1IxwCExiJXU9hy76kd+7H21CcgDpre+TBDS83FYcAEp9Iz LvLYHfMcE1p0hqovQcoefp2RFqkKxRVSpL8Y00I4tyZ8zmkAyv5qKL0GW4EGV906qjFk HInA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=n24NzfKitcTf9zHsO+AtZE0etiOfZpoyLlTiY27hQ/Q=; b=cU6f3g5j3AbOE+u5DIgHnfq31/OUF3nOuQPoUR+bLCSsnv4XEPKOhV/h170huYIZ0R P/kqS/YNPxK35G3Gt5Z1yLbRqJOMweVcKtSC1wt1dybq2aQBd5/7qA/Od+Vk6DmG+XDU dXfmjgvDJp9LZ3v3zxjcqdEE2pLhQcJ1UitFsMiqsIF9Ik7EvDoDtxrsWc5BhW+wK4NW ygtEgZH8LtOS7RRiroXq4iiSvgBvk4FpW8zfriXGFKe9kUz1IIGKA3wfs4ERaAUm56mR d679x6G26DKlWWnwwg7o+fhX24SdGLDLGpxWxyOBN3o09qyYJtBn7l2OfPZvFpoEGyfP 5K4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uQBAUREh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u71-20020a63854a000000b00524ca1b89f0si5510345pgd.596.2023.05.23.11.54.42; Tue, 23 May 2023 11:54:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uQBAUREh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237965AbjEWSg3 (ORCPT + 99 others); Tue, 23 May 2023 14:36:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229940AbjEWSg0 (ORCPT ); Tue, 23 May 2023 14:36:26 -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 D4EFF119 for ; Tue, 23 May 2023 11:36:24 -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 628BB63018 for ; Tue, 23 May 2023 18:36:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A9ACC433A0; Tue, 23 May 2023 18:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684866983; bh=NuUDB+s2fxCd02gyUF/+pz6UWNHOrX4UeDzZX2n8uUc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uQBAUREh60Gr1FLdpcLEhzxRCksz9Y59IU3sZk8ecYC0PxV52TlFVyqV8JVsjAO1e eOU1bdYgNjcH15Yk1hZT2wqy8VHsMNmiXfSQ2rtNoqJEg7obIm+FekSas+RsNhwpAD Pk1+o7ioFd49CkNI/SK2to/Q5i4/bWvM/ccNsIIEvK1Gw0lHZu5iiCdd//GDrYQddS Qwy0IiFOp/TODBoiIfhjPPEjKOAPaTAhjy0tYN8FWsSYpG9MpLT0QLeN8tYfn7oN2/ rlIQikzHROkhWdbBRwVXRXlQt32Cu3cMeIO18O1ma8nlISAONAx1SQzNdhrW9a21NW VwFeVzMSsBJSQ== From: Mark Brown Date: Tue, 23 May 2023 19:35:58 +0100 Subject: [PATCH v2 1/7] arm64/sysreg: Convert MDCCINT_EL1 to automatic register generation MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v2-1-e0064336e2dd@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@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=owEBbAGT/pANAwAKASTWi3JdVIfQAcsmYgBkbQecpBPJq6dmdM6ZsngIix8E2wh+AuFVeFOY6dnO UT1QwvqJATIEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0HnAAKCRAk1otyXVSH0CiGB/ iPDxlXd7O+xziutS6ElVO72oLguJ1A+14z/QJR/XUzGlPjqDJYZsXJrmMYAw+/6AfO8Ve82JCNZuVB uPmea3L0uBx2kFCaAg139pN4nq27EnmnGYeuUaDdIp9v54HV6f7y42VPuXjKcnhsZiyB0IoZy/z00s /l6+dZ486iYtuzO7riQVcSnQAZn5ZKGP4kJgvSn+Y5qnoDeRl4I5326LNM645zPeqXTiiI1jwbi+xE +EUB+KstMZop+V//YMZxN2Nyb2Ma8PYQTwOB2Q8vceJpwiDU1qr4RoHP2ppZtPARCifK5gxMq69lNu GO4R5kCjrUbOblJUyZRlrCuRcbMoM= X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766712247194976590?= X-GMAIL-MSGID: =?utf-8?q?1766712247194976590?= 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 --- 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/sysreg.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) #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 enumeration # item ACCDATA) though it may be more taseful to do something else. +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 From patchwork Tue May 23 18:35:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 98129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2344451vqo; Tue, 23 May 2023 11:38:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Dme9hRpIm/D68t8Ev6m/bcRiBJhrocCflbJ2glYvyuKYTeLD8S2L3Vf/SvmRjlpuZPK4d X-Received: by 2002:a17:90a:2fce:b0:23f:81c0:eadd with SMTP id n14-20020a17090a2fce00b0023f81c0eaddmr14173235pjm.47.1684867130110; Tue, 23 May 2023 11:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684867130; cv=none; d=google.com; s=arc-20160816; b=uqEACupa/xqtxo7P0y+YGKnyVbGZ2C6ElyTm4/NQCI0Rr3hZwGRnO6n5WJFHMGTELx Tcs+eJzn2CpHNYCcnSpI9d0YooCWFO7z2C9Hm/kteZmdEKW1p14IR0G8m73AIcOzEeU/ g0zAtaeyktS+w6Wgjpz5BMYVOO7omF8QENv2ETK8d/yP06RgDzHwXC5JM1j5A4Qo4uE6 2c7MMWpcC+4BuDCoutP3uun8p38jkdMJK/vDO1eNKyuJ6vtudHw6Dk053RYOYhxg8J5c oMeFU+jcpqhPam7XMmx9EwkdakqY+I3La0/5+FKj8S7fTjcpK16pvlk1QdOS69TkBLGh 73MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=1HKTf0i9D2yUftvsg0+tqJQTkKCye2YJpOrjAmZqAOk=; b=SLyQbI+wyJaMkV64XjTR4ntSxnLJJO3ZhjFOkFOciaYstJJjsdfbVJMZ8yculd10VS gjSt2k1uV/+RQ3LlftHBoCy/Du+3spq1IvXZmekNKkPmXZYlBqkg/rdW2Rntbmgn7Mnw Gmm1N86QjcOWB7BbO9nKSQcYP/At3UTgf3BFjRUXJMbTD4ncVbiOSG/rh0Owl85MoBO5 MvAqerVz+Z1POUBNSMHLELQ6+t6xHC4kIxX3x0sT/bSVEpz0sOxv4x6Kj6wM/7pTPSbA pQbvukB40FMU7jyqs5CbnQG0gbEFBaQ1JKpfhEStaic9G7T2BvwsrdIK/gaGnwl6YhVc DRhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GwtUKcLs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 129-20020a630087000000b005346ce4f2absi6988489pga.605.2023.05.23.11.38.37; Tue, 23 May 2023 11:38:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GwtUKcLs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235832AbjEWSgc (ORCPT + 99 others); Tue, 23 May 2023 14:36:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237946AbjEWSg3 (ORCPT ); Tue, 23 May 2023 14:36:29 -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 7D72D11D for ; Tue, 23 May 2023 11:36:27 -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 1279F619F9 for ; Tue, 23 May 2023 18:36:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 394BAC4339C; Tue, 23 May 2023 18:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684866986; bh=Dx+cWy0dcqpkMVnXLdbKAeKzPOC7O9mGntVnbrrmpd4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GwtUKcLsV2PLBiXOp/GUzbMERQK58RTA0sYaMFO0GOOaJqDFnYGJw6u0e2L5S6rFc O4CW7iW0SWxotlf/d4s543sumF257NOpUq1C9ntxTcGxy0SBK3oUG3roO+NrZ121uz mQQuha5tYrUtdgjMV13Ck5lEsFeR9M3oabwAPTgbJe4BnQTfOpCMUYEJDB5FuSph3B JyTu7T4qB7FRn9Uj3s4sQ74XG4zPsbJ7GpWkc00uOTJIyeTtf/N1SFwOuxev5E+DGm HEvBzHSOPKr9AmTk5cBehyp14wtIZw8faMCM7F2a5E/XUmIN7rB10KBY5HvtV/t4Hw imVPxyUiYgnEg== From: Mark Brown Date: Tue, 23 May 2023 19:35:59 +0100 Subject: [PATCH v2 2/7] arm64/sysreg: Convert MDSCR_EL1 to automatic register generation MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v2-2-e0064336e2dd@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@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/pANAwAKASTWi3JdVIfQAcsmYgBkbQedL1ucn3fvpkib4oCilUGYKem9UUroIbYvCS8O g1IK8yyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0HnQAKCRAk1otyXVSH0OXMB/ 9iYlgr1hOmpq/gcm4VFQJPbyMYzmtuVvhN9LGrafQBKGmFWuNL9U8vlQtzscMkrXBczHJJL3hvv/yC Fn+76uc7Ye6Ab5htVthE6I0UMJtRf7KtUIUfrVKYGY3DJeTGeviRk0tSx9AJ0vd2xIZw3edmC4YIbm fxikSqDmeczL3NFZwopSOABYgaeWatku2rX5EWH1xNelMpKtpyAHLkl0LjjimJ7gaWO+uOK/QdVoYT Oq8ZwyIPfnqNC5IYB3u5SCou1EXsydzf1CTzz/2WNyM/SBN0V+vSsjCa6V/LZWUm4FCPbOamyAnFWo IsgZUlZRch+a9aZ4cLfS0fw48x3rNp X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766711235704482432?= X-GMAIL-MSGID: =?utf-8?q?1766711235704482432?= Convert MDSCR_EL1 to automatic register generation as per DDI0616 2023-03. No functional change. Reviewed-by: Shaoqin Huang Signed-off-by: Mark Brown --- 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/sysreg.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) #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 +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 From patchwork Tue May 23 18:36:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 98130 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2344508vqo; Tue, 23 May 2023 11:38:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6dqwhxb21ewbMIEMb8wgE/xWwEjWRLPAJk1r/dB5tHcASQ/ci0dw+a2GU18pb44qIa7vPM X-Received: by 2002:a05:6a00:15cf:b0:643:59cd:6caa with SMTP id o15-20020a056a0015cf00b0064359cd6caamr17234pfu.7.1684867136715; Tue, 23 May 2023 11:38:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684867136; cv=none; d=google.com; s=arc-20160816; b=cauM9c3BRk+4kgILrEa2hq5G9cVBIf4WwNZC8AI74ZFkAfR0A/7S5RUUSxajSx/fN+ TEPaGRVM7SZyqCzW8W8aOVoA+7Ui/kqkaPL8dgSe68l78mG47p1lquaxhMVk11XaQAv8 /Sa5WIyRszacOpcLw5DCmLeegVLOyzZApJ9XkUi5+1Zt02Ho9sHaX2WsSsUzDRdCLJwf R6DsL+LJ/V+stYR+56YiHaihS9z03rw8ISDGHPgr9QAdbLYiakZqC08ncsMbRbT9cbBw sVEdbtQ/Q37GZhxndRRG3xfihUJskPm5Y8uTIA5RNpRdYsROonj8pAmlfzXX7Ty3cXW3 6maA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=35qO+wlzDg/p+bsYc1U/bJnW4669aRolfEZ2/xN7PSQ=; b=ippCCoxtqZrfEvywiuiZl2+DO6sNnBjB6v+lrFmzISA3Yp/alDkfojhwFilDj01rxk 7UOv9haIOSxGV+KLAAKNMLEJoRnm/pVhILEi+RTGGwqgq0WaFA4qYHI3598mZgYan5Q9 7kZNDLNb7oSllhQBQR460k7Hnmcl7Op3SV7p/hXkDJYAs2sNIwPJVM6sNt35DXE9z+gm 9aH49oPDPbQm43jh3elWeK4s42MyUe1khG6lcoHbPQ2TTJ3wkFjZ7K8EmSehk+6/Be1L mP6QKmAGumM3Eil69SHxG1t1/6dExBtS3HJeCHh2/6ohP3dkuUJMVsQ47RkLFBFnaj0U cuLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AOhqJPds; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x27-20020aa79adb000000b0062dbc05a323si5636789pfp.298.2023.05.23.11.38.42; Tue, 23 May 2023 11:38:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AOhqJPds; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233077AbjEWSgi (ORCPT + 99 others); Tue, 23 May 2023 14:36:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237988AbjEWSgb (ORCPT ); Tue, 23 May 2023 14:36:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 136EF139 for ; Tue, 23 May 2023 11:36: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 A4BE6635B6 for ; Tue, 23 May 2023 18:36:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2ACDC433EF; Tue, 23 May 2023 18:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684866989; bh=gSxLCAUCV6RPVUE1Qap7EtWP0tdGJ920xLzGkpNf2Hk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AOhqJPdsAk/pLy43Fs0rnVL4ZvbBFzzg5PxXojyFXRWGnNaP7ptM1VnCTQ4uX5bTz Y3EbSuzQzZKA55u8GjxzQ5NcBu80Jvnwu1OBdDy2oCtzi/+ZEqyGEx0A2Ic2PnU7UR ZPjspDsHPFByG3psBJdneRChANVRF+hBrd5SM3bvbxoVKag9SEhTcoNrlg2247qePR Zmnvfucc3cQq8U0dlEO9ddaT5yrd2spa4TO6ne43l2nVTKPS+b0Ne8Z0SBixKwOz8Y QvSTL/CUz1eztm1xHWjf/CQ3QlRUfOH/i7lx8qd4JkfrKYAMAZx/EP4N0YftPn8uAQ OY+ArOv1GiFQA== From: Mark Brown Date: Tue, 23 May 2023 19:36:00 +0100 Subject: [PATCH v2 3/7] arm64/sysreg: Standardise naming of bitfield constants in OSL[AS]R_EL1 MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v2-3-e0064336e2dd@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@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/pANAwAKASTWi3JdVIfQAcsmYgBkbQee3XiICBLdmd0OeHK1e5ewznmaFHosUQsFNehQ 7m4jtIuJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZG0HngAKCRAk1otyXVSH0JiNB/ 9Htw/ZN9JAamsjDxYSfbX1czX5qy427lQZ4Z4tqBfvCGrlblnXC4dqXV8cObsNZTAp/y9GGTbzPAmb kVKa8PqCJVE6S6a1jaImOCypLeGHThjAH/sJbjMl6RmX0ET34ZH8rw/KHn7Cid46L7UnaE56RkT2PP KHz07HhuTAI2m65EUx5fsJwr+u2+T3h9lUG8seCnkwFw6uFhEjjoSRkw7EXKVfNdPFqOny42chpxhA ZqkPoFlByB0aXj6VQtoZxeK14zQwGI4nlxHF/LChcU4yk6hxvz/t338AKV7joxbGJqFrCgS+pRaAqY wQghPGVG6GsOQ0KnHG4MHZGuu6HGt0 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766711242545356342?= X-GMAIL-MSGID: =?utf-8?q?1766711242545356342?= 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 --- 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); #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)) 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/sysreg.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) #define SYS_OSLAR_EL1 sys_reg(2, 0, 1, 0, 4) -#define SYS_OSLAR_OSLK BIT(0) +#define OSLAR_EL1_OSLK BIT(0) #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) #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); /* Forward the OSLK bit to OSLSR */ - oslsr = __vcpu_sys_reg(vcpu, OSLSR_EL1) & ~SYS_OSLSR_OSLK; - if (p->regval & SYS_OSLAR_OSLK) - oslsr |= SYS_OSLSR_OSLK; + oslsr = __vcpu_sys_reg(vcpu, OSLSR_EL1) & ~OSLSR_EL1_OSLK; + if (p->regval & OSLAR_EL1_OSLK) + oslsr |= OSLSR_EL1_OSLK; __vcpu_sys_reg(vcpu, OSLSR_EL1) = oslsr; return true; @@ -414,7 +414,7 @@ static int set_oslsr_el1(struct kvm_vcpu *vcpu, const struct 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; __vcpu_sys_reg(vcpu, rd->reg) = val; @@ -1781,7 +1781,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { { 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 = set_oslsr_el1, }, + OSLSR_EL1_OSLM_IMPLEMENTED, .set_user = 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 }, From patchwork Tue May 23 18:36:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 98131 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2344538vqo; Tue, 23 May 2023 11:39:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5DvA1eslVQmU0oOvk7TLFL5+by6whtdFHi7apCxNwvGqtfYFvf8Ix49xOk8yodp4vQ4v2T X-Received: by 2002:a05:6a20:428a:b0:10b:cdb1:3563 with SMTP id o10-20020a056a20428a00b0010bcdb13563mr7919466pzj.46.1684867141478; Tue, 23 May 2023 11:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684867141; cv=none; d=google.com; s=arc-20160816; b=1A01SSYcesONt9IuIvzpB54JPzV1aKPUU1dwRJgqc3eaDh6CWWYY7MOcWbk6kyW4g9 mcm+KJZbPalYXDFDOMr9OutCBty2sHxEQ+BQyuUcdj3lLVjgiQcrUt7HUkVQGATfeyJ6 VDoZD2Sap+sECpi4r1ICC5aQLh50JVCNAwSIq/M3J1+lGrGBYE2QH2yxoBEw7T9TzXoS //Gy4aG8SHcIyN78hHAtft6YXkfrapO4n+ABbJSHyuX6UUh+cTMtJ9eHgc40LtDHoaZB b44Zt6MD1clicLL7vPWGS2TnntPUtsZZPMAJBaQtbGo5cB7tG1Qm4oPAbXD/WjjSs3gk +oIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Toz+dosuf9jj4pn+YY/rD7M4lgKPiOs9xMDQgg7CJqA=; b=KfaIhNbTuZnN3OL4k6np66niys81nTcun9gfzEcSfZ0qQVtIXJC51Va/3T4XcNEuqW GRJTi2kZQhMtba6MLLAeTYqk8nA5jvYYIbWl1NvOqArIjsoMcW13Agnhpl/MkLa0nu/v bYe7WEZE8KdtKdBhP5KoBK0GzZOSkDmPyKRqJLTw8OGLF4zLYx3WnJ8bSdX6Zk1oitd7 gBH9ctkUNk5uF9MytvcJlX5My21r9oVPbOTQ3ECtk1J60JS2I/bcN0XrHGKlStsYbWNV sLuvgqSg3KsGgg4t3sSnYZHpuxgu2Yme4q958vE2ARTC338wc72il8bNmo+YNenbmXGl qgEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BD2vp1wp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n25-20020a637219000000b0053eedccfe48si2081297pgc.144.2023.05.23.11.38.47; Tue, 23 May 2023 11:39:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BD2vp1wp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238017AbjEWSgk (ORCPT + 99 others); Tue, 23 May 2023 14:36:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237946AbjEWSgg (ORCPT ); Tue, 23 May 2023 14:36:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD9AD186 for ; Tue, 23 May 2023 11:36:32 -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 37F0363088 for ; Tue, 23 May 2023 18:36:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79CEFC4339C; Tue, 23 May 2023 18:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684866991; bh=1trlKZwAecGTqrKD0iQKq5crYO5E8+VYUNMVFUR5Ei0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BD2vp1wpRNzi10+ritEJUUw3B+MKSXAXhTdKM1A/URGx2Ikv2sSbeKBny1JRahGM3 tU71pyFygfCS89Zi4HVFHQL92Dx1sfMFQ3YhitUgPOCeslXryQyL0oXNj/Ao4+qcBI vf1OA2JibVLM1l5A2T2eznGiyHjBpoCuQRjbgzbTrfd20SL0CSO2k9M3xBfoH/b8b6 iUfcncJyJpiA4Oxa4roH4jef/neoKd6XPPhrB5Xc1SJcg+JPdwIhLjK7OLhLKZVy90 Lv1U4GiOxxjuyNs33ciwWRPfwXdWKU+NzWIBXghdKT4KgDX5XVDNb/+Z8QAe/xDMOY 5SEolKQ1MVFSw== From: Mark Brown Date: Tue, 23 May 2023 19:36:01 +0100 Subject: [PATCH v2 4/7] arm64/sysreg: Convert OSLAR_EL1 to automatic generation MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v2-4-e0064336e2dd@kernel.org> References: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v2-0-e0064336e2dd@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=owGbwMvMwMWocq27KDak/QLjabUkhpRc9vm52/QENbWsT+teDHgcH5yw7JS5itZaRkW/yJDmNbyZ V151MhqzMDByMciKKbKsfZaxKj1cYuv8R/NfwQxiZQKZwsDFKQAT8ehm/++UZqi5OF45yC/7qmC0y8 8pa7dbNkdZLF+QMbHoWZ2AwTZ/A6dnrcodD302P3P+9jeyIfDSzPxwJQferZlmF7zOv551ZrnoJTeG S5IN/lueFqR31kdVKqZt+iS/bll6vmjSx8fJtVGX/ac59zpdv+L6lzebudL5jfGUL6wCHczRrEu/d7 m/WhPS9NtypVD40RWvrmuJ2xnkXihLMRM4t74t2HE5X3rYC6G5qyZ1OYptP1DIscRIW+tR36SeVTNL dXfxl055/+ibTKJMp3DBn1+NFVuqb16r5zm2Kzww99nvqccv3pdh6+CrquGcnn2wYhLr640elTw+4q nzK9/I1TE3n/4jKWz3MPDJwTtxAA== X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766711247722112433?= X-GMAIL-MSGID: =?utf-8?q?1766711247722112433?= Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No functional change. Reviewed-by: Shaoqin Huang Signed-off-by: Mark Brown --- 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/sysreg.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) -#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 +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