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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0BA7BC54EBD for ; Mon, 9 Jan 2023 19:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5Zzn5dSMq6L2BTKkrvsCcus3fW1Rwdekx8jGCRniOqs=; b=AhJe13KaoseMv6 GBJ7VBoaJhkhA6+FAXTWo11iFYklES9Y2brNh0Xe4VHADV6tdcUUOwLqkSE7Bju0t9AD4gtYM3xlo +AtZ+qPYl/EVuzGT/RWrBbo+Vg2C0Hx544NjezCSBDWA5Sb/lWDUNR5BAo3u6dAHtfllZzTtt84mO ngiQ5yzdXXzNvmsXVqpPBj/mbrdM7XJQ/YZuAB63OIi/I/Co6px/ShNFVGFQInsthbZG8gcEumuan HVjMNCxMQ1UUtVp8r5cADVyxgx4LsXySWP2CKPu0sSp2DSlSCLEJmkZfI/o7GVmXUOxmonlbtBq70 iOXCaEWfhIFFyGSMRt+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pExnL-003cCh-O0; Mon, 09 Jan 2023 19:26:55 +0000 Received: from mail-oi1-f172.google.com ([209.85.167.172]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pExn5-003c3W-K1 for linux-arm-kernel@lists.infradead.org; Mon, 09 Jan 2023 19:26:42 +0000 Received: by mail-oi1-f172.google.com with SMTP id s66so7407727oib.7 for ; Mon, 09 Jan 2023 11:26:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6qlUF9HNd4rhwHYMQ5xuQk0FhH5s2r6XHjIaKh5J7pM=; b=rac0glpZ7p09L6C0Tiisf7zqFq8xEBFTbRknXNSNqVxc9z9uImbtCv23JbQRCRE/9S e4DTAOxe8a5MU1XEWJWo6AWQygbVB5uEvkXjBjB1hU9ph8h1AVa1YBnJq3CfcdMZC+Nq 36w9XYjAr3reT8U/fhzTmuOsKnGRTomv0rSOJD/RT09f1GNIU2PSbdPjC18WKikQb/p6 EmLN/Lw6opVf65Ojq+/SqF1NY2rXxXiIvvqO++lXoPmCYVFwJpxWRAEVEydNy51URxuI QsIjBhA63GgGTNFELh8PvArVio2JYiljwxrj6N+YxBSXg7jDjDKaqHjih8Fp3Wjp5f2M Lb2Q== X-Gm-Message-State: AFqh2kpKqQUvyymqm/TDHNpyZvlgIeYiKtyVpYkMMJx9qYYUWtLGERHB HUwPBUclSJm70VMTZOn65w== X-Google-Smtp-Source: AMrXdXs5GwdD14a9+D9T5fmo0XFg0RejaVwU/Uj/3zWCM5OroBS74qT4+WmW1Th8L5E5KwxUfeiRRg== X-Received: by 2002:a05:6808:19a8:b0:363:1cc8:566e with SMTP id bj40-20020a05680819a800b003631cc8566emr35846673oib.3.1673292397060; Mon, 09 Jan 2023 11:26:37 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id 21-20020aca2115000000b00354d8589a15sm4280594oiz.45.2023.01.09.11.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:26:36 -0800 (PST) Received: (nullmailer pid 1483606 invoked by uid 1000); Mon, 09 Jan 2023 19:26:31 -0000 From: Rob Herring Date: Mon, 09 Jan 2023 13:26:17 -0600 Subject: [PATCH v4 1/8] perf: arm_spe: Use feature numbering for PMSEVFR_EL1 defines MIME-Version: 1.0 Message-Id: <20220825-arm-spe-v8-7-v4-1-327f860daf28@kernel.org> References: <20220825-arm-spe-v8-7-v4-0-327f860daf28@kernel.org> In-Reply-To: <20220825-arm-spe-v8-7-v4-0-327f860daf28@kernel.org> To: Peter Zijlstra , Will Deacon , Mark Rutland , Catalin Marinas , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Oliver Upton , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim Cc: Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-perf-users@vger.kernel.org, James Clark X-Mailer: b4 0.12-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230109_112639_867597_55F49BAF X-CRM114-Status: GOOD ( 15.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Similar to commit 121a8fc088f1 ("arm64/sysreg: Use feature numbering for PMU and SPE revisions") use feature numbering instead of architecture versions for the PMSEVFR_EL1 Res0 defines. Tested-by: James Clark Signed-off-by: Rob Herring --- v4: - Rebase on v6.2-rc1 v3: - No change v2: - New patch --- arch/arm64/include/asm/sysreg.h | 6 +++--- drivers/perf/arm_spe_pmu.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 1312fb48f18b..c4ce16333750 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -273,11 +273,11 @@ #define SYS_PMSFCR_EL1_ST_SHIFT 18 #define SYS_PMSEVFR_EL1 sys_reg(3, 0, 9, 9, 5) -#define SYS_PMSEVFR_EL1_RES0_8_2 \ +#define PMSEVFR_EL1_RES0_IMP \ (GENMASK_ULL(47, 32) | GENMASK_ULL(23, 16) | GENMASK_ULL(11, 8) |\ BIT_ULL(6) | BIT_ULL(4) | BIT_ULL(2) | BIT_ULL(0)) -#define SYS_PMSEVFR_EL1_RES0_8_3 \ - (SYS_PMSEVFR_EL1_RES0_8_2 & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11))) +#define PMSEVFR_EL1_RES0_V1P1 \ + (PMSEVFR_EL1_RES0_IMP & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11))) #define SYS_PMSLATFR_EL1 sys_reg(3, 0, 9, 9, 6) #define SYS_PMSLATFR_EL1_MINLAT_SHIFT 0 diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c index 00e3a637f7b6..65cf93dcc8ee 100644 --- a/drivers/perf/arm_spe_pmu.c +++ b/drivers/perf/arm_spe_pmu.c @@ -677,11 +677,11 @@ static u64 arm_spe_pmsevfr_res0(u16 pmsver) { switch (pmsver) { case ID_AA64DFR0_EL1_PMSVer_IMP: - return SYS_PMSEVFR_EL1_RES0_8_2; + return PMSEVFR_EL1_RES0_IMP; case ID_AA64DFR0_EL1_PMSVer_V1P1: /* Return the highest version we support in default */ default: - return SYS_PMSEVFR_EL1_RES0_8_3; + return PMSEVFR_EL1_RES0_V1P1; } } -- 2.39.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel