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

Commit 0c267bb5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Perf: Enable pmuv3 on 32 bit kernel"

parents e19da044 e7358dd0

arch/arm/kernel/perf_event_v7.c

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

}



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;

	armv7_read_num_pmnc_events(&cpu_pmu->num_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);
@@ -2066,6 +2076,7 @@ static const struct of_device_id armv7_pmu_of_device_ids[] = { 
	{.compatible = "qcom,krait-pmu",	.data = krait_pmu_init},

	{.compatible = "qcom,scorpion-pmu",	.data = scorpion_pmu_init},

	{.compatible = "qcom,scorpion-mp-pmu",	.data = scorpion_mp_pmu_init},

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

	{},

};