diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2003-06-23 01:38:06 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2003-06-23 01:38:06 +0000 |
| commit | 3202aca5848a50cdfb7b8fc632d2f65c4559935e (patch) | |
| tree | 7d5a1bb6f724b190bc90f20b6bccadd61115e530 | |
| parent | 7d55775e260f0840640d21e14a2856e6fb835ee1 (diff) | |
Fix NAP/DOZE sleeping on powerpc. also on newer 745x machines use NAP not
DOZE, DOZE is not valid on these processors. Improves battery life on
12" PBG4 from 3 hours to 4 hours. tested by tdeval@
| -rw-r--r-- | sys/arch/macppc/macppc/cpu.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c index d53c778ad84..ab78d9875b0 100644 --- a/sys/arch/macppc/macppc/cpu.c +++ b/sys/arch/macppc/macppc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.11 2003/02/26 19:12:08 drahn Exp $ */ +/* $OpenBSD: cpu.c,v 1.12 2003/06/23 01:38:05 drahn Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -61,6 +61,11 @@ #define HID0_NAP (1 << (31-9)) #define HID0_SLEEP (1 << (31-10)) #define HID0_DPM (1 << (31-11)) +#define HID0_SGE (1 << (31-24)) +#define HID0_BTIC (1 << (31-26)) +#define HID0_LRSTK (1 << (31-27)) +#define HID0_FOLD (1 << (31-28)) +#define HID0_BHT (1 << (31-29)) char cpu_model[80]; char machine[] = MACHINE; /* cpu architecture */ @@ -190,13 +195,23 @@ cpuattach(parent, dev, aux) case MPC7400: case IBM750FX: case MPC7410: - case MPC7450: - case MPC7455: /* select DOZE mode */ hid0 &= ~(HID0_NAP | HID0_SLEEP); hid0 |= HID0_DOZE | HID0_DPM; + break; + case MPC7450: + case MPC7455: + /* select NAP mode */ + hid0 &= ~(HID0_DOZE | HID0_SLEEP); + hid0 |= HID0_NAP | HID0_DPM; + /* try some other flags */ + hid0 |= HID0_SGE | HID0_BTIC; + hid0 |= HID0_LRSTK | HID0_FOLD | HID0_BHT; + /* Disable BTIC on 7450 Rev 2.0 or earlier */ + if (cpu == MPC7450 && (pvr & 0xffff) < 0x0200) + hid0 &= ~HID0_BTIC; } - __asm __volatile ("mtspr 1008,%0" : "=r" (hid0)); + __asm __volatile ("mtspr 1008,%0" :: "r" (hid0)); /* if processor is G3 or G4, configure l2 cache */ if ( (cpu == MPC750) || (cpu == MPC7400) || (cpu == IBM750FX) |