Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4
From: Benjamin Herrenschmidt (benh_at_kernel.crashing.org)
Date: 03/13/05
- Previous message: Benjamin Herrenschmidt: "Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4"
- In reply to: Sean Neakums: "Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4"
- Next in thread: Benjamin Herrenschmidt: "Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
To: Andrew Morton <akpm@osdl.org> Date: Mon, 14 Mar 2005 09:12:25 +1100
> Oh, fiddlesticks, that didn't occur to me. I can redo with overnight
> sleeps on a full charge, if you like.
In the meantime, Andrew, please submit this one to Linus, I'll update
the stuff if it happens the other one gives better power consumptions:
--
This patch fixes a logic error in the ide-pmac driver which could try to
access the chip's fcr register after the cell clock has been shut down,
thus causing a machine check on machines with the "Intrepid" chipset.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Index: linux-work/drivers/ide/ppc/pmac.c
===================================================================
--- linux-work.orig/drivers/ide/ppc/pmac.c 2005-03-13 10:10:58.000000000 +1100
+++ linux-work/drivers/ide/ppc/pmac.c 2005-03-13 23:29:40.000000000 +1100
@@ -1208,16 +1208,17 @@
if (pmif->mediabay)
return 0;
- /* Disable the bus */
- ppc_md.feature_call(PMAC_FTR_IDE_ENABLE, pmif->node, pmif->aapl_bus_id, 0);
-
- /* Kauai has it different */
+ /* Kauai has bus control FCRs directly here */
if (pmif->kauai_fcr) {
u32 fcr = readl(pmif->kauai_fcr);
fcr &= ~(KAUAI_FCR_UATA_RESET_N | KAUAI_FCR_UATA_ENABLE);
writel(fcr, pmif->kauai_fcr);
}
+ /* Disable the bus on older machines and the cell on kauai */
+ ppc_md.feature_call(PMAC_FTR_IDE_ENABLE, pmif->node, pmif->aapl_bus_id,
+ 0);
+
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Benjamin Herrenschmidt: "Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4"
- In reply to: Sean Neakums: "Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4"
- Next in thread: Benjamin Herrenschmidt: "Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
