Commit abdd7b91 authored Nov 25, 2011 by Marc Zyngier Committed by Russell King Nov 26, 2011

ARM: 7176/1: cpu_pm: register GIC PM notifier only once



When multiple GICs exist on a platform (RealView PB1176/11MP),
we must make sure the PM notifier block is only registered
once, otherwise we end up corrupting the PM notifier list.

The fix is to only register the notifier when initializing
the first GIC, as the power management functions seem
to iterate over all the registered GICs.

Tested on PB11MP and PB1176.

Reported-by: Will Deacon <will.deacon@arm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Cc: Colin Cross <ccross@android.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 97371fa9

arch/arm/common/gic.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -526,6 +526,7 @@ static void __init gic_pm_init(struct gic_chip_data *gic)
	sizeof(u32));		sizeof(u32));
	BUG_ON(!gic->saved_ppi_conf);		BUG_ON(!gic->saved_ppi_conf);

			if (gic == &gic_data[0])
	cpu_pm_register_notifier(&gic_notifier_block);		cpu_pm_register_notifier(&gic_notifier_block);
	}		}
	#else		#else

Admin message