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

Commit a9356a04 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

ARM: perf: move platform device to struct arm_pmu 



Currently the ARM perf code supports having a single struct
platform_device to supply IRQ numbers, limiting it to supporting a
single PMU.

This patch makes a platform_device instance variable on struct arm_pmu.
This should allow for multiple PMUs to be supported in future.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Reviewed-by: default avatarJamie Iles <jamie@jamieiles.com>
Reviewed-by: default avatarAshwin Chaugule <ashwinc@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 03b7898d

arch/arm/kernel/perf_event.c

+6 −4
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <asm/pmu.h>

#include <asm/stacktrace.h>



static struct platform_device *pmu_device;



/*

 * Hardware lock to serialize accesses to PMU registers. Needed for the

 * read/modify/write sequences.
@@ -85,6 +83,7 @@ struct arm_pmu { 
	atomic_t	active_events;

	struct mutex	reserve_mutex;

	u64		max_period;

	struct platform_device	*plat_device;

};



/* Set at runtime when we know what CPU type we are. */
@@ -374,7 +373,8 @@ validate_group(struct perf_event *event) 


static irqreturn_t armpmu_platform_irq(int irq, void *dev)

{

	struct arm_pmu_platdata *plat = dev_get_platdata(&pmu_device->dev);

	struct platform_device *plat_device = armpmu->plat_device;

	struct arm_pmu_platdata *plat = dev_get_platdata(&plat_device->dev);



	return plat->handle_irq(irq, dev, armpmu->handle_irq);

}
@@ -383,6 +383,7 @@ static void 
armpmu_release_hardware(void)

{

	int i, irq, irqs;

	struct platform_device *pmu_device = armpmu->plat_device;



	irqs = min(pmu_device->num_resources, num_possible_cpus());
@@ -404,6 +405,7 @@ armpmu_reserve_hardware(void) 
	struct arm_pmu_platdata *plat;

	irq_handler_t handle_irq;

	int i, err, irq, irqs;

	struct platform_device *pmu_device = armpmu->plat_device;



	err = reserve_pmu(ARM_PMU_DEVICE_CPU);

	if (err) {
@@ -657,7 +659,7 @@ static struct platform_device_id armpmu_plat_device_ids[] = { 


static int __devinit armpmu_device_probe(struct platform_device *pdev)

{

	pmu_device = pdev;

	armpmu->plat_device = pdev;

	return 0;

}