49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From b860fa9563bef6669732959cf9fc9733b40a9721 Mon Sep 17 00:00:00 2001
|
|
From: Yicong Yang <yangyicong@hisilicon.com>
|
|
Date: Thu, 17 Nov 2022 16:41:33 +0800
|
|
Subject: [PATCH 33/55] drivers/perf: hisi: Fix some event id for hisi-pcie-pmu
|
|
|
|
mainline inclusion
|
|
from mainline-v6.2-rc1
|
|
commit 6b4bb4f38dbfe85247f006f06135ba46450d5bf0
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8AU2M
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6b4bb4f38dbfe85247f006f06135ba46450d5bf0
|
|
|
|
----------------------------------------------------------------------------
|
|
|
|
Some event id of hisi-pcie-pmu is incorrect, fix them.
|
|
|
|
Fixes: 8404b0fbc7fb ("drivers/perf: hisi: Add driver for HiSilicon PCIe PMU")
|
|
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
|
|
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
|
|
Link: https://lore.kernel.org/r/20221117084136.53572-2-yangyicong@huawei.com
|
|
Signed-off-by: Will Deacon <will@kernel.org>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
drivers/perf/hisilicon/hisi_pcie_pmu.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c
|
|
index 1e9e841cfe95..c115f5c77acb 100644
|
|
--- a/drivers/perf/hisilicon/hisi_pcie_pmu.c
|
|
+++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c
|
|
@@ -696,10 +696,10 @@ static struct attribute *hisi_pcie_pmu_events_attr[] = {
|
|
HISI_PCIE_PMU_EVENT_ATTR(rx_mrd_cnt, 0x10210),
|
|
HISI_PCIE_PMU_EVENT_ATTR(tx_mrd_latency, 0x0011),
|
|
HISI_PCIE_PMU_EVENT_ATTR(tx_mrd_cnt, 0x10011),
|
|
- HISI_PCIE_PMU_EVENT_ATTR(rx_mrd_flux, 0x1005),
|
|
- HISI_PCIE_PMU_EVENT_ATTR(rx_mrd_time, 0x11005),
|
|
- HISI_PCIE_PMU_EVENT_ATTR(tx_mrd_flux, 0x2004),
|
|
- HISI_PCIE_PMU_EVENT_ATTR(tx_mrd_time, 0x12004),
|
|
+ HISI_PCIE_PMU_EVENT_ATTR(rx_mrd_flux, 0x0804),
|
|
+ HISI_PCIE_PMU_EVENT_ATTR(rx_mrd_time, 0x10804),
|
|
+ HISI_PCIE_PMU_EVENT_ATTR(tx_mrd_flux, 0x0405),
|
|
+ HISI_PCIE_PMU_EVENT_ATTR(tx_mrd_time, 0x10405),
|
|
NULL
|
|
};
|
|
|
|
--
|
|
2.27.0
|
|
|