From patchwork Sat Mar 5 00:24:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 592274 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1F98B1401C7 for ; Sat, 5 Mar 2016 11:26:45 +1100 (AEDT) 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 1ac01p-000098-V6; Sat, 05 Mar 2016 00:25:05 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ac01k-0008QE-T2; Sat, 05 Mar 2016 00:25:02 +0000 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0LtA6t-1Zrhlu23f1-012tOV; Sat, 05 Mar 2016 01:24:37 +0100 From: Arnd Bergmann To: Brian Norris Subject: Re: [PATCH] mtd: only use __xipram annotation when XIP_KERNEL is set Date: Sat, 05 Mar 2016 01:24:36 +0100 Message-ID: <3582240.H8v1IXn8EB@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20160305001057.GC55664@google.com> References: <1453736525-1959191-2-git-send-email-arnd@arndb.de> <20160305000225.GB55664@google.com> <20160305001057.GC55664@google.com> MIME-Version: 1.0 X-Provags-ID: V03:K0:qRmM+PGrRHtsVjej/0VU4N3HiPIzqE/jWf/xgjBbL4XJe7/WGe3 ONIsaPMl7lqn70eRiXZNTBmBov3IaqRPwGuUGOQ0zjF6bnx/qDcWZJlD+wJVIO08p4tTwkY mhOnZAVMP2WvW9woJtSx86kJp6+bUcZlAddOC9e8M9gkSVlAYnc5krb+VKzwam76rc7R2Um RsWMPEhH6zS8UqJe6Umug== X-UI-Out-Filterresults: notjunk:1; V01:K0:YEjOmcVQu/Y=:sn1EaDKeWdX97OCv25TJT2 txONpJXOSu/+s8ILo7x8JY41dX+QgZL2yZMFZJXiy0INeiB+b5p0dEdFTxUr9IjYQTDLqubxz 7LLs7P0Adgotall0+/hdWvF+9uxzz+T1DPze+k4eI7dUQ/8pClzFV9w3MJeD5tUz0cpVMuhfj 451JTIS+tIMWxClYhWoqfLBFs0gOjv17CesNbCuo5mjcSBT/p0JKb6Fuwj32/050UBzM5BsWr lKig2Hsxu/9kgPW00vUBLid9oAqlsN2lI5WwBXy6I3ZlvoqCAezpqVoS9IgEgWpnXb8x2QbxI Lj+LbHNI04ecVPCw2GUkbAJ6jHQrA2HxBEppfyI4Ydj8Crw27Jo1kYf4KUunNIa+3q7a7CckG fpPQwiA+rZDK8Ds4ERQ9a7eG3lX0CB1XNf6hA4r6IYTfOPYx321/pbqkB7jWsGPfURSuamPso ovX4dC7Euz1j1WQLjZg+7S0KlvCosH/B5PizJxZlgzo0NHA8uvRKQhfoiYwuGFGqtuBy2gpk9 S6X5+mxE9QvulZNp/7VL+shj4phjLz7kbxYoWsmwSl8FFGDWJBR4pZ4JcM2tARobOqylIvPIt b/mrYmyBgH6jy2oWbqZGU9kvqovzz/5N56Aq1yoPv/Wu+Iy8HpdEuqPHvKBNGoW7zzrTIojlw /BE+HteSCK5XWPmTEzPoU9ILET7e8a5Ja0yj85i68XkRgOcdHH5bhyHAhmVU7SY0WfqBiKv1l 6T2E3dHhoTZAs+Rv X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160304_162501_465956_A02EF72D X-CRM114-Status: GOOD ( 13.39 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, David Woodhouse , linux-kernel@vger.kernel.org, Haojian Zhuang , linux-mtd@lists.infradead.org, Daniel Mack , Robert Jarzmik , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Friday 04 March 2016 16:10:57 Brian Norris wrote: > 5d284e353eb1 ARM: pxa: avoid accessing interrupt registers directly > > CC drivers/mtd/chips/cfi_cmdset_0002.o > drivers/mtd/chips/cfi_cmdset_0002.c: In function ‘xip_udelay’: > drivers/mtd/chips/cfi_cmdset_0002.c:962:35: warning: initialization makes integer from pointer without a cast [enabled by default] > drivers/mtd/chips/cfi_cmdset_0002.c:967:8: error: ‘ICIP’ undeclared (first use in this function) > drivers/mtd/chips/cfi_cmdset_0002.c:967:8: note: each undeclared identifier is reported only once for each function it appears in > drivers/mtd/chips/cfi_cmdset_0002.c:967:15: error: ‘ICMR’ undeclared (first use in this function) > drivers/mtd/chips/cfi_cmdset_0002.c:981:123: error: invalid operands to binary / (have ‘void *’ and ‘int’) > drivers/mtd/chips/cfi_cmdset_0002.c:982:14: warning: assignment makes integer from pointer without a cast [enabled by default] > drivers/mtd/chips/cfi_cmdset_0002.c:984:124: error: invalid operands to binary / (have ‘void *’ and ‘int’) > drivers/mtd/chips/cfi_cmdset_0002.c:1034:10: warning: assignment makes integer from pointer without a cast [enabled by default] > drivers/mtd/chips/cfi_cmdset_0002.c:1045:118: error: invalid operands to binary / (have ‘void *’ and ‘int’) > > Looks like arch/arm/mach-pxa/include/mach/mtd-xip.h can't find ICIP or ICMR... > Right, I also have a workaround for that one, but found later that it won't work. I think this is the patch that broke it five years ago: commit 5d284e353eb11ab2e8b1c5671ba06489b0bd1e0c Author: Eric Miao Date: Wed Apr 27 22:48:04 2011 +0800 ARM: pxa: avoid accessing interrupt registers directly Signed-off-by: Eric Miao diff --git a/arch/arm/mach-pxa/include/mach/regs-intc.h b/arch/arm/mach-pxa/include/mach/regs-intc.h deleted file mode 100644 index 662288eb6f95..000000000000 --- a/arch/arm/mach-pxa/include/mach/regs-intc.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __ASM_MACH_REGS_INTC_H -#define __ASM_MACH_REGS_INTC_H - -#include - -/* - * Interrupt Controller - */ - -#define ICIP __REG(0x40D00000) /* Interrupt Controller IRQ Pending Register */ -#define ICMR __REG(0x40D00004) /* Interrupt Controller Mask Register */ -#define ICLR __REG(0x40D00008) /* Interrupt Controller Level Register */ -#define ICFP __REG(0x40D0000C) /* Interrupt Controller FIQ Pending Register */ -#define ICPR __REG(0x40D00010) /* Interrupt Controller Pending Register */ -#define ICCR __REG(0x40D00014) /* Interrupt Controller Control Register */ -#define ICHP __REG(0x40D00018) /* Interrupt Controller Highest Priority Register */ and it's possible that nobody ever noticed... I guess we can bring back the macros for the case that MTD_XIP and XIP_KERNEL are both enabled. Arnd _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel