From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f74.google.com (mail-io1-f74.google.com [209.85.166.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EFE5285C9E for ; Mon, 14 Jul 2025 22:59:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752533981; cv=none; b=pJB0vWtW7zMqhwJrq1VYlIXFM8f9smpf+mI+dRnhPUeqCa3Xjj9TSktwvhWRrdlvKD5J0HSKuVqDRjmZWomKH5qSMfXNWxAw8FpqO8pGhPVteV6LQNT+jYN3XPjflmDgp2vB1rQsa/y8gd+4LyZUAWEYBtb28DGnsnYOpM5OfnA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752533981; c=relaxed/simple; bh=7v4sX5q8lLRJ/EAnEhPnRBoogEWKPydlhazoaBQzE90=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Rf/DbeIRzw8kkcvFWr1MdyHaXlbsBIyceevvXWVGyIbJRInavamnfos4pJ+NE+TmnQsf6nTX/IvYxjrrr/GnNbbdWcCsQmKpRx6OhoMY9j/qPmFI21E21X2UVmDiaCX06B7Y1apKph4jDsttcUkmQvTADUbhZmIzbvzY2nAHMnQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Zu+YNcNa; arc=none smtp.client-ip=209.85.166.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Zu+YNcNa" Received: by mail-io1-f74.google.com with SMTP id ca18e2360f4ac-86cc7cdb86fso524065639f.1 for ; Mon, 14 Jul 2025 15:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752533975; x=1753138775; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4LikijBgA9hgJn1z8WT/27yywkDcxcZWUZywAO0Cb1M=; b=Zu+YNcNa3/K+QAWxd2ELbUb/41b/6dRNMoftovfqHLGBpm5S0u89xQcHtiOMDeeTt9 EUJ6s07PSjHp9PwA+Hxu/XV3Y+lx7lZfKnfMB0pV5C5oRMbjAaDx/WKPXQJasbDzP2MS rvqq29m8+GocQa1PjLMe2Wgs6j9IsKTVWhiRHaWOyWcYn3/E1W28D4SFmgtQSt6gdWMn 2j8laq+kTXU68TZxPgsHI6klJ1/vGyhDgTgq+yPg2TD0fjX9k9Z6KTWVwISeY4yXJB82 vJ5hg/PGehayVO7ItFwBZJgdDpEeGvaz9lCF+i67TRwnsMI2EFhX5hBjBhf3r9zS0+OQ cBdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752533975; x=1753138775; h=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; bh=4LikijBgA9hgJn1z8WT/27yywkDcxcZWUZywAO0Cb1M=; b=EtBbcZEvwqo8otKu8deMcMx+X8BW7ztHJc93D1/a3SH7kSPaDvQtRexF5aSlnjBcci 7VjKikyP96QiYnp5plzegPGKdQrPxORwTeg2L2yJ2zZ55Ev9J2p5ZGQ/dmLSmVyRcQ59 8R/V/fNUrG+KjV/sRU4onv4yPMOwqpy88kevjvsbJ1vDrEopdk03qTmwnua7eMUgAqnf zwt0qDN1lPz95k3hse2YrqCKwI5kEvrDHRNGnuIU1VwM5EGK4eTxK0I4F0I+hvtWkYee z1chjZKxGqKSrqBXzDsoGn7/sEkvSdxJsqjVTD3RbXTLkvxMJmV53Vp/IqreAzq6kQfS 7eYw== X-Forwarded-Encrypted: i=1; AJvYcCXTEcRwnhOPcglBt/B1tTmEjEjp+5pp5yYEFeieOcYGdy4y+rKcTt7ytqi3Ml7ZPjx4t7rutxbZWRyn/U6SVS8=@vger.kernel.org X-Gm-Message-State: AOJu0YzCXCrmtI7/ERLZLlWNNRgRpmDJsQKfIIRYcjDowBB0vzjGOayG hPjWwgwzwchrDTf4nH3BK7kFFpjoIy8WQIy9XWr8vp4U/5TR8bagLfhnUQQDvtoF0RYHkd/bmKE cQblkHtUG/G503ZZ1LEz/epw3AA== X-Google-Smtp-Source: AGHT+IEwx9UBGT/8wheREiWV+S0ihYQlL4yh0otkxzUq1va/b8+IqqW7BehvDHYAb7BE/vWyVZofNwSdDr4keaqSbQ== X-Received: from iove26.prod.google.com ([2002:a05:6602:45a:b0:861:c7b1:d848]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6602:7402:b0:873:35c8:16f9 with SMTP id ca18e2360f4ac-8797882781amr1351696339f.8.1752533975408; Mon, 14 Jul 2025 15:59:35 -0700 (PDT) Date: Mon, 14 Jul 2025 22:58:59 +0000 In-Reply-To: <20250714225917.1396543-1-coltonlewis@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250714225917.1396543-1-coltonlewis@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250714225917.1396543-6-coltonlewis@google.com> Subject: [PATCH v4 05/23] perf: arm_pmuv3: Generalize counter bitmasks From: Colton Lewis To: kvm@vger.kernel.org Cc: Paolo Bonzini , Jonathan Corbet , Russell King , Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Mingwei Zhang , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Mark Rutland , Shuah Khan , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, Colton Lewis Content-Type: text/plain; charset="UTF-8" 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 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c index 294ccbdc3816..339d3c2d91a0 100644 --- a/drivers/perf/arm_pmuv3.c +++ b/drivers/perf/arm_pmuv3.c @@ -518,7 +518,7 @@ static u64 armv8pmu_pmcr_n_read(void) 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) @@ -754,7 +754,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 d698efba28a2..fd2a34b4a64d 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 -- 2.50.0.727.gbf7dc18ff4-goog