linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Ethan Blanton <eblanton@cs.ohiou.edu>
Cc: linuxppc-dev@lists.linuxppc.org
Subject: Re: ibook2 will not wake from sleep on 2.4.20-ben7
Date: 01 Mar 2003 23:27:05 +0100	[thread overview]
Message-ID: <1046557625.2030.91.camel@zion.wanadoo.fr> (raw)
In-Reply-To: <1046557102.2030.89.camel@zion.wanadoo.fr>


On Sat, 2003-03-01 at 23:18, Benjamin Herrenschmidt wrote:
> On Sat, 2003-03-01 at 21:29, Ethan Blanton wrote:
> > I have an iBook 2 (PowerBook 4,1) and I rsync'd my kernel to
> > 2.4.20-ben7 last night (I had previously been running 2.4.20-pre7-ben0
> > with no trouble).  The lid latch does not seem to put the machine to
> > sleep any more, and when I put it to sleep with the power button,
> > waking the machine up shuts it off rather than waking it.  I then have
> > to depress the power button for a few seconds, release it, and press
> > it briefly in order to power the machine back up.
> >
> > The machine is not losing its time/etc, merely shutting down.
> >
> > I'm running pbbuttonsd-0.5.2 in pmud replacement mode.
>
> Can you try -ben4 or -ben5 ? Patches against official 2.4.20
> are on kernel.org/pub/linux/kernel/people/benh.
>
> Let me know if it works

Hrm... before that, try this patch against -ben7

--- 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:


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

  reply	other threads:[~2003-03-01 22:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-03-01 20:29 ibook2 will not wake from sleep on 2.4.20-ben7 Ethan Blanton
2003-03-01 22:18 ` Benjamin Herrenschmidt
2003-03-01 22:27   ` Benjamin Herrenschmidt [this message]
2003-03-01 23:49     ` Ethan Blanton
2003-03-02  9:33       ` Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1046557625.2030.91.camel@zion.wanadoo.fr \
    --to=benh@kernel.crashing.org \
    --cc=eblanton@cs.ohiou.edu \
    --cc=linuxppc-dev@lists.linuxppc.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).