Commit 12f051c9 authored by Rob Herring (Arm)'s avatar Rob Herring (Arm) Committed by Will Deacon
Browse files

perf: arm_v6/7_pmu: Drop non-DT probe support 



There are no non-DT based PMU users for v6 or v7, so drop the custom
non-DT probe table. Unfortunately XScale still needs non-DT probing.

Note that this drops support for arm1156 PMU, but there are no arm1156
based systems supported in the kernel.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20240626-arm-pmu-3-9-icntr-v2-4-c9784b4f4065@kernel.org


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

drivers/perf/arm_v6_pmu.c

+1 −16
Original line number Diff line number Diff line
@@ -401,13 +401,6 @@ static int armv6_1136_pmu_init(struct arm_pmu *cpu_pmu) 
	return 0;

}



static int armv6_1156_pmu_init(struct arm_pmu *cpu_pmu)

{

	armv6pmu_init(cpu_pmu);

	cpu_pmu->name		= "armv6_1156";

	return 0;

}



static int armv6_1176_pmu_init(struct arm_pmu *cpu_pmu)

{

	armv6pmu_init(cpu_pmu);
@@ -421,17 +414,9 @@ static const struct of_device_id armv6_pmu_of_device_ids[] = { 
	{ /* sentinel value */ }

};



static const struct pmu_probe_info armv6_pmu_probe_table[] = {

	ARM_PMU_PROBE(ARM_CPU_PART_ARM1136, armv6_1136_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_ARM1156, armv6_1156_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_ARM1176, armv6_1176_pmu_init),

	{ /* sentinel value */ }

};



static int armv6_pmu_device_probe(struct platform_device *pdev)

{

	return arm_pmu_device_probe(pdev, armv6_pmu_of_device_ids,

				    armv6_pmu_probe_table);

	return arm_pmu_device_probe(pdev, armv6_pmu_of_device_ids, NULL);

}



static struct platform_driver armv6_pmu_driver = {

drivers/perf/arm_v7_pmu.c

+1 −9
Original line number Diff line number Diff line
@@ -1977,17 +1977,9 @@ static const struct of_device_id armv7_pmu_of_device_ids[] = { 
	{},

};



static const struct pmu_probe_info armv7_pmu_probe_table[] = {

	ARM_PMU_PROBE(ARM_CPU_PART_CORTEX_A8, armv7_a8_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_CORTEX_A9, armv7_a9_pmu_init),

	{ /* sentinel value */ }

};





static int armv7_pmu_device_probe(struct platform_device *pdev)

{

	return arm_pmu_device_probe(pdev, armv7_pmu_of_device_ids,

				    armv7_pmu_probe_table);

	return arm_pmu_device_probe(pdev, armv7_pmu_of_device_ids, NULL);

}



static struct platform_driver armv7_pmu_driver = {