143 lines
6.1 KiB
Diff
143 lines
6.1 KiB
Diff
From 8c346b56153744591b51dadcde8b603b8b872e2d Mon Sep 17 00:00:00 2001
|
|
From: Junhao He <hejunhao3@huawei.com>
|
|
Date: Tue, 23 May 2023 14:44:26 +0800
|
|
Subject: [PATCH 48/55] drivers/perf: hisi: Simplify the parameters of
|
|
hisi_pmu_init()
|
|
|
|
mainline inclusion
|
|
from mainline-v6.3-rc1
|
|
commit 053b5579dacfc5763dda0c073ee14147421d32d7
|
|
category: cleanup
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I77IH6
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=053b5579dacfc5763dda0c073ee14147421d32d7
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Use "hisi_pmu" to simplify the parameter list for the hisi_pmu_init()
|
|
function.
|
|
|
|
Signed-off-by: Junhao He <hejunhao3@huawei.com>
|
|
Link: https://lore.kernel.org/r/20230119100307.3660-3-hejunhao3@huawei.com
|
|
Signed-off-by: Will Deacon <will@kernel.org>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 2 +-
|
|
drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 2 +-
|
|
drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +-
|
|
drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 2 +-
|
|
drivers/perf/hisilicon/hisi_uncore_pmu.c | 8 +++++---
|
|
drivers/perf/hisilicon/hisi_uncore_pmu.h | 4 ++--
|
|
drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 2 +-
|
|
7 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
|
|
index 69d2b08847e2..3a1b3919c736 100644
|
|
--- a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
|
|
+++ b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
|
|
@@ -519,7 +519,7 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev)
|
|
"hisi_sccl%u_ddrc%u", ddrc_pmu->sccl_id,
|
|
ddrc_pmu->index_id);
|
|
|
|
- hisi_pmu_init(&ddrc_pmu->pmu, name, ddrc_pmu->pmu_events.attr_groups, THIS_MODULE);
|
|
+ hisi_pmu_init(ddrc_pmu, name, THIS_MODULE);
|
|
|
|
ret = perf_pmu_register(&ddrc_pmu->pmu, name, -1);
|
|
if (ret) {
|
|
diff --git a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
|
|
index c5f752f4ff22..9aa951bdf417 100644
|
|
--- a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
|
|
+++ b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
|
|
@@ -522,7 +522,7 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev)
|
|
|
|
name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sccl%u_hha%u",
|
|
hha_pmu->sccl_id, hha_pmu->index_id);
|
|
- hisi_pmu_init(&hha_pmu->pmu, name, hha_pmu->pmu_events.attr_groups, THIS_MODULE);
|
|
+ hisi_pmu_init(hha_pmu, name, THIS_MODULE);
|
|
|
|
ret = perf_pmu_register(&hha_pmu->pmu, name, -1);
|
|
if (ret) {
|
|
diff --git a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
|
|
index d723e008a0f9..0406c034e7c4 100644
|
|
--- a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
|
|
+++ b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
|
|
@@ -560,7 +560,7 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev)
|
|
*/
|
|
name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sccl%u_l3c%u",
|
|
l3c_pmu->sccl_id, l3c_pmu->ccl_id);
|
|
- hisi_pmu_init(&l3c_pmu->pmu, name, l3c_pmu->pmu_events.attr_groups, THIS_MODULE);
|
|
+ hisi_pmu_init(l3c_pmu, name, THIS_MODULE);
|
|
|
|
ret = perf_pmu_register(&l3c_pmu->pmu, name, -1);
|
|
if (ret) {
|
|
diff --git a/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
|
|
index 99786ef708a6..df8605a0b24d 100644
|
|
--- a/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
|
|
+++ b/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
|
|
@@ -414,7 +414,7 @@ static int hisi_pa_pmu_probe(struct platform_device *pdev)
|
|
return ret;
|
|
}
|
|
|
|
- hisi_pmu_init(&pa_pmu->pmu, name, pa_pmu->pmu_events.attr_groups, THIS_MODULE);
|
|
+ hisi_pmu_init(pa_pmu, name, THIS_MODULE);
|
|
ret = perf_pmu_register(&pa_pmu->pmu, name, -1);
|
|
if (ret) {
|
|
dev_err(pa_pmu->dev, "PMU register failed, ret = %d\n", ret);
|
|
diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c
|
|
index c5860912d765..13e54e458f9a 100644
|
|
--- a/drivers/perf/hisilicon/hisi_uncore_pmu.c
|
|
+++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c
|
|
@@ -540,9 +540,11 @@ int hisi_uncore_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)
|
|
}
|
|
EXPORT_SYMBOL_GPL(hisi_uncore_pmu_offline_cpu);
|
|
|
|
-void hisi_pmu_init(struct pmu *pmu, const char *name,
|
|
- const struct attribute_group **attr_groups, struct module *module)
|
|
+void hisi_pmu_init(struct hisi_pmu *hisi_pmu, const char *name,
|
|
+ struct module *module)
|
|
{
|
|
+ struct pmu *pmu = &hisi_pmu->pmu;
|
|
+
|
|
pmu->name = name;
|
|
pmu->module = module;
|
|
pmu->task_ctx_nr = perf_invalid_context;
|
|
@@ -554,7 +556,7 @@ void hisi_pmu_init(struct pmu *pmu, const char *name,
|
|
pmu->start = hisi_uncore_pmu_start;
|
|
pmu->stop = hisi_uncore_pmu_stop;
|
|
pmu->read = hisi_uncore_pmu_read;
|
|
- pmu->attr_groups = attr_groups;
|
|
+ pmu->attr_groups = hisi_pmu->pmu_events.attr_groups;
|
|
pmu->capabilities = PERF_PMU_CAP_NO_EXCLUDE;
|
|
}
|
|
EXPORT_SYMBOL_GPL(hisi_pmu_init);
|
|
diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.h b/drivers/perf/hisilicon/hisi_uncore_pmu.h
|
|
index 9818e20d36f8..27951213c9e8 100644
|
|
--- a/drivers/perf/hisilicon/hisi_uncore_pmu.h
|
|
+++ b/drivers/perf/hisilicon/hisi_uncore_pmu.h
|
|
@@ -135,6 +135,6 @@ ssize_t hisi_uncore_pmu_identifier_attr_show(struct device *dev,
|
|
int hisi_uncore_pmu_init_irq(struct hisi_pmu *hisi_pmu,
|
|
struct platform_device *pdev);
|
|
|
|
-void hisi_pmu_init(struct pmu *pmu, const char *name,
|
|
- const struct attribute_group **attr_groups, struct module *module);
|
|
+void hisi_pmu_init(struct hisi_pmu *hisi_pmu, const char *name,
|
|
+ struct module *module);
|
|
#endif /* __HISI_UNCORE_PMU_H__ */
|
|
diff --git a/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c
|
|
index b71de6597016..c1b038fc534e 100644
|
|
--- a/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c
|
|
+++ b/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c
|
|
@@ -447,7 +447,7 @@ static int hisi_sllc_pmu_probe(struct platform_device *pdev)
|
|
return ret;
|
|
}
|
|
|
|
- hisi_pmu_init(&sllc_pmu->pmu, name, sllc_pmu->pmu_events.attr_groups, THIS_MODULE);
|
|
+ hisi_pmu_init(sllc_pmu, name, THIS_MODULE);
|
|
|
|
ret = perf_pmu_register(&sllc_pmu->pmu, name, -1);
|
|
if (ret) {
|
|
--
|
|
2.27.0
|
|
|