MFC r258002, r258024, r258027, r258051, r258052, r258243, r258244, r258002,

    r258024, r258027, r258051, r258052, r258243,

  Follow up r223485, which made AIM use the ABI thread pointer instead of
  PCPU fields for curthread, by doing the same to Book-E.

  Use the same implementation of copyinout.c for both AIM and Book-E.

  Actually add IOMMU domain to the list of known mappings.

  Following the approach with ACPI DMAR on x86, split IOMMU handling into
  a variant PCI bus instead of trying to shoehorn it into the PCI host bridge
  adapter.

  Make sure that TLB1 mappings are aligned correctly.

7 files changed, 21 insertions, 484 deletions

diff --git a/sys/powerpc/booke/copyinout.c b/sys/powerpc/booke/copyinout.c
deleted file mode 100644
index 011b8bd..0000000
--- a/sys/powerpc/booke/copyinout.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*-
- * Copyright (C) 2002 Benno Rice
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/*-
- * Copyright (C) 1993 Wolfgang Solfrank.
- * Copyright (C) 1993 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <vm/vm_map.h>
-
-#include <machine/pcb.h>
-#include <machine/vmparam.h>
-
-
-int	setfault(faultbuf);	/* defined in locore.S */
-
-static int
-is_uaddr(const void *addr)
-{
-	int rv = ((vm_offset_t)addr <= VM_MAXUSER_ADDRESS) ? 1 : 0;
-
-	return rv;
-}
-
-int
-copyout(const void *kaddr, void *udaddr, size_t len)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(udaddr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	bcopy(kaddr, udaddr, len);
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-copyin(const void *udaddr, void *kaddr, size_t len)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(udaddr) || is_uaddr(kaddr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	bcopy(udaddr, kaddr, len);
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done)
-{
-	struct		thread *td;
-	faultbuf	env;
-	const char	*up;
-	char		*kp;
-	size_t		l;
-	int		rv, c;
-
-	if (!is_uaddr(udaddr) || is_uaddr(kaddr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	kp = kaddr;
-	up = udaddr;
-
-	rv = ENAMETOOLONG;
-
-	for (l = 0; len-- > 0; l++) {
-
-		c = *up++;
-		
-		if (!(*kp++ = c)) {
-			l++;
-			rv = 0;
-			break;
-		}
-	}
-
-	if (done != NULL) {
-		*done = l;
-	}
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (rv);
-}
-
-int
-subyte(void *addr, int byte)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	*(char *)addr = (char)byte;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-suword(void *addr, long word)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	*(long *)addr = word;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-suword32(void *addr, int32_t word)
-{
-
-	return (suword(addr, (long)word));
-}
-
-
-int
-fubyte(const void *addr)
-{
-	struct		thread *td;
-	faultbuf	env;
-	int		val;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	val = *(const u_char *)addr;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (val);
-}
-
-long
-fuword(const void *addr)
-{
-	struct		thread *td;
-	faultbuf	env;
-	long		val;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	val = *(const long *)addr;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (val);
-}
-
-int32_t
-fuword32(const void *addr)
-{
-
-	return ((int32_t)fuword(addr));
-}
-
-uint32_t
-casuword32(volatile uint32_t *base, uint32_t oldval, uint32_t newval)
-{
-
-	return (casuword((volatile u_long *)base, oldval, newval));
-}
-
-u_long
-casuword(volatile u_long *addr, u_long old, u_long new)
-{
-	struct thread *td;
-	faultbuf env;
-	u_long val;
-
-	if (!((vm_offset_t)addr <= VM_MAXUSER_ADDRESS))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	__asm __volatile (
-		"1:\tlwarx %0, 0, %2\n\t"	/* load old value */
-		"cmplw %3, %0\n\t"		/* compare */
-		"bne 2f\n\t"			/* exit if not equal */
-		"stwcx. %4, 0, %2\n\t"      	/* attempt to store */
-		"bne- 1b\n\t"			/* spin if failed */
-		"b 3f\n\t"			/* we've succeeded */
-		"2:\n\t"
-		"stwcx. %0, 0, %2\n\t"       	/* clear reservation (74xx) */
-		"3:\n\t"
-		: "=&r" (val), "=m" (*addr)
-		: "r" (addr), "r" (old), "r" (new), "m" (*addr)
-		: "cc", "memory");
-
-	td->td_pcb->pcb_onfault = NULL;
-
-	return (val);
-}
diff --git a/sys/powerpc/booke/locore.S b/sys/powerpc/booke/locore.S
index d7ebac9..514afa6 100644
--- a/sys/powerpc/booke/locore.S
+++ b/sys/powerpc/booke/locore.S
@@ -738,8 +738,7 @@ ENTRY(icache_enable)
 setfault:
 	mflr	%r0
 	mfsprg0	%r4
-	lwz	%r4, PC_CURTHREAD(%r4)
-	lwz	%r4, TD_PCB(%r4)
+	lwz	%r4, TD_PCB(%r2)
 	stw	%r3, PCB_ONFAULT(%r4)
 	mfcr	%r10
 	mfctr	%r11
diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c
index 9318012..69a9ef6 100644
--- a/sys/powerpc/booke/machdep.c
+++ b/sys/powerpc/booke/machdep.c
@@ -409,6 +409,11 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	pc = &__pcpu[0];
 	pcpu_init(pc, 0, sizeof(struct pcpu));
 	pc->pc_curthread = &thread0;
+#ifdef __powerpc64__
+	__asm __volatile("mr 13,%0" :: "r"(pc->pc_curthread));
+#else
+	__asm __volatile("mr 2,%0" :: "r"(pc->pc_curthread));
+#endif
 	__asm __volatile("mtsprg 0, %0" :: "r"(pc));
 
 	/* Initialize system mutexes. */
diff --git a/sys/powerpc/booke/mp_cpudep.c b/sys/powerpc/booke/mp_cpudep.c
index 55e33d8..5f6bece 100644
--- a/sys/powerpc/booke/mp_cpudep.c
+++ b/sys/powerpc/booke/mp_cpudep.c
@@ -71,6 +71,11 @@ cpudep_ap_bootstrap()
 
 	/* Assign pcpu fields, return ptr to this AP's idle thread kstack */
 	pcpup->pc_curthread = pcpup->pc_idlethread;
+#ifdef __powerpc64__
+	__asm __volatile("mr 13,%0" :: "r"(pcpup->pc_curthread));
+#else
+	__asm __volatile("mr 2,%0" :: "r"(pcpup->pc_curthread));
+#endif
 	pcpup->pc_curpcb = pcpup->pc_curthread->td_pcb;
 	sp = pcpup->pc_curpcb->pcb_sp;
 
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c
index 6d943c9..2f60b72 100644
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -100,8 +100,6 @@ __FBSDID("$FreeBSD$");
 
 #define TODO			panic("%s: not implemented", __func__);
 
-extern struct mtx sched_lock;
-
 extern int dumpsys_minidump;
 
 extern unsigned char _etext[];
@@ -1906,7 +1904,7 @@ mmu_booke_activate(mmu_t mmu, struct thread *td)
 
 	KASSERT((pmap != kernel_pmap), ("mmu_booke_activate: kernel_pmap!"));
 
-	mtx_lock_spin(&sched_lock);
+	sched_pin();
 
 	cpuid = PCPU_GET(cpuid);
 	CPU_SET_ATOMIC(cpuid, &pmap->pm_active);
@@ -1919,7 +1917,7 @@ mmu_booke_activate(mmu_t mmu, struct thread *td)
 	mtspr(SPR_PID0, pmap->pm_tid[cpuid]);
 	__asm __volatile("isync");
 
-	mtx_unlock_spin(&sched_lock);
+	sched_unpin();
 
 	CTR3(KTR_PMAP, "%s: e (tid = %d for '%s')", __func__,
 	    pmap->pm_tid[PCPU_GET(cpuid)], td->td_proc->p_comm);
@@ -3177,6 +3175,7 @@ pmap_early_io_map(vm_paddr_t pa, vm_size_t size)
 
 	pa_base = trunc_page(pa);
 	size = roundup(size + (pa - pa_base), PAGE_SIZE);
+	tlb1_map_base = roundup2(tlb1_map_base, 1 << (ilog2(size) & ~1));
 	va = tlb1_map_base + (pa - pa_base);
 
 	do {
diff --git a/sys/powerpc/booke/swtch.S b/sys/powerpc/booke/swtch.S
deleted file mode 100644
index 88cbf29..0000000
--- a/sys/powerpc/booke/swtch.S
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * Copyright (C) 2001 Benno Rice
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	from: $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $
- *	from: $FreeBSD$
- *
- * $FreeBSD$
- */
-/*-
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "assym.s"
-
-#include <sys/syscall.h>
-
-#include <machine/trap.h>
-#include <machine/param.h>
-#include <machine/asm.h>
-#include <machine/spr.h>
-
-/*
- * void cpu_throw(struct thread *old, struct thread *new)
- */
-ENTRY(cpu_throw)
-	mr	%r15, %r4
-	b	cpu_switchin
-
-/*
- * void cpu_switch(struct thread *old, struct thread *new, struct mutex *mtx);)
- *
- * Switch to a new thread saving the current state in the old thread.
- */
-ENTRY(cpu_switch)
-	stw	%r5, TD_LOCK(%r3)
-
-	lwz	%r5, TD_PCB(%r3)	/* Get the old thread's PCB ptr */
-
-	mr	%r12, %r2	
-	stmw	%r12, PCB_CONTEXT(%r5)	/* Save the non-volatile GP regs.
-					   These can now be used for scratch */
-
-	mfcr	%r16			/* Save the condition register */
-	stw	%r16, PCB_CR(%r5)
-	mflr	%r16			/* Save the link register */
-	stw	%r16, PCB_LR(%r5)
-	mfctr	%r16
-	stw	%r16, PCB_BOOKE_CTR(%r5)
-	mfxer	%r16
-	stw	%r16, PCB_BOOKE_XER(%r5)
-	mfspr	%r16, SPR_DBCR0
-	stw	%r16, PCB_BOOKE_DBCR0(%r5)
-
-	stw	%r1, PCB_SP(%r5)	/* Save the stack pointer */
-
-	mr	%r14, %r3		/* Copy the old thread ptr... */
-	mr	%r15, %r4		/* and the new thread ptr in scratch */
-
-	bl	pmap_deactivate		/* Deactivate the current pmap */
-
-cpu_switchin:
-	mr	%r3, %r15		/* Get new thread ptr */
-	bl	pmap_activate		/* Activate the new address space */
-
-	mfsprg	%r7, 0			/* Get the pcpu pointer */
-	stw	%r15, PC_CURTHREAD(%r7)	/* Store new current thread */
-	lwz	%r17, TD_PCB(%r15)	/* Store new current PCB */
-	stw	%r17, PC_CURPCB(%r7)
-
-	mr	%r3, %r17		/* Recover PCB ptr */
-	lmw	%r12, PCB_CONTEXT(%r3)	/* Load the non-volatile GP regs */
-	mr	%r2, %r12
-	lwz	%r5, PCB_CR(%r3)	/* Load the condition register */
-	mtcr	%r5
-	lwz	%r5, PCB_LR(%r3)	/* Load the link register */
-	mtlr	%r5
-	lwz	%r5, PCB_BOOKE_CTR(%r3)
-	mtctr	%r5
-	lwz	%r5, PCB_BOOKE_XER(%r3)
-	mtxer	%r5
-	lwz	%r5, PCB_BOOKE_DBCR0(%r3)
-	mtspr	SPR_DBCR0, %r5
-
-	lwz	%r1, PCB_SP(%r3)	/* Load the stack pointer */
-	blr
-
-/*
- * savectx(pcb)
- * Update pcb, saving current processor state
- */
-ENTRY(savectx)
-	mr	%r12, %r2
-	stmw	%r12, PCB_CONTEXT(%r3)	/* Save the non-volatile GP regs */
-	mfcr	%r4			/* Save the condition register */
-	stw	%r4, PCB_CONTEXT(%r3)
-	blr
-
-/*
- * fork_trampoline()
- * Set up the return from cpu_fork()
- */
-ENTRY(fork_trampoline)
-	lwz	%r3, CF_FUNC(%r1)
-	lwz	%r4, CF_ARG0(%r1)
-	lwz	%r5, CF_ARG1(%r1)
-	bl	fork_exit
-	addi	%r1, %r1, CF_SIZE-FSP	/* Allow 8 bytes in front of
-					   trapframe to simulate FRAME_SETUP
-					   does when allocating space for
-					   a frame pointer/saved LR */
-	b	trapexit
diff --git a/sys/powerpc/booke/trap_subr.S b/sys/powerpc/booke/trap_subr.S
index 33976ca..7576449 100644
--- a/sys/powerpc/booke/trap_subr.S
+++ b/sys/powerpc/booke/trap_subr.S
@@ -219,7 +219,8 @@
 	lwz	%r30, (savearea+CPUSAVE_SRR0)(%r2);			\
 	lwz	%r31, (savearea+CPUSAVE_SRR1)(%r2);			\
 	stw	%r30, FRAME_SRR0+8(%r1);				\
-	stw	%r31, FRAME_SRR1+8(%r1)
+	stw	%r31, FRAME_SRR1+8(%r1);				\
+	lwz	%r2,PC_CURTHREAD(%r2)	/* set curthread pointer */
 
 /*
  *
@@ -734,7 +735,8 @@ interrupt_vector_top:
 INTERRUPT(int_debug)
 	STANDARD_CRIT_PROLOG(SPR_SPRG2, PC_BOOKE_CRITSAVE, SPR_CSRR0, SPR_CSRR1)
 	FRAME_SETUP(SPR_SPRG2, PC_BOOKE_CRITSAVE, EXC_DEBUG)
-	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0)(%r2);
+	GET_CPUINFO(%r3)
+	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0)(%r3)
 	lis	%r4, interrupt_vector_base@ha
 	addi	%r4, %r4, interrupt_vector_base@l
 	cmplw	cr0, %r3, %r4
@@ -748,9 +750,10 @@ INTERRUPT(int_debug)
 	rlwinm	%r3, %r3, 0, 23, 21
 	stw	%r3, FRAME_SRR1+8(%r1);
 	/* Restore srr0 and srr1 as they could have been clobbered. */
-	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0+8)(%r2);
+	GET_CPUINFO(%r4)
+	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0+8)(%r4);
 	mtspr	SPR_SRR0, %r3
-	lwz	%r4, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR1+8)(%r2);
+	lwz	%r4, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR1+8)(%r4);
 	mtspr	SPR_SRR1, %r4
 	b	9f
 1: