Commit 958d24df authored Oct 26, 2005 by Benjamin Herrenschmidt Committed by Linus Torvalds Oct 26, 2005

[PATCH] ppc64: Fix wrong register mapping in mpic driver



The mpic interrupt controller driver (used on G5 and early pSeries among
others) has a bug where it doesn't get the right virtual address for the
timer registers.  It causes the driver to poke at the MMIO space of
whatever has been mapped just next to it (ouch !) when initializing and
causes boot failures on some IBM machines.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 1c6fe946

arch/ppc64/kernel/mpic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -506,8 +506,8 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr,
		mpic->senses_count = senses_count;

		/* Map the global registers */
		mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x1000);
		mpic->tmregs = mpic->gregs + (MPIC_TIMER_BASE >> 2);
		mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x2000);
		mpic->tmregs = mpic->gregs + ((MPIC_TIMER_BASE - MPIC_GREG_BASE) >> 2);
		BUG_ON(mpic->gregs == NULL);

		/* Reset */

Admin message