Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp986334rwd; Thu, 25 May 2023 06:45:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6A8djNV+AQjQT7wb4hjy9DFuKkQ0Y8kl1A76JwG0wcDiRk1zNF11OqAbYfz10053LczqYP X-Received: by 2002:a05:6a20:8e04:b0:10d:bc30:b9ea with SMTP id y4-20020a056a208e0400b0010dbc30b9eamr6756263pzj.39.1685022352112; Thu, 25 May 2023 06:45:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685022352; cv=none; d=google.com; s=arc-20160816; b=SpmYPj4rWkZVl1geiGo8r9ZD1RzCZyj1OMBArjCUUauQ6fU+GGLDrQFUAa3myYTVx6 jS+NA7qBSVgefuJ2emU3iJS3ts1IJpjBs87EH/sPXFbI04FWTgHwjPizer+vuJOlWx5S 2NVvsFzokAMabi3Au5VSU3R6Ly3lhCSsYwA/2B6O62+8PCWHzmsTWk7P9zWkhJ0CYRId MJUfUNGeNR6nA2kB71JhOkJRSjIXkSd6RmBusCV/yxGk/2ol3M0gcGI/KK6xoH0JT4zO knVK7B19S7Kmhk9qwMslD28OI/CZOMDLyN6jpLbDk7+ILbExFbOPU4DKy8SYw/nZHAQz LGRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:references:to:subject :cc; bh=/9h5ASF2tIvTHLKXGd997HN65baQYvxUg3U12iDwKJA=; b=AsAWtDdACPsJvAg5xPMK0hOTEM3xpDcIj3gDsw7UwClHPHZQBSkwpRw+i5zqOGnFcW SBioetA1+XJ97YZoQeNu4JElxNOmiYkysdDsSoQdDtZ1kghSkd9hT173+CWkyxifqGTn hQ7wM5XQQosJyEEX5oVKOxc+IM6NUVEZAT6z4B/yQlwO+4kzhAp4KaEGujwEfcjGYR57 tJN0uZB2cE8MRZ/eN/fmR6Qa+imBuWJ8yEuso6HaY7oCNuf4PJZy7YBbdyvOZi1fPmpr Pze8pn+9Eayw60hzsByYpohW54DJ0x+Fa0zSNUH5DQ7aOK16LPKyuIIerD1fXrA8V/zL V39w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w190-20020a6382c7000000b005323e5a006csi1226207pgd.411.2023.05.25.06.45.37; Thu, 25 May 2023 06:45:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240345AbjEYNkL (ORCPT + 99 others); Thu, 25 May 2023 09:40:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241375AbjEYNjx (ORCPT ); Thu, 25 May 2023 09:39:53 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62389E74; Thu, 25 May 2023 06:39:39 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QRpyD0TvNzYsmR; Thu, 25 May 2023 21:37:24 +0800 (CST) Received: from [10.67.102.169] (10.67.102.169) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 25 May 2023 21:39:32 +0800 CC: , , , , , Subject: Re: [PATCH 2/3] drivers/perf: hisi: Add support for HiSilicon UC PMU driver To: Junhao He , , , , References: <20230523131825.6102-1-hejunhao3@huawei.com> <20230523131825.6102-3-hejunhao3@huawei.com> From: Yicong Yang Message-ID: <53d143fc-ce68-0d0b-1186-c8a5d87af0c5@huawei.com> Date: Thu, 25 May 2023 21:39:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: <20230523131825.6102-3-hejunhao3@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.102.169] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Junhao, On 2023/5/23 21:18, Junhao He wrote: > On HiSilicon Hip09 platform, there is a UC (unified cache) module > on each chip SCCL (Super CPU Cluster). UC is a cache that provides > coherence between NUMA and UMA domains. It is located between L2 > and Memory System. While PA uncore PMU model is the same as other > Hip09 PMU modules and many PMU events are supported. Let's support > the PMU driver using the HiSilicon uncore PMU framework. > > * rd_req_en : rd_req_en is the abbreviation of read request tracetag enable > and allows user to count only read operations. > details are listed in the hisi-pmu document. > > * srcid_en & srcid: allows user to filter statistics that come from > specific CPU/ICL by configuration source ID. > > * uring_channel: Allows users to filter statistical information based on > the specified tx request uring channel. > uring_channel only supported events: [0x47 ~ 0x59]. > Just a quick glance and some minor comments below. > Signed-off-by: Junhao He > --- > drivers/perf/hisilicon/Makefile | 2 +- > drivers/perf/hisilicon/hisi_uncore_pmu.c | 5 +- > drivers/perf/hisilicon/hisi_uncore_pmu.h | 6 + > drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 581 ++++++++++++++++++++ > 4 files changed, 592 insertions(+), 2 deletions(-) > create mode 100644 drivers/perf/hisilicon/hisi_uncore_uc_pmu.c > > diff --git a/drivers/perf/hisilicon/Makefile b/drivers/perf/hisilicon/Makefile > index 4d2c9abe3372..48dcc8381ea7 100644 > --- a/drivers/perf/hisilicon/Makefile > +++ b/drivers/perf/hisilicon/Makefile > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > obj-$(CONFIG_HISI_PMU) += hisi_uncore_pmu.o hisi_uncore_l3c_pmu.o \ > hisi_uncore_hha_pmu.o hisi_uncore_ddrc_pmu.o hisi_uncore_sllc_pmu.o \ > - hisi_uncore_pa_pmu.o hisi_uncore_cpa_pmu.o > + hisi_uncore_pa_pmu.o hisi_uncore_cpa_pmu.o hisi_uncore_uc_pmu.o > > obj-$(CONFIG_HISI_PCIE_PMU) += hisi_pcie_pmu.o > obj-$(CONFIG_HNS3_PMU) += hns3_pmu.o > diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c > index 2823f381930d..c5ac1c1a9fc1 100644 > --- a/drivers/perf/hisilicon/hisi_uncore_pmu.c > +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c > @@ -20,7 +20,6 @@ > > #include "hisi_uncore_pmu.h" > > -#define HISI_GET_EVENTID(ev) (ev->hw.config_base & 0xff) > #define HISI_MAX_PERIOD(nr) (GENMASK_ULL((nr) - 1, 0)) > > /* > @@ -226,6 +225,10 @@ int hisi_uncore_pmu_event_init(struct perf_event *event) > hwc->idx = -1; > hwc->config_base = event->attr.config; > > + if (hisi_pmu->ops->check_format) > + if (hisi_pmu->ops->check_format(event)) It can be merged into one if. > + return -EINVAL; > + > /* Enforce to use the same CPU for all events in this PMU */ > event->cpu = hisi_pmu->on_cpu; > > diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.h b/drivers/perf/hisilicon/hisi_uncore_pmu.h > index 73574cc0a243..af6529e99c13 100644 > --- a/drivers/perf/hisilicon/hisi_uncore_pmu.h > +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.h > @@ -49,9 +49,15 @@ enum hisi_pmu_version { > HISI_PMU_MAX > }; > > +#define HISI_GET_EVENTID(ev) (ev->hw.config_base & 0xff) > + > +#define HISI_PMU_EVTYPE_BITS 8 > +#define HISI_PMU_EVTYPE_SHIFT(idx) ((idx) % 4 * HISI_PMU_EVTYPE_BITS) > + > struct hisi_pmu; > > struct hisi_uncore_ops { > + int (*check_format)(struct perf_event *event); > void (*write_evtype)(struct hisi_pmu *, int, u32); > int (*get_event_idx)(struct perf_event *); > u64 (*read_counter)(struct hisi_pmu *, struct hw_perf_event *); > diff --git a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c > new file mode 100644 > index 000000000000..385966eab816 > --- /dev/null > +++ b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c > @@ -0,0 +1,581 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * HiSilicon SoC UC (unified cache) uncore Hardware event counters support > + * > + * Copyright (C) 2023 HiSilicon Limited > + * > + * This code is based on the uncore PMUs like hisi_uncore_l3c_pmu. > + */ > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "hisi_uncore_pmu.h" > + > +/* Dynamic CPU hotplug state used by UC PMU */ > +static enum cpuhp_state hisi_uc_pmu_online; > + > +/* UC register definition */ > +#define HISI_UC_INT_MASK_REG 0x0800 > +#define HISI_UC_INT_STS_REG 0x0808 > +#define HISI_UC_INT_CLEAR_REG 0x080c > +#define HISI_UC_TRACETAG_CTRL_REG 0x1b2c > +#define HISI_UC_TRACETAG_REQ_MSK GENMASK(9, 7) > +#define HISI_UC_TRACETAG_MARK_EN BIT(0) > +#define HISI_UC_TRACETAG_REQ_EN (HISI_UC_TRACETAG_MARK_EN | BIT(2)) > +#define HISI_UC_TRACETAG_SRCID_EN BIT(3) > +#define HISI_UC_SRCID_CTRL_REG 0x1b40 > +#define HISI_UC_SRCID_MSK GENMASK(14, 1) > +#define HISI_UC_EVENT_CTRL_REG 0x1c00 > +#define HISI_UC_EVENT_TRACETAG_EN BIT(29) > +#define HISI_UC_EVENT_URING_MSK GENMASK(28, 27) > +#define HISI_UC_EVENT_GLB_EN BIT(26) > +#define HISI_UC_VERSION_REG 0x1cf0 > +#define HISI_UC_EVTYPE0_REG 0x1d00 > +#define HISI_UC_EVTYPE_REG(n) (HISI_UC_EVTYPE0_REG + (n) * 4) > +#define HISI_UC_EVTYPE_MASK GENMASK(7, 0) > +#define HISI_UC_CNTR0_REG 0x1e00 > +#define HISI_UC_CNTR_REG(n) (HISI_UC_CNTR0_REG + (n) * 8) > + > +#define HISI_UC_NR_COUNTERS 0x8 > +#define HISI_UC_V2_NR_EVENTS 0xFF > +#define HISI_UC_CNTR_REG_BITS 64 > + > +#define HISI_UC_RD_REQ_TRACETAG 0x4 > +#define HISI_UC_URING_EVENT_MIN 0x47 > +#define HISI_UC_URING_EVENT_MAX 0x59 > + > +HISI_PMU_EVENT_ATTR_EXTRACTOR(rd_req_en, config1, 0, 0); > +HISI_PMU_EVENT_ATTR_EXTRACTOR(uring_channel, config1, 5, 4); > +HISI_PMU_EVENT_ATTR_EXTRACTOR(srcid, config1, 19, 6); > +HISI_PMU_EVENT_ATTR_EXTRACTOR(srcid_en, config1, 20, 20); > + > +static int hisi_uc_pmu_check_format(struct perf_event *event) check_config or check_event will be clearer. > +{ > + struct hisi_pmu *uc_pmu = to_hisi_pmu(event->pmu); > + > + if (hisi_get_srcid_en(event) && !hisi_get_rd_req_en(event)) { > + dev_err(uc_pmu->dev, > + "Failed to set srcid: depending on read request enabled!\n"); > + return -EINVAL; > + } > + > + if (!hisi_get_uring_channel(event)) > + return 0; > + > + if ((HISI_GET_EVENTID(event) < HISI_UC_URING_EVENT_MIN) || > + (HISI_GET_EVENTID(event) > HISI_UC_URING_EVENT_MAX)) > + dev_warn(uc_pmu->dev, > + "Only events: [%#x ~ %#x] support channel filtering!", > + HISI_UC_URING_EVENT_MIN, HISI_UC_URING_EVENT_MAX); > + > + return 0; > +} > + > +static void hisi_uc_pmu_config_req_tracetag(struct perf_event *event) > +{ > + struct hisi_pmu *uc_pmu = to_hisi_pmu(event->pmu); > + u32 val; > + > + if (!hisi_get_rd_req_en(event)) > + return; > + > + val = readl(uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > + > + /* The request-type has been configured */ > + if (FIELD_GET(HISI_UC_TRACETAG_REQ_MSK, val) == HISI_UC_RD_REQ_TRACETAG) > + return; > + > + /* Set request-type for tracetag, only read request is supported! */ > + val &= ~HISI_UC_TRACETAG_REQ_MSK; > + val |= FIELD_PREP(HISI_UC_TRACETAG_REQ_MSK, HISI_UC_RD_REQ_TRACETAG); > + val |= HISI_UC_TRACETAG_REQ_EN; > + writel(val, uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > +} > + > +static void hisi_uc_pmu_clear_req_tracetag(struct perf_event *event) > +{ > + struct hisi_pmu *uc_pmu = to_hisi_pmu(event->pmu); > + u32 val; > + > + if (!hisi_get_rd_req_en(event)) > + return; > + > + val = readl(uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > + > + /* Do nothing, the request-type tracetag has been cleaned up */ > + if (FIELD_GET(HISI_UC_TRACETAG_REQ_MSK, val) == 0) > + return; > + > + /* Clear request-type */ > + val &= ~HISI_UC_TRACETAG_REQ_MSK; > + val &= ~HISI_UC_TRACETAG_REQ_EN; > + writel(val, uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > +} > + > +static void hisi_uc_pmu_config_srcid_tracetag(struct perf_event *event) > +{ > + struct hisi_pmu *uc_pmu = to_hisi_pmu(event->pmu); > + u32 val; > + > + if (!hisi_get_srcid_en(event)) > + return; > + > + val = readl(uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > + > + /* Do nothing, the source id has been configured */ > + if (FIELD_GET(HISI_UC_TRACETAG_SRCID_EN, val)) > + return; > + > + /* Enable source id tracetag */ > + val |= HISI_UC_TRACETAG_SRCID_EN; > + writel(val, uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > + > + val = readl(uc_pmu->base + HISI_UC_SRCID_CTRL_REG); > + val &= ~HISI_UC_SRCID_MSK; > + val |= FIELD_PREP(HISI_UC_SRCID_MSK, hisi_get_srcid(event)); > + writel(val, uc_pmu->base + HISI_UC_SRCID_CTRL_REG); > + > + /* Depend on request-type tracetag enabled */ > + hisi_uc_pmu_config_req_tracetag(event); > +} > + > +static void hisi_uc_pmu_clear_srcid_tracetag(struct perf_event *event) > +{ > + struct hisi_pmu *uc_pmu = to_hisi_pmu(event->pmu); > + u32 val; > + > + if (!hisi_get_srcid_en(event)) > + return; > + > + val = readl(uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > + > + /* Do nothing, the source id has been cleaned up */ > + if (FIELD_GET(HISI_UC_TRACETAG_SRCID_EN, val) == 0) > + return; > + > + hisi_uc_pmu_clear_req_tracetag(event); > + > + /* Disable source id tracetag */ > + val &= ~HISI_UC_TRACETAG_SRCID_EN; > + writel(val, uc_pmu->base + HISI_UC_TRACETAG_CTRL_REG); > + > + val = readl(uc_pmu->base + HISI_UC_SRCID_CTRL_REG); > + val &= ~HISI_UC_SRCID_MSK; > + writel(val, uc_pmu->base + HISI_UC_SRCID_CTRL_REG); > +} > + > +static void hisi_uc_pmu_config_uring_channel(struct perf_event *event) > +{ > + struct hisi_pmu *uc_pmu = to_hisi_pmu(event->pmu); > + u32 uring_channel = hisi_get_uring_channel(event); > + u32 val; > + > + /* Do nothing if not being set or is set explicitly to zero (default) */ > + if (uring_channel == 0) > + return; > + > + val = readl(uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > + > + /* Do nothing, the uring_channel has been configured */ > + if (uring_channel == FIELD_GET(HISI_UC_EVENT_URING_MSK, val)) > + return; > + > + val &= ~HISI_UC_EVENT_URING_MSK; > + val |= FIELD_PREP(HISI_UC_EVENT_URING_MSK, uring_channel); > + writel(val, uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > +} > + > +static void hisi_uc_pmu_clear_uring_channel(struct perf_event *event) > +{ > + struct hisi_pmu *uc_pmu = to_hisi_pmu(event->pmu); > + u32 val; > + > + /* Do nothing if not being set or is set explicitly to zero (default) */ > + if (hisi_get_uring_channel(event) == 0) > + return; > + > + val = readl(uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > + > + /* Do nothing, the uring_channel has been cleaned up */ > + if (FIELD_GET(HISI_UC_EVENT_URING_MSK, val) == 0) > + return; > + > + val &= ~HISI_UC_EVENT_URING_MSK; > + writel(val, uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > +} > + > +static void hisi_uc_pmu_enable_filter(struct perf_event *event) > +{ > + if (event->attr.config1 == 0) > + return; > + > + hisi_uc_pmu_config_uring_channel(event); > + hisi_uc_pmu_config_req_tracetag(event); > + hisi_uc_pmu_config_srcid_tracetag(event); > +} > + > +static void hisi_uc_pmu_disable_filter(struct perf_event *event) > +{ > + if (event->attr.config1 == 0) > + return; > + > + hisi_uc_pmu_clear_srcid_tracetag(event); > + hisi_uc_pmu_clear_req_tracetag(event); > + hisi_uc_pmu_clear_uring_channel(event); > +} > + > +static void hisi_uc_pmu_write_evtype(struct hisi_pmu *uc_pmu, int idx, u32 type) > +{ > + u32 val; > + > + /* > + * Select the appropriate event select register. > + * There are 2 32-bit event select registers for the > + * 8 hardware counters, each event code is 8-bit wide. > + */ > + val = readl(uc_pmu->base + HISI_UC_EVTYPE_REG(idx / 4)); > + val &= ~(HISI_UC_EVTYPE_MASK << HISI_PMU_EVTYPE_SHIFT(idx)); > + val |= (type << HISI_PMU_EVTYPE_SHIFT(idx)); > + writel(val, uc_pmu->base + HISI_UC_EVTYPE_REG(idx / 4)); > +} > + > +static void hisi_uc_pmu_start_counters(struct hisi_pmu *uc_pmu) > +{ > + u32 val; > + > + val = readl(uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > + val |= HISI_UC_EVENT_GLB_EN; > + writel(val, uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > +} > + > +static void hisi_uc_pmu_stop_counters(struct hisi_pmu *uc_pmu) > +{ > + u32 val; > + > + val = readl(uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > + val &= ~HISI_UC_EVENT_GLB_EN; > + writel(val, uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > +} > + > +static void hisi_uc_pmu_enable_counter(struct hisi_pmu *uc_pmu, > + struct hw_perf_event *hwc) > +{ > + u32 val; > + > + /* Enable counter index */ > + val = readl(uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > + val |= (1 << hwc->idx); > + writel(val, uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > +} > + > +static void hisi_uc_pmu_disable_counter(struct hisi_pmu *uc_pmu, > + struct hw_perf_event *hwc) > +{ > + u32 val; > + > + /* Clear counter index */ > + val = readl(uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > + val &= ~(1 << hwc->idx); > + writel(val, uc_pmu->base + HISI_UC_EVENT_CTRL_REG); > +} > + > +static u64 hisi_uc_pmu_read_counter(struct hisi_pmu *uc_pmu, > + struct hw_perf_event *hwc) > +{ > + return readq(uc_pmu->base + HISI_UC_CNTR_REG(hwc->idx)); > +} > + > +static void hisi_uc_pmu_write_counter(struct hisi_pmu *uc_pmu, > + struct hw_perf_event *hwc, u64 val) > +{ > + hisi_uc_pmu_start_counters(uc_pmu); > + writeq(val, uc_pmu->base + HISI_UC_CNTR_REG(hwc->idx)); > +} > + > +static void hisi_uc_pmu_enable_counter_int(struct hisi_pmu *uc_pmu, > + struct hw_perf_event *hwc) > +{ > + u32 val; > + > + val = readl(uc_pmu->base + HISI_UC_INT_MASK_REG); > + /* Write 0 to enable interrupt */ The comment here and below maybe redundant. The code is self explanatory > + val &= ~(1 << hwc->idx); > + writel(val, uc_pmu->base + HISI_UC_INT_MASK_REG); > +} > + > +static void hisi_uc_pmu_disable_counter_int(struct hisi_pmu *uc_pmu, > + struct hw_perf_event *hwc) > +{ > + u32 val; > + > + val = readl(uc_pmu->base + HISI_UC_INT_MASK_REG); > + /* Write 1 to mask interrupt */ > + val |= (1 << hwc->idx); > + writel(val, uc_pmu->base + HISI_UC_INT_MASK_REG); > +} > + > +static u32 hisi_uc_pmu_get_int_status(struct hisi_pmu *uc_pmu) > +{ > + return readl(uc_pmu->base + HISI_UC_INT_STS_REG); > +} > + > +static void hisi_uc_pmu_clear_int_status(struct hisi_pmu *uc_pmu, int idx) > +{ > + writel(1 << idx, uc_pmu->base + HISI_UC_INT_CLEAR_REG); > +} > + > +static int hisi_uc_pmu_init_data(struct platform_device *pdev, > + struct hisi_pmu *uc_pmu) > +{ > + /* > + * Use the SCCL_ID and CCL_ID to identify the UC PMU, while > + * SCCL_ID is in MPIDR[aff2] and CCL_ID is in MPIDR[aff1]. > + */ The comment doesn't match what you've done here, these information is gotten from device properties rather than MPIDR. Thanks. > + if (device_property_read_u32(&pdev->dev, "hisilicon,scl-id", > + &uc_pmu->sccl_id)) { > + dev_err(&pdev->dev, "Can not read uc sccl-id!\n"); > + return -EINVAL; > + } > + > + if (device_property_read_u32(&pdev->dev, "hisilicon,ccl-id", > + &uc_pmu->ccl_id)) { > + dev_err(&pdev->dev, "Can not read uc ccl-id!\n"); > + return -EINVAL; > + } > + > + if (device_property_read_u32(&pdev->dev, "hisilicon,sub-id", > + &uc_pmu->sub_id)) { > + dev_err(&pdev->dev, "Can not read sub-id!\n"); > + return -EINVAL; > + } > + > + uc_pmu->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(uc_pmu->base)) { > + dev_err(&pdev->dev, "ioremap failed for uc_pmu resource\n"); > + return PTR_ERR(uc_pmu->base); > + } > + > + uc_pmu->identifier = readl(uc_pmu->base + HISI_UC_VERSION_REG); > + > + return 0; > +} > + > +static struct attribute *hisi_uc_pmu_format_attr[] = { > + HISI_PMU_FORMAT_ATTR(event, "config:0-7"), > + HISI_PMU_FORMAT_ATTR(rd_req_en, "config1:0-0"), > + HISI_PMU_FORMAT_ATTR(uring_channel, "config1:4-5"), > + HISI_PMU_FORMAT_ATTR(srcid, "config1:6-19"), > + HISI_PMU_FORMAT_ATTR(srcid_en, "config1:20-20"), > + NULL > +}; > + > +static const struct attribute_group hisi_uc_pmu_format_group = { > + .name = "format", > + .attrs = hisi_uc_pmu_format_attr, > +}; > + > +static struct attribute *hisi_uc_pmu_events_attr[] = { > + HISI_PMU_EVENT_ATTR(sq_time, 0x00), > + HISI_PMU_EVENT_ATTR(pq_time, 0x01), > + HISI_PMU_EVENT_ATTR(hbm_time, 0x02), > + HISI_PMU_EVENT_ATTR(iq_comp_time_cring, 0x03), > + HISI_PMU_EVENT_ATTR(iq_comp_time_uring, 0x05), > + HISI_PMU_EVENT_ATTR(cpu_rd, 0x10), > + HISI_PMU_EVENT_ATTR(cpu_rd64, 0x17), > + HISI_PMU_EVENT_ATTR(cpu_rs64, 0x19), > + HISI_PMU_EVENT_ATTR(cpu_mru, 0x1a), > + HISI_PMU_EVENT_ATTR(cycles, 0x9c), > + HISI_PMU_EVENT_ATTR(spipe_hit, 0xb3), > + HISI_PMU_EVENT_ATTR(hpipe_hit, 0xdb), > + HISI_PMU_EVENT_ATTR(cring_rxdat_cnt, 0xfa), > + HISI_PMU_EVENT_ATTR(cring_txdat_cnt, 0xfb), > + HISI_PMU_EVENT_ATTR(uring_rxdat_cnt, 0xfc), > + HISI_PMU_EVENT_ATTR(uring_txdat_cnt, 0xfd), > + NULL > +}; > + > +static const struct attribute_group hisi_uc_pmu_events_group = { > + .name = "events", > + .attrs = hisi_uc_pmu_events_attr, > +}; > + > +static DEVICE_ATTR(cpumask, 0444, hisi_cpumask_sysfs_show, NULL); > + > +static struct attribute *hisi_uc_pmu_cpumask_attrs[] = { > + &dev_attr_cpumask.attr, > + NULL, > +}; > + > +static const struct attribute_group hisi_uc_pmu_cpumask_attr_group = { > + .attrs = hisi_uc_pmu_cpumask_attrs, > +}; > + > +static struct device_attribute hisi_uc_pmu_identifier_attr = > + __ATTR(identifier, 0444, hisi_uncore_pmu_identifier_attr_show, NULL); > + > +static struct attribute *hisi_uc_pmu_identifier_attrs[] = { > + &hisi_uc_pmu_identifier_attr.attr, > + NULL > +}; > + > +static const struct attribute_group hisi_uc_pmu_identifier_group = { > + .attrs = hisi_uc_pmu_identifier_attrs, > +}; > + > +static const struct attribute_group *hisi_uc_pmu_attr_groups[] = { > + &hisi_uc_pmu_format_group, > + &hisi_uc_pmu_events_group, > + &hisi_uc_pmu_cpumask_attr_group, > + &hisi_uc_pmu_identifier_group, > + NULL > +}; > + > +static const struct hisi_uncore_ops hisi_uncore_uc_pmu_ops = { > + .check_format = hisi_uc_pmu_check_format, > + .write_evtype = hisi_uc_pmu_write_evtype, > + .get_event_idx = hisi_uncore_pmu_get_event_idx, > + .start_counters = hisi_uc_pmu_start_counters, > + .stop_counters = hisi_uc_pmu_stop_counters, > + .enable_counter = hisi_uc_pmu_enable_counter, > + .disable_counter = hisi_uc_pmu_disable_counter, > + .enable_counter_int = hisi_uc_pmu_enable_counter_int, > + .disable_counter_int = hisi_uc_pmu_disable_counter_int, > + .write_counter = hisi_uc_pmu_write_counter, > + .read_counter = hisi_uc_pmu_read_counter, > + .get_int_status = hisi_uc_pmu_get_int_status, > + .clear_int_status = hisi_uc_pmu_clear_int_status, > + .enable_filter = hisi_uc_pmu_enable_filter, > + .disable_filter = hisi_uc_pmu_disable_filter, > +}; > + > +static int hisi_uc_pmu_dev_probe(struct platform_device *pdev, > + struct hisi_pmu *uc_pmu) > +{ > + int ret; > + > + ret = hisi_uc_pmu_init_data(pdev, uc_pmu); > + if (ret) > + return ret; > + > + ret = hisi_uncore_pmu_init_irq(uc_pmu, pdev); > + if (ret) > + return ret; > + > + uc_pmu->pmu_events.attr_groups = hisi_uc_pmu_attr_groups; > + uc_pmu->check_event = HISI_UC_EVTYPE_MASK;> + uc_pmu->ops = &hisi_uncore_uc_pmu_ops; > + uc_pmu->counter_bits = HISI_UC_CNTR_REG_BITS; > + uc_pmu->num_counters = HISI_UC_NR_COUNTERS; > + uc_pmu->dev = &pdev->dev; > + uc_pmu->on_cpu = -1; > + > + return 0; > +} > + > +static void hisi_uc_pmu_remove_cpuhp_instance(void *hotplug_node) > +{ > + cpuhp_state_remove_instance_nocalls(hisi_uc_pmu_online, hotplug_node); > +} > + > +static void hisi_uc_pmu_unregister_pmu(void *pmu) > +{ > + perf_pmu_unregister(pmu); > +} > + > +static int hisi_uc_pmu_probe(struct platform_device *pdev) > +{ > + struct hisi_pmu *uc_pmu; > + char *name; > + int ret; > + > + uc_pmu = devm_kzalloc(&pdev->dev, sizeof(*uc_pmu), GFP_KERNEL); > + if (!uc_pmu) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, uc_pmu); > + > + ret = hisi_uc_pmu_dev_probe(pdev, uc_pmu); > + if (ret) > + return ret; > + > + name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sccl%d_uc%d_%u", > + uc_pmu->sccl_id, uc_pmu->ccl_id, uc_pmu->sub_id); > + if (!name) > + return -ENOMEM; > + > + ret = cpuhp_state_add_instance(hisi_uc_pmu_online, &uc_pmu->node); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "Error registering hotplug\n"); > + > + ret = devm_add_action_or_reset(&pdev->dev, > + hisi_uc_pmu_remove_cpuhp_instance, > + &uc_pmu->node); > + if (ret) > + return ret; > + > + hisi_pmu_init(uc_pmu, THIS_MODULE); > + > + ret = perf_pmu_register(&uc_pmu->pmu, name, -1); > + if (ret) > + return ret; > + > + return devm_add_action_or_reset(&pdev->dev, > + hisi_uc_pmu_unregister_pmu, > + &uc_pmu->pmu); > +} > + > +static const struct acpi_device_id hisi_uc_pmu_acpi_match[] = { > + { "HISI0291", }, > + {} > +}; > +MODULE_DEVICE_TABLE(acpi, hisi_uc_pmu_acpi_match); > + > +static struct platform_driver hisi_uc_pmu_driver = { > + .driver = { > + .name = "hisi_uc_pmu", > + .acpi_match_table = hisi_uc_pmu_acpi_match, > + /* > + * We have not worked out a safe bind/unbind process, > + * so this is not supported yet. > + */ > + .suppress_bind_attrs = true, > + }, > + .probe = hisi_uc_pmu_probe, > +}; > + > +static int __init hisi_uc_pmu_module_init(void) > +{ > + int ret; > + > + ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, > + "perf/hisi/uc:online", > + hisi_uncore_pmu_online_cpu, > + hisi_uncore_pmu_offline_cpu); > + if (ret < 0) { > + pr_err("UC PMU: Error setup hotplug, ret = %d\n", ret); > + return ret; > + } > + hisi_uc_pmu_online = ret; > + > + ret = platform_driver_register(&hisi_uc_pmu_driver); > + if (ret) > + cpuhp_remove_multi_state(hisi_uc_pmu_online); > + > + return ret; > +} > +module_init(hisi_uc_pmu_module_init); > + > +static void __exit hisi_uc_pmu_module_exit(void) > +{ > + platform_driver_unregister(&hisi_uc_pmu_driver); > + cpuhp_remove_multi_state(hisi_uc_pmu_online); > +} > +module_exit(hisi_uc_pmu_module_exit); > + > +MODULE_DESCRIPTION("HiSilicon SoC UC uncore PMU driver"); > +MODULE_LICENSE("GPL"); > +MODULE_AUTHOR("Junhao He "); >