[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: ibook2/M3 and 2.4.20-ben7 - does not wake up any more



On Tue, 2003-03-04 at 15:17, Clemens Mangler wrote:
> On Tue, 4 Mar 2003, Georg Koss wrote:
> 
> > Hello all!
> >
> > I recompiled the new 2.4.20-ben7 sources from rsync.penguinppc.org
> > yesterday with my old .config, which worked with several 2.4.20-ben*
> > up to *-ben6 flawlessly.
> >
> > After rebooting I closed the lid after couple of minutes on console
> > (no XF) Thereafter my ibook2/M3 didn't awake any more, so I had to
> > take out the batteries to be able to boot again.
> 
> i have no sulution, but a hint:
> I think you never have to take out the batteries! just press the
> on-button for about 10 seconds to switch off yout ibook!

Known bug in -ben7 with G3 based powerbooks, I'm sorry about that...

patch attached (will be in -ben6)


===== arch/ppc/kernel/cpu_setup_6xx.S 1.1 vs edited =====
--- 1.1/arch/ppc/kernel/cpu_setup_6xx.S	Thu Feb 27 09:50:24 2003
+++ edited/arch/ppc/kernel/cpu_setup_6xx.S	Sat Mar  1 23:25:37 2003
@@ -356,7 +356,7 @@
 	cror	4*cr0+eq,4*cr0+eq,4*cr3+eq
 	cror	4*cr0+eq,4*cr0+eq,4*cr4+eq
 	cror	4*cr0+eq,4*cr0+eq,4*cr1+eq
-	bne	1f
+	bne	2f
 	/* Restore 74xx specific regs */
 	lwz	r4,CS_MSSCR0(r5)
 	sync
@@ -372,7 +372,7 @@
 	/* Clear 7410 L2CR2 */
 	li	r4,0
 	mtspr	SPRN_L2CR2,r4
-1:	beq	cr1,1f
+1:	beq	cr1,2f
 	/* Restore 745x specific registers */
 	lwz	r4,CS_HID1(r5)
 	sync
@@ -394,7 +394,7 @@
 	mtspr	SPRN_LDSTDB,r4
 	isync
 	sync
-1:	bne	cr5,1f
+2:	bne	cr5,1f
 	/* Restore 750FX specific registers
 	 * that is restore PLL config & switch
 	 * to PLL 0
@@ -404,10 +404,10 @@
 	mtspr	SPRN_HID1,r5
 		/* Wait for PLL to stabilize */
 	mftbl	r5
-2:	mftbl	r6
+3:	mftbl	r6
 	sub	r6,r6,r5
 	cmpli	cr0,r6,10000
-	ble	2b
+	ble	3b
 	/* Setup final PLL */
 	mtspr	SPRN_HID1,r4
 1:

Reply to: