Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
From:   Ilkka Koskinen <ilkka@os.amperecomputing.com>
To:     Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
        Suzuki K Poulose <suzuki.poulose@arm.com>,
        Besar Wicaksono <bwicaksono@nvidia.com>,
        Robin Murphy <robin.murphy@arm.com>,
        Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        Jonathan Corbet <corbet@lwn.net>,
        Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc:     linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        linux-doc@vger.kernel.org
Subject: [PATCH v7 2/4] perf: arm_cspmu: Support implementation specific filters
Date:   Wed, 13 Sep 2023 16:39:39 -0700
Message-Id: <20230913233941.9814-3-ilkka@os.amperecomputing.com>
In-Reply-To: <20230913233941.9814-1-ilkka@os.amperecomputing.com>
References: <20230913233941.9814-1-ilkka@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fK1skDFDya8V9Hq8JsW25MkkwJ8l2dtLuP0Ynx6Pwgk29i8cexanugtbZZwI?=
 =?us-ascii?Q?O7rntfHdomkS7KoqY6OKWbezFxqhvz5URDSxP1olKEoAwoKwnq/w0AgJj3wd?=
 =?us-ascii?Q?UoJprCEFfMqMTURv0IZ9Oon1/A7Pwv296o8odKIrVsIdyLOLJf+sHre2xBUY?=
 =?us-ascii?Q?vdXvn4zPG/yxSzekcCEQ+SO16y/1TiwwjCBqhTqF1rYoNjo3ZRkr5y4tDSZL?=
 =?us-ascii?Q?+4ZyqsFEImwg0PucbYw6aBPkcU4KblvW+WidrXeKvSGNNL/3bwPb31rmlPMa?=
 =?us-ascii?Q?vDhhqHPjBvZRgZuWaIPiBAajybTv7i31+QpM53ZT9ukXZqanpR5w94Xbmpzs?=
 =?us-ascii?Q?FslbyfuV1OT/6w++X6+aCsG7dTI8Oy8AZxcKjdoS7RVGirLUZxasipmV9Cls?=
 =?us-ascii?Q?nU/cdfyXR4cf5oVmmHo/YyBV492XglXINxB7BWgbdh8dgA58l0jXD8hHik0G?=
 =?us-ascii?Q?Kui99BCmN9S8LLboeUJSXO6HJ9CVZNYYnNm43opLGb0Gmn8Yyn0Ifob1Oh4A?=
 =?us-ascii?Q?+u2WAN3gzmIve0+ZIV+dUtphGT+E/ls7MMc+gKsVf6yqamrxkjKFx5ZWkANf?=
 =?us-ascii?Q?AqMgVRuvfxt2MF9P8A34nlgya+MqJjiHKprkTScIS+UqzU2kHvtpFtfnPb1s?=
 =?us-ascii?Q?rev5kB2EulMC+/zFc+L9oWR8FEZHGfWGFtN7RMaGdmlkCdj9BxPSWoQ8144r?=
 =?us-ascii?Q?X53AFWwQ0GKKCw2VacfOZGlzGY9wbWWbsP4BLmR9CEGB3ptsV6+ORBqQ1plb?=
 =?us-ascii?Q?Zx8TwyM59vDGz0DVlB2wO0YespVi1/oATSg0yeuwjltE+DLHlrydCB2n27an?=
 =?us-ascii?Q?dH4Sw2Rv0RH4/xSt3vbYyuwhjrB1aoshTOGW43RepF2DMpreXSxBMynp1T3I?=
 =?us-ascii?Q?7560QkN6Qfu6qn46bqUUGkDA8f5mptAAMxgXC3vKtGes8SYV4lmYP9+vQ1QR?=
 =?us-ascii?Q?BsoTdWHid/HlHpetwHtSz6LzMRp/oV7XnBJZSIl4tuT9/e46vbFsfSxqoVxL?=
 =?us-ascii?Q?hXdLNgCySabOI7az7rzdII1HXx4DWCoIp9vJKVqfLaoYqCC5GGh2V8FMISkJ?=
 =?us-ascii?Q?UYgHhuJSv33HQrq3jVK4TYhAVWNPk03BWEL/5933YmgU/lCvZUwFfy+auBdT?=
 =?us-ascii?Q?0cPGta3MzCoMMALzF+PXR72nmP1GeekaaBR/QIuYlZ7Brooa7MqMrZKyts8/?=
 =?us-ascii?Q?CcO661+ddcKatUaRCwe5yE2FsXYRM3CYpmXUM/36uzBjDAJjtpFRND1dhe7L?=
 =?us-ascii?Q?Kn0va6rsOiCFoxIRFK8QooOQv1jYvRuPr7aZS6OnsGhk+XkqpPHVaRmrGCrM?=
 =?us-ascii?Q?3fERUP+dBKZet2vCtgWgg3OMmSjNYr8nO32FBs1EN/dn3nbJ2w9wB82gOECM?=
 =?us-ascii?Q?ZMQqmKmrIsdWCBeAwTnE48LJsCq9Z2JgshSSV4UrBciurPVgw6PCHamRwKN6?=
 =?us-ascii?Q?IFGRcNNs37lIhatIPK5aP/n33tJNLZB2EvcpdLdRRlBqWrULqKrH5oWKk32B?=
 =?us-ascii?Q?ehrw8PIqYEK+4qkOV1QXBCVsYBS6zL1x4gUUMIlP697UUvWATXrKJdjIoOo4?=
 =?us-ascii?Q?bk8CtHeJDwQF5j+Tbt1X+rZzmiice0UqQMRfMWPX2sHo9t9N9aFXQIz/yQJM?=
 =?us-ascii?Q?UetbdD9kL191IIiY5dpNbXk=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ce0f04d-3ae0-4ecb-ecfc-08dbb4b2e4db
X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 23:41:04.0700
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1OOXT+NLBKjwvGbEQ7HFa/rdCHZDD1/pKPdiX8hdgX5WvKpZp++DMmnCdagNjrG74XlnEz8rGEubXdyvPlehtVZWLNdUfm3QsuNeHXYkbpTCIn4LwOvWVEb5+IJ6RWjb
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR01MB6241
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 16:41:36 -0700 (PDT)
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email

ARM Coresight PMU architecture specification [1] defines PMEVTYPER and
PMEVFILT* registers as optional in Chapter 2.1. Moreover, implementers may
choose to use PMIMPDEF* registers (offset: 0xD80-> 0xDFF) to filter the
events. Add support for those by adding implementation specific filter
callback function.

[1] https://developer.arm.com/documentation/ihi0091/latest

Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Reviewed-by: Besar Wicaksono <bwicaksono@nvidia.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
 drivers/perf/arm_cspmu/arm_cspmu.c | 12 ++++++++----
 drivers/perf/arm_cspmu/arm_cspmu.h |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
index 5f4f04135a22..2ecbf8d7714b 100644
--- a/drivers/perf/arm_cspmu/arm_cspmu.c
+++ b/drivers/perf/arm_cspmu/arm_cspmu.c
@@ -116,6 +116,9 @@ static unsigned long arm_cspmu_cpuhp_state;
 
 static DEFINE_MUTEX(arm_cspmu_lock);
 
+static void arm_cspmu_set_ev_filter(struct arm_cspmu *cspmu,
+				    struct hw_perf_event *hwc, u32 filter);
+
 static struct acpi_apmt_node *arm_cspmu_apmt_node(struct device *dev)
 {
 	return *(struct acpi_apmt_node **)dev_get_platdata(dev);
@@ -454,6 +457,7 @@ static int arm_cspmu_init_impl_ops(struct arm_cspmu *cspmu)
 	CHECK_DEFAULT_IMPL_OPS(impl_ops, event_type);
 	CHECK_DEFAULT_IMPL_OPS(impl_ops, event_filter);
 	CHECK_DEFAULT_IMPL_OPS(impl_ops, event_attr_is_visible);
+	CHECK_DEFAULT_IMPL_OPS(impl_ops, set_ev_filter);
 
 	return 0;
 }
@@ -815,9 +819,9 @@ static inline void arm_cspmu_set_event(struct arm_cspmu *cspmu,
 	writel(hwc->config, cspmu->base0 + offset);
 }
 
-static inline void arm_cspmu_set_ev_filter(struct arm_cspmu *cspmu,
-					   struct hw_perf_event *hwc,
-					   u32 filter)
+static void arm_cspmu_set_ev_filter(struct arm_cspmu *cspmu,
+					struct hw_perf_event *hwc,
+					u32 filter)
 {
 	u32 offset = PMEVFILTR + (4 * hwc->idx);
 
@@ -849,7 +853,7 @@ static void arm_cspmu_start(struct perf_event *event, int pmu_flags)
 		arm_cspmu_set_cc_filter(cspmu, filter);
 	} else {
 		arm_cspmu_set_event(cspmu, hwc);
-		arm_cspmu_set_ev_filter(cspmu, hwc, filter);
+		cspmu->impl.ops.set_ev_filter(cspmu, hwc, filter);
 	}
 
 	hwc->state = 0;
diff --git a/drivers/perf/arm_cspmu/arm_cspmu.h b/drivers/perf/arm_cspmu/arm_cspmu.h
index 7936a90ded7f..e0cca5b4aab9 100644
--- a/drivers/perf/arm_cspmu/arm_cspmu.h
+++ b/drivers/perf/arm_cspmu/arm_cspmu.h
@@ -104,6 +104,9 @@ struct arm_cspmu_impl_ops {
 	u32 (*event_type)(const struct perf_event *event);
 	/* Decode filter value from configs */
 	u32 (*event_filter)(const struct perf_event *event);
+	/* Set event filter */
+	void (*set_ev_filter)(struct arm_cspmu *cspmu,
+			      struct hw_perf_event *hwc, u32 filter);
 	/* Hide/show unsupported events */
 	umode_t (*event_attr_is_visible)(struct kobject *kobj,
 					 struct attribute *attr, int unused);
-- 
2.40.1