From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann 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> References: <1453736525-1959191-2-git-send-email-arnd@arndb.de> <20160305000225.GB55664@google.com> <20160305001057.GC55664@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160305001057.GC55664@google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Brian Norris 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 List-Id: linux-arch.vger.kernel.org T24gRnJpZGF5IDA0IE1hcmNoIDIwMTYgMTY6MTA6NTcgQnJpYW4gTm9ycmlzIHdyb3RlOgo+ICAg NWQyODRlMzUzZWIxIEFSTTogcHhhOiBhdm9pZCBhY2Nlc3NpbmcgaW50ZXJydXB0IHJlZ2lzdGVy cyBkaXJlY3RseQo+IAo+ICAgQ0MgICAgICBkcml2ZXJzL210ZC9jaGlwcy9jZmlfY21kc2V0XzAw MDIubwo+IGRyaXZlcnMvbXRkL2NoaXBzL2NmaV9jbWRzZXRfMDAwMi5jOiBJbiBmdW5jdGlvbiDi gJh4aXBfdWRlbGF54oCZOgo+IGRyaXZlcnMvbXRkL2NoaXBzL2NmaV9jbWRzZXRfMDAwMi5jOjk2 MjozNTogd2FybmluZzogaW5pdGlhbGl6YXRpb24gbWFrZXMgaW50ZWdlciBmcm9tIHBvaW50ZXIg d2l0aG91dCBhIGNhc3QgW2VuYWJsZWQgYnkgZGVmYXVsdF0KPiBkcml2ZXJzL210ZC9jaGlwcy9j ZmlfY21kc2V0XzAwMDIuYzo5Njc6ODogZXJyb3I6IOKAmElDSVDigJkgdW5kZWNsYXJlZCAoZmly c3QgdXNlIGluIHRoaXMgZnVuY3Rpb24pCj4gZHJpdmVycy9tdGQvY2hpcHMvY2ZpX2NtZHNldF8w MDAyLmM6OTY3Ojg6IG5vdGU6IGVhY2ggdW5kZWNsYXJlZCBpZGVudGlmaWVyIGlzIHJlcG9ydGVk IG9ubHkgb25jZSBmb3IgZWFjaCBmdW5jdGlvbiBpdCBhcHBlYXJzIGluCj4gZHJpdmVycy9tdGQv Y2hpcHMvY2ZpX2NtZHNldF8wMDAyLmM6OTY3OjE1OiBlcnJvcjog4oCYSUNNUuKAmSB1bmRlY2xh cmVkIChmaXJzdCB1c2UgaW4gdGhpcyBmdW5jdGlvbikKPiBkcml2ZXJzL210ZC9jaGlwcy9jZmlf Y21kc2V0XzAwMDIuYzo5ODE6MTIzOiBlcnJvcjogaW52YWxpZCBvcGVyYW5kcyB0byBiaW5hcnkg LyAoaGF2ZSDigJh2b2lkICrigJkgYW5kIOKAmGludOKAmSkKPiBkcml2ZXJzL210ZC9jaGlwcy9j ZmlfY21kc2V0XzAwMDIuYzo5ODI6MTQ6IHdhcm5pbmc6IGFzc2lnbm1lbnQgbWFrZXMgaW50ZWdl ciBmcm9tIHBvaW50ZXIgd2l0aG91dCBhIGNhc3QgW2VuYWJsZWQgYnkgZGVmYXVsdF0KPiBkcml2 ZXJzL210ZC9jaGlwcy9jZmlfY21kc2V0XzAwMDIuYzo5ODQ6MTI0OiBlcnJvcjogaW52YWxpZCBv cGVyYW5kcyB0byBiaW5hcnkgLyAoaGF2ZSDigJh2b2lkICrigJkgYW5kIOKAmGludOKAmSkKPiBk cml2ZXJzL210ZC9jaGlwcy9jZmlfY21kc2V0XzAwMDIuYzoxMDM0OjEwOiB3YXJuaW5nOiBhc3Np Z25tZW50IG1ha2VzIGludGVnZXIgZnJvbSBwb2ludGVyIHdpdGhvdXQgYSBjYXN0IFtlbmFibGVk IGJ5IGRlZmF1bHRdCj4gZHJpdmVycy9tdGQvY2hpcHMvY2ZpX2NtZHNldF8wMDAyLmM6MTA0NTox MTg6IGVycm9yOiBpbnZhbGlkIG9wZXJhbmRzIHRvIGJpbmFyeSAvIChoYXZlIOKAmHZvaWQgKuKA mSBhbmQg4oCYaW504oCZKQo+IAo+IExvb2tzIGxpa2UgYXJjaC9hcm0vbWFjaC1weGEvaW5jbHVk ZS9tYWNoL210ZC14aXAuaCBjYW4ndCBmaW5kIElDSVAgb3IgSUNNUi4uLgo+IAoKUmlnaHQsIEkg YWxzbyBoYXZlIGEgd29ya2Fyb3VuZCBmb3IgdGhhdCBvbmUsIGJ1dCBmb3VuZCBsYXRlciB0aGF0 IGl0Cndvbid0IHdvcmsuIEkgdGhpbmsgdGhpcyBpcyB0aGUgcGF0Y2ggdGhhdCBicm9rZSBpdCBm aXZlIHllYXJzIGFnbzoKCmNvbW1pdCA1ZDI4NGUzNTNlYjExYWIyZThiMWM1NjcxYmEwNjQ4OWIw YmQxZTBjCkF1dGhvcjogRXJpYyBNaWFvIDxlcmljLnkubWlhb0BnbWFpbC5jb20+CkRhdGU6ICAg V2VkIEFwciAyNyAyMjo0ODowNCAyMDExICswODAwCgogICAgQVJNOiBweGE6IGF2b2lkIGFjY2Vz c2luZyBpbnRlcnJ1cHQgcmVnaXN0ZXJzIGRpcmVjdGx5CiAgICAKICAgIFNpZ25lZC1vZmYtYnk6 IEVyaWMgTWlhbyA8ZXJpYy55Lm1pYW9AZ21haWwuY29tPgoKZGlmZiAtLWdpdCBhL2FyY2gvYXJt L21hY2gtcHhhL2luY2x1ZGUvbWFjaC9yZWdzLWludGMuaCBiL2FyY2gvYXJtL21hY2gtcHhhL2lu Y2x1ZGUvbWFjaC9yZWdzLWludGMuaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNjYy Mjg4ZWI2Zjk1Li4wMDAwMDAwMDAwMDAKLS0tIGEvYXJjaC9hcm0vbWFjaC1weGEvaW5jbHVkZS9t YWNoL3JlZ3MtaW50Yy5oCisrKyAvZGV2L251bGwKQEAgLTEsMzAgKzAsMCBAQAotI2lmbmRlZiBf X0FTTV9NQUNIX1JFR1NfSU5UQ19ICi0jZGVmaW5lIF9fQVNNX01BQ0hfUkVHU19JTlRDX0gKLQot I2luY2x1ZGUgPG1hY2gvaGFyZHdhcmUuaD4KLQotLyoKLSAqIEludGVycnVwdCBDb250cm9sbGVy Ci0gKi8KLQotI2RlZmluZSBJQ0lQICAgICAgICAgICBfX1JFRygweDQwRDAwMDAwKSAgLyogSW50 ZXJydXB0IENvbnRyb2xsZXIgSVJRIFBlbmRpbmcgUmVnaXN0ZXIgKi8KLSNkZWZpbmUgSUNNUiAg ICAgICAgICAgX19SRUcoMHg0MEQwMDAwNCkgIC8qIEludGVycnVwdCBDb250cm9sbGVyIE1hc2sg UmVnaXN0ZXIgKi8KLSNkZWZpbmUgSUNMUiAgICAgICAgICAgX19SRUcoMHg0MEQwMDAwOCkgIC8q IEludGVycnVwdCBDb250cm9sbGVyIExldmVsIFJlZ2lzdGVyICovCi0jZGVmaW5lIElDRlAgICAg ICAgICAgIF9fUkVHKDB4NDBEMDAwMEMpICAvKiBJbnRlcnJ1cHQgQ29udHJvbGxlciBGSVEgUGVu ZGluZyBSZWdpc3RlciAqLwotI2RlZmluZSBJQ1BSICAgICAgICAgICBfX1JFRygweDQwRDAwMDEw KSAgLyogSW50ZXJydXB0IENvbnRyb2xsZXIgUGVuZGluZyBSZWdpc3RlciAqLwotI2RlZmluZSBJ Q0NSICAgICAgICAgICBfX1JFRygweDQwRDAwMDE0KSAgLyogSW50ZXJydXB0IENvbnRyb2xsZXIg Q29udHJvbCBSZWdpc3RlciAqLwotI2RlZmluZSBJQ0hQICAgICAgICAgICBfX1JFRygweDQwRDAw MDE4KSAgLyogSW50ZXJydXB0IENvbnRyb2xsZXIgSGlnaGVzdCBQcmlvcml0eSBSZWdpc3RlciAq LwoKYW5kIGl0J3MgcG9zc2libGUgdGhhdCBub2JvZHkgZXZlciBub3RpY2VkLi4uCgpJIGd1ZXNz IHdlIGNhbiBicmluZyBiYWNrIHRoZSBtYWNyb3MgZm9yIHRoZSBjYXNlIHRoYXQgTVREX1hJUCBh bmQgWElQX0tFUk5FTAphcmUgYm90aCBlbmFibGVkLgoKCUFybmQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBs aXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5m cmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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> 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" Sender: linux-arch-owner@vger.kernel.org List-ID: 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 Message-ID: <20160305002436.KCReGl81hrhk1uMBCq2i801YwN4qDGp2Lsr5bTwhiUg@z> 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