drivers/perf: hisi: Fix some event id for HiSilicon UC pmu

[PATCH] drivers/perf: hisi: Fix some event id for HiSilicon UC pmu

Posted by Junhao He 2 years ago

Some event id of HiSilicon uncore UC PMU driver is incorrect, fix them.

Fixes: 312eca95e28d ("drivers/perf: hisi: Add support for HiSilicon UC PMU driver")
Signed-off-by: Junhao He <hejunhao3@huawei.com>
---
 drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
index 63da05e5831c..636fb79647c8 100644
--- a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
@@ -383,8 +383,8 @@ static struct attribute *hisi_uc_pmu_events_attr[] = {
 	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(cpu_mru,		0x1c),
+	HISI_PMU_EVENT_ATTR(cycles,		0x95),
 	HISI_PMU_EVENT_ATTR(spipe_hit,		0xb3),
 	HISI_PMU_EVENT_ATTR(hpipe_hit,		0xdb),
 	HISI_PMU_EVENT_ATTR(cring_rxdat_cnt,	0xfa),
-- 
2.33.0

Re: [PATCH] drivers/perf: hisi: Fix some event id for HiSilicon UC pmu

Posted by Will Deacon 2 years ago

On Mon, 4 Dec 2023 19:04:25 +0800, Junhao He wrote:
> Some event id of HiSilicon uncore UC PMU driver is incorrect, fix them.
> 
> 

Applied to will (for-next/perf), thanks!

[1/1] drivers/perf: hisi: Fix some event id for HiSilicon UC pmu
      https://git.kernel.org/will/c/38bbef7240b8

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

Re: [PATCH] drivers/perf: hisi: Fix some event id for HiSilicon UC pmu

Posted by Yicong Yang 2 years ago

On 2023/12/4 19:04, Junhao He wrote:
> Some event id of HiSilicon uncore UC PMU driver is incorrect, fix them.
> 
> Fixes: 312eca95e28d ("drivers/perf: hisi: Add support for HiSilicon UC PMU driver")
> Signed-off-by: Junhao He <hejunhao3@huawei.com>

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>

> ---
>  drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
> index 63da05e5831c..636fb79647c8 100644
> --- a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
> +++ b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
> @@ -383,8 +383,8 @@ static struct attribute *hisi_uc_pmu_events_attr[] = {
>  	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(cpu_mru,		0x1c),
> +	HISI_PMU_EVENT_ATTR(cycles,		0x95),
>  	HISI_PMU_EVENT_ATTR(spipe_hit,		0xb3),
>  	HISI_PMU_EVENT_ATTR(hpipe_hit,		0xdb),
>  	HISI_PMU_EVENT_ATTR(cring_rxdat_cnt,	0xfa),
>