Commit e500405d authored by Chen Jun's avatar Chen Jun Committed by Will Deacon
Browse files

perf: hisi: Extract hisi_pmu_init 



Extract the initialization code of hisi_pmu->pmu into a function

Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Link: https://lore.kernel.org/r/20220516131601.48383-1-chenjun102@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent f5ebeb13

drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c

+1 −15
Original line number Diff line number Diff line
@@ -516,21 +516,7 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev) 
				      "hisi_sccl%u_ddrc%u", ddrc_pmu->sccl_id,

				      ddrc_pmu->index_id);



	ddrc_pmu->pmu = (struct pmu) {

		.name		= name,

		.module		= THIS_MODULE,

		.task_ctx_nr	= perf_invalid_context,

		.event_init	= hisi_uncore_pmu_event_init,

		.pmu_enable	= hisi_uncore_pmu_enable,

		.pmu_disable	= hisi_uncore_pmu_disable,

		.add		= hisi_uncore_pmu_add,

		.del		= hisi_uncore_pmu_del,

		.start		= hisi_uncore_pmu_start,

		.stop		= hisi_uncore_pmu_stop,

		.read		= hisi_uncore_pmu_read,

		.attr_groups	= ddrc_pmu->pmu_events.attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};

	hisi_pmu_init(&ddrc_pmu->pmu, name, ddrc_pmu->pmu_events.attr_groups, THIS_MODULE);



	ret = perf_pmu_register(&ddrc_pmu->pmu, name, -1);

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_hha_pmu.c

+1 −15
Original line number Diff line number Diff line
@@ -519,21 +519,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);

	hha_pmu->pmu = (struct pmu) {

		.name		= name,

		.module		= THIS_MODULE,

		.task_ctx_nr	= perf_invalid_context,

		.event_init	= hisi_uncore_pmu_event_init,

		.pmu_enable	= hisi_uncore_pmu_enable,

		.pmu_disable	= hisi_uncore_pmu_disable,

		.add		= hisi_uncore_pmu_add,

		.del		= hisi_uncore_pmu_del,

		.start		= hisi_uncore_pmu_start,

		.stop		= hisi_uncore_pmu_stop,

		.read		= hisi_uncore_pmu_read,

		.attr_groups	= hha_pmu->pmu_events.attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};

	hisi_pmu_init(&hha_pmu->pmu, name, hha_pmu->pmu_events.attr_groups, THIS_MODULE);



	ret = perf_pmu_register(&hha_pmu->pmu, name, -1);

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c

+1 −15
Original line number Diff line number Diff line
@@ -557,21 +557,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);

	l3c_pmu->pmu = (struct pmu) {

		.name		= name,

		.module		= THIS_MODULE,

		.task_ctx_nr	= perf_invalid_context,

		.event_init	= hisi_uncore_pmu_event_init,

		.pmu_enable	= hisi_uncore_pmu_enable,

		.pmu_disable	= hisi_uncore_pmu_disable,

		.add		= hisi_uncore_pmu_add,

		.del		= hisi_uncore_pmu_del,

		.start		= hisi_uncore_pmu_start,

		.stop		= hisi_uncore_pmu_stop,

		.read		= hisi_uncore_pmu_read,

		.attr_groups	= l3c_pmu->pmu_events.attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};

	hisi_pmu_init(&l3c_pmu->pmu, name, l3c_pmu->pmu_events.attr_groups, THIS_MODULE);



	ret = perf_pmu_register(&l3c_pmu->pmu, name, -1);

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_pa_pmu.c

+1 −15
Original line number Diff line number Diff line
@@ -412,21 +412,7 @@ static int hisi_pa_pmu_probe(struct platform_device *pdev) 
		return ret;

	}



	pa_pmu->pmu = (struct pmu) {

		.module		= THIS_MODULE,

		.task_ctx_nr	= perf_invalid_context,

		.event_init	= hisi_uncore_pmu_event_init,

		.pmu_enable	= hisi_uncore_pmu_enable,

		.pmu_disable	= hisi_uncore_pmu_disable,

		.add		= hisi_uncore_pmu_add,

		.del		= hisi_uncore_pmu_del,

		.start		= hisi_uncore_pmu_start,

		.stop		= hisi_uncore_pmu_stop,

		.read		= hisi_uncore_pmu_read,

		.attr_groups    = pa_pmu->pmu_events.attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};



	hisi_pmu_init(&pa_pmu->pmu, name, pa_pmu->pmu_events.attr_groups, 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);

drivers/perf/hisilicon/hisi_uncore_pmu.c

+18 −0
Original line number Diff line number Diff line
@@ -531,4 +531,22 @@ 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)

{

	pmu->name               = name;

	pmu->module             = module;

	pmu->task_ctx_nr        = perf_invalid_context;

	pmu->event_init         = hisi_uncore_pmu_event_init;

	pmu->pmu_enable         = hisi_uncore_pmu_enable;

	pmu->pmu_disable        = hisi_uncore_pmu_disable;

	pmu->add                = hisi_uncore_pmu_add;

	pmu->del                = hisi_uncore_pmu_del;

	pmu->start              = hisi_uncore_pmu_start;

	pmu->stop               = hisi_uncore_pmu_stop;

	pmu->read               = hisi_uncore_pmu_read;

	pmu->attr_groups        = attr_groups;

}

EXPORT_SYMBOL_GPL(hisi_pmu_init);



MODULE_LICENSE("GPL v2");