linux-next: "ARM: make mach/io.h include optional" commit breaks cm_x2xx_defconfig

Hi Rob,

If you have a moment can you check this build failure?

http://kisskb.ellerman.id.au/kisskb/buildresult/5923845/

A git bisect seems to want to blame your commit for it.

Thanks,
Paul.

---

c334bc150524f833db3c76a0aaf55fb5044444e1 is the first bad commit commit c334bc150524f833db3c76a0aaf55fb5044444e1

Author: Rob Herring <[email protected]>
Date:   Sun Mar 4 22:03:33 2012 -0600

ARM: make mach/io.h include optional

git bisect start
# good: [fde7d9049e55ab85a390be7f415d74c9f62dd0f9] Linux 3.3-rc7
git bisect good fde7d9049e55ab85a390be7f415d74c9f62dd0f9
# bad: [f355e8684f7e8e7077ca6d3988f24e01047804b6] Add linux-next specific files for 20120320
git bisect bad f355e8684f7e8e7077ca6d3988f24e01047804b6
# good: [5fe35ba6690ea0136d649cb2a07ac3f64a4c3cfb] Merge remote-tracking branch 'sound/for-next'
git bisect good 5fe35ba6690ea0136d649cb2a07ac3f64a4c3cfb
# good: [5260d60f170ebd381538dd56f6f6b765cbf9db29] Merge remote-tracking branch 'tip/auto-latest'
git bisect good 5260d60f170ebd381538dd56f6f6b765cbf9db29
# good: [2eb0aaa70022cbd3cdac7bdb610ed79a3b0c60a7] Merge remote-tracking branch 'writeback/writeback-for-next'
git bisect good 2eb0aaa70022cbd3cdac7bdb610ed79a3b0c60a7
# bad: [da7499ed07635785926c4a12915f54c61dc44170] Merge branch 'next/clk' into for-next
git bisect bad da7499ed07635785926c4a12915f54c61dc44170
# good: [eae71abd0e6d466105c66a40115907335a3e20fa] Merge branch 'next/boards' into for-next
git bisect good eae71abd0e6d466105c66a40115907335a3e20fa
# good: [cdc3df6f44f72c5924a16a47e1663c3fb0e57820] Merge branch 'dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt git bisect good cdc3df6f44f72c5924a16a47e1663c3fb0e57820
# good: [f66f9bdf6d2c2b540f73bb57bd24b886b39beb14] Merge branch 'lpc32xx/drivers' into next/drivers
git bisect good f66f9bdf6d2c2b540f73bb57bd24b886b39beb14
# good: [e5412a49eceeab5b9ecb761b536ad7ac829e1c45] Merge branch 'next/dt' into for-next
git bisect good e5412a49eceeab5b9ecb761b536ad7ac829e1c45
# good: [efa497b9ec8cc534f8883a2d1d42f52174070f38] ARM: dove: add explicit include of dove.h to addr-map.c
git bisect good efa497b9ec8cc534f8883a2d1d42f52174070f38
# bad: [accf709b39a9cdbeaf6233000ccb9af966fd691e] Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2 git bisect bad accf709b39a9cdbeaf6233000ccb9af966fd691e
# bad: [708795cd975579ba7115666f585c428f8cebd572] Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2 git bisect bad 708795cd975579ba7115666f585c428f8cebd572
# bad: [c334bc150524f833db3c76a0aaf55fb5044444e1] ARM: make mach/io.h include optional
git bisect bad c334bc150524f833db3c76a0aaf55fb5044444e1
# good: [41e32c906054be3a600cdeb69eb70350066e0a91] ARM: clps711x: remove unneeded include of mach/io.h
git bisect good 41e32c906054be3a600cdeb69eb70350066e0a91

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

From: Rob Herring <[email protected]>

pxa was missed in the moving of IOMEM to a common defintion, so lots of IOMEM redefined warnings were introduced. So remove pxa IOMEM definition and fix all the fallout.

From: Rob Herring <[email protected]>

pxa was missed in the moving of IOMEM to a common definition, so lots of IOMEM redefined warnings were introduced. So remove pxa IOMEM definition and fix all the fallout.

Reported-by Paul Gortmaker <[email protected]>

Signed-off-by Rob Herring <[email protected]>

Cc Eric Miao <[email protected]>

Cc Russell King <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Alessandro Zummo <[email protected]>

Cc Jaroslav Kysela <[email protected]>

Cc Takashi Iwai <[email protected]>

Cc [email protected]

Cc [email protected]

---
v2:
- fix my commit msg typos
- add fix for sa1100_wdt.c

I plan to send this fix thru the arm-soc tree.

Rob

 arch/arm/mach-pxa/clock-pxa2xx.c          |    1 +
 arch/arm/mach-pxa/corgi_pm.c              |    1 +
 arch/arm/mach-pxa/cpufreq-pxa3xx.c        |    1 +
 arch/arm/mach-pxa/include/mach/hardware.h |    2 --
 arch/arm/mach-pxa/mfp-pxa2xx.c            |    1 +
 arch/arm/mach-pxa/pxa2xx.c                |    1 +
 arch/arm/mach-pxa/pxa300.c                |    1 +
 arch/arm/mach-pxa/pxa320.c                |    1 +
 arch/arm/mach-pxa/sharpsl_pm.c            |    1 +
 drivers/rtc/rtc-sa1100.c                  |    1 +
 drivers/watchdog/sa1100_wdt.c             |    1 +
 sound/arm/pxa2xx-ac97-lib.c               |    1 +
 sound/arm/pxa2xx-ac97.c                   |    1 +
 sound/soc/pxa/pxa2xx-ac97.c               |    1 +
 14 files changed, 13 insertions(+), 2 deletions(-)

arch/arm/mach-pxa/clock-pxa2xx.c +1 -0

index 1d5859d..9ee2ad6 100644
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/syscore_ops.h>
 
 #include <mach/pxa2xx-regs.h>

arch/arm/mach-pxa/corgi_pm.c +1 -0

index 39e265c..048c429 100644
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/apm-emulation.h>
+#include <linux/io.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>

arch/arm/mach-pxa/cpufreq-pxa3xx.c +1 -0

index 88fbec0..b85b4ab 100644
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <mach/pxa3xx-regs.h>
 

arch/arm/mach-pxa/include/mach/hardware.h +0 -2

index 54b64ea..56d92e5 100644
@@ -40,7 +40,6 @@
 #define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))
 
 #ifndef __ASSEMBLY__
-# define IOMEM(x) ((void __iomem *)(x))
 # define __REG(x)	(*((volatile u32 __iomem *)io_p2v(x)))
 
 /* With indexed regs we don't want to feed the index through io_p2v()

@@ -52,7 +51,6 @@
 
 #else
 
-# define IOMEM(x)	x 
 # define __REG(x)	io_p2v(x)
 # define __PREG(x)	io_v2p(x)
 

arch/arm/mach-pxa/mfp-pxa2xx.c +1 -0

index f147755..b029562 100644
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/syscore_ops.h>
 
 #include <mach/pxa2xx-regs.h>

arch/arm/mach-pxa/pxa2xx.c +1 -0

index 8682704..f8ec854 100644
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <mach/pxa2xx-regs.h>

arch/arm/mach-pxa/pxa300.c +1 -0

index 40bb165..17cbc0c 100644
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 #include <mach/pxa300.h>
 

arch/arm/mach-pxa/pxa320.c +1 -0

index 8d614ec..6dc99d4 100644
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 #include <mach/pxa320.h>
 

arch/arm/mach-pxa/sharpsl_pm.c +1 -0

index 8d5168d..6d3b39f 100644
@@ -24,6 +24,7 @@
 #include <linux/leds.h>
 #include <linux/suspend.h>
 #include <linux/gpio.h>
+#include <linux/io.h>
 
 #include <asm/mach-types.h>
 #include <mach/pm.h>

drivers/rtc/rtc-sa1100.c +1 -0

index cb9a585..398ab7a 100644
@@ -30,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>

drivers/watchdog/sa1100_wdt.c +1 -0

index 0162454..a3ff321 100644
@@ -25,6 +25,7 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/bitops.h>
 #include <linux/uaccess.h>
 #include <linux/timex.h>

sound/arm/pxa2xx-ac97-lib.c +1 -0

index d1aa421..d760371 100644
@@ -17,6 +17,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/io.h>
 
 #include <sound/ac97_codec.h>
 #include <sound/pxa2xx-lib.h>

sound/arm/pxa2xx-ac97.c +1 -0

index 3a39626..afef72c 100644
@@ -11,6 +11,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 

sound/soc/pxa/pxa2xx-ac97.c +1 -0

index 837ff34..b4bfd97 100644
@@ -11,6 +11,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 

Signature · 1 line

1.7.5.4

From: Rob Herring <[email protected]>

The only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms:
ixp4xx and pxa cm_x2xx. We've been getting lucky that the define is implicitly included before dma-mapping.h, but the removal of io.h broke things (c334bc1 ARM: make mach/io.h include optional). Since memory.h is the correct place, but no longer exists, convert the define to a kconfig entry.

Reported-by Paul Gortmaker <[email protected]>

Signed-off-by Rob Herring <[email protected]>

Cc Russell King <[email protected]>

Cc Imre Kaloz <[email protected]>

Cc Krzysztof Halasa <[email protected]>

Cc Eric Miao <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Vinod Koul <[email protected]>

Cc Dan Williams <[email protected]>

---
 arch/arm/Kconfig                             |    4 ++++
 arch/arm/mach-ixp4xx/include/mach/hardware.h |    2 --
 arch/arm/mach-pxa/Kconfig                    |    1 +
 arch/arm/mach-pxa/include/mach/hardware.h    |    4 ----
 include/linux/dma-mapping.h                  |    2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

arch/arm/Kconfig +4 -0

index 31a2ddc..d3999a5 100644
@@ -180,6 +180,9 @@ config ZONE_DMA
 config NEED_DMA_MAP_STATE
        def_bool y
 
+config ARCH_HAS_DMA_SET_COHERENT_MASK
+	bool
+
 config GENERIC_ISA_DMA
 	bool
 

@@ -547,6 +550,7 @@ config ARCH_IXP2000
 config ARCH_IXP4XX
 	bool "IXP4xx-based"
 	depends on MMU
+	select ARCH_HAS_DMA_SET_COHERENT_MASK
 	select CLKSRC_MMIO
 	select CPU_XSCALE
 	select GENERIC_GPIO

arch/arm/mach-ixp4xx/include/mach/hardware.h +0 -2

index c30e7e9..034bb2a 100644
@@ -23,8 +23,6 @@
 #define PCIBIOS_MAX_MEM		0x4BFFFFFF
 #endif
 
-#define ARCH_HAS_DMA_SET_COHERENT_MASK
-
 /* Register locations and bits */
 #include "ixp4xx-regs.h"
 

arch/arm/mach-pxa/Kconfig +1 -0

index 61d3c72..109ccd2 100644
@@ -108,6 +108,7 @@ config CSB726_CSB701
 
 config MACH_ARMCORE
 	bool "CompuLab CM-X255/CM-X270 modules"
+	select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI
 	select PXA27x
 	select IWMMXT
 	select PXA25x

arch/arm/mach-pxa/include/mach/hardware.h +0 -4

index 8184669..54b64ea 100644
@@ -337,8 +337,4 @@ extern unsigned int get_memclk_frequency_10khz(void);
 extern unsigned long get_clock_tick_rate(void);
 #endif
 
-#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
-#define ARCH_HAS_DMA_SET_COHERENT_MASK
-#endif
-
 #endif  /* _ASM_ARCH_HARDWARE_H */

include/linux/dma-mapping.h +1 -1

index e13117c..5a736af 100644
@@ -77,7 +77,7 @@ static inline u64 dma_get_mask(struct device *dev)
 	return DMA_BIT_MASK(32);
 }
 
-#ifdef ARCH_HAS_DMA_SET_COHERENT_MASK
+#ifdef CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK
 int dma_set_coherent_mask(struct device *dev, u64 mask);
 #else
 static inline int dma_set_coherent_mask(struct device *dev, u64 mask)

Signature · 1 line

1.7.5.4

Quoted 9 lines · Rob Herring

From: Rob Herring <[email protected]>

The only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms:
ixp4xx and pxa cm_x2xx. We've been getting lucky that the define is implicitly included before dma-mapping.h, but the removal of io.h broke things (c334bc1 ARM: make mach/io.h include optional). Since memory.h is the correct place, but no longer exists, convert the define to a kconfig entry.

Quoted 9 lines

Reported-by Paul Gortmaker <[email protected]>

Signed-off-by Rob Herring <[email protected]>

Cc Russell King <[email protected]>

Cc Imre Kaloz <[email protected]>

Cc Krzysztof Halasa <[email protected]>

Cc Eric Miao <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Vinod Koul <[email protected]>

Cc Dan Williams <[email protected]>

Acked-by Nicolas Pitre <[email protected]>

Quoted 21 lines · Nicolas Pitre

Quoted 18 lines · Rob Herring

From: Rob Herring <[email protected]>

The only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms:
ixp4xx and pxa cm_x2xx. We've been getting lucky that the define is implicitly included before dma-mapping.h, but the removal of io.h broke things (c334bc1 ARM: make mach/io.h include optional). Since memory.h is the correct place, but no longer exists, convert the define to a kconfig entry.

Reported-by Paul Gortmaker <[email protected]>

Signed-off-by Rob Herring <[email protected]>

Cc Russell King <[email protected]>

Cc Imre Kaloz <[email protected]>

Cc Krzysztof Halasa <[email protected]>

Cc Eric Miao <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Vinod Koul <[email protected]>

Cc Dan Williams <[email protected]>

Quoted 2 lines

Acked-by Nicolas Pitre <[email protected]>

Acked.

Imre & Krzysztof,

Do you mind that I merge these patches into arch-pxa git tree? Since a lot of files in arch-pxa are changed.

Quoted 28 lines · Haojian Zhuang

Quoted 21 lines · Nicolas Pitre

Quoted 9 lines · Rob Herring

From: Rob Herring <[email protected]>

The only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms:
ixp4xx and pxa cm_x2xx. We've been getting lucky that the define is implicitly included before dma-mapping.h, but the removal of io.h broke things (c334bc1 ARM: make mach/io.h include optional). Since memory.h is the correct place, but no longer exists, convert the define to a kconfig entry.

Quoted 9 lines

Reported-by Paul Gortmaker <[email protected]>

Signed-off-by Rob Herring <[email protected]>

Cc Russell King <[email protected]>

Cc Imre Kaloz <[email protected]>

Cc Krzysztof Halasa <[email protected]>

Cc Eric Miao <[email protected]>

Cc Haojian Zhuang <[email protected]>

Cc Vinod Koul <[email protected]>

Cc Dan Williams <[email protected]>

Quoted 2 lines

Acked-by Nicolas Pitre <[email protected]>

Acked.

Imre & Krzysztof,

Quoted 3 lines

Do you mind that I merge these patches into arch-pxa git tree? Since a lot of files in arch-pxa are changed.

I plan to send these 2 along with another fix to arm-soc if that's okay.

Rob