From patchwork Fri Oct 29 07:14:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shaohui xie X-Patchwork-Id: 69562 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 7D5FCB7602 for ; Fri, 29 Oct 2010 18:44:34 +1100 (EST) Received: from TX2EHSOBE009.bigfish.com (tx2ehsobe004.messaging.microsoft.com [65.55.88.14]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Cybertrust SureServer Standard Validation CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 3E2D7B70CD for ; Fri, 29 Oct 2010 18:44:27 +1100 (EST) Received: from mail41-tx2-R.bigfish.com (10.9.14.245) by TX2EHSOBE009.bigfish.com (10.9.40.29) with Microsoft SMTP Server id 14.1.225.8; Fri, 29 Oct 2010 07:44:21 +0000 Received: from mail41-tx2 (localhost.localdomain [127.0.0.1]) by mail41-tx2-R.bigfish.com (Postfix) with ESMTP id CB28BB0769 for ; Fri, 29 Oct 2010 07:44:21 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h65h) X-Spam-TCS-SCL: 4:0 Received: from mail41-tx2 (localhost.localdomain [127.0.0.1]) by mail41-tx2 (MessageSwitch) id 1288338256594541_4592; Fri, 29 Oct 2010 07:44:16 +0000 (UTC) Received: from TX2EHSMHS019.bigfish.com (unknown [10.9.14.240]) by mail41-tx2.bigfish.com (Postfix) with ESMTP id CAAF115D0056 for ; Fri, 29 Oct 2010 07:44:15 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by TX2EHSMHS019.bigfish.com (10.9.99.119) with Microsoft SMTP Server (TLS) id 14.0.482.44; Fri, 29 Oct 2010 07:44:14 +0000 Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id o9T7j3G3004452 for ; Fri, 29 Oct 2010 00:45:03 -0700 (MST) Received: from zmy16exm20.fsl.freescale.net (zmy16exm20.ap.freescale.net [10.211.3.23]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id o9T7iB6p004105 for ; Fri, 29 Oct 2010 02:44:12 -0500 (CDT) Received: from localhost.localdomain ([10.193.20.106]) by zmy16exm20.fsl.freescale.net with Microsoft SMTPSVC(6.0.3790.4675); Fri, 29 Oct 2010 15:44:43 +0800 From: Shaohui Xie To: Subject: [PATCH 3/4][v2] fsl_rio: move machine_check handler into machine_check_e500 & machine_check_e500mc Date: Fri, 29 Oct 2010 15:14:02 +0800 Message-ID: <1288336442-11756-1-git-send-email-b21989@freescale.com> X-Mailer: git-send-email 1.6.4 X-OriginalArrivalTime: 29 Oct 2010 07:44:43.0301 (UTC) FILETIME=[2682D550:01CB773D] MIME-Version: 1.0 X-Reverse-DNS: de01egw01.freescale.net Cc: Alexandre Bounine , Kumar Gala , Shaohui Xie X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Signed-off-by: Shaohui Xie Cc: Li Yang Cc: Kumar Gala Cc: Roy Zang Cc: Alexandre Bounine --- arch/powerpc/kernel/traps.c | 14 +++++++++++++- arch/powerpc/sysdev/fsl_rio.c | 15 +++------------ include/linux/rio.h | 1 + 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index a45a63c..2a5fb9d 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -55,6 +55,7 @@ #endif #include #include +#include #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC) int (*__debugger)(struct pt_regs *regs) __read_mostly; @@ -500,6 +501,13 @@ int machine_check_e500mc(struct pt_regs *regs) reason & MCSR_MEA ? "Effective" : "Physical", addr); } + if (reason & MCSR_BUS_RBERR) { + printk("Bus - Read Data Bus Error\n"); +#ifdef CONFIG_RAPIDIO + recoverable = fsl_rio_mcheck_exception(regs); +#endif + } + mtspr(SPRN_MCSR, mcsr); return mfspr(SPRN_MCSR) == 0 && recoverable; } @@ -527,8 +535,12 @@ int machine_check_e500(struct pt_regs *regs) printk("Bus - Write Address Error\n"); if (reason & MCSR_BUS_IBERR) printk("Bus - Instruction Data Error\n"); - if (reason & MCSR_BUS_RBERR) + if (reason & MCSR_BUS_RBERR) { printk("Bus - Read Data Bus Error\n"); +#ifdef CONFIG_RAPIDIO + fsl_rio_mcheck_exception(regs); +#endif + } if (reason & MCSR_BUS_WBERR) printk("Bus - Read Data Bus Error\n"); if (reason & MCSR_BUS_IPERR) diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index 1143c93..a9bc1e8 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -256,9 +256,7 @@ struct rio_priv { static void __iomem *rio_regs_win; #ifdef CONFIG_E500 -static int (*saved_mcheck_exception)(struct pt_regs *regs); - -static int fsl_rio_mcheck_exception(struct pt_regs *regs) +int fsl_rio_mcheck_exception(struct pt_regs *regs) { const struct exception_table_entry *entry = NULL; unsigned long reason = mfspr(SPRN_MCSR); @@ -280,11 +278,9 @@ static int fsl_rio_mcheck_exception(struct pt_regs *regs) } } - if (saved_mcheck_exception) - return saved_mcheck_exception(regs); - else - return cur_cpu_spec->machine_check(regs); + return 0; } +EXPORT_SYMBOL_GPL(fsl_rio_mcheck_exception); #endif /** @@ -1534,11 +1530,6 @@ int fsl_rio_setup(struct platform_device *dev) fsl_rio_doorbell_init(port); fsl_rio_port_write_init(port); -#ifdef CONFIG_E500 - saved_mcheck_exception = ppc_md.machine_check_exception; - ppc_md.machine_check_exception = fsl_rio_mcheck_exception; -#endif - return 0; err: iounmap(priv->regs_win); diff --git a/include/linux/rio.h b/include/linux/rio.h index bd6eb0e..685b18f 100644 --- a/include/linux/rio.h +++ b/include/linux/rio.h @@ -365,5 +365,6 @@ extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int); extern void rio_close_inb_mbox(struct rio_mport *, int); extern int rio_open_outb_mbox(struct rio_mport *, void *, int, int); extern void rio_close_outb_mbox(struct rio_mport *, int); +extern int fsl_rio_mcheck_exception(struct pt_regs *); #endif /* LINUX_RIO_H */