| Message ID | 20230419-arm64-syreg-gen-v1-5-936cd769cb9e@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1575290vqo;
Mon, 22 May 2023 09:32:07 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ6tP+1u1sv2C5Q4yWPBww94S44o3M4L+PwDBeOi1fPbbO9xKeZ6GtCXPdI+Fxipb7mi9Fc0
X-Received: by 2002:a17:902:ef94:b0:1ab:1241:f671 with SMTP id
iz20-20020a170902ef9400b001ab1241f671mr10396266plb.29.1684773127146;
Mon, 22 May 2023 09:32:07 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1684773127; cv=none;
d=google.com; s=arc-20160816;
b=ZInb+NIPl0ObL4QMo0T8PbFhTK+6Uqu+sOcQNcEGLyj4zBnP7v/UAxUHRWHV7uhXrf
AzOpJBfvlqNUt+y3QQ8oJUgAr1Lwqm58cGILBiLVji5N0VnEdfBOJAJUAr1xwajwOip7
3lxLrLSOclsNyGvmo3WLNlGPWubwfLzWnXj3bjSv3qiovvVO+E8plRFS3GEJySCIKp9H
wDvFvX6kHF/o8JEe5XaMltoNZ4tVx8YIwMXRI/icZ+6PEhovx1epH2KDggrUy+oMAqpP
K6W3twjVdLREzToh0tJEWmX0217mpn1GT0LRHe0Qaqz3TVTCUrwZsbXxP+gPFijZ74vC
788g==
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=Eob8nJiXEKGs9l3FLi4U5aThtJuInTONmOD12CZuJq0=;
b=eLjEGd1gK4K8h1dmguNbYAHbSYx4SFU/jltWUeXAkAKhQYSUgY4mBA6/LB/Cf+mOrh
ASkrL7k6ktHUEnFBMEzv7HEbiwvkGJM2fLFh3Zl6xHyyxQfp4J49PKgDLDxY0PDph91V
saFMeZeMdSEhmJdseqKe6hSM32XgdqA01Z++vw0ifyOGnOn/puFJTlWfhi1lEcauZz1k
quE6Beadv2aJDuyn0MOHWX96vzO5G+veXMcOKNIDUAXqu5WPnz6jz8QJieOtaHO6SDxV
9F7JMFtIjaJS/2RYxE7AogZBx7gAtl2/ok5c6xuIDRsLAttFQpqHKy6BHqv8AwsdWCfB
yWFg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b="R7TlZ/sw";
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
jg1-20020a17090326c100b001a987371830si4661709plb.120.2023.05.22.09.31.54;
Mon, 22 May 2023 09:32:07 -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="R7TlZ/sw";
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 S231683AbjEVQXL (ORCPT <rfc822;wlfightup@gmail.com> + 99 others);
Mon, 22 May 2023 12:23:11 -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
<rfc822;linux-kernel@vger.kernel.org>);
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 <linux-kernel@vger.kernel.org>;
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 <linux-kernel@vger.kernel.org>;
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 <broonie@kernel.org>
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: 7bit
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 <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
kvmarm@lists.linux.dev, Mark Brown <broonie@kernel.org>
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
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1766612666515203582?=
X-GMAIL-MSGID: =?utf-8?q?1766612666515203582?=
|
| Series |
b4/sysreg: More conversions to automatic generation
|
|
Commit Message
Mark Brown
May 22, 2023, 4:22 p.m. UTC
Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No
functional change.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/sysreg.h | 3 ---
arch/arm64/tools/sysreg | 5 +++++
2 files changed, 5 insertions(+), 3 deletions(-)
Comments
On Mon, May 22, 2023 at 05:22:44PM +0100, Mark Brown wrote: > Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No > functional change. > > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > 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 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) > > -#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 Should the OSLSR_EL1 definitions be rolled over to the generated scheme as well? > 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 > > +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 > > -- > 2.30.2 >
On 5/23/23 13:43, Oliver Upton wrote: > On Mon, May 22, 2023 at 05:22:44PM +0100, Mark Brown wrote: >> Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No >> functional change. >> >> Signed-off-by: Mark Brown <broonie@kernel.org> >> --- >> 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 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) >> >> -#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 > > Should the OSLSR_EL1 definitions be rolled over to the generated scheme > as well? Agreed, was about to ask the same question :) Any reason it got skipped ? > >> 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 >> >> +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 >> >> -- >> 2.30.2 >> >
On Tue, May 23, 2023 at 08:13:01AM +0000, Oliver Upton wrote: > On Mon, May 22, 2023 at 05:22:44PM +0100, Mark Brown wrote: > > -#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 > Should the OSLSR_EL1 definitions be rolled over to the generated scheme > as well? It should at some point but it has a field with non-contiguous bits which the tool doesn't understand yet so it can wait.
On 5/23/23 00:22, Mark Brown wrote: > Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No > functional change. > > Signed-off-by: Mark Brown <broonie@kernel.org> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> > --- > 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 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) > > -#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 > > +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 >
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.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) -#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 +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