From patchwork Wed Nov 3 09:36:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shaohui xie X-Patchwork-Id: 69960 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 8F39F1008B6 for ; Wed, 3 Nov 2010 21:08:04 +1100 (EST) Received: from DB3EHSOBE002.bigfish.com (db3ehsobe002.messaging.microsoft.com [213.199.154.140]) (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 EC7711007D4 for ; Wed, 3 Nov 2010 21:07:58 +1100 (EST) Received: from mail62-db3-R.bigfish.com (10.3.81.254) by DB3EHSOBE002.bigfish.com (10.3.84.22) with Microsoft SMTP Server id 14.1.225.8; Wed, 3 Nov 2010 10:07:52 +0000 Received: from mail62-db3 (localhost.localdomain [127.0.0.1]) by mail62-db3-R.bigfish.com (Postfix) with ESMTP id AFA11684DA for ; Wed, 3 Nov 2010 10:07:52 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h66h) X-Spam-TCS-SCL: 5:0 Received: from mail62-db3 (localhost.localdomain [127.0.0.1]) by mail62-db3 (MessageSwitch) id 1288778872331003_544; Wed, 3 Nov 2010 10:07:52 +0000 (UTC) Received: from DB3EHSMHS001.bigfish.com (unknown [10.3.81.250]) by mail62-db3.bigfish.com (Postfix) with ESMTP id 4E9BE7B0050 for ; Wed, 3 Nov 2010 10:07:52 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by DB3EHSMHS001.bigfish.com (10.3.87.101) with Microsoft SMTP Server (TLS) id 14.1.225.8; Wed, 3 Nov 2010 10:07:45 +0000 Received: from de01smr02.am.mot.com (de01smr02.freescale.net [10.208.0.151]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id oA3A8iuQ026184 for ; Wed, 3 Nov 2010 03:08:44 -0700 (MST) Received: from zmy16exm20.fsl.freescale.net (zmy16exm20.ap.freescale.net [10.211.3.23]) by de01smr02.am.mot.com (8.13.1/8.13.0) with ESMTP id oA3AOeHv004117 for ; Wed, 3 Nov 2010 05:24:41 -0500 (CDT) Received: from localhost.localdomain ([10.193.20.106]) by zmy16exm20.fsl.freescale.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 3 Nov 2010 18:08:20 +0800 From: Shaohui Xie To: Subject: [PATCH 2/4][v2] fsl_rio: fix non-standard HID1 register access Date: Wed, 3 Nov 2010 17:36:37 +0800 Message-ID: <1288776997-23562-1-git-send-email-b21989@freescale.com> X-Mailer: git-send-email 1.6.4 X-OriginalArrivalTime: 03 Nov 2010 10:08:20.0915 (UTC) FILETIME=[0B132030:01CB7B3F] MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: Shaohui Xie , linuxppc-dev@lists.ozlabs.org, Kumar Gala , linux-kernel@vger.kernel.org, Alexandre Bounine 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/cpu_setup_fsl_booke.S | 6 ++++++ arch/powerpc/sysdev/fsl_rio.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 0adb50a..8fd5bc6 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -63,6 +63,12 @@ _GLOBAL(__setup_cpu_e500v2) bl __e500_icache_setup bl __e500_dcache_setup bl __setup_e500_ivors +#ifdef CONFIG_RAPIDIO + /* Ensure that RFXE is set */ + mfspr r3,SPRN_HID1 + oris r3,r3,HID1_RFXE@h + mtspr SPRN_HID1,r3 +#endif mtlr r4 blr _GLOBAL(__setup_cpu_e500mc) diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index 4127636..1143c93 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -1538,8 +1538,6 @@ int fsl_rio_setup(struct platform_device *dev) saved_mcheck_exception = ppc_md.machine_check_exception; ppc_md.machine_check_exception = fsl_rio_mcheck_exception; #endif - /* Ensure that RFXE is set */ - mtspr(SPRN_HID1, (mfspr(SPRN_HID1) | 0x20000)); return 0; err: