From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29CCFC433DF for ; Tue, 21 Jul 2020 12:30:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E84B32080D for ; Tue, 21 Jul 2020 12:30:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iYvqQTfO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E84B32080D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iO6cb9ZZOhEBT5uDIj6F0ium6+kucf58uMEUsjUbm2o=; b=iYvqQTfOv0PDIH4y7TMb4yP56 4dxFKHJUzdxUDjD4hnRYTNYExhEKItX31TQBRMQze0bfmCnEpsKew4wLYobd5GKS6XXjo/2UtB/u4 LCcDJdW5HW0M/QMP2WGNFDQ8oIoz11tf+x4p3IGS0QoQWFYQ2JSwbjijBhSBgD15PeCPH4hLOcAOU qUzgWxsmBJGMG7tk2wKNYdOnLdeEEv7K+wihAsfhjcXWx2HQ82qay75TveXRbaVM6d4gmu+M5n5HH 9TEil+4RQbiNXXV62UnUVkwnS6SnO+jWKEmf63scYmuLBWmBOB8v0kOYyNxUAbeKBbsKDhswgTM83 osYjXcJHg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxrO3-0004LB-U8; Tue, 21 Jul 2020 12:28:47 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxrO2-0004KW-2m for linux-arm-kernel@lists.infradead.org; Tue, 21 Jul 2020 12:28:47 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1F726101E; Tue, 21 Jul 2020 05:28:45 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.3.181]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 96D833F66E; Tue, 21 Jul 2020 05:28:43 -0700 (PDT) Date: Tue, 21 Jul 2020 13:28:41 +0100 From: Mark Rutland To: Vladimir Murzin Subject: Re: [PATCH] arm64: s/AMEVTYPE/AMEVTYPER Message-ID: <20200721122841.GD84703@C02TD0UTHF1T.local> References: <20200721091259.102756-1-vladimir.murzin@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200721091259.102756-1-vladimir.murzin@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200721_082846_227229_1969FB6E X-CRM114-Status: GOOD ( 16.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: will@kernel.org, catalin.marinas@arm.com, kbuild-all@01.org, ionela.voinescu@arm.com, valentin.schneider@arm.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org [adding folk to Cc] On Tue, Jul 21, 2020 at 10:12:59AM +0100, Vladimir Murzin wrote: > Activity Monitor Event Type Registers are named as AMEVTYPER{0,1} > > Signed-off-by: Vladimir Murzin This matches the ARM ARM, and looks sound to me, so FWIW: Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/sysreg.h | 4 +-- > arch/arm64/kvm/sys_regs.c | 68 ++++++++++++++++++++--------------------- > 2 files changed, 36 insertions(+), 36 deletions(-) > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > index 463175f..273bb1d 100644 > --- a/arch/arm64/include/asm/sysreg.h > +++ b/arch/arm64/include/asm/sysreg.h > @@ -421,9 +421,9 @@ > */ > > #define SYS_AMEVCNTR0_EL0(n) SYS_AM_EL0(4 + ((n) >> 3), (n) & 7) > -#define SYS_AMEVTYPE0_EL0(n) SYS_AM_EL0(6 + ((n) >> 3), (n) & 7) > +#define SYS_AMEVTYPER0_EL0(n) SYS_AM_EL0(6 + ((n) >> 3), (n) & 7) > #define SYS_AMEVCNTR1_EL0(n) SYS_AM_EL0(12 + ((n) >> 3), (n) & 7) > -#define SYS_AMEVTYPE1_EL0(n) SYS_AM_EL0(14 + ((n) >> 3), (n) & 7) > +#define SYS_AMEVTYPER1_EL0(n) SYS_AM_EL0(14 + ((n) >> 3), (n) & 7) > > /* AMU v1: Fixed (architecturally defined) activity monitors */ > #define SYS_AMEVCNTR0_CORE_EL0 SYS_AMEVCNTR0_EL0(0) > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index baf5ce9..d319667 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -1024,9 +1024,9 @@ static bool access_amu(struct kvm_vcpu *vcpu, struct sys_reg_params *p, > > /* Macro to expand the AMU counter and type registers*/ > #define AMU_AMEVCNTR0_EL0(n) { SYS_DESC(SYS_AMEVCNTR0_EL0(n)), access_amu } > -#define AMU_AMEVTYPE0_EL0(n) { SYS_DESC(SYS_AMEVTYPE0_EL0(n)), access_amu } > +#define AMU_AMEVTYPER0_EL0(n) { SYS_DESC(SYS_AMEVTYPER0_EL0(n)), access_amu } > #define AMU_AMEVCNTR1_EL0(n) { SYS_DESC(SYS_AMEVCNTR1_EL0(n)), access_amu } > -#define AMU_AMEVTYPE1_EL0(n) { SYS_DESC(SYS_AMEVTYPE1_EL0(n)), access_amu } > +#define AMU_AMEVTYPER1_EL0(n) { SYS_DESC(SYS_AMEVTYPER1_EL0(n)), access_amu } > > static bool trap_ptrauth(struct kvm_vcpu *vcpu, > struct sys_reg_params *p, > @@ -1629,22 +1629,22 @@ static const struct sys_reg_desc sys_reg_descs[] = { > AMU_AMEVCNTR0_EL0(13), > AMU_AMEVCNTR0_EL0(14), > AMU_AMEVCNTR0_EL0(15), > - AMU_AMEVTYPE0_EL0(0), > - AMU_AMEVTYPE0_EL0(1), > - AMU_AMEVTYPE0_EL0(2), > - AMU_AMEVTYPE0_EL0(3), > - AMU_AMEVTYPE0_EL0(4), > - AMU_AMEVTYPE0_EL0(5), > - AMU_AMEVTYPE0_EL0(6), > - AMU_AMEVTYPE0_EL0(7), > - AMU_AMEVTYPE0_EL0(8), > - AMU_AMEVTYPE0_EL0(9), > - AMU_AMEVTYPE0_EL0(10), > - AMU_AMEVTYPE0_EL0(11), > - AMU_AMEVTYPE0_EL0(12), > - AMU_AMEVTYPE0_EL0(13), > - AMU_AMEVTYPE0_EL0(14), > - AMU_AMEVTYPE0_EL0(15), > + AMU_AMEVTYPER0_EL0(0), > + AMU_AMEVTYPER0_EL0(1), > + AMU_AMEVTYPER0_EL0(2), > + AMU_AMEVTYPER0_EL0(3), > + AMU_AMEVTYPER0_EL0(4), > + AMU_AMEVTYPER0_EL0(5), > + AMU_AMEVTYPER0_EL0(6), > + AMU_AMEVTYPER0_EL0(7), > + AMU_AMEVTYPER0_EL0(8), > + AMU_AMEVTYPER0_EL0(9), > + AMU_AMEVTYPER0_EL0(10), > + AMU_AMEVTYPER0_EL0(11), > + AMU_AMEVTYPER0_EL0(12), > + AMU_AMEVTYPER0_EL0(13), > + AMU_AMEVTYPER0_EL0(14), > + AMU_AMEVTYPER0_EL0(15), > AMU_AMEVCNTR1_EL0(0), > AMU_AMEVCNTR1_EL0(1), > AMU_AMEVCNTR1_EL0(2), > @@ -1661,22 +1661,22 @@ static const struct sys_reg_desc sys_reg_descs[] = { > AMU_AMEVCNTR1_EL0(13), > AMU_AMEVCNTR1_EL0(14), > AMU_AMEVCNTR1_EL0(15), > - AMU_AMEVTYPE1_EL0(0), > - AMU_AMEVTYPE1_EL0(1), > - AMU_AMEVTYPE1_EL0(2), > - AMU_AMEVTYPE1_EL0(3), > - AMU_AMEVTYPE1_EL0(4), > - AMU_AMEVTYPE1_EL0(5), > - AMU_AMEVTYPE1_EL0(6), > - AMU_AMEVTYPE1_EL0(7), > - AMU_AMEVTYPE1_EL0(8), > - AMU_AMEVTYPE1_EL0(9), > - AMU_AMEVTYPE1_EL0(10), > - AMU_AMEVTYPE1_EL0(11), > - AMU_AMEVTYPE1_EL0(12), > - AMU_AMEVTYPE1_EL0(13), > - AMU_AMEVTYPE1_EL0(14), > - AMU_AMEVTYPE1_EL0(15), > + AMU_AMEVTYPER1_EL0(0), > + AMU_AMEVTYPER1_EL0(1), > + AMU_AMEVTYPER1_EL0(2), > + AMU_AMEVTYPER1_EL0(3), > + AMU_AMEVTYPER1_EL0(4), > + AMU_AMEVTYPER1_EL0(5), > + AMU_AMEVTYPER1_EL0(6), > + AMU_AMEVTYPER1_EL0(7), > + AMU_AMEVTYPER1_EL0(8), > + AMU_AMEVTYPER1_EL0(9), > + AMU_AMEVTYPER1_EL0(10), > + AMU_AMEVTYPER1_EL0(11), > + AMU_AMEVTYPER1_EL0(12), > + AMU_AMEVTYPER1_EL0(13), > + AMU_AMEVTYPER1_EL0(14), > + AMU_AMEVTYPER1_EL0(15), > > { SYS_DESC(SYS_CNTP_TVAL_EL0), access_arch_timer }, > { SYS_DESC(SYS_CNTP_CTL_EL0), access_arch_timer }, > -- > 2.7.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============6116961526891351720==" MIME-Version: 1.0 From: Mark Rutland To: kbuild-all@lists.01.org Subject: Re: [PATCH] arm64: s/AMEVTYPE/AMEVTYPER Date: Tue, 21 Jul 2020 13:28:41 +0100 Message-ID: <20200721122841.GD84703@C02TD0UTHF1T.local> In-Reply-To: <20200721091259.102756-1-vladimir.murzin@arm.com> List-Id: --===============6116961526891351720== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable [adding folk to Cc] On Tue, Jul 21, 2020 at 10:12:59AM +0100, Vladimir Murzin wrote: > Activity Monitor Event Type Registers are named as AMEVTYPER{0,1} > = > Signed-off-by: Vladimir Murzin This matches the ARM ARM, and looks sound to me, so FWIW: Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/sysreg.h | 4 +-- > arch/arm64/kvm/sys_regs.c | 68 ++++++++++++++++++++---------------= ------ > 2 files changed, 36 insertions(+), 36 deletions(-) > = > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sys= reg.h > index 463175f..273bb1d 100644 > --- a/arch/arm64/include/asm/sysreg.h > +++ b/arch/arm64/include/asm/sysreg.h > @@ -421,9 +421,9 @@ > */ > = > #define SYS_AMEVCNTR0_EL0(n) SYS_AM_EL0(4 + ((n) >> 3), (n) & 7) > -#define SYS_AMEVTYPE0_EL0(n) SYS_AM_EL0(6 + ((n) >> 3), (n) & 7) > +#define SYS_AMEVTYPER0_EL0(n) SYS_AM_EL0(6 + ((n) >> 3), (n) & 7) > #define SYS_AMEVCNTR1_EL0(n) SYS_AM_EL0(12 + ((n) >> 3), (n) & 7) > -#define SYS_AMEVTYPE1_EL0(n) SYS_AM_EL0(14 + ((n) >> 3), (n) & 7) > +#define SYS_AMEVTYPER1_EL0(n) SYS_AM_EL0(14 + ((n) >> 3), (n) & 7) > = > /* AMU v1: Fixed (architecturally defined) activity monitors */ > #define SYS_AMEVCNTR0_CORE_EL0 SYS_AMEVCNTR0_EL0(0) > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index baf5ce9..d319667 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -1024,9 +1024,9 @@ static bool access_amu(struct kvm_vcpu *vcpu, struc= t sys_reg_params *p, > = > /* Macro to expand the AMU counter and type registers*/ > #define AMU_AMEVCNTR0_EL0(n) { SYS_DESC(SYS_AMEVCNTR0_EL0(n)), access_am= u } > -#define AMU_AMEVTYPE0_EL0(n) { SYS_DESC(SYS_AMEVTYPE0_EL0(n)), access_am= u } > +#define AMU_AMEVTYPER0_EL0(n) { SYS_DESC(SYS_AMEVTYPER0_EL0(n)), access_= amu } > #define AMU_AMEVCNTR1_EL0(n) { SYS_DESC(SYS_AMEVCNTR1_EL0(n)), access_am= u } > -#define AMU_AMEVTYPE1_EL0(n) { SYS_DESC(SYS_AMEVTYPE1_EL0(n)), access_am= u } > +#define AMU_AMEVTYPER1_EL0(n) { SYS_DESC(SYS_AMEVTYPER1_EL0(n)), access_= amu } > = > static bool trap_ptrauth(struct kvm_vcpu *vcpu, > struct sys_reg_params *p, > @@ -1629,22 +1629,22 @@ static const struct sys_reg_desc sys_reg_descs[] = =3D { > AMU_AMEVCNTR0_EL0(13), > AMU_AMEVCNTR0_EL0(14), > AMU_AMEVCNTR0_EL0(15), > - AMU_AMEVTYPE0_EL0(0), > - AMU_AMEVTYPE0_EL0(1), > - AMU_AMEVTYPE0_EL0(2), > - AMU_AMEVTYPE0_EL0(3), > - AMU_AMEVTYPE0_EL0(4), > - AMU_AMEVTYPE0_EL0(5), > - AMU_AMEVTYPE0_EL0(6), > - AMU_AMEVTYPE0_EL0(7), > - AMU_AMEVTYPE0_EL0(8), > - AMU_AMEVTYPE0_EL0(9), > - AMU_AMEVTYPE0_EL0(10), > - AMU_AMEVTYPE0_EL0(11), > - AMU_AMEVTYPE0_EL0(12), > - AMU_AMEVTYPE0_EL0(13), > - AMU_AMEVTYPE0_EL0(14), > - AMU_AMEVTYPE0_EL0(15), > + AMU_AMEVTYPER0_EL0(0), > + AMU_AMEVTYPER0_EL0(1), > + AMU_AMEVTYPER0_EL0(2), > + AMU_AMEVTYPER0_EL0(3), > + AMU_AMEVTYPER0_EL0(4), > + AMU_AMEVTYPER0_EL0(5), > + AMU_AMEVTYPER0_EL0(6), > + AMU_AMEVTYPER0_EL0(7), > + AMU_AMEVTYPER0_EL0(8), > + AMU_AMEVTYPER0_EL0(9), > + AMU_AMEVTYPER0_EL0(10), > + AMU_AMEVTYPER0_EL0(11), > + AMU_AMEVTYPER0_EL0(12), > + AMU_AMEVTYPER0_EL0(13), > + AMU_AMEVTYPER0_EL0(14), > + AMU_AMEVTYPER0_EL0(15), > AMU_AMEVCNTR1_EL0(0), > AMU_AMEVCNTR1_EL0(1), > AMU_AMEVCNTR1_EL0(2), > @@ -1661,22 +1661,22 @@ static const struct sys_reg_desc sys_reg_descs[] = =3D { > AMU_AMEVCNTR1_EL0(13), > AMU_AMEVCNTR1_EL0(14), > AMU_AMEVCNTR1_EL0(15), > - AMU_AMEVTYPE1_EL0(0), > - AMU_AMEVTYPE1_EL0(1), > - AMU_AMEVTYPE1_EL0(2), > - AMU_AMEVTYPE1_EL0(3), > - AMU_AMEVTYPE1_EL0(4), > - AMU_AMEVTYPE1_EL0(5), > - AMU_AMEVTYPE1_EL0(6), > - AMU_AMEVTYPE1_EL0(7), > - AMU_AMEVTYPE1_EL0(8), > - AMU_AMEVTYPE1_EL0(9), > - AMU_AMEVTYPE1_EL0(10), > - AMU_AMEVTYPE1_EL0(11), > - AMU_AMEVTYPE1_EL0(12), > - AMU_AMEVTYPE1_EL0(13), > - AMU_AMEVTYPE1_EL0(14), > - AMU_AMEVTYPE1_EL0(15), > + AMU_AMEVTYPER1_EL0(0), > + AMU_AMEVTYPER1_EL0(1), > + AMU_AMEVTYPER1_EL0(2), > + AMU_AMEVTYPER1_EL0(3), > + AMU_AMEVTYPER1_EL0(4), > + AMU_AMEVTYPER1_EL0(5), > + AMU_AMEVTYPER1_EL0(6), > + AMU_AMEVTYPER1_EL0(7), > + AMU_AMEVTYPER1_EL0(8), > + AMU_AMEVTYPER1_EL0(9), > + AMU_AMEVTYPER1_EL0(10), > + AMU_AMEVTYPER1_EL0(11), > + AMU_AMEVTYPER1_EL0(12), > + AMU_AMEVTYPER1_EL0(13), > + AMU_AMEVTYPER1_EL0(14), > + AMU_AMEVTYPER1_EL0(15), > = > { SYS_DESC(SYS_CNTP_TVAL_EL0), access_arch_timer }, > { SYS_DESC(SYS_CNTP_CTL_EL0), access_arch_timer }, > -- = > 2.7.4 > = > = > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel(a)lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============6116961526891351720==--