* [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/
@ 2016-08-23 7:22 ` Chris Wilson
0 siblings, 0 replies; 16+ messages in thread
From: Chris Wilson @ 2016-08-23 7:22 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson, Daniel Vetter, Joonas Lahtinen, linux-mm
PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t
used for the iomapped region, it itself is just PAGE_KERNEL. On all
other arches, PAGE_KERNEL_IO is undefined so in a general header we must
refrain from using it.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: linux-mm@kvack.org
---
include/linux/io-mapping.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index b4c4b5c4216d..ab690801eb59 100644
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -112,7 +112,6 @@ io_mapping_unmap(void __iomem *vaddr)
#else
#include <linux/uaccess.h>
-#include <asm/pgtable_types.h>
/* Create the io_mapping object*/
static inline struct io_mapping *
@@ -123,7 +122,7 @@ io_mapping_init_wc(struct io_mapping *iomap,
iomap->base = base;
iomap->size = size;
iomap->iomem = ioremap_wc(base, size);
- iomap->prot = pgprot_writecombine(PAGE_KERNEL_IO);
+ iomap->prot = pgprot_writecombine(PAGE_KERNEL);
return iomap;
}
--
2.9.3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ @ 2016-08-23 7:22 ` Chris Wilson 0 siblings, 0 replies; 16+ messages in thread From: Chris Wilson @ 2016-08-23 7:22 UTC (permalink / raw) To: intel-gfx; +Cc: linux-mm, Daniel Vetter PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t used for the iomapped region, it itself is just PAGE_KERNEL. On all other arches, PAGE_KERNEL_IO is undefined so in a general header we must refrain from using it. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Fixes: cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: linux-mm@kvack.org --- include/linux/io-mapping.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index b4c4b5c4216d..ab690801eb59 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h @@ -112,7 +112,6 @@ io_mapping_unmap(void __iomem *vaddr) #else #include <linux/uaccess.h> -#include <asm/pgtable_types.h> /* Create the io_mapping object*/ static inline struct io_mapping * @@ -123,7 +122,7 @@ io_mapping_init_wc(struct io_mapping *iomap, iomap->base = base; iomap->size = size; iomap->iomem = ioremap_wc(base, size); - iomap->prot = pgprot_writecombine(PAGE_KERNEL_IO); + iomap->prot = pgprot_writecombine(PAGE_KERNEL); return iomap; } -- 2.9.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 16+ messages in thread
* ✗ Fi.CI.BAT: failure for io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 7:22 ` Chris Wilson (?) @ 2016-08-23 7:51 ` Patchwork -1 siblings, 0 replies; 16+ messages in thread From: Patchwork @ 2016-08-23 7:51 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ URL : https://patchwork.freedesktop.org/series/11447/ State : failure == Summary == Series 11447v1 io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ http://patchwork.freedesktop.org/api/1.0/series/11447/revisions/1/mbox/ Test kms_pipe_crc_basic: Subgroup nonblocking-crc-pipe-c-frame-sequence: pass -> SKIP (fi-skl-6260u) Subgroup suspend-read-crc-pipe-c: dmesg-warn -> INCOMPLETE (fi-hsw-4770k) fi-bdw-5557u total:249 pass:232 dwarn:0 dfail:0 fail:1 skip:16 fi-bsw-n3050 total:249 pass:202 dwarn:0 dfail:0 fail:3 skip:44 fi-byt-n2820 total:249 pass:204 dwarn:0 dfail:0 fail:4 skip:41 fi-hsw-4770k total:213 pass:189 dwarn:3 dfail:0 fail:0 skip:20 fi-hsw-4770r total:249 pass:222 dwarn:0 dfail:0 fail:1 skip:26 fi-ivb-3520m total:249 pass:217 dwarn:0 dfail:0 fail:1 skip:31 fi-skl-6260u total:249 pass:233 dwarn:0 dfail:0 fail:1 skip:15 fi-skl-6700k total:249 pass:214 dwarn:4 dfail:2 fail:1 skip:28 fi-snb-2520m total:249 pass:201 dwarn:4 dfail:0 fail:2 skip:42 fi-snb-2600 total:249 pass:202 dwarn:4 dfail:0 fail:1 skip:42 Results at /archive/results/CI_IGT_test/Patchwork_2397/ f1707bbbf96774eaf799c9578c3558bd065e9749 drm-intel-nightly: 2016y-08m-22d-17h-43m-22s UTC integration manifest aebe27b io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 7:22 ` Chris Wilson @ 2016-08-23 8:04 ` Joonas Lahtinen -1 siblings, 0 replies; 16+ messages in thread From: Joonas Lahtinen @ 2016-08-23 8:04 UTC (permalink / raw) To: Chris Wilson, intel-gfx; +Cc: Daniel Vetter, linux-mm On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > used for the iomapped region, it itself is just PAGE_KERNEL. On all > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > refrain from using it. > There is; #define __PAGE_KERNEL_IOA A A A A A A A A A A (__PAGE_KERNEL) So no functional change, but will compile on all archs. Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas -- Joonas Lahtinen Open Source Technology Center Intel Corporation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ @ 2016-08-23 8:04 ` Joonas Lahtinen 0 siblings, 0 replies; 16+ messages in thread From: Joonas Lahtinen @ 2016-08-23 8:04 UTC (permalink / raw) To: Chris Wilson, intel-gfx; +Cc: Daniel Vetter, linux-mm On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > used for the iomapped region, it itself is just PAGE_KERNEL. On all > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > refrain from using it. > There is; #define __PAGE_KERNEL_IO (__PAGE_KERNEL) So no functional change, but will compile on all archs. Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 8:04 ` Joonas Lahtinen @ 2016-08-23 12:05 ` Daniel Vetter -1 siblings, 0 replies; 16+ messages in thread From: Daniel Vetter @ 2016-08-23 12:05 UTC (permalink / raw) To: Joonas Lahtinen; +Cc: Chris Wilson, intel-gfx, Daniel Vetter, linux-mm On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > > used for the iomapped region, it itself is just PAGE_KERNEL. On all > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > > refrain from using it. > > > > There is; > > #define __PAGE_KERNEL_IOA A A A A A A A A A A (__PAGE_KERNEL) > > So no functional change, but will compile on all archs. > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Still not happy: CC drivers/gpio/gpiolib-of.o In file included from drivers/gpio/gpiolib-of.c:19:0: ./include/linux/io-mapping.h: In function a??io_mapping_init_wca??: ./include/linux/io-mapping.h:125:16: error: implicit declaration of function a??pgprot_writecombinea?? [-Werror=implicit-function-declaration] iomap->prot = pgprot_writecombine(PAGE_KERNEL); ^~~~~~~~~~~~~~~~~~~ ./include/linux/io-mapping.h:125:36: error: a??PAGE_KERNELa?? undeclared (first use in this function) iomap->prot = pgprot_writecombine(PAGE_KERNEL); ^~~~~~~~~~~ ./include/linux/io-mapping.h:125:36: note: each undeclared identifier is reported only once for each function it appears in cc1: some warnings being treated as errors scripts/Makefile.build:289: recipe for target 'drivers/gpio/gpiolib-of.o' failed make[2]: *** [drivers/gpio/gpiolib-of.o] Error 1 scripts/Makefile.build:440: recipe for target 'drivers/gpio' failed make[1]: *** [drivers/gpio] Error 2 make[1]: *** Waiting for unfinished jobs.... DTC drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb DTB drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb.S AS drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb.o LD drivers/gpu/drm/tilcdc/built-in.o rm drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb.S LD drivers/gpu/drm/built-in.o LD drivers/gpu/built-in.o Makefile:968: recipe for target 'drivers' failed make: *** [drivers] Error 2 arm compile-testing howto: http://blog.ffwll.ch/2016/02/arm-kernel-cross-compiling.html Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ @ 2016-08-23 12:05 ` Daniel Vetter 0 siblings, 0 replies; 16+ messages in thread From: Daniel Vetter @ 2016-08-23 12:05 UTC (permalink / raw) To: Joonas Lahtinen; +Cc: Chris Wilson, intel-gfx, Daniel Vetter, linux-mm On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > > used for the iomapped region, it itself is just PAGE_KERNEL. On all > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > > refrain from using it. > > > > There is; > > #define __PAGE_KERNEL_IO (__PAGE_KERNEL) > > So no functional change, but will compile on all archs. > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Still not happy: CC drivers/gpio/gpiolib-of.o In file included from drivers/gpio/gpiolib-of.c:19:0: ./include/linux/io-mapping.h: In function ‘io_mapping_init_wc’: ./include/linux/io-mapping.h:125:16: error: implicit declaration of function ‘pgprot_writecombine’ [-Werror=implicit-function-declaration] iomap->prot = pgprot_writecombine(PAGE_KERNEL); ^~~~~~~~~~~~~~~~~~~ ./include/linux/io-mapping.h:125:36: error: ‘PAGE_KERNEL’ undeclared (first use in this function) iomap->prot = pgprot_writecombine(PAGE_KERNEL); ^~~~~~~~~~~ ./include/linux/io-mapping.h:125:36: note: each undeclared identifier is reported only once for each function it appears in cc1: some warnings being treated as errors scripts/Makefile.build:289: recipe for target 'drivers/gpio/gpiolib-of.o' failed make[2]: *** [drivers/gpio/gpiolib-of.o] Error 1 scripts/Makefile.build:440: recipe for target 'drivers/gpio' failed make[1]: *** [drivers/gpio] Error 2 make[1]: *** Waiting for unfinished jobs.... DTC drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb DTB drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb.S AS drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb.o LD drivers/gpu/drm/tilcdc/built-in.o rm drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dtb.S LD drivers/gpu/drm/built-in.o LD drivers/gpu/built-in.o Makefile:968: recipe for target 'drivers' failed make: *** [drivers] Error 2 arm compile-testing howto: http://blog.ffwll.ch/2016/02/arm-kernel-cross-compiling.html Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 12:05 ` Daniel Vetter @ 2016-08-23 12:21 ` Chris Wilson -1 siblings, 0 replies; 16+ messages in thread From: Chris Wilson @ 2016-08-23 12:21 UTC (permalink / raw) To: Joonas Lahtinen, intel-gfx, linux-mm On Tue, Aug 23, 2016 at 02:05:18PM +0200, Daniel Vetter wrote: > On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: > > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > > > used for the iomapped region, it itself is just PAGE_KERNEL. On all > > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > > > refrain from using it. > > > > > > > There is; > > > > #define __PAGE_KERNEL_IOA A A A A A A A A A A (__PAGE_KERNEL) > > > > So no functional change, but will compile on all archs. > > > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Still not happy: > > CC drivers/gpio/gpiolib-of.o > In file included from drivers/gpio/gpiolib-of.c:19:0: > ./include/linux/io-mapping.h: In function a??io_mapping_init_wca??: > ./include/linux/io-mapping.h:125:16: error: implicit declaration of function a??pgprot_writecombinea?? [-Werror=implicit-function-declaration] > iomap->prot = pgprot_writecombine(PAGE_KERNEL); > ^~~~~~~~~~~~~~~~~~~ > ./include/linux/io-mapping.h:125:36: error: a??PAGE_KERNELa?? undeclared (first use in this function) > iomap->prot = pgprot_writecombine(PAGE_KERNEL); > ^~~~~~~~~~~ That was pulled in by the x86 headers, #include <asm/pgtable.h> -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ @ 2016-08-23 12:21 ` Chris Wilson 0 siblings, 0 replies; 16+ messages in thread From: Chris Wilson @ 2016-08-23 12:21 UTC (permalink / raw) To: Joonas Lahtinen, intel-gfx, linux-mm On Tue, Aug 23, 2016 at 02:05:18PM +0200, Daniel Vetter wrote: > On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: > > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > > > used for the iomapped region, it itself is just PAGE_KERNEL. On all > > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > > > refrain from using it. > > > > > > > There is; > > > > #define __PAGE_KERNEL_IO (__PAGE_KERNEL) > > > > So no functional change, but will compile on all archs. > > > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Still not happy: > > CC drivers/gpio/gpiolib-of.o > In file included from drivers/gpio/gpiolib-of.c:19:0: > ./include/linux/io-mapping.h: In function ‘io_mapping_init_wc’: > ./include/linux/io-mapping.h:125:16: error: implicit declaration of function ‘pgprot_writecombine’ [-Werror=implicit-function-declaration] > iomap->prot = pgprot_writecombine(PAGE_KERNEL); > ^~~~~~~~~~~~~~~~~~~ > ./include/linux/io-mapping.h:125:36: error: ‘PAGE_KERNEL’ undeclared (first use in this function) > iomap->prot = pgprot_writecombine(PAGE_KERNEL); > ^~~~~~~~~~~ That was pulled in by the x86 headers, #include <asm/pgtable.h> -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 12:21 ` Chris Wilson @ 2016-08-23 13:43 ` Daniel Vetter -1 siblings, 0 replies; 16+ messages in thread From: Daniel Vetter @ 2016-08-23 13:43 UTC (permalink / raw) To: Chris Wilson, Joonas Lahtinen, intel-gfx, Linux MM On Tue, Aug 23, 2016 at 2:21 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote: > On Tue, Aug 23, 2016 at 02:05:18PM +0200, Daniel Vetter wrote: >> On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: >> > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: >> > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t >> > > used for the iomapped region, it itself is just PAGE_KERNEL. On all >> > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must >> > > refrain from using it. >> > > >> > >> > There is; >> > >> > #define __PAGE_KERNEL_IO (__PAGE_KERNEL) >> > >> > So no functional change, but will compile on all archs. >> > >> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >> >> Still not happy: >> >> CC drivers/gpio/gpiolib-of.o >> In file included from drivers/gpio/gpiolib-of.c:19:0: >> ./include/linux/io-mapping.h: In function ‘io_mapping_init_wc’: >> ./include/linux/io-mapping.h:125:16: error: implicit declaration of function ‘pgprot_writecombine’ [-Werror=implicit-function-declaration] >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); >> ^~~~~~~~~~~~~~~~~~~ >> ./include/linux/io-mapping.h:125:36: error: ‘PAGE_KERNEL’ undeclared (first use in this function) >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); >> ^~~~~~~~~~~ > > That was pulled in by the x86 headers, > > #include <asm/pgtable.h> Can you pls respin? Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ @ 2016-08-23 13:43 ` Daniel Vetter 0 siblings, 0 replies; 16+ messages in thread From: Daniel Vetter @ 2016-08-23 13:43 UTC (permalink / raw) To: Chris Wilson, Joonas Lahtinen, intel-gfx, Linux MM On Tue, Aug 23, 2016 at 2:21 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote: > On Tue, Aug 23, 2016 at 02:05:18PM +0200, Daniel Vetter wrote: >> On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: >> > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: >> > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t >> > > used for the iomapped region, it itself is just PAGE_KERNEL. On all >> > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must >> > > refrain from using it. >> > > >> > >> > There is; >> > >> > #define __PAGE_KERNEL_IO (__PAGE_KERNEL) >> > >> > So no functional change, but will compile on all archs. >> > >> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >> >> Still not happy: >> >> CC drivers/gpio/gpiolib-of.o >> In file included from drivers/gpio/gpiolib-of.c:19:0: >> ./include/linux/io-mapping.h: In function ‘io_mapping_init_wc’: >> ./include/linux/io-mapping.h:125:16: error: implicit declaration of function ‘pgprot_writecombine’ [-Werror=implicit-function-declaration] >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); >> ^~~~~~~~~~~~~~~~~~~ >> ./include/linux/io-mapping.h:125:36: error: ‘PAGE_KERNEL’ undeclared (first use in this function) >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); >> ^~~~~~~~~~~ > > That was pulled in by the x86 headers, > > #include <asm/pgtable.h> Can you pls respin? Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 13:43 ` Daniel Vetter @ 2016-08-23 13:54 ` Chris Wilson -1 siblings, 0 replies; 16+ messages in thread From: Chris Wilson @ 2016-08-23 13:54 UTC (permalink / raw) To: Daniel Vetter; +Cc: Joonas Lahtinen, intel-gfx, Linux MM On Tue, Aug 23, 2016 at 03:43:15PM +0200, Daniel Vetter wrote: > On Tue, Aug 23, 2016 at 2:21 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote: > > On Tue, Aug 23, 2016 at 02:05:18PM +0200, Daniel Vetter wrote: > >> On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: > >> > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > >> > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > >> > > used for the iomapped region, it itself is just PAGE_KERNEL. On all > >> > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > >> > > refrain from using it. > >> > > > >> > > >> > There is; > >> > > >> > #define __PAGE_KERNEL_IO (__PAGE_KERNEL) > >> > > >> > So no functional change, but will compile on all archs. > >> > > >> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > >> > >> Still not happy: > >> > >> CC drivers/gpio/gpiolib-of.o > >> In file included from drivers/gpio/gpiolib-of.c:19:0: > >> ./include/linux/io-mapping.h: In function a??io_mapping_init_wca??: > >> ./include/linux/io-mapping.h:125:16: error: implicit declaration of function a??pgprot_writecombinea?? [-Werror=implicit-function-declaration] > >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); > >> ^~~~~~~~~~~~~~~~~~~ > >> ./include/linux/io-mapping.h:125:36: error: a??PAGE_KERNELa?? undeclared (first use in this function) > >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); > >> ^~~~~~~~~~~ > > > > That was pulled in by the x86 headers, > > > > #include <asm/pgtable.h> > > Can you pls respin? Was that right? -Chris -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ @ 2016-08-23 13:54 ` Chris Wilson 0 siblings, 0 replies; 16+ messages in thread From: Chris Wilson @ 2016-08-23 13:54 UTC (permalink / raw) To: Daniel Vetter; +Cc: Joonas Lahtinen, intel-gfx, Linux MM On Tue, Aug 23, 2016 at 03:43:15PM +0200, Daniel Vetter wrote: > On Tue, Aug 23, 2016 at 2:21 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote: > > On Tue, Aug 23, 2016 at 02:05:18PM +0200, Daniel Vetter wrote: > >> On Tue, Aug 23, 2016 at 11:04:03AM +0300, Joonas Lahtinen wrote: > >> > On ti, 2016-08-23 at 08:22 +0100, Chris Wilson wrote: > >> > > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > >> > > used for the iomapped region, it itself is just PAGE_KERNEL. On all > >> > > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > >> > > refrain from using it. > >> > > > >> > > >> > There is; > >> > > >> > #define __PAGE_KERNEL_IO (__PAGE_KERNEL) > >> > > >> > So no functional change, but will compile on all archs. > >> > > >> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > >> > >> Still not happy: > >> > >> CC drivers/gpio/gpiolib-of.o > >> In file included from drivers/gpio/gpiolib-of.c:19:0: > >> ./include/linux/io-mapping.h: In function ‘io_mapping_init_wc’: > >> ./include/linux/io-mapping.h:125:16: error: implicit declaration of function ‘pgprot_writecombine’ [-Werror=implicit-function-declaration] > >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); > >> ^~~~~~~~~~~~~~~~~~~ > >> ./include/linux/io-mapping.h:125:36: error: ‘PAGE_KERNEL’ undeclared (first use in this function) > >> iomap->prot = pgprot_writecombine(PAGE_KERNEL); > >> ^~~~~~~~~~~ > > > > That was pulled in by the x86 headers, > > > > #include <asm/pgtable.h> > > Can you pls respin? Was that right? -Chris -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v2] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 13:43 ` Daniel Vetter @ 2016-08-23 15:50 ` Chris Wilson -1 siblings, 0 replies; 16+ messages in thread From: Chris Wilson @ 2016-08-23 15:50 UTC (permalink / raw) To: dri-devel Cc: intel-gfx, Chris Wilson, Daniel Vetter, Joonas Lahtinen, linux-mm PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t used for the iomapped region, it itself is just PAGE_KERNEL. On all other arches, PAGE_KERNEL_IO is undefined so in a general header we must refrain from using it. v2: include pgtable for pgprot_combine() Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Fixes: cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: linux-mm@kvack.org --- include/linux/io-mapping.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index b4c4b5c4216d..a87dd7fffc0a 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h @@ -112,7 +112,7 @@ io_mapping_unmap(void __iomem *vaddr) #else #include <linux/uaccess.h> -#include <asm/pgtable_types.h> +#include <asm/pgtable.h> /* Create the io_mapping object*/ static inline struct io_mapping * @@ -123,7 +123,7 @@ io_mapping_init_wc(struct io_mapping *iomap, iomap->base = base; iomap->size = size; iomap->iomem = ioremap_wc(base, size); - iomap->prot = pgprot_writecombine(PAGE_KERNEL_IO); + iomap->prot = pgprot_writecombine(PAGE_KERNEL); return iomap; } -- 2.9.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v2] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ @ 2016-08-23 15:50 ` Chris Wilson 0 siblings, 0 replies; 16+ messages in thread From: Chris Wilson @ 2016-08-23 15:50 UTC (permalink / raw) To: dri-devel; +Cc: linux-mm, Daniel Vetter, intel-gfx, Joonas Lahtinen PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t used for the iomapped region, it itself is just PAGE_KERNEL. On all other arches, PAGE_KERNEL_IO is undefined so in a general header we must refrain from using it. v2: include pgtable for pgprot_combine() Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Fixes: cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: linux-mm@kvack.org --- include/linux/io-mapping.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index b4c4b5c4216d..a87dd7fffc0a 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h @@ -112,7 +112,7 @@ io_mapping_unmap(void __iomem *vaddr) #else #include <linux/uaccess.h> -#include <asm/pgtable_types.h> +#include <asm/pgtable.h> /* Create the io_mapping object*/ static inline struct io_mapping * @@ -123,7 +123,7 @@ io_mapping_init_wc(struct io_mapping *iomap, iomap->base = base; iomap->size = size; iomap->iomem = ioremap_wc(base, size); - iomap->prot = pgprot_writecombine(PAGE_KERNEL_IO); + iomap->prot = pgprot_writecombine(PAGE_KERNEL); return iomap; } -- 2.9.3 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v2] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ 2016-08-23 15:50 ` Chris Wilson (?) @ 2016-08-23 16:32 ` Daniel Vetter -1 siblings, 0 replies; 16+ messages in thread From: Daniel Vetter @ 2016-08-23 16:32 UTC (permalink / raw) To: Chris Wilson Cc: dri-devel, intel-gfx, Daniel Vetter, Joonas Lahtinen, linux-mm On Tue, Aug 23, 2016 at 04:50:24PM +0100, Chris Wilson wrote: > PAGE_KERNEL_IO is an x86-ism. Though it is used to define the pgprot_t > used for the iomapped region, it itself is just PAGE_KERNEL. On all > other arches, PAGE_KERNEL_IO is undefined so in a general header we must > refrain from using it. > > v2: include pgtable for pgprot_combine() > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Fixes: cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: linux-mm@kvack.org This one seems to have worked out, applied to dinq. Thanks, Daniel > --- > include/linux/io-mapping.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h > index b4c4b5c4216d..a87dd7fffc0a 100644 > --- a/include/linux/io-mapping.h > +++ b/include/linux/io-mapping.h > @@ -112,7 +112,7 @@ io_mapping_unmap(void __iomem *vaddr) > #else > > #include <linux/uaccess.h> > -#include <asm/pgtable_types.h> > +#include <asm/pgtable.h> > > /* Create the io_mapping object*/ > static inline struct io_mapping * > @@ -123,7 +123,7 @@ io_mapping_init_wc(struct io_mapping *iomap, > iomap->base = base; > iomap->size = size; > iomap->iomem = ioremap_wc(base, size); > - iomap->prot = pgprot_writecombine(PAGE_KERNEL_IO); > + iomap->prot = pgprot_writecombine(PAGE_KERNEL); > > return iomap; > } > -- > 2.9.3 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-08-23 16:33 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-08-23 7:22 [PATCH] io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/ Chris Wilson 2016-08-23 7:22 ` Chris Wilson 2016-08-23 7:51 ` ✗ Fi.CI.BAT: failure for " Patchwork 2016-08-23 8:04 ` [PATCH] " Joonas Lahtinen 2016-08-23 8:04 ` Joonas Lahtinen 2016-08-23 12:05 ` Daniel Vetter 2016-08-23 12:05 ` Daniel Vetter 2016-08-23 12:21 ` Chris Wilson 2016-08-23 12:21 ` Chris Wilson 2016-08-23 13:43 ` Daniel Vetter 2016-08-23 13:43 ` Daniel Vetter 2016-08-23 13:54 ` Chris Wilson 2016-08-23 13:54 ` Chris Wilson 2016-08-23 15:50 ` [PATCH v2] " Chris Wilson 2016-08-23 15:50 ` Chris Wilson 2016-08-23 16:32 ` Daniel Vetter
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.