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 25A0AC98318 for ; Thu, 24 Sep 2026 17:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eo5DRTmpsGszPddi/UamZur+o5cefOUS1h+X+Vf57sI=; b=IdkB9kk4YohE4jjzAuVkMNkSqZ r9S0x1U0mIxs0en6ZI9n9We7x1nnuoXaqp2lcNw1NX3s4lGKKA+Dm44LTZdV9xs9jzvfU6RDxrboN aD4BoaJrlpAh6V+gTATYamYsfsTOICt0qJztNu6+xQRLGTJmXXrQpWiObxhh9F5kChouLObPuHOaA y3l8sT1oQhj3GXIH7ywVtHvN7rurn3DcnHmuxI6KqUj1OXp1scLOen8OjNB65Sk74+drax9GGfJ5K VGxMbhYsTeFd8PZ/PHb1EbUyvSGrAVnYqzskwdAqDIp5QpxX8GXl2do+cgvupqXC8FhmOgdF+aKPl CBgrM7rw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9nGU-0000000BjvT-3ThI; Thu, 24 Sep 2026 17:29:46 +0000 Received: from mail-oi1-x247.google.com ([2607:f8b0:4864:20::247]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9nGK-0000000Bjpq-322j for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2026 17:29:37 +0000 Received: by mail-oi1-x247.google.com with SMTP id 5614622812f47-4ab8b4887d4so133913b6e.1 for ; Thu, 24 Sep 2026 10:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790270975; x=1790875775; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=eo5DRTmpsGszPddi/UamZur+o5cefOUS1h+X+Vf57sI=; b=WK1EEA83DjQ+FpQPKcr6LNmxmqQAnyYisVLqV0h08D891Svq6FgUzU58MJbPXer5xY 5Th1ihKjt9bc4KV2L/OtwSQgSO2EfsGV+Bnn1+GgV/ajgeAqYZL+zBJBMkQsMtvj2gnu w/7t8gWzyKRh/h2GYm7ZD8KPX1ff9+5IeGB1LaloU3A9tPArcNQZI80xd+L3bD2M9O7T 9Pp/XoSbNWy1dyg/IfeLcbIoNLQTGbxUtTZPrmq4qDhxLKl9fAriqEFF4ECl4o4wlu3Y xNk3RVgr2TsdnL8b7CGHTgH2aOEusFhdpKb123M5Bc+ODj5O7lGy2LljZYAM5Kb6Ey5L 0bLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790270975; x=1790875775; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=eo5DRTmpsGszPddi/UamZur+o5cefOUS1h+X+Vf57sI=; b=p3rkHx3fgB0T3KCB9YLna6+BoMN023Xt2gBaE4k22cUipLVEuBTemQiSpH0N+Cacf1 /WYFy58ioM5pn8wVuLO/OE0rZHx3hVMtSLBCGFAN7VbU53BrY8oVWWcI2sZkpYNfU/Bl XqRg3nA/DyLBaFfnZzu82oEoyDgg0j1iGiQaDuPuemGcXO3caNKoFmKEv/ekOhbeRETr V5nBjI8ZFbPaOtPVkYxr4NJh15lqjuTaVAb34kJkU4flyedziXasSH7nsh0cTd75O2pc Teb1uAqNlb+gNVoBuPDUnV7FFWYsfvDyAH8l+2dn8LtiRyFo237tHWncShAXQTE7RaI6 Xd4w== X-Forwarded-Encrypted: i=1; AKwUvBy/H5DGjF+r+At9FN3RAE4mZ3sO77/HOwiYqESzjL3C9e/ESyWo3GuLWSxtaeXAxELgq5w23BCI1UTq39riDAuY@lists.infradead.org X-Gm-Message-State: AFuF++nuTk8yqRnW8vBHadmhDxyCmrwHc2pThUqzwt7o8FY+XBltZKws pvDgcuRP6hG4o8bAES2AyWAg0EeNwdK4BWU33hbyoJTeJflfJIwT3qcJtOwxh5cxa9dGkdgfp2Y AC9pcn419vsaHl3wzxCZRbomQUA== X-Received: from ilei14-n2.prod.google.com ([2002:a05:6e02:61ce:20b0:50d:6d0c:d703]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:1825:b0:4c3:5e7e:84cf with SMTP id 5614622812f47-4d728717be4mr3871316b6e.14.1790270974963; Thu, 24 Sep 2026 10:29:34 -0700 (PDT) Date: Thu, 24 Sep 2026 17:29:10 +0000 In-Reply-To: <20260924172928.2110956-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20260924172928.2110956-1-coltonlewis@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20260924172928.2110956-5-coltonlewis@google.com> Subject: [PATCH v9 04/22] perf: arm_pmuv3: Generalize counter bitmasks From: Colton Lewis To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Oliver Upton , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Fuad Tabba , Catalin Marinas , Will Deacon , Mark Rutland , Paolo Bonzini , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , James Clark , Robin Murphy , Zide Chen , Alexandru Elisei , Ganapatrao Kulkarni , Mingwei Zhang , Jonathan Corbet , Russell King , Shuah Khan , linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Colton Lewis Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260924_102936_774202_78D63E7C X-CRM114-Status: GOOD ( 14.17 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The OVSR bitmasks are valid for enable and interrupt registers as well as overflow registers. Generalize the names. Acked-by: Mark Rutland Signed-off-by: Colton Lewis --- drivers/perf/arm_pmuv3.c | 4 ++-- include/linux/perf/arm_pmuv3.h | 14 +++++++------- tools/include/perf/arm_pmuv3.h | 12 +++++++----- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c index fbd631ec71a65..4a6c1f3bcea1f 100644 --- a/drivers/perf/arm_pmuv3.c +++ b/drivers/perf/arm_pmuv3.c @@ -535,7 +535,7 @@ static void armv8pmu_pmcr_write(u64 val) static int armv8pmu_has_overflowed(u64 pmovsr) { - return !!(pmovsr & ARMV8_PMU_OVERFLOWED_MASK); + return !!(pmovsr & ARMV8_PMU_CNT_MASK_ALL); } static int armv8pmu_counter_has_overflowed(u64 pmnc, int idx) @@ -771,7 +771,7 @@ static u64 armv8pmu_getreset_flags(void) value = read_pmovsclr(); /* Write to clear flags */ - value &= ARMV8_PMU_OVERFLOWED_MASK; + value &= ARMV8_PMU_CNT_MASK_ALL; write_pmovsclr(value); return value; diff --git a/include/linux/perf/arm_pmuv3.h b/include/linux/perf/arm_pmuv3.h index d698efba28a27..fd2a34b4a64d1 100644 --- a/include/linux/perf/arm_pmuv3.h +++ b/include/linux/perf/arm_pmuv3.h @@ -224,14 +224,14 @@ ARMV8_PMU_PMCR_LC | ARMV8_PMU_PMCR_LP) /* - * PMOVSR: counters overflow flag status reg + * Counter bitmask layouts for overflow, enable, and interrupts */ -#define ARMV8_PMU_OVSR_P GENMASK(30, 0) -#define ARMV8_PMU_OVSR_C BIT(31) -#define ARMV8_PMU_OVSR_F BIT_ULL(32) /* arm64 only */ -/* Mask for writable bits is both P and C fields */ -#define ARMV8_PMU_OVERFLOWED_MASK (ARMV8_PMU_OVSR_P | ARMV8_PMU_OVSR_C | \ - ARMV8_PMU_OVSR_F) +#define ARMV8_PMU_CNT_MASK_P GENMASK(30, 0) +#define ARMV8_PMU_CNT_MASK_C BIT(31) +#define ARMV8_PMU_CNT_MASK_F BIT_ULL(32) /* arm64 only */ +#define ARMV8_PMU_CNT_MASK_ALL (ARMV8_PMU_CNT_MASK_P | \ + ARMV8_PMU_CNT_MASK_C | \ + ARMV8_PMU_CNT_MASK_F) /* * PMXEVTYPER: Event selection reg diff --git a/tools/include/perf/arm_pmuv3.h b/tools/include/perf/arm_pmuv3.h index 1e397d55384ed..d045b0f3b93fe 100644 --- a/tools/include/perf/arm_pmuv3.h +++ b/tools/include/perf/arm_pmuv3.h @@ -226,12 +226,14 @@ ARMV8_PMU_PMCR_LC | ARMV8_PMU_PMCR_LP) /* - * PMOVSR: counters overflow flag status reg + * Counter bitmask layouts for overflow, enable, and interrupts */ -#define ARMV8_PMU_OVSR_P GENMASK(30, 0) -#define ARMV8_PMU_OVSR_C BIT(31) -/* Mask for writable bits is both P and C fields */ -#define ARMV8_PMU_OVERFLOWED_MASK (ARMV8_PMU_OVSR_P | ARMV8_PMU_OVSR_C) +#define ARMV8_PMU_CNT_MASK_P GENMASK(30, 0) +#define ARMV8_PMU_CNT_MASK_C BIT(31) +#define ARMV8_PMU_CNT_MASK_F BIT_ULL(32) /* arm64 only */ +#define ARMV8_PMU_CNT_MASK_ALL (ARMV8_PMU_CNT_MASK_P | \ + ARMV8_PMU_CNT_MASK_C | \ + ARMV8_PMU_CNT_MASK_F) /* * PMXEVTYPER: Event selection reg -- 2.56.0.rc1.310.g51773c2048-goog