Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be3cd936 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Perf: Enable pmuv3 on 32 bit kernel"

parents 2f4a5a13 59ff2fbc

arch/arm/kernel/perf_event_cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static struct of_device_id cpu_pmu_of_device_ids[] = { 
	{.compatible = "arm,arm1176-pmu",	.data = armv6_1176_pmu_init},

	{.compatible = "arm,arm1136-pmu",	.data = armv6_1136_pmu_init},

	{.compatible = "qcom,krait-pmu",	.data = krait_pmu_init},

	{.compatible = "arm,armv8-pmuv3",	.data = armv8_pmuv3_pmu_init},

	{},

};

arch/arm/kernel/perf_event_v7.c

+10 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,16 @@ static int armv7_a15_pmu_init(struct arm_pmu *cpu_pmu) 
	return 0;

}



static int armv8_pmuv3_pmu_init(struct arm_pmu *cpu_pmu)

{

	armv7pmu_init(cpu_pmu);

	cpu_pmu->name		= "ARMv8 Cortex-A53";

	cpu_pmu->map_event	= armv7_a7_map_event;

	cpu_pmu->num_events	= armv7_read_num_pmnc_events();

	cpu_pmu->set_event_filter = armv7pmu_set_event_filter;

	return 0;

}



static int armv7_a7_pmu_init(struct arm_pmu *cpu_pmu)

{

	armv7pmu_init(cpu_pmu);