debug macro fixups

As part of the DEBUG_LL mapping changes, I ran all of the defconfigs with DEBUG_LL=y. Some of the configs are broken, so I'm posting the fixups.

mx1 is still broken, as IMX_IO_ADDRESS() (used by the mx1 debug macros) uses C syntax, and so it not suitable for asm.

These changes are on top of the DEBUG_LL mapping changes.

Cheers,

Jeremy

---
Jeremy Kerr (6):
arm/clps711x: fix debug macro compilation failure arm/h720x: fix debug macro compilation failure arm/l7200: fix debug macro compilation failure arm/plat-spear: fix debug macro compilation failure arm/ns9xxx: fix debug macro compilation failure arm/shark: fix debug macro compilation failure

We need mach/hardware.h for CLPS7111_VIRT_BASE.

---
 arch/arm/mach-clps711x/include/mach/debug-macro.S |    1 +
 1 file changed, 1 insertion(+)

index 2d61679..507c687 100644
@@ -11,6 +11,7 @@
  *
 */
 
+#include <mach/hardware.h>
 #include <asm/hardware/clps7111.h>
 
 		.macro	addruart, rp, rv

IO_BASE shoule be IO_VIRT, and IO_START should be IO_PHYS. We also need mach/hardware.h for these definitions.

---
 arch/arm/mach-h720x/include/mach/debug-macro.S |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

index 60c0c43..c2093e8 100644
@@ -11,8 +11,10 @@
  *
 */
 
-		.equ    io_virt, IO_BASE
-		.equ    io_phys, IO_START
+#include <mach/hardware.h>
+
+		.equ    io_virt, IO_VIRT
+		.equ    io_phys, IO_PHYS
 
 		.macro  addruart, rp, rv
 		mov     \rp, #0x00020000	@ UART1

We need mach/hardware.h for IO_BASE and IO_START.

---
 arch/arm/mach-l7200/include/mach/debug-macro.S |    2 ++
 1 file changed, 2 insertions(+)

index b0a2db7..31be104 100644
@@ -11,6 +11,8 @@
  *
 */
 
+#include <mach/hardware.h>
+
 		.equ	io_virt, IO_BASE
 		.equ	io_phys, IO_START
 

mov rx, =<immediate> isn't valid, use #<immediate> instead.

---
 arch/arm/plat-spear/include/plat/debug-macro.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index d922310..e91270e 100644
@@ -15,8 +15,8 @@
 #include <mach/spear.h>
 
 		.macro	addruart, rp, rv
-		mov	\rp, =SPEAR_DBG_UART_BASE		@ Physical base
-		mov	\rv, =VA_SPEAR_DBG_UART_BASE		@ Virtual base
+		mov	\rp, #SPEAR_DBG_UART_BASE		@ Physical base
+		mov	\rv, #VA_SPEAR_DBG_UART_BASE		@ Virtual base
 		.endm
 
 		.macro	senduart, rd, rx

We need mach/memory.h for NS9XXX_CSxSTAT_PHYS, and mach/memory.h needs asm/memory.h for UL().

---
 arch/arm/mach-ns9xxx/include/mach/debug-macro.S |    1 +
 arch/arm/mach-ns9xxx/include/mach/memory.h      |    2 ++
 2 files changed, 3 insertions(+)

index ae770fd..06f41f7 100644
@@ -8,6 +8,7 @@
  * the Free Software Foundation.
  */
 #include <mach/hardware.h>
+#include <mach/memory.h>
 
 #include <mach/regs-board-a9m9750dev.h>
 

index 6107193..b5bbda5 100644
@@ -11,6 +11,8 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
+#include <asm/memory.h>
+
 /* x in [0..3] */
 #define NS9XXX_CSxSTAT_PHYS(x)	UL(((x) + 4) << 28)
 

NAK. Definitely NAK. You haven't checked what includes whatelse.

asm/memory.h includes mach/memory.h to pick up the platform specific parts, and provides mach/memory.h with its pre-requisits. Use asm/memory.h _everywhere_ rather than mach/memory.h.

Doing otherwise will create include loops, which leads to unreliability in defined symbols.

I think it would be just fine to encode PHYS_OFFSET as 0xNNNNNNNNUL instead of using UL() if there is no specific reason. So we don't need to include
asm/memory.h any more in machine specific code.

No it's not. 0xNNNNNNNNUL isn't able to be parsed by the assembler. That's the whole reason for UL() existing.

We need asm/memory.h for NS9XXX_CSxSTAT_PHYS (via mach/memory.h).

---
v2: use asm/memory.h directly

---
 arch/arm/mach-ns9xxx/include/mach/debug-macro.S |    1 +
 1 file changed, 1 insertion(+)

index 0859336..5c934bd 100644
@@ -8,6 +8,7 @@
  * the Free Software Foundation.
  */
 #include <mach/hardware.h>
+#include <asm/memory.h>
 
 #include <mach/regs-board-a9m9750dev.h>
 

Ok.

We need a waituart macro.

---
 arch/arm/mach-shark/include/mach/debug-macro.S |    5 +++++
 1 file changed, 5 insertions(+)

index 269281f..3c46860 100644
@@ -21,6 +21,9 @@
 		strb	\rd, [\rx]
 		.endm
 
+		.macro waituart,rd,rx
+		.endm
+
 		.macro	busyuart,rd,rx
 		mov	\rd, #0
 1001:		add	\rd, \rd, #1

@@ -28,3 +31,5 @@
 		bne	1001b
 		.endm
 
+
+

Hi all,

Let me know if these would be better off the other way around - fixes first, then the mapping changes on top of that.

Cheers,

Jeremy

Having fixes first would be preferable indeed.

Nicolas

Hi Nicolas,

OK, done & sent. I'll hold off on re-sending the (rebased) addruart changes, as I expect there'll be more feedback on those that I can roll into one update.

Cheers,

Jeremy

Hi Jeremy,

You can use the patches from
http://thread.gmane.org/gmane.linux.ports.arm.kernel/75691 to make mx1 (and mx25) pass your tests.

baruch

                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

Apart from the two comments, the rest is fine, and should be merged in -rc. Please send the fixed patches to the patch system.

Hi Russell,

OK, done. Do you want a pull request for the 'debug maping via addruart'?

Cheers,

Jeremy