From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760666AbcCEAZg (ORCPT ); Fri, 4 Mar 2016 19:25:36 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:64563 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760612AbcCEAZd convert rfc822-to-8bit (ORCPT ); Fri, 4 Mar 2016 19:25:33 -0500 From: Arnd Bergmann To: Brian Norris Cc: David Woodhouse , linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Robert Jarzmik , Haojian Zhuang , Daniel Mack 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 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="utf-8" 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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