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

Commit 8acdb4c5 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 22444592 880361ae

arch/arm/kernel/perf_event_cpu.c

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

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

	{.compatible = "qcom,krait-pmu",	.data = armv7_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
@@ -1303,6 +1303,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);

arch/arm/mach-msm/perf_debug.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static char *descriptions = 
	"16 msm: perf: tracectr: Initialize cnts after hotplug\n"

	"17 Perf: Reset pmu after hotplug\n"

	"18 ARM: dts: msm: add perf-events support for msm8916\n"

	"19 Perf: Enable pmuv3 on 32 bit kernel\n"

;



static ssize_t desc_read(struct file *fp, char __user *buf,