Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261182AbVCMMbK (ORCPT ); Sun, 13 Mar 2005 07:31:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261186AbVCMMbK (ORCPT ); Sun, 13 Mar 2005 07:31:10 -0500 Received: from gate.crashing.org ([63.228.1.57]:21639 "EHLO gate.crashing.org") by vger.kernel.org with ESMTP id S261182AbVCMMbH (ORCPT ); Sun, 13 Mar 2005 07:31:07 -0500 Subject: Re: 2.6.11-mm3: machine check on sleep, PowerBook5.4 From: Benjamin Herrenschmidt To: Sean Neakums Cc: Andrew Morton , Linux Kernel list In-Reply-To: <6upsy37o0v.fsf@zork.zork.net> References: <20050312034222.12a264c4.akpm@osdl.org> <6upsy37o0v.fsf@zork.zork.net> Content-Type: text/plain Date: Sun, 13 Mar 2005 23:30:16 +1100 Message-Id: <1110717016.5787.143.camel@gaston> Mime-Version: 1.0 X-Mailer: Evolution 2.0.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1618 Lines: 55 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 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/