From patchwork Mon Oct 12 13:44:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7375281 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8801C9F1D5 for ; Mon, 12 Oct 2015 13:46:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BCD9720411 for ; Mon, 12 Oct 2015 13:46:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6BA6220810 for ; Mon, 12 Oct 2015 13:46:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZldPj-0007Hd-QU; Mon, 12 Oct 2015 13:45:19 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZldPc-00063Z-QS for linux-arm-kernel@lists.infradead.org; Mon, 12 Oct 2015 13:45:13 +0000 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0LZqH7-1aS52l1RDZ-00lkaS; Mon, 12 Oct 2015 15:44:50 +0200 From: Arnd Bergmann To: Robert Jarzmik Subject: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Date: Mon, 12 Oct 2015 15:44:49 +0200 Message-ID: <5287252.pkh9x0t1Y6@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:uma3aFWnPO9HrVJBoY1QAWDmFhAWEdJdofCM/ANLJr2gPYJdYj6 rZ5pBoPHbmWBl8B1P9NCvb9BCiDst8PZexKcmZZZf08Hde+gFqnb2qjiedOwtF7DWHV5zhH 4RjZaaVdLWPICnQWC5zdKyEiUOPJ8E9+qnUU7vTs0V86sDnB2XuJwIWrgk/WBe8TVGR8UGY RL057F5YWMt+7P6tWgAkA== X-UI-Out-Filterresults: notjunk:1; V01:K0:V1Qd7dTImnA=:fAJPHoNOONekj07Sz1KGLQ 1xM7lZV4Qo39eYh+SpNv9G3GGbwIXl1GfVBE8jCEUnp40N49E9uIr1RFen85JNl40tAbPzjdL sbr703SzFdyjnq3M0hCan1sgbtTHdmqYy+v6TN2GDvflnoVTJ+KF+NQeKPds9ebprXdMCK4ui CheZ5o72+Uj0N7SjkXlRnIzJGsyW7aaHXC6ZOCJQI2buWdNSVJWJbtJ0tJrZd3ue1B/EsDRxC 6EtifkdmO2STYMMZNmHlPiaBS4IkRVOXIcMzz1QF/7veq8vA8QJAEEjA+f5/10nSkVginQQL8 8cfvlMscsKvqwWBeA/8gbr/tKzm6mQCewuimWYOwcZb+qUIPipDOsjlxjShQmefzFYOY6axRI PrybXUkRNxgSBB9PzqpRPVBdM9rQnUkMFzYZP7kICTzJF4ouqPX3DWr1U9YdP+hX75qrecUwa VY4UdB7ny5ci6eo0Dm5grFukbpSAVYtFlWMZvVei4bxWlAX2dw67BmaiJcQp6FbtCs48Ku5d1 6X/3XEhKRr5pWJgKeJ7TUDxRUN8XUY6jnGXhp+pqSpJoRc43CphHv9XOp6zzQzoD/uyF1KP7Q UDoo7iNZV8W+oDA/SU0yN7hLwxr2XstOjaPHZpc5hNnMGhSMudcH2Kndd0HtN7wg3tGCi+61P aZqlyxTAq7AJlYO9s18UpWHwpp5sJu2T5oGe9BPlH99KvwjYs2XSIkeVaIp0Yeb4SV8xhE4ws T6L8reoD3fyzbotU X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151012_064513_158579_2B59B63A X-CRM114-Status: GOOD ( 15.97 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Haojian Zhuang , Daniel Mack , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some recently added code to avoid a bug introduced a build error when CONFIG_PM is disabled and a macro is hidden: arch/arm/mach-pxa/pxa3xx.c: In function 'pxa3xx_init': arch/arm/mach-pxa/pxa3xx.c:439:3: error: 'NDCR' undeclared (first use in this function) NDCR = (NDCR & ~NDCR_ND_ARB_EN) | NDCR_ND_ARB_CNTL; ^ This moves the macro outside of the #ifdef so it can be referenced correctly. Signed-off-by: Arnd Bergmann Fixes: adf3442cc890 ("ARM: pxa: fix DFI bus lockups on startup") Acked-by: Robert Jarzmik --- We merged the patch that introduced this as a fix for 4.3, so we should probably add this one too. diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 06005d3f2ba3..20ce2d386f17 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -42,10 +42,6 @@ #define PECR_IS(n) ((1 << ((n) * 2)) << 29) extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)); -#ifdef CONFIG_PM - -#define ISRAM_START 0x5c000000 -#define ISRAM_SIZE SZ_256K /* * NAND NFC: DFI bus arbitration subset @@ -54,6 +50,11 @@ extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)); #define NDCR_ND_ARB_EN (1 << 12) #define NDCR_ND_ARB_CNTL (1 << 19) +#ifdef CONFIG_PM + +#define ISRAM_START 0x5c000000 +#define ISRAM_SIZE SZ_256K + static void __iomem *sram; static unsigned long wakeup_src;