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

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

drivers/perf: arm_pmu: handle no platform_device 



In armpmu_dispatch_irq() we look at arm_pmu::plat_device to acquire
platdata, so that we can defer to platform-specific IRQ handling,
required on some 32-bit parts. With the advent of ACPI we won't always
have a platform_device, and so we must avoid trying to dereference
fields from it.

This patch fixes up armpmu_dispatch_irq() to avoid doing so, introducing
a new armpmu_get_platdata() helper.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 3a5a89d3

drivers/perf/arm_pmu.c

+9 −3
Original line number Diff line number Diff line
@@ -316,10 +316,16 @@ validate_group(struct perf_event *event) 
	return 0;

}



static struct arm_pmu_platdata *armpmu_get_platdata(struct arm_pmu *armpmu)

{

	struct platform_device *pdev = armpmu->plat_device;



	return pdev ? dev_get_platdata(&pdev->dev) : NULL;

}



static irqreturn_t armpmu_dispatch_irq(int irq, void *dev)

{

	struct arm_pmu *armpmu;

	struct platform_device *plat_device;

	struct arm_pmu_platdata *plat;

	int ret;

	u64 start_clock, finish_clock;
@@ -331,8 +337,8 @@ static irqreturn_t armpmu_dispatch_irq(int irq, void *dev) 
	 * dereference.

	 */

	armpmu = *(void **)dev;

	plat_device = armpmu->plat_device;

	plat = dev_get_platdata(&plat_device->dev);



	plat = armpmu_get_platdata(armpmu);



	start_clock = sched_clock();

	if (plat && plat->handle_irq)