From patchwork Fri Jun 4 11:24:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kerstin jonsson X-Patchwork-Id: 54566 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 6CAAEB7FF1 for ; Fri, 4 Jun 2010 21:39:57 +1000 (EST) X-Greylist: delayed 915 seconds by postgrey-1.32 at bilbo; Fri, 04 Jun 2010 21:39:49 EST Received: from mailgw9.se.ericsson.net (mailgw9.se.ericsson.net [193.180.251.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2BCD1B7D6A for ; Fri, 4 Jun 2010 21:39:48 +1000 (EST) X-AuditID: c1b4fb39-b7b80ae000001aa1-ea-4c08e25e5445 Received: from esessmw0256.eemea.ericsson.se (Unknown_Domain [153.88.253.125]) by mailgw9.se.ericsson.net (Symantec Mail Security) with SMTP id BF.43.06817.E52E80C4; Fri, 4 Jun 2010 13:24:14 +0200 (CEST) Received: from [147.214.99.161] (153.88.115.8) by esessmw0256.eemea.ericsson.se (153.88.115.97) with Microsoft SMTP Server id 8.2.234.1; Fri, 4 Jun 2010 13:24:13 +0200 Message-ID: <4C08E25E.8000200@ericsson.com> Date: Fri, 4 Jun 2010 13:24:14 +0200 From: kerstin jonsson User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100515 Icedove/3.0.4 MIME-Version: 1.0 To: linuxppc-dev@lists.ozlabs.org Subject: fsl_rio.c build problem X-Brightmail-Tracker: AAAAAA== 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 Hi, I'm using: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git and building for ARCH=powerpc - mpc85xx_defconfig arch/powerpc/sysdev/fsl_rio.c will not build due to a missing MCSR_MASK bitmask definition. The attached patch is based on code found in git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git and - at the least - will fix the build problem. BR, Kerstin From 42d0a01865beda04b70549245ce1854c8f0074d3 Mon Sep 17 00:00:00 2001 From: Kerstin Jonsson Date: Fri, 4 Jun 2010 12:56:02 +0200 Subject: [PATCH] fix fsl_rio.c build problem in powerpc mpc85xx_defconfig --- arch/powerpc/include/asm/reg_booke.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h index 2360317..68c3833 100644 --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h @@ -231,6 +231,12 @@ #define MCSR_LDG 0x00002000UL /* Guarded Load */ #define MCSR_TLBSYNC 0x00000002UL /* Multiple tlbsyncs detected */ #define MCSR_BSL2_ERR 0x00000001UL /* Backside L2 cache error */ + +/* e500 parts may set unused bits in MCSR; mask these off */ +#define MCSR_MASK (MCSR_MCP | MCSR_ICPERR | MCSR_DCP_PERR | \ + MCSR_DCPERR | MCSR_BUS_IAERR | MCSR_BUS_RAERR | \ + MCSR_BUS_WAERR | MCSR_BUS_IBERR | MCSR_BUS_RBERR | \ + MCSR_BUS_WBERR | MCSR_BUS_IPERR | MCSR_BUS_RPERR) #endif #ifdef CONFIG_E200 @@ -243,6 +249,11 @@ #define MCSR_BUS_DRERR 0x00000008UL /* Read Bus Error on data load */ #define MCSR_BUS_WRERR 0x00000004UL /* Write Bus Error on buffered store or cache line push */ + +/* e200 parts may set unused bits in MCSR; mask these off */ +#define MCSR_MASK (MCSR_MCP | MCSR_CP_PERR | MCSR_CPERR | \ + MCSR_EXCP_ERR | MCSR_BUS_IRERR | MCSR_BUS_DRERR | \ + MCSR_BUS_WRERR) #endif /* Bit definitions for the DBSR. */ -- 1.7.1