On Sun, 2005-03-13 at 12:01 +0000, Sean Neakums wrote:
> Machine check in kernel mode.
> Caused by (from SRR1=149030): Transfer error ack signal
> Oops: machine check, sig: 7 [#1]
> TASK = etc. 'pmud' etc.
> (for registers and such, see:
> http://flynn.zork.net/~sneakums/pmac-machine-check-on-sleep-2611mm3.jpeg )
> Call trace:
> pmac_ide_pci_suspend
> pci_device_suspend
> suspend_device
> device_suspend
> 0xc03dd894
> 0xc03dddb8
> 0xc03de7cc
> do_ioctl
> vfs_ioctl
> sys_ioctl
> ret_from_syscall
Does that fix it ?
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 [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
