Unverified Commit 682685d0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!805 Add support for HiSilicon UC/H60PA/PAv3 PMU driver 

Merge Pull Request from: @hejunhao3 
 
1. Compared with the PAv2 PMU, the PAv3 PMU has different event
IDs and definitions. The version number in the version register
is used to distinguish the event IDs and definitions in the driver.
2. The H60PA PMU and PA are two different devices. The H60PA PMU
supports higher bandwidth, and the PA PMU delay is relatively low.
Different HIDs are used to distinguish the delay.
3. Each cluster is integrated with a unified cache (UC) PMU, which
provides consistency between NUMA and UMA domains. It sits between
L2 and the memory system. 
 
Link:https://gitee.com/openeuler/kernel/pulls/805

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3470c3d8 5ed05cb2

drivers/perf/hisilicon/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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

drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c

+1 −15
Original line number Diff line number Diff line
@@ -319,21 +319,7 @@ static int hisi_cpa_pmu_probe(struct platform_device *pdev) 
	if (!name)

		return -ENOMEM;



	cpa_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	= cpa_pmu->pmu_events.attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};

	hisi_pmu_init(cpa_pmu, THIS_MODULE);



	/* Power Management should be disabled before using CPA PMU. */

	hisi_cpa_pmu_disable_pm(cpa_pmu);

drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c

+11 −22
Original line number Diff line number Diff line
@@ -499,13 +499,6 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = cpuhp_state_add_instance(CPUHP_AP_PERF_ARM_HISI_DDRC_ONLINE,

				       &ddrc_pmu->node);

	if (ret) {

		dev_err(&pdev->dev, "Error %d registering hotplug;\n", ret);

		return ret;

	}



	if (ddrc_pmu->identifier >= HISI_PMU_V2)

		name = devm_kasprintf(&pdev->dev, GFP_KERNEL,

				      "hisi_sccl%u_ddrc%u_%u",
@@ -516,21 +509,17 @@ 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,

	};

	if (!name)

		return -ENOMEM;



	ret = cpuhp_state_add_instance(CPUHP_AP_PERF_ARM_HISI_DDRC_ONLINE,

				       &ddrc_pmu->node);

	if (ret) {

		dev_err(&pdev->dev, "Error %d registering hotplug;\n", ret);

		return ret;

	}



	hisi_pmu_init(ddrc_pmu, THIS_MODULE);



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

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_hha_pmu.c

+6 −17
Original line number Diff line number Diff line
@@ -510,6 +510,11 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sccl%u_hha%u",

			      hha_pmu->sccl_id, hha_pmu->index_id);

	if (!name)

		return -ENOMEM;



	ret = cpuhp_state_add_instance(CPUHP_AP_PERF_ARM_HISI_HHA_ONLINE,

				       &hha_pmu->node);

	if (ret) {
@@ -517,23 +522,7 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev) 
		return ret;

	}



	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, THIS_MODULE);



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

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c

+6 −21
Original line number Diff line number Diff line
@@ -544,6 +544,11 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sccl%u_l3c%u",

			      l3c_pmu->sccl_id, l3c_pmu->ccl_id);

	if (!name)

		return -ENOMEM;



	ret = cpuhp_state_add_instance(CPUHP_AP_PERF_ARM_HISI_L3_ONLINE,

				       &l3c_pmu->node);

	if (ret) {
@@ -551,27 +556,7 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev) 
		return ret;

	}



	/*

	 * CCL_ID is used to identify the L3C in the same SCCL which was

	 * used _UID by mistake.

	 */

	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, THIS_MODULE);



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

	if (ret) {