From patchwork Fri Jun 18 05:29:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 56118 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 72664100D1F for ; Fri, 18 Jun 2010 15:38:53 +1000 (EST) Received: from az33egw02.freescale.net (az33egw02.freescale.net [192.88.158.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "az33egw02.freescale.net", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 9F362B7D86 for ; Fri, 18 Jun 2010 15:38:30 +1000 (EST) Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by az33egw02.freescale.net (8.14.3/az33egw02) with ESMTP id o5I5cC6I015230 for ; Thu, 17 Jun 2010 22:38:22 -0700 (MST) Received: from zch01exm26.fsl.freescale.net (zch01exm26.ap.freescale.net [10.192.129.221]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id o5I5cFcl026493 for ; Fri, 18 Jun 2010 00:38:17 -0500 (CDT) Received: from localhost.localdomain ([10.193.20.106]) by zch01exm26.fsl.freescale.net with Microsoft SMTPSVC(6.0.3790.4675); Fri, 18 Jun 2010 13:38:08 +0800 From: Li Yang To: galak@kernel.crashing.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/3] fsl_rio: fix machine check exception for e500mc Date: Fri, 18 Jun 2010 13:29:17 +0800 Message-Id: <1276838958-28947-2-git-send-email-leoli@freescale.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1276838958-28947-1-git-send-email-leoli@freescale.com> References: <1276838958-28947-1-git-send-email-leoli@freescale.com> X-OriginalArrivalTime: 18 Jun 2010 05:38:09.0014 (UTC) FILETIME=[6F05D960:01CB0EA8] 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: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org The original code only covers e500 v1/v2. Signed-off-by: Li Yang --- arch/powerpc/sysdev/fsl_rio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index f908ba6..954a754 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -248,7 +248,8 @@ static int fsl_rio_mcheck_exception(struct pt_regs *regs) const struct exception_table_entry *entry = NULL; unsigned long reason = mfspr(SPRN_MCSR); - if (reason & MCSR_BUS_RBERR) { + /* covers both e500v1/v2 and e500mc */ + if (reason & (MCSR_BUS_RBERR | MCSR_LD)) { reason = in_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR)); if (reason & (RIO_LTLEDCSR_IER | RIO_LTLEDCSR_PRT)) { /* Check if we are prepared to handle this fault */