* [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-23 9:21 [PATCH] asm-generic/io.h: remove asm/cacheflush.h include James Hogan
@ 2012-10-23 9:21 ` James Hogan
2012-10-25 13:40 ` Jonas Bonn
` (2 subsequent siblings)
3 siblings, 0 replies; 14+ messages in thread
From: James Hogan @ 2012-10-23 9:21 UTC (permalink / raw)
To: Arnd Bergmann, Jonas Bonn
Cc: linux-arch, linux, linux-kernel, uclinux-dist-devel, linux-xtensa,
James Hogan, Chris Zankel, Max Filippov, Mike Frysinger,
Chen Liqin, Lennox Wu, Guan Xuetao
Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
cacheflush.h being able to use I/O functions like readl and writel due
to circular include dependencies. It doesn't appear as if anything from
cacheflush.h is actually used by the generic io.h, so remove the
include.
I've compile tested a defconfig compilation of blackfin, openrisc (which
needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
definitions), and xtensa.
Other architectures which use asm-generic/io.h are score and unicore32,
and looking at their io.h I don't see any obvious problems.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
---
Any compile testing of score and unicore32 anybody could provide would
be great.
arch/openrisc/include/asm/io.h | 1 +
include/asm-generic/io.h | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h
index 07f5299..7c69139 100644
--- a/arch/openrisc/include/asm/io.h
+++ b/arch/openrisc/include/asm/io.h
@@ -30,6 +30,7 @@
#define PIO_MASK 0
#include <asm-generic/io.h>
+#include <asm/pgtable.h>
extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size,
pgprot_t prot);
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 448303b..616eea5 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -12,7 +12,6 @@
#define __ASM_GENERIC_IO_H
#include <asm/page.h> /* I/O is all done through memory accesses */
-#include <asm/cacheflush.h>
#include <linux/types.h>
#ifdef CONFIG_GENERIC_IOMAP
--
1.7.7.6
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-23 9:21 [PATCH] asm-generic/io.h: remove asm/cacheflush.h include James Hogan
2012-10-23 9:21 ` James Hogan
@ 2012-10-25 13:40 ` Jonas Bonn
2012-10-25 13:40 ` Jonas Bonn
` (2 more replies)
2012-10-25 21:19 ` Max Filippov
2012-10-29 1:28 ` guanxuetao
3 siblings, 3 replies; 14+ messages in thread
From: Jonas Bonn @ 2012-10-25 13:40 UTC (permalink / raw)
To: James Hogan
Cc: linux-arch, linux-xtensa, Guan Xuetao, Mike Frysinger,
Arnd Bergmann, Chris Zankel, linux-kernel, Max Filippov, linux,
uclinux-dist-devel, Chen Liqin, Lennox Wu
[-- Attachment #1.1: Type: text/plain, Size: 978 bytes --]
On Tue, 2012-10-23 at 10:21 +0100, James Hogan wrote:
> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
> cacheflush.h being able to use I/O functions like readl and writel due
> to circular include dependencies. It doesn't appear as if anything from
> cacheflush.h is actually used by the generic io.h, so remove the
> include.
>
> I've compile tested a defconfig compilation of blackfin, openrisc (which
> needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
> definitions), and xtensa.
>
> Other architectures which use asm-generic/io.h are score and unicore32,
> and looking at their io.h I don't see any obvious problems.
Acked-by: Jonas Bonn <jonas@southpole.se> for OpenRISC
Who's tree should this go via. I can take it via the openrisc tree, but
it would be good to get some Ack's that this isn't going to break things
for the other arch's (in particular score and unicore32, since they are
untested).
/Jonas
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-25 13:40 ` Jonas Bonn
@ 2012-10-25 13:40 ` Jonas Bonn
2012-10-25 14:07 ` Arnd Bergmann
2012-10-25 14:07 ` James Hogan
2 siblings, 0 replies; 14+ messages in thread
From: Jonas Bonn @ 2012-10-25 13:40 UTC (permalink / raw)
To: James Hogan
Cc: Arnd Bergmann, linux-arch, linux, linux-kernel,
uclinux-dist-devel, linux-xtensa, Chris Zankel, Max Filippov,
Mike Frysinger, Chen Liqin, Lennox Wu, Guan Xuetao
[-- Attachment #1: Type: text/plain, Size: 978 bytes --]
On Tue, 2012-10-23 at 10:21 +0100, James Hogan wrote:
> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
> cacheflush.h being able to use I/O functions like readl and writel due
> to circular include dependencies. It doesn't appear as if anything from
> cacheflush.h is actually used by the generic io.h, so remove the
> include.
>
> I've compile tested a defconfig compilation of blackfin, openrisc (which
> needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
> definitions), and xtensa.
>
> Other architectures which use asm-generic/io.h are score and unicore32,
> and looking at their io.h I don't see any obvious problems.
Acked-by: Jonas Bonn <jonas@southpole.se> for OpenRISC
Who's tree should this go via. I can take it via the openrisc tree, but
it would be good to get some Ack's that this isn't going to break things
for the other arch's (in particular score and unicore32, since they are
untested).
/Jonas
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-25 13:40 ` Jonas Bonn
2012-10-25 13:40 ` Jonas Bonn
@ 2012-10-25 14:07 ` Arnd Bergmann
2012-10-25 14:07 ` Arnd Bergmann
2012-10-25 14:07 ` James Hogan
2 siblings, 1 reply; 14+ messages in thread
From: Arnd Bergmann @ 2012-10-25 14:07 UTC (permalink / raw)
To: Jonas Bonn
Cc: linux-arch, linux-xtensa, James Hogan, Mike Frysinger,
Chris Zankel, linux-kernel, Max Filippov, linux, Guan Xuetao,
uclinux-dist-devel, Chen Liqin, Lennox Wu
On Thursday 25 October 2012, Jonas Bonn wrote:
> On Tue, 2012-10-23 at 10:21 +0100, James Hogan wrote:
> > Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
> > cacheflush.h being able to use I/O functions like readl and writel due
> > to circular include dependencies. It doesn't appear as if anything from
> > cacheflush.h is actually used by the generic io.h, so remove the
> > include.
> >
> > I've compile tested a defconfig compilation of blackfin, openrisc (which
> > needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
> > definitions), and xtensa.
> >
> > Other architectures which use asm-generic/io.h are score and unicore32,
> > and looking at their io.h I don't see any obvious problems.
>
> Acked-by: Jonas Bonn <jonas@southpole.se> for OpenRISC
>
> Who's tree should this go via. I can take it via the openrisc tree, but
> it would be good to get some Ack's that this isn't going to break things
> for the other arch's (in particular score and unicore32, since they are
> untested).
I've put it into the asm-generic tree, now that I have set it up again
for the 3.7 merge window.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-25 14:07 ` Arnd Bergmann
@ 2012-10-25 14:07 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2012-10-25 14:07 UTC (permalink / raw)
To: Jonas Bonn
Cc: James Hogan, linux-arch, linux, linux-kernel, uclinux-dist-devel,
linux-xtensa, Chris Zankel, Max Filippov, Mike Frysinger,
Chen Liqin, Lennox Wu, Guan Xuetao
On Thursday 25 October 2012, Jonas Bonn wrote:
> On Tue, 2012-10-23 at 10:21 +0100, James Hogan wrote:
> > Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
> > cacheflush.h being able to use I/O functions like readl and writel due
> > to circular include dependencies. It doesn't appear as if anything from
> > cacheflush.h is actually used by the generic io.h, so remove the
> > include.
> >
> > I've compile tested a defconfig compilation of blackfin, openrisc (which
> > needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
> > definitions), and xtensa.
> >
> > Other architectures which use asm-generic/io.h are score and unicore32,
> > and looking at their io.h I don't see any obvious problems.
>
> Acked-by: Jonas Bonn <jonas@southpole.se> for OpenRISC
>
> Who's tree should this go via. I can take it via the openrisc tree, but
> it would be good to get some Ack's that this isn't going to break things
> for the other arch's (in particular score and unicore32, since they are
> untested).
I've put it into the asm-generic tree, now that I have set it up again
for the 3.7 merge window.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-25 13:40 ` Jonas Bonn
2012-10-25 13:40 ` Jonas Bonn
2012-10-25 14:07 ` Arnd Bergmann
@ 2012-10-25 14:07 ` James Hogan
2012-10-25 14:07 ` James Hogan
2012-10-25 14:10 ` Arnd Bergmann
2 siblings, 2 replies; 14+ messages in thread
From: James Hogan @ 2012-10-25 14:07 UTC (permalink / raw)
To: Jonas Bonn
Cc: linux-arch, linux-xtensa, Guan Xuetao, Mike Frysinger,
Arnd Bergmann, Chris Zankel, linux-kernel, Max Filippov, linux,
uclinux-dist-devel, Chen Liqin, Lennox Wu
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 25/10/12 14:40, Jonas Bonn wrote:
> On Tue, 2012-10-23 at 10:21 +0100, James Hogan wrote:
>> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
>> cacheflush.h being able to use I/O functions like readl and
>> writel due to circular include dependencies. It doesn't appear as
>> if anything from cacheflush.h is actually used by the generic
>> io.h, so remove the include.
>>
>> I've compile tested a defconfig compilation of blackfin, openrisc
>> (which needed <asm/pgtable.h> including from it's <asm/io.h> to
>> get the PAGE_* definitions), and xtensa.
>>
>> Other architectures which use asm-generic/io.h are score and
>> unicore32, and looking at their io.h I don't see any obvious
>> problems.
>
> Acked-by: Jonas Bonn <jonas@southpole.se> for OpenRISC
Thanks Jonas
> Who's tree should this go via. I can take it via the openrisc
> tree, but it would be good to get some Ack's that this isn't going
> to break things for the other arch's (in particular score and
> unicore32, since they are untested).
Yeh I'd like some acks from score and unicore32 if possible, since I
didn't notice I needed the openrisc bit until I tried compiling it.
Cheers
James
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBAgAGBQJQiUefAAoJEKHZs+irPybfly0P/3RZDS5sxivx513plCPNMucV
rXmZnEGh87Iw9c8htjV0WFH5dAtmUQ88wkExGEWPdK57AYhMLwKN+soycq3XGS6E
156EFDpp602K9bwZ5bTodJco2FalaQrUh+GQqWOBGhi0NPwnt0pwEpUC/F5Vn71d
rekQ9er/fKWhF74ONKh+/K3fSTHl6/S2Krt3izsPH9a+7aYpWNVNvfrhyS43A+AR
xa3tE0Q5sHvaRTYp+42p/7CHwOzAerXs3Cvp7QYrwErV8cB6IvkVh+b7RYkawYAq
czVIjbi45ouJlRek7EO3ZlcDFtiuoQZxzdVDNUwMuKWv7e9ASQ1StTHbh67DDlGK
cZsFMnuO0ddkdzs8ya/HWdA9+hZmrigPmst4rKUvM4idJ/N7zpO4G74fCwVDLng1
GIUrPrZTbcgpZyGepJfH9jGmwRJBcS8nYiep3quz21p3oGafeIVdv7WsPcHC0/HA
BOW2NcGDihtiJjooVWAiRhEPO4jxBCpY187YuoKJXCFdm5CfJ7ZdCIjeEt/cWVQs
yNfoGeVtHgRxKEJFsKAIto92iT18JY0qZWJL7WAqFDD4qB13RmJbmUOE4LCChFKK
Jui/Fi46j6uWdau6mujMlYKx3RMHjB/Lw09WRL78gEB6JaxpzVh4iShu4BI8G50P
Ye3bZ/gyfOLBRBky14FJ
=xH4e
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-25 14:07 ` James Hogan
@ 2012-10-25 14:07 ` James Hogan
2012-10-25 14:10 ` Arnd Bergmann
1 sibling, 0 replies; 14+ messages in thread
From: James Hogan @ 2012-10-25 14:07 UTC (permalink / raw)
To: Jonas Bonn
Cc: Arnd Bergmann, linux-arch, linux, linux-kernel,
uclinux-dist-devel, linux-xtensa, Chris Zankel, Max Filippov,
Mike Frysinger, Chen Liqin, Lennox Wu, Guan Xuetao
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 25/10/12 14:40, Jonas Bonn wrote:
> On Tue, 2012-10-23 at 10:21 +0100, James Hogan wrote:
>> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
>> cacheflush.h being able to use I/O functions like readl and
>> writel due to circular include dependencies. It doesn't appear as
>> if anything from cacheflush.h is actually used by the generic
>> io.h, so remove the include.
>>
>> I've compile tested a defconfig compilation of blackfin, openrisc
>> (which needed <asm/pgtable.h> including from it's <asm/io.h> to
>> get the PAGE_* definitions), and xtensa.
>>
>> Other architectures which use asm-generic/io.h are score and
>> unicore32, and looking at their io.h I don't see any obvious
>> problems.
>
> Acked-by: Jonas Bonn <jonas@southpole.se> for OpenRISC
Thanks Jonas
> Who's tree should this go via. I can take it via the openrisc
> tree, but it would be good to get some Ack's that this isn't going
> to break things for the other arch's (in particular score and
> unicore32, since they are untested).
Yeh I'd like some acks from score and unicore32 if possible, since I
didn't notice I needed the openrisc bit until I tried compiling it.
Cheers
James
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBAgAGBQJQiUefAAoJEKHZs+irPybfly0P/3RZDS5sxivx513plCPNMucV
rXmZnEGh87Iw9c8htjV0WFH5dAtmUQ88wkExGEWPdK57AYhMLwKN+soycq3XGS6E
156EFDpp602K9bwZ5bTodJco2FalaQrUh+GQqWOBGhi0NPwnt0pwEpUC/F5Vn71d
rekQ9er/fKWhF74ONKh+/K3fSTHl6/S2Krt3izsPH9a+7aYpWNVNvfrhyS43A+AR
xa3tE0Q5sHvaRTYp+42p/7CHwOzAerXs3Cvp7QYrwErV8cB6IvkVh+b7RYkawYAq
czVIjbi45ouJlRek7EO3ZlcDFtiuoQZxzdVDNUwMuKWv7e9ASQ1StTHbh67DDlGK
cZsFMnuO0ddkdzs8ya/HWdA9+hZmrigPmst4rKUvM4idJ/N7zpO4G74fCwVDLng1
GIUrPrZTbcgpZyGepJfH9jGmwRJBcS8nYiep3quz21p3oGafeIVdv7WsPcHC0/HA
BOW2NcGDihtiJjooVWAiRhEPO4jxBCpY187YuoKJXCFdm5CfJ7ZdCIjeEt/cWVQs
yNfoGeVtHgRxKEJFsKAIto92iT18JY0qZWJL7WAqFDD4qB13RmJbmUOE4LCChFKK
Jui/Fi46j6uWdau6mujMlYKx3RMHjB/Lw09WRL78gEB6JaxpzVh4iShu4BI8G50P
Ye3bZ/gyfOLBRBky14FJ
=xH4e
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-25 14:07 ` James Hogan
2012-10-25 14:07 ` James Hogan
@ 2012-10-25 14:10 ` Arnd Bergmann
2012-10-25 14:10 ` Arnd Bergmann
1 sibling, 1 reply; 14+ messages in thread
From: Arnd Bergmann @ 2012-10-25 14:10 UTC (permalink / raw)
To: James Hogan
Cc: linux-arch, Guan Xuetao, Mike Frysinger, linux-xtensa,
linux-kernel, Max Filippov, linux, uclinux-dist-devel, Chen Liqin,
Chris Zankel, Lennox Wu
On Thursday 25 October 2012, James Hogan wrote:
> > Who's tree should this go via. I can take it via the openrisc
> > tree, but it would be good to get some Ack's that this isn't going
> > to break things for the other arch's (in particular score and
> > unicore32, since they are untested).
>
> Yeh I'd like some acks from score and unicore32 if possible, since I
> didn't notice I needed the openrisc bit until I tried compiling it.
I'm not worried about score, because there have been no updates at
all for the entire last year, and I doubt anyone is using that any
more. I agree that having an Ack from Guan Xuetao would be good.
The patch will also show up in linux-next now, and I can update
it if necessary.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-25 14:10 ` Arnd Bergmann
@ 2012-10-25 14:10 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2012-10-25 14:10 UTC (permalink / raw)
To: James Hogan
Cc: Jonas Bonn, linux-arch, linux, linux-kernel, uclinux-dist-devel,
linux-xtensa, Chris Zankel, Max Filippov, Mike Frysinger,
Chen Liqin, Lennox Wu, Guan Xuetao
On Thursday 25 October 2012, James Hogan wrote:
> > Who's tree should this go via. I can take it via the openrisc
> > tree, but it would be good to get some Ack's that this isn't going
> > to break things for the other arch's (in particular score and
> > unicore32, since they are untested).
>
> Yeh I'd like some acks from score and unicore32 if possible, since I
> didn't notice I needed the openrisc bit until I tried compiling it.
I'm not worried about score, because there have been no updates at
all for the entire last year, and I doubt anyone is using that any
more. I agree that having an Ack from Guan Xuetao would be good.
The patch will also show up in linux-next now, and I can update
it if necessary.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-23 9:21 [PATCH] asm-generic/io.h: remove asm/cacheflush.h include James Hogan
2012-10-23 9:21 ` James Hogan
2012-10-25 13:40 ` Jonas Bonn
@ 2012-10-25 21:19 ` Max Filippov
2012-10-29 1:28 ` guanxuetao
3 siblings, 0 replies; 14+ messages in thread
From: Max Filippov @ 2012-10-25 21:19 UTC (permalink / raw)
To: James Hogan
Cc: Arnd Bergmann, Jonas Bonn, linux-arch, linux, linux-kernel,
uclinux-dist-devel, linux-xtensa, Chris Zankel, Mike Frysinger,
Chen Liqin, Lennox Wu, Guan Xuetao
On Tue, Oct 23, 2012 at 1:21 PM, James Hogan <james.hogan@imgtec.com> wrote:
> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
> cacheflush.h being able to use I/O functions like readl and writel due
> to circular include dependencies. It doesn't appear as if anything from
> cacheflush.h is actually used by the generic io.h, so remove the
> include.
Acked-by: Max Filippov <jcmvbkbc@gmail.com> for xtensa part.
> I've compile tested a defconfig compilation of blackfin, openrisc (which
> needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
> definitions), and xtensa.
>
> Other architectures which use asm-generic/io.h are score and unicore32,
> and looking at their io.h I don't see any obvious problems.
>
> Signed-off-by: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> ---
> Any compile testing of score and unicore32 anybody could provide would
> be great.
>
> arch/openrisc/include/asm/io.h | 1 +
> include/asm-generic/io.h | 1 -
> 2 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h
> index 07f5299..7c69139 100644
> --- a/arch/openrisc/include/asm/io.h
> +++ b/arch/openrisc/include/asm/io.h
> @@ -30,6 +30,7 @@
> #define PIO_MASK 0
>
> #include <asm-generic/io.h>
> +#include <asm/pgtable.h>
>
> extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size,
> pgprot_t prot);
> diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
> index 448303b..616eea5 100644
> --- a/include/asm-generic/io.h
> +++ b/include/asm-generic/io.h
> @@ -12,7 +12,6 @@
> #define __ASM_GENERIC_IO_H
>
> #include <asm/page.h> /* I/O is all done through memory accesses */
> -#include <asm/cacheflush.h>
> #include <linux/types.h>
>
> #ifdef CONFIG_GENERIC_IOMAP
> --
> 1.7.7.6
>
>
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-23 9:21 [PATCH] asm-generic/io.h: remove asm/cacheflush.h include James Hogan
` (2 preceding siblings ...)
2012-10-25 21:19 ` Max Filippov
@ 2012-10-29 1:28 ` guanxuetao
2012-10-29 1:28 ` guanxuetao
2012-10-29 9:28 ` James Hogan
3 siblings, 2 replies; 14+ messages in thread
From: guanxuetao @ 2012-10-29 1:28 UTC (permalink / raw)
Cc: Arnd Bergmann, Jonas Bonn, linux-arch, linux, linux-kernel,
uclinux-dist-devel, linux-xtensa, James Hogan, Chris Zankel,
Max Filippov, Mike Frysinger, Chen Liqin, Lennox Wu, Guan Xuetao
> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
> cacheflush.h being able to use I/O functions like readl and writel due
> to circular include dependencies. It doesn't appear as if anything from
> cacheflush.h is actually used by the generic io.h, so remove the
> include.
>
> I've compile tested a defconfig compilation of blackfin, openrisc (which
> needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
> definitions), and xtensa.
>
> Other architectures which use asm-generic/io.h are score and unicore32,
> and looking at their io.h I don't see any obvious problems.
>
> Signed-off-by: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
> ---
> Any compile testing of score and unicore32 anybody could provide would
> be great.
>
> arch/openrisc/include/asm/io.h | 1 +
> include/asm-generic/io.h | 1 -
> 2 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/openrisc/include/asm/io.h
> b/arch/openrisc/include/asm/io.h
> index 07f5299..7c69139 100644
> --- a/arch/openrisc/include/asm/io.h
> +++ b/arch/openrisc/include/asm/io.h
> @@ -30,6 +30,7 @@
> #define PIO_MASK 0
>
> #include <asm-generic/io.h>
> +#include <asm/pgtable.h>
>
> extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size,
> pgprot_t prot);
> diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
> index 448303b..616eea5 100644
> --- a/include/asm-generic/io.h
> +++ b/include/asm-generic/io.h
> @@ -12,7 +12,6 @@
> #define __ASM_GENERIC_IO_H
>
> #include <asm/page.h> /* I/O is all done through memory accesses */
> -#include <asm/cacheflush.h>
> #include <linux/types.h>
>
> #ifdef CONFIG_GENERIC_IOMAP
> --
> 1.7.7.6
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-29 1:28 ` guanxuetao
@ 2012-10-29 1:28 ` guanxuetao
2012-10-29 9:28 ` James Hogan
1 sibling, 0 replies; 14+ messages in thread
From: guanxuetao @ 2012-10-29 1:28 UTC (permalink / raw)
To: James Hogan
Cc: Arnd Bergmann, Jonas Bonn, linux-arch, linux, linux-kernel,
uclinux-dist-devel, linux-xtensa, Chris Zankel, Max Filippov,
Mike Frysinger, Chen Liqin, Lennox Wu, Guan Xuetao
> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
> cacheflush.h being able to use I/O functions like readl and writel due
> to circular include dependencies. It doesn't appear as if anything from
> cacheflush.h is actually used by the generic io.h, so remove the
> include.
>
> I've compile tested a defconfig compilation of blackfin, openrisc (which
> needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
> definitions), and xtensa.
>
> Other architectures which use asm-generic/io.h are score and unicore32,
> and looking at their io.h I don't see any obvious problems.
>
> Signed-off-by: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
> ---
> Any compile testing of score and unicore32 anybody could provide would
> be great.
>
> arch/openrisc/include/asm/io.h | 1 +
> include/asm-generic/io.h | 1 -
> 2 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/openrisc/include/asm/io.h
> b/arch/openrisc/include/asm/io.h
> index 07f5299..7c69139 100644
> --- a/arch/openrisc/include/asm/io.h
> +++ b/arch/openrisc/include/asm/io.h
> @@ -30,6 +30,7 @@
> #define PIO_MASK 0
>
> #include <asm-generic/io.h>
> +#include <asm/pgtable.h>
>
> extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size,
> pgprot_t prot);
> diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
> index 448303b..616eea5 100644
> --- a/include/asm-generic/io.h
> +++ b/include/asm-generic/io.h
> @@ -12,7 +12,6 @@
> #define __ASM_GENERIC_IO_H
>
> #include <asm/page.h> /* I/O is all done through memory accesses */
> -#include <asm/cacheflush.h>
> #include <linux/types.h>
>
> #ifdef CONFIG_GENERIC_IOMAP
> --
> 1.7.7.6
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include
2012-10-29 1:28 ` guanxuetao
2012-10-29 1:28 ` guanxuetao
@ 2012-10-29 9:28 ` James Hogan
1 sibling, 0 replies; 14+ messages in thread
From: James Hogan @ 2012-10-29 9:28 UTC (permalink / raw)
To: guanxuetao
Cc: Arnd Bergmann, Jonas Bonn, linux-arch, linux, linux-kernel,
uclinux-dist-devel, linux-xtensa, Chris Zankel, Max Filippov,
Mike Frysinger, Chen Liqin, Lennox Wu, Guan Xuetao
On 29/10/12 01:28, guanxuetao@mprc.pku.edu.cn wrote:
>> Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
>> cacheflush.h being able to use I/O functions like readl and writel due
>> to circular include dependencies. It doesn't appear as if anything from
>> cacheflush.h is actually used by the generic io.h, so remove the
>> include.
>>
>> I've compile tested a defconfig compilation of blackfin, openrisc (which
>> needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
>> definitions), and xtensa.
>>
>> Other architectures which use asm-generic/io.h are score and unicore32,
>> and looking at their io.h I don't see any obvious problems.
>>
>> Signed-off-by: James Hogan <james.hogan@imgtec.com>
>> Cc: Arnd Bergmann <arnd@arndb.de>
>> Cc: Jonas Bonn <jonas@southpole.se>
>> Cc: Chris Zankel <chris@zankel.net>
>> Cc: Max Filippov <jcmvbkbc@gmail.com>
>> Cc: Mike Frysinger <vapier@gentoo.org>
>> Cc: Chen Liqin <liqin.chen@sunplusct.com>
>> Cc: Lennox Wu <lennox.wu@gmail.com>
>> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
>
> Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Thanks Guan
Cheers
James
^ permalink raw reply [flat|nested] 14+ messages in thread