Skip to contentSkip to conversation

Allow late mdesc detection, v5

PATCH New Jeremy Kerr 5 participants 10 messages Sep 1, 2010 – Oct 19, 2010

Subsystems (21)
lore
Share & tools
lore
#0 lore raw

cover Allow late mdesc detection, v5

Hi all,

Currently, we probe for a mdesc early in boot. At this early stage, the only thing we use the mdesc for is to determine the debug page mapping.

However, the debug addresses (phys and virt) need to be coded into the addruart macro anyway; the dynamic probing is only going to tell us what we already know.

These changes allow us to use the addruart macros to find the debug mapping addresses, rather than pulling them out of the mdesc. This means that the addresses are only kept in the one place, and that we don't need the mdesc nearly as early.

The first change updates all of the addruart macros to return both physical and virtual addresses. I've used 'rp' and 'rv' as the macro arguments to indicate which address goes where

The second change updates the debug setup routine to use the addruart macro to establish the debug mapping, now that we can invoke the macro to find the phyical and virtual addresses.

This allows us to delay the requirement to have a mdesc available until much later. For example, we can parse one from the device tree once we've reached C code.

As they have more complex and/or new debug macros, the following platforms could do with extra testing:
* omap (mach-omap1 and mach-omap2)
* davinci (done, thanks Kevin)
* tegra

Cheers,

Jeremy

v5:
* Add handing for !CONFIG_MMU

v4:
* updates for 2.6.36
* add changes for tegra
* update davinci
* include fixes for omap[12]
* drop mdesc changes

v3:
* only establish page mapping if !DEBUG_ICEDCC

v2:
* return both phys and virt addresses from addruart
* mask unneeded bits from uart physical address in mapping setup
* remove io_pg_offst and phys_io, in a separate patch

---
Jeremy Kerr (3):
arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
arm: return both physical and virtual addresses from addruart
arm: use addruart macro to establish debug mappings

#1 lore raw

PATCH 1/3 arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC

We have the same (empty) macro for all IDEDCC flavours, so consolidate it to one.

---
 arch/arm/kernel/debug.S |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
arch/arm/kernel/debug.S +2 -11
index a38b487..f913952 100644
@@ -22,11 +22,11 @@
 #if defined(CONFIG_DEBUG_ICEDCC)
 		@@ debug using ARM EmbeddedICE DCC channel
 
-#if defined(CONFIG_CPU_V6)
-
 		.macro	addruart, rx, tmp
 		.endm
 
+#if defined(CONFIG_CPU_V6)
+
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c0, c5, 0
 		.endm
@@ -51,9 +51,6 @@
 
 #elif defined(CONFIG_CPU_V7)
 
-		.macro	addruart, rx, tmp
-		.endm
-
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c0, c5, 0
 		.endm
@@ -71,9 +68,6 @@ wait:		mrc	p14, 0, pc, c0, c1, 0
 
 #elif defined(CONFIG_CPU_XSCALE)
 
-		.macro	addruart, rx, tmp
-		.endm
-
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c8, c0, 0
 		.endm
@@ -98,9 +92,6 @@ wait:		mrc	p14, 0, pc, c0, c1, 0
 
 #else
 
-		.macro	addruart, rx, tmp
-		.endm
-
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c1, c0, 0
 		.endm
#2 lore raw

PATCH 2/3 arm: return both physical and virtual addresses from addruart

In reply to Jeremy Kerr

Rather than checking the MMU status in every instance of addruart, do it once in kernel/debug.S, and change the existing addruart macros to return both physical and virtual addresses. The main debug code can then select the appropriate address to use.

This will also allow us to retreive the address of a uart for the MMU state that we're not current in.

Updated with fixes for OMAP from Jason Wang <[email protected]> and Tony Lindgren <[email protected]>, and fix for versatile express from Lorenzo Pieralisi <[email protected]>.

---
 arch/arm/kernel/debug.S                             |   22 +-
 arch/arm/mach-aaec2000/include/mach/debug-macro.S   |   10 
 arch/arm/mach-at91/include/mach/debug-macro.S       |    8 
 arch/arm/mach-clps711x/include/mach/debug-macro.S   |   12 -
 arch/arm/mach-cns3xxx/include/mach/debug-macro.S    |   10 
 arch/arm/mach-davinci/include/mach/debug-macro.S    |   46 ++--
 arch/arm/mach-dove/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-ebsa110/include/mach/debug-macro.S    |    7 
 arch/arm/mach-ep93xx/include/mach/debug-macro.S     |   11 -
 arch/arm/mach-footbridge/include/mach/debug-macro.S |   22 --
 arch/arm/mach-gemini/include/mach/debug-macro.S     |    8 
 arch/arm/mach-h720x/include/mach/debug-macro.S      |   10 
 arch/arm/mach-integrator/include/mach/debug-macro.S |   10 
 arch/arm/mach-iop13xx/include/mach/debug-macro.S    |   16 -
 arch/arm/mach-iop32x/include/mach/debug-macro.S     |    7 
 arch/arm/mach-iop33x/include/mach/debug-macro.S     |   12 -
 arch/arm/mach-ixp2000/include/mach/debug-macro.S    |   14 -
 arch/arm/mach-ixp23xx/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-ixp4xx/include/mach/debug-macro.S     |   16 -
 arch/arm/mach-kirkwood/include/mach/debug-macro.S   |   11 -
 arch/arm/mach-ks8695/include/mach/debug-macro.S     |    8 
 arch/arm/mach-l7200/include/mach/debug-macro.S      |   38 +++
 arch/arm/mach-lh7a40x/include/mach/debug-macro.S    |   10 
 arch/arm/mach-loki/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-mmp/include/mach/debug-macro.S        |   11 -
 arch/arm/mach-msm/include/mach/debug-macro.S        |   10 
 arch/arm/mach-mv78xx0/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-netx/include/mach/debug-macro.S       |   10 
 arch/arm/mach-nomadik/include/mach/debug-macro.S    |   12 -
 arch/arm/mach-ns9xxx/include/mach/debug-macro.S     |    8 
 arch/arm/mach-omap1/include/mach/debug-macro.S      |   68 +++---
 arch/arm/mach-omap2/include/mach/debug-macro.S      |  127 +++++-------
 arch/arm/mach-orion5x/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-pnx4008/include/mach/debug-macro.S    |   10 
 arch/arm/mach-pxa/include/mach/debug-macro.S        |   10 
 arch/arm/mach-realview/include/mach/debug-macro.S   |   10 
 arch/arm/mach-rpc/include/mach/debug-macro.S        |   12 -
 arch/arm/mach-s3c2410/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-s3c24a0/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-s3c64xx/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-s5p6440/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-s5p6442/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-s5pc100/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-s5pv210/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-sa1100/include/mach/debug-macro.S     |   36 +--
 arch/arm/mach-shark/include/mach/debug-macro.S      |    7 
 arch/arm/mach-tegra/include/mach/debug-macro.S      |   26 +-
 arch/arm/mach-u300/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-ux500/include/mach/debug-macro.S      |    8 
 arch/arm/mach-versatile/include/mach/debug-macro.S  |   12 -
 arch/arm/mach-vexpress/include/mach/debug-macro.S   |   10 
 arch/arm/plat-mxc/include/mach/debug-macro.S        |    8 
 arch/arm/plat-spear/include/plat/debug-macro.S      |    8 
 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S   |   11 -
 54 files changed, 432 insertions(+), 433 deletions(-)
arch/arm/kernel/debug.S +19 -3
index f913952..a0f0752 100644
@@ -22,7 +22,7 @@
 #if defined(CONFIG_DEBUG_ICEDCC)
 		@@ debug using ARM EmbeddedICE DCC channel
 
-		.macro	addruart, rx, tmp
+		.macro	addruart, rp, rv
 		.endm
 
 #if defined(CONFIG_CPU_V6)
@@ -121,6 +121,22 @@ wait:		mrc	p14, 0, pc, c0, c1, 0
 #include <mach/debug-macro.S>
 #endif	/* CONFIG_DEBUG_ICEDCC */
 
+#ifdef CONFIG_MMU
+		.macro	addruart_current, rx, tmp1, tmp2
+		addruart	\tmp1, \tmp2
+		mrc		p15, 0, \rx, c1, c0
+		tst		\rx, #1
+		moveq		\rx, \tmp1
+		movne		\rx, \tmp2
+		.endm
+
+#else /* !CONFIG_MMU */
+		.macro	addruart_current, rx, tmp1, tmp2
+		addruart	\rx, \tmp1
+		.endm
+
+#endif /* CONFIG_MMU */
+
 /*
  * Useful debugging routines
  */
@@ -155,7 +171,7 @@ ENDPROC(printhex2)
 		.ltorg
 
 ENTRY(printascii)
-		addruart r3, r1
+		addruart_current r3, r1, r2
 		b	2f
 1:		waituart r2, r3
 		senduart r1, r3
@@ -171,7 +187,7 @@ ENTRY(printascii)
 ENDPROC(printascii)
 
 ENTRY(printch)
-		addruart r3, r1
+		addruart_current r3, r1, r2
 		mov	r1, r0
 		mov	r0, #0
 		b	1b
arch/arm/mach-aaec2000/include/mach/debug-macro.S +4 -6
index a9cac36..bc7ad55 100644
@@ -10,12 +10,10 @@
  */
 
 #include "hardware.h"
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x80000000		@ physical
-		movne	\rx, #io_p2v(0x80000000)	@ virtual
-		orr	\rx, \rx, #0x00000800
+		.macro	addruart, rp, rv
+		mov	\rp, 0x00000800
+		orr	\rv, \rp, #io_p2v(0x80000000)	@ virtual
+		orr	\rp, \rp, #0x80000000		@ physical
 		.endm
 
 		.macro	senduart,rd,rx
arch/arm/mach-at91/include/mach/debug-macro.S +3 -5
index 9e750a1..0f959fa 100644
@@ -14,11 +14,9 @@
 #include <mach/hardware.h>
 #include <mach/at91_dbgu.h>
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1						@ MMU enabled?
-	ldreq	\rx, =(AT91_BASE_SYS + AT91_DBGU)		@ System peripherals (phys address)
-	ldrne	\rx, =(AT91_VA_BASE_SYS	+ AT91_DBGU)		@ System peripherals (virt address)
+	.macro	addruart, rp, rv
+	ldr	\rp, =(AT91_BASE_SYS + AT91_DBGU)		@ System peripherals (phys address)
+	ldr	\rv, =(AT91_VA_BASE_SYS	+ AT91_DBGU)		@ System peripherals (virt address)
 	.endm
 
 	.macro	senduart,rd,rx
arch/arm/mach-clps711x/include/mach/debug-macro.S +5 -7
index 072cc6b..507c687 100644
@@ -14,16 +14,14 @@
 #include <mach/hardware.h>
 #include <asm/hardware/clps7111.h>
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #CLPS7111_PHYS_BASE
-		movne	\rx, #CLPS7111_VIRT_BASE
+		.macro	addruart, rp, rv
 #ifndef CONFIG_DEBUG_CLPS711X_UART2
-		add	\rx, \rx, #0x0000	@ UART1
+		mov	\rp, #0x0000	@ UART1
 #else
-		add	\rx, \rx, #0x1000	@ UART2
+		mov	\rp, #0x1000	@ UART2
 #endif
+		orr	\rv, \rp, #CLPS7111_VIRT_BASE
+		orr	\rp, \rp, #CLPS7111_PHYS_BASE
 		.endm
 
 		.macro	senduart,rd,rx
arch/arm/mach-cns3xxx/include/mach/debug-macro.S +4 -6
index d16ce7e..56d8286 100644
@@ -10,12 +10,10 @@
  * published by the Free Software Foundation.
  */
 
-		.macro	addruart,rx
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx,      #0x10000000
-		movne	\rx,      #0xf0000000	@ virtual base
-		orr	\rx, \rx, #0x00009000
+		.macro	addruart,rp,rv
+		mov	\rp, #0x00009000
+		orr	\rv, \rp, #0xf0000000	@ virtual base
+		orr	\rp, \rp, #0x10000000
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-davinci/include/mach/debug-macro.S +25 -21

60 lines not on this page · raw message

arch/arm/mach-dove/include/mach/debug-macro.S +5 -6
index 1521d13..da8bf2b 100644
@@ -8,12 +8,11 @@
 
 #include <mach/bridge-regs.h>
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =DOVE_SB_REGS_PHYS_BASE
-	ldrne	\rx, =DOVE_SB_REGS_VIRT_BASE
-	orr	\rx, \rx, #0x00012000
+	.macro	addruart, rp, rv
+	ldr	\rp, =DOVE_SB_REGS_PHYS_BASE
+	ldr	\rv, =DOVE_SB_REGS_VIRT_BASE
+	orr	\rp, \rp, #0x00012000
+	orr	\rv, \rv, #0x00012000
 	.endm
 
 #define UART_SHIFT	2
arch/arm/mach-ebsa110/include/mach/debug-macro.S +4 -3
index ebbd89f..7ef5690 100644
@@ -11,9 +11,10 @@
  *
 **/
 
-		.macro	addruart, rx, tmp
-		mov	\rx, #0xf0000000
-		orr	\rx, \rx, #0x00000be0
+		.macro	addruart, rp, rv
+		mov	\rp, #0xf0000000
+		orr	\rp, \rp, #0x00000be0
+		mov	\rp, \rv
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-ep93xx/include/mach/debug-macro.S +5 -6
index 5cd2244..b25bc90 100644
@@ -11,12 +11,11 @@
  */
 #include <mach/ep93xx-regs.h>
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1				@ MMU enabled?
-		ldreq	\rx, =EP93XX_APB_PHYS_BASE	@ Physical base
-		ldrne	\rx, =EP93XX_APB_VIRT_BASE	@ virtual base
-		orr	\rx, \rx, #0x000c0000
+		.macro	addruart, rp, rv
+		ldr	\rp, =EP93XX_APB_PHYS_BASE	@ Physical base
+		ldr	\rv, =EP93XX_APB_VIRT_BASE	@ virtual base
+		orr	\rp, \rp, #0x000c0000
+		orr	\rv, \rv, #0x000c0000
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-footbridge/include/mach/debug-macro.S +10 -12
index 60dda13..3c9e0c4 100644
@@ -15,12 +15,10 @@
 
 #ifndef CONFIG_DEBUG_DC21285_PORT
 	/* For NetWinder debugging */
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x7c000000	@ physical
-		movne	\rx, #0xff000000	@ virtual
-		orr	\rx, \rx, #0x000003f8
+		.macro	addruart, rp, rv
+		mov	\rp, #0x000003f8
+		orr	\rv, \rp, #0x7c000000	@ physical
+		orr	\rp, \rp, #0xff000000	@ virtual
 		.endm
 
 #define UART_SHIFT	0
@@ -32,14 +30,14 @@
 		.equ	dc21285_high, ARMCSR_BASE & 0xff000000
 		.equ	dc21285_low,  ARMCSR_BASE & 0x00ffffff
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x42000000
-		movne	\rx, #dc21285_high
+		.macro	addruart, rp, rv
 		.if	dc21285_low
-		orrne	\rx, \rx, #dc21285_low
+		mov	\rp, #dc21285_low
+		.else
+		mov	\rp, #0
 		.endif
+		orr	\rv, \rp, #0x42000000
+		orr	\rp, \rp, #dc21285_high
 		.endm
 
 		.macro	senduart,rd,rx
arch/arm/mach-gemini/include/mach/debug-macro.S +3 -5
index ad47704..f40e006 100644
@@ -11,11 +11,9 @@
  */
 #include <mach/hardware.h>
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =GEMINI_UART_BASE			@ physical
-	ldrne	\rx, =IO_ADDRESS(GEMINI_UART_BASE)	@ virtual
+	.macro	addruart, rp, rv
+	ldr	\rp, =GEMINI_UART_BASE			@ physical
+	ldr	\rv, =IO_ADDRESS(GEMINI_UART_BASE)	@ virtual
 	.endm
 
 #define UART_SHIFT	2
arch/arm/mach-h720x/include/mach/debug-macro.S +4 -6
index 27cafd1..c2093e8 100644
@@ -16,12 +16,10 @@
 		.equ    io_virt, IO_VIRT
 		.equ    io_phys, IO_PHYS
 
-		.macro  addruart, rx, tmp
-		mrc     p15, 0, \rx, c1, c0
-		tst     \rx, #1  	       @ MMU enabled?
-		moveq   \rx, #io_phys	       @ physical base address
-		movne   \rx, #io_virt	       @ virtual address
-		add     \rx, \rx, #0x00020000   @ UART1
+		.macro  addruart, rp, rv
+		mov     \rp, #0x00020000	@ UART1
+		add     \rv, \rp, #io_virt	@ virtual address
+		add     \rp, \rp, #io_phys	@ physical base address
 		.endm
 
 		.macro  senduart,rd,rx
arch/arm/mach-integrator/include/mach/debug-macro.S +4 -6
index 87a6888..a1f598f 100644
@@ -11,12 +11,10 @@
  *
 */
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x16000000	@ physical base address
-		movne	\rx, #0xf0000000	@ virtual base
-		addne	\rx, \rx, #0x16000000 >> 4
+		.macro	addruart, rp, rv
+		mov	\rp, #0x16000000	@ physical base address
+		mov	\rv, #0xf0000000	@ virtual base
+		add	\rv, \rv, #0x16000000 >> 4
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-iop13xx/include/mach/debug-macro.S +7 -9
index c9d6ba4..e664466 100644
@@ -11,15 +11,13 @@
  * published by the Free Software Foundation.
  */
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1			@ mmu enabled?
-	moveq	\rx, #0xff000000	@ physical
-	orreq	\rx, \rx, #0x00d80000
-	movne	\rx, #0xfe000000	@ virtual
-	orrne	\rx, \rx, #0x00e80000
-	orr	\rx, \rx, #0x00002300
-	orr	\rx, \rx, #0x00000040
+	.macro	addruart, rp, rv
+	mov	\rp, #0x00002300
+	orr	\rp, \rp, #0x00000040
+	orr	\rv, \rp, #0xfe000000	@ virtual
+	orr	\rv, \rv, #0x00e80000
+	orr	\rp, \rp, #0xff000000	@ physical
+	orr	\rp, \rp, #0x00d80000
 	.endm
 
 #define UART_SHIFT	2
arch/arm/mach-iop32x/include/mach/debug-macro.S +4 -3
index 736afe1..ff9e76c 100644
@@ -11,9 +11,10 @@
  * published by the Free Software Foundation.
  */
 
-		.macro	addruart, rx, tmp
-		mov	\rx, #0xfe000000	@ physical as well as virtual
-		orr	\rx, \rx, #0x00800000	@ location of the UART
+		.macro	addruart, rp, rv
+		mov	\rp, #0xfe000000	@ physical as well as virtual
+		orr	\rp, \rp, #0x00800000	@ location of the UART
+		mov	\rv, \rp
 		.endm
 
 #define UART_SHIFT	0
arch/arm/mach-iop33x/include/mach/debug-macro.S +5 -7
index addb2da..40c500d 100644
@@ -11,13 +11,11 @@
  * published by the Free Software Foundation.
  */
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ mmu enabled?
-		moveq	\rx, #0xff000000	@ physical
-		movne	\rx, #0xfe000000	@ virtual
-		orr	\rx, \rx, #0x00ff0000
-		orr	\rx, \rx, #0x0000f700
+		.macro	addruart, rp, rv
+		mov	\rp, #0x00ff0000
+		orr	\rp, \rp, #0x0000f700
+		orr	\rv, #0xfe000000	@ virtual
+		orr	\rp, #0xff000000	@ physical
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-ixp2000/include/mach/debug-macro.S +6 -8
index 6a82768..0ef533b 100644
@@ -11,16 +11,14 @@
  *
 */
 
-		.macro  addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0xc0000000	@ Physical base
-		movne	\rx, #0xfe000000	@ virtual base
-		orrne	\rx, \rx, #0x00f00000
-		orr	\rx, \rx, #0x00030000
+		.macro  addruart, rp, rv
+		mov	\rp, #0x00030000
 #ifdef	__ARMEB__
-		orr	\rx, \rx, #0x00000003
+		orr	\rp, \rp, #0x00000003
 #endif
+		orr	\rv, \rp, #0xfe000000	@ virtual base
+		orr	\rv, \rv, #0x00f00000
+		orr	\rp, \rp, #0xc0000000	@ Physical base
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-ixp23xx/include/mach/debug-macro.S +5 -6
index a82e375..f7c6eef 100644
@@ -12,13 +12,12 @@
  */
 #include <mach/ixp23xx.h>
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1				@ mmu enabled?
-		ldreq	\rx, =IXP23XX_PERIPHERAL_PHYS 	@ physical
-		ldrne	\rx, =IXP23XX_PERIPHERAL_VIRT	@ virtual
+		.macro	addruart, rp, rv
+		ldr	\rp, =IXP23XX_PERIPHERAL_PHYS 	@ physical
+		ldr	\rv, =IXP23XX_PERIPHERAL_VIRT	@ virtual
 #ifdef __ARMEB__
-		orr	\rx, \rx, #0x00000003
+		orr	\rp, \rp, #0x00000003
+		orr	\rv, \rv, #0x00000003
 #endif
 		.endm
 
arch/arm/mach-ixp4xx/include/mach/debug-macro.S +8 -8
index 3fc66d6..b974a49 100644
@@ -10,16 +10,16 @@
  * published by the Free Software Foundation.
 */
 
-                .macro  addruart, rx, tmp
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0xc8000000
-                movne   \rx, #0xff000000
-		orrne	\rx, \rx, #0x00b00000
+                .macro  addruart, rp, rv
 #ifdef __ARMEB__
-                add     \rx,\rx,#3              @ Uart regs are at off set of 3 if
-						@ byte writes used - Big Endian.
+                mov     \rp, #3         @ Uart regs are at off set of 3 if
+					@ byte writes used - Big Endian.
+#else
+		mov	\rp, #0
 #endif
+                orr     \rv, \rp, #0xff000000	@ virtual
+		orr	\rv, \rv, #0x00b00000
+                orr     \rp, \rp, #0xc8000000	@ physical
                 .endm
 
 #define UART_SHIFT	2
arch/arm/mach-kirkwood/include/mach/debug-macro.S +5 -6
index d060677..db06ae4 100644
@@ -8,12 +8,11 @@
 
 #include <mach/bridge-regs.h>
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =KIRKWOOD_REGS_PHYS_BASE
-	ldrne	\rx, =KIRKWOOD_REGS_VIRT_BASE
-	orr	\rx, \rx, #0x00012000
+	.macro	addruart, rp, rv
+	ldr	\rp, =KIRKWOOD_REGS_PHYS_BASE
+	ldr	\rv, =KIRKWOOD_REGS_VIRT_BASE
+	orr	\rp, \rp, #0x00012000
+	orr	\rv, \rv, #0x00012000
 	.endm
 
 #define UART_SHIFT	2
arch/arm/mach-ks8695/include/mach/debug-macro.S +3 -5
index cf2095d..bf516ad 100644
@@ -14,11 +14,9 @@
 #include <mach/hardware.h>
 #include <mach/regs-uart.h>
 
-	.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1				@ MMU enabled?
-		ldreq	\rx, =KS8695_UART_PA		@ physical base address
-		ldrne	\rx, =KS8695_UART_VA		@ virtual base address
+	.macro	addruart, rp, rv
+		ldr	\rp, =KS8695_UART_PA		@ physical base address
+		ldr	\rv, =KS8695_UART_VA		@ virtual base address
 	.endm
 
 	.macro	senduart, rd, rx
arch/arm/mach-l7200/include/mach/debug-macro.S new file +38 -0
new file mode 100644
index 0000000..b0a2db7
@@ -0,0 +1,38 @@
+/* arch/arm/mach-l7200/include/mach/debug-macro.S
+ *
+ * Debugging macro include header
+ *
+ *  Copyright (C) 1994-1999 Russell King
+ *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+*/
+
+		.equ	io_virt, IO_BASE
+		.equ	io_phys, IO_START
+
+		.macro	addruart, rp, rv
+		mov	\rp, #0x00044000	@ UART1
+@		mov	\rp, #0x00045000	@ UART2
+		add	\rv, \rp, #io_virt	@ virtual address
+		add	\rp, \rp, #io_phys	@ physical base address
+		.endm
+
+		.macro	senduart,rd,rx
+		str	\rd, [\rx, #0x0]	@ UARTDR
+		.endm
+
+		.macro	waituart,rd,rx
+1001:		ldr	\rd, [\rx, #0x18]	@ UARTFLG
+		tst	\rd, #1 << 5		@ UARTFLGUTXFF - 1 when full
+		bne	1001b
+		.endm
+
+		.macro	busyuart,rd,rx
+1001:		ldr	\rd, [\rx, #0x18]	@ UARTFLG
+		tst	\rd, #1 << 3		@ UARTFLGUBUSY - 1 when busy
+		bne	1001b
+		.endm
arch/arm/mach-lh7a40x/include/mach/debug-macro.S +4 -6
index c0dcbbb..cff3362 100644
@@ -14,12 +14,10 @@
 	@ It is not known if this will be appropriate for every 40x
 	@ board.
 
-		.macro  addruart, rx, tmp
-		mrc     p15, 0, \rx, c1, c0
-		tst     \rx, #1                 @ MMU enabled?
-		mov     \rx, #0x00000700        @ offset from base
-		orreq   \rx, \rx, #0x80000000   @ physical base
-		orrne   \rx, \rx, #0xf8000000   @ virtual base
+		.macro  addruart, rp, rv
+		mov     \rp, #0x00000700        @ offset from base
+		orr     \rv, \rp, #0xf8000000   @ virtual base
+		orr     \rp, \rp, #0x80000000   @ physical base
 		.endm
 
 		.macro  senduart,rd,rx
arch/arm/mach-loki/include/mach/debug-macro.S +5 -6
index 3136c91..cc90d99 100644
@@ -8,12 +8,11 @@
 
 #include <mach/loki.h>
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =LOKI_REGS_PHYS_BASE
-	ldrne	\rx, =LOKI_REGS_VIRT_BASE
-	orr	\rx, \rx, #0x00012000
+	.macro	addruart, rp, rv
+	ldr	\rp, =LOKI_REGS_PHYS_BASE
+	ldr	\rv, =LOKI_REGS_VIRT_BASE
+	orr	\rp, \rp, #0x00012000
+	orr	\rv, \rv, #0x00012000
 	.endm
 
 #define UART_SHIFT	2
arch/arm/mach-mmp/include/mach/debug-macro.S +5 -6
index 76deff2..7e2ebd3 100644
@@ -11,12 +11,11 @@
 
 #include <mach/addr-map.h>
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1				@ MMU enabled?
-		ldreq	\rx, =APB_PHYS_BASE		@ physical
-		ldrne	\rx, =APB_VIRT_BASE		@ virtual
-		orr	\rx, \rx, #0x00017000
+		.macro	addruart, rp, rv
+		ldr	\rp, =APB_PHYS_BASE		@ physical
+		ldr	\rv, =APB_VIRT_BASE		@ virtual
+		orr	\rp, \rp, #0x00017000
+		orr	\rv, \rv, #0x00017000
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-msm/include/mach/debug-macro.S +4 -6
index 528750f..3c35b0d 100644
@@ -20,12 +20,10 @@
 #include <mach/msm_iomap.h>
 
 #ifdef CONFIG_MSM_DEBUG_UART
-	.macro	addruart, rx, tmp
+	.macro	addruart, rp, rv
 	@ see if the MMU is enabled and select appropriate base address
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1
-	ldreq	\rx, =MSM_DEBUG_UART_PHYS
-	ldrne	\rx, =MSM_DEBUG_UART_BASE
+	ldr	\rp, =MSM_DEBUG_UART_PHYS
+	ldr	\rv, =MSM_DEBUG_UART_BASE
 	.endm
 
 	.macro	senduart,rd,rx
@@ -40,7 +38,7 @@
 	beq	1001b
 	.endm
 #else
-	.macro	addruart, rx, tmp
+	.macro	addruart, rp, rv
 	.endm
 
 	.macro	senduart,rd,rx
arch/arm/mach-mv78xx0/include/mach/debug-macro.S +5 -6
index cd81689..0489142 100644
@@ -8,12 +8,11 @@
 
 #include <mach/mv78xx0.h>
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =MV78XX0_REGS_PHYS_BASE
-	ldrne	\rx, =MV78XX0_REGS_VIRT_BASE
-	orr	\rx, \rx, #0x00012000
+	.macro	addruart, rp, rv
+	ldr	\rp, =MV78XX0_REGS_PHYS_BASE
+	ldr	\rv, =MV78XX0_REGS_VIRT_BASE
+	orr	\rp, \rp, #0x00012000
+	orr	\rv, \rv, #0x00012000
 	.endm
 
 #define UART_SHIFT	2
arch/arm/mach-netx/include/mach/debug-macro.S +4 -6
index e96339e..56a9152 100644
@@ -13,12 +13,10 @@
 
 #include "hardware.h"
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x00100000		@ physical
-		movne	\rx, #io_p2v(0x00100000)	@ virtual
-		orr	\rx, \rx, #0x00000a00
+		.macro	addruart, rp, rv
+		mov	\rp, #0x00000a00
+		orr	\rv, \rp, #io_p2v(0x00100000)	@ virtual
+		orr	\rp, \rp, #0x00100000		@ physical
 		.endm
 
 		.macro	senduart,rd,rx
arch/arm/mach-nomadik/include/mach/debug-macro.S +5 -7
index 4f92acf..e7151b4 100644
@@ -10,13 +10,11 @@
  *
 */
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x10000000	@ physical base address
-		movne	\rx, #0xf0000000	@ virtual base
-		add	\rx, \rx, #0x00100000
-		add	\rx, \rx, #0x000fb000
+		.macro	addruart, rp, rv
+		mov	\rp, #0x00100000
+		add	\rp, \rp, #0x000fb000
+		add	\rv, \rp, #0xf0000000	@ virtual base
+		add	\rp, \rp, #0x10000000	@ physical base address
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-ns9xxx/include/mach/debug-macro.S +3 -5
index 5c934bd..5a2acbd 100644
@@ -12,11 +12,9 @@
 
 #include <mach/regs-board-a9m9750dev.h>
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, =NS9XXX_CSxSTAT_PHYS(0)
-		ldrne	\rx, =io_p2v(NS9XXX_CSxSTAT_PHYS(0))
+		.macro	addruart, rp, rv
+		ldr	\rp, =NS9XXX_CSxSTAT_PHYS(0)
+		ldr	\rv, =io_p2v(NS9XXX_CSxSTAT_PHYS(0))
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-omap1/include/mach/debug-macro.S +35 -33

91 lines not on this page · raw message

arch/arm/mach-omap2/include/mach/debug-macro.S +63 -64

167 lines not on this page · raw message

arch/arm/mach-orion5x/include/mach/debug-macro.S +5 -6
index 91e0e39..5e3bf5b 100644
@@ -10,12 +10,11 @@
 
 #include <mach/orion5x.h>
 
-	.macro  addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =ORION5X_REGS_PHYS_BASE
-	ldrne	\rx, =ORION5X_REGS_VIRT_BASE
-	orr	\rx, \rx, #0x00012000
+	.macro  addruart, rp, rv
+	ldr	\rp, =ORION5X_REGS_PHYS_BASE
+	ldr	\rv, =ORION5X_REGS_VIRT_BASE
+	orr	\rp, \rp, #0x00012000
+	orr	\rv, \rv, #0x00012000
 	.endm
 
 #define UART_SHIFT	2
arch/arm/mach-pnx4008/include/mach/debug-macro.S +4 -6
index 6ca8bd3..931afeb 100644
@@ -11,12 +11,10 @@
  *
 */
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		mov	\rx, #0x00090000
-		addeq	\rx, \rx, #0x40000000
-		addne	\rx, \rx, #0xf4000000
+		.macro	addruart, rp, rv
+		mov	\rp, #0x00090000
+		add	\rv, \rp, #0xf4000000	@ virtual
+		add	\rp, \rp, #0x40000000	@ physical
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-pxa/include/mach/debug-macro.S +4 -6
index 01cf813..7d5c751 100644
@@ -13,12 +13,10 @@
 
 #include "hardware.h"
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x40000000		@ physical
-		movne	\rx, #io_p2v(0x40000000)	@ virtual
-		orr	\rx, \rx, #0x00100000
+		.macro	addruart, rp, rv
+		mov	\rp, #0x00100000
+		orr	\rv, \rp, #io_p2v(0x40000000)	@ virtual
+		orr	\rp, \rp, #0x40000000		@ physical
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-realview/include/mach/debug-macro.S +4 -6
index 8662228..90b687c 100644
@@ -33,12 +33,10 @@
 #error "Unknown RealView platform"
 #endif
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx,      #0x10000000
-		movne	\rx,      #0xfb000000	@ virtual base
-		orr	\rx, \rx, #DEBUG_LL_UART_OFFSET
+		.macro	addruart, rp, rv
+		mov	\rp, #DEBUG_LL_UART_OFFSET
+		orr	\rv, \rp, #0xfb000000	@ virtual base
+		orr	\rp, \rp, #0x10000000	@ physical base
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-rpc/include/mach/debug-macro.S +5 -7
index 6fc8d66..85effff 100644
@@ -11,13 +11,11 @@
  *
 */
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x03000000
-		movne	\rx, #0xe0000000
-		orr	\rx, \rx, #0x00010000
-		orr	\rx, \rx, #0x00000fe0
+		.macro	addruart, rp, rv
+		mov	\rp, #0x00010000
+		orr	\rp, \rp, #0x00000fe0
+		orr	\rv, \rp, #0xe0000000	@ virtual
+		orr	\rp, \rp, #0x03000000	@ physical
 		.endm
 
 #define UART_SHIFT	2
arch/arm/mach-s3c2410/include/mach/debug-macro.S +5 -6
index 0eef78b..5882dea 100644
@@ -19,13 +19,12 @@
 #define S3C2410_UART1_OFF (0x4000)
 #define SHIFT_2440TXF (14-9)
 
-	.macro addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, = S3C24XX_PA_UART
-		ldrne	\rx, = S3C24XX_VA_UART
+	.macro addruart, rp, rv
+		ldr	\rp, = S3C24XX_PA_UART
+		ldr	\rv, = S3C24XX_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
-		add	\rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
+		add	\rp, \rp, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
+		add	\rv, \rv, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
 #endif
 	.endm
 
arch/arm/mach-s3c24a0/include/mach/debug-macro.S +5 -6
index 239476b..0c5a738 100644
@@ -10,13 +10,12 @@
 #include <mach/map.h>
 #include <plat/regs-serial.h>
 
-	.macro addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, = S3C24XX_PA_UART
-		ldrne	\rx, = S3C24XX_VA_UART
+	.macro addruart, rp, rv
+		ldr	\rp, = S3C24XX_PA_UART
+		ldr	\rv, = S3C24XX_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
-		add	\rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
+		add	\rp, \rp, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
+		add	\rv, \rv, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
 #endif
 	.endm
 
arch/arm/mach-s3c64xx/include/mach/debug-macro.S +5 -6
index f9ab5d2..a29e705 100644
@@ -21,13 +21,12 @@
 	 * aligned and add in the offset when we load the value here.
 	 */
 
-	.macro addruart, rx, rtmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, = S3C_PA_UART
-		ldrne	\rx, = (S3C_VA_UART + S3C_PA_UART & 0xfffff)
+	.macro addruart, rp, rv
+		ldr	\rp, = S3C_PA_UART
+		ldr	\rv, = (S3C_VA_UART + S3C_PA_UART & 0xfffff)
 #if CONFIG_DEBUG_S3C_UART != 0
-		add	\rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
 #endif
 	.endm
 
arch/arm/mach-s5p6440/include/mach/debug-macro.S +5 -6
index 1347d7f..f4c20ee 100644
@@ -19,13 +19,12 @@
 	 * aligned and add in the offset when we load the value here.
 	 */
 
-	.macro addruart, rx, rtmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, = S3C_PA_UART
-		ldrne	\rx, = S3C_VA_UART
+	.macro addruart, rp, rv
+		ldr	\rp, = S3C_PA_UART
+		ldr	\rv, = S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
-		add	\rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
 #endif
 	.endm
 
arch/arm/mach-s5p6442/include/mach/debug-macro.S +5 -6
index bb65361..e221320 100644
@@ -15,13 +15,12 @@
 #include <mach/map.h>
 #include <plat/regs-serial.h>
 
-	.macro addruart, rx, rtmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, = S3C_PA_UART
-		ldrne	\rx, = S3C_VA_UART
+	.macro addruart, rp, rv
+		ldr	\rp, = S3C_PA_UART
+		ldr	\rv, = S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
-		add	\rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
 #endif
 	.endm
 
arch/arm/mach-s5pc100/include/mach/debug-macro.S +5 -6
index 70e02e9..b2ba95d 100644
@@ -22,13 +22,12 @@
 	 * aligned and add in the offset when we load the value here.
 	 */
 
-	.macro addruart, rx, rtmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, = S3C_PA_UART
-		ldrne	\rx, = S3C_VA_UART
+	.macro addruart, rp, rv
+		ldr	\rp, = S3C_PA_UART
+		ldr	\rv, = S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
-		add	\rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
 #endif
 	.endm
 
arch/arm/mach-s5pv210/include/mach/debug-macro.S +5 -6
index 7872f5c..169fe65 100644
@@ -21,13 +21,12 @@
 	 * aligned and add in the offset when we load the value here.
 	 */
 
-	.macro addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1
-		ldreq	\rx, = S3C_PA_UART
-		ldrne	\rx, = S3C_VA_UART
+	.macro addruart, rp, rv
+		ldr	\rp, = S3C_PA_UART
+		ldr	\rv, = S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
-		add	\rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
+		add	\rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
 #endif
 	.endm
 
arch/arm/mach-sa1100/include/mach/debug-macro.S +20 -16
index 336adcc..0cd0fc9 100644
@@ -12,33 +12,37 @@
 */
 #include <mach/hardware.h>
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x80000000	@ physical base address
-		movne	\rx, #0xf8000000	@ virtual address
+		.macro	addruart, rp, rv
+		mrc	p15, 0, \rp, c1, c0
+		tst	\rp, #1			@ MMU enabled?
+		moveq	\rp, #0x80000000	@ physical base address
+		movne	\rp, #0xf8000000	@ virtual address
 
 		@ We probe for the active serial port here, coherently with
 		@ the comment in arch/arm/mach-sa1100/include/mach/uncompress.h.
 		@ We assume r1 can be clobbered.
 
 		@ see if Ser3 is active
-		add	\rx, \rx, #0x00050000
-		ldr	r1, [\rx, #UTCR3]
-		tst	r1, #UTCR3_TXE
+		add	\rp, \rp, #0x00050000
+		ldr	\rv, [\rp, #UTCR3]
+		tst	\rv, #UTCR3_TXE
 
 		@ if Ser3 is inactive, then try Ser1
-		addeq	\rx, \rx, #(0x00010000 - 0x00050000)
-		ldreq	r1, [\rx, #UTCR3]
-		tsteq	r1, #UTCR3_TXE
+		addeq	\rp, \rp, #(0x00010000 - 0x00050000)
+		ldreq	\rv, [\rp, #UTCR3]
+		tsteq	\rv, #UTCR3_TXE
 
 		@ if Ser1 is inactive, then try Ser2
-		addeq	\rx, \rx, #(0x00030000 - 0x00010000)
-		ldreq	r1, [\rx, #UTCR3]
-		tsteq	r1, #UTCR3_TXE
+		addeq	\rp, \rp, #(0x00030000 - 0x00010000)
+		ldreq	\rv, [\rp, #UTCR3]
+		tsteq	\rv, #UTCR3_TXE
+
+		@ clear top bits, and generate both phys and virt addresses
+		lsl	\rp, \rp, #8
+		lsr	\rp, \rp, #8
+		orr	\rv, \rp, #0xf8000000	@ virtual
+		orr	\rp, \rp, #0x80000000	@ physical
 
-		@ if all ports are inactive, then there is nothing we can do
-		moveq	pc, lr
 		.endm
 
 		.macro	senduart,rd,rx
arch/arm/mach-shark/include/mach/debug-macro.S +4 -3
index 5ea24d4..a473f55 100644
@@ -11,9 +11,10 @@
  *
 */
 
-		.macro	addruart, rx, tmp
-		mov	\rx, #0xe0000000
-		orr	\rx, \rx, #0x000003f8
+		.macro	addruart, rp, rv
+		mov	\rp, #0xe0000000
+		orr	\rp, \rp, #0x000003f8
+		mov	\rv, \rp
 		.endm
 
 		.macro	senduart,rd,rx
arch/arm/mach-tegra/include/mach/debug-macro.S +15 -11
index 55a3956..8ea3bff 100644
@@ -20,24 +20,28 @@
 
 #include <mach/io.h>
 
-	.macro  addruart,rx, tmp
-        mrc     p15, 0, \rx, c1, c0
-        tst     \rx, #1                 @ MMU enabled?
-        ldreq   \rx, =IO_APB_PHYS       @ physical
-        ldrne   \rx, =IO_APB_VIRT        @ virtual
+	.macro  addruart, rp, rv
+        ldreq   \rp, =IO_APB_PHYS       @ physical
+        ldrne   \rv, =IO_APB_VIRT        @ virtual
 #if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
 #error "A debug UART must be selected in the kernel config to use DEBUG_LL"
 #elif defined(CONFIG_TEGRA_DEBUG_UARTA)
-        orr     \rx, \rx, #0x6000
+        orr     \rp, \rp, #0x6000
+        orr     \rv, \rv, #0x6000
 #elif defined(CONFIG_TEGRA_DEBUG_UARTB)
-	ldr	\tmp, =0x6040
-        orr     \rx, \rx, \tmp
+        orr     \rp, \rp, #0x6000
+	orr	\rp, \rp, #0x40
+        orr     \rv, \rv, #0x6000
+	orr	\rv, \rv, #0x40
 #elif defined(CONFIG_TEGRA_DEBUG_UARTC)
-        orr     \rx, \rx, #0x6200
+        orr     \rp, \rp, #0x6200
+        orr     \rv, \rv, #0x6200
 #elif defined(CONFIG_TEGRA_DEBUG_UARTD)
-        orr     \rx, \rx, #0x6300
+        orr     \rp, \rp, #0x6300
+        orr     \rv, \rv, #0x6300
 #elif defined(CONFIG_TEGRA_DEBUG_UARTE)
-        orr     \rx, \rx, #0x6400
+        orr     \rp, \rp, #0x6400
+        orr     \rv, \rv, #0x6400
 #endif
 	.endm
 
arch/arm/mach-u300/include/mach/debug-macro.S +5 -6
index 92c1242..df71570 100644
@@ -10,13 +10,12 @@
  */
 #include <mach/hardware.h>
 
-	.macro	addruart, rx, tmp
+	.macro	addruart, rp, rv
 	/* If we move the address using MMU, use this. */
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1			@ MMU enabled?
-	ldreq	\rx,	  = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
-	ldrne	\rx,	  = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address
-	orr	\rx, \rx, #0x00003000
+	ldr	\rp,	  = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
+	ldr	\rv,	  = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address
+	orr	\rp, \rp, #0x00003000
+	orr	\rv, \rv, #0x00003000
 	.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-ux500/include/mach/debug-macro.S +3 -5
index c5203b7..be7c0f1 100644
@@ -18,11 +18,9 @@
 #define UX500_UART(n)	__UX500_UART(n)
 #define UART_BASE	UX500_UART(CONFIG_UX500_DEBUG_UART)
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =UART_BASE				@ no, physical address
-	ldrne	\rx, =IO_ADDRESS(UART_BASE)		@ yes, virtual address
+	.macro	addruart, rp, rv
+	ldr	\rp, =UART_BASE				@ no, physical address
+	ldr	\rv, =IO_ADDRESS(UART_BASE)		@ yes, virtual address
 	.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-versatile/include/mach/debug-macro.S +5 -7
index 6fea719..eb2cf7d 100644
@@ -11,13 +11,11 @@
  *
 */
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx,      #0x10000000
-		movne	\rx,      #0xf1000000	@ virtual base
-		orr	\rx, \rx, #0x001F0000
-		orr	\rx, \rx, #0x00001000
+		.macro	addruart, rp, rv
+		mov	\rp,      #0x001F0000
+		orr	\rp, \rp, #0x00001000
+		orr	\rv, \rp, #0xf1000000	@ virtual base
+		orr	\rp, \rp,  #0x10000000	@ physical base
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/mach-vexpress/include/mach/debug-macro.S +4 -6
index 5167e2a..050d65e 100644
@@ -12,12 +12,10 @@
 
 #define DEBUG_LL_UART_OFFSET	0x00009000
 
-		.macro	addruart,rx,tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx,      #0x10000000
-		movne	\rx,      #0xf8000000	@ virtual base
-		orr	\rx, \rx, #DEBUG_LL_UART_OFFSET
+		.macro	addruart,rp,rv
+		mov	\rp, #DEBUG_LL_UART_OFFSET
+		orr	\rv, \rp, #0xf8000000	@ virtual base
+		orr	\rp, \rp, #0x10000000	@ physical base
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>
arch/arm/plat-mxc/include/mach/debug-macro.S +3 -5
index 2560640..d56213f 100644
@@ -62,11 +62,9 @@
 #define UART_PADDR	MXC91231_UART2_BASE_ADDR
 #define UART_VADDR	MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR)
 #endif
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		ldreq	\rx, =UART_PADDR	@ physical
-		ldrne	\rx, =UART_VADDR	@ virtual
+		.macro	addruart, rp, rv
+		ldr	\rp, =UART_PADDR	@ physical
+		ldr	\rv, =UART_VADDR	@ virtual
 		.endm
 
 		.macro	senduart,rd,rx
arch/arm/plat-spear/include/plat/debug-macro.S +3 -5
index 37fa593..e91270e 100644
@@ -14,11 +14,9 @@
 #include <linux/amba/serial.h>
 #include <mach/spear.h>
 
-		.macro	addruart, rx
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1					@ MMU enabled?
-		moveq	\rx, #SPEAR_DBG_UART_BASE		@ Physical base
-		movne	\rx, #VA_SPEAR_DBG_UART_BASE		@ Virtual base
+		.macro	addruart, rp, rv
+		mov	\rp, #SPEAR_DBG_UART_BASE		@ Physical base
+		mov	\rv, #VA_SPEAR_DBG_UART_BASE		@ Virtual base
 		.endm
 
 		.macro	senduart, rd, rx
arch/arm/plat-stmp3xxx/include/mach/debug-macro.S +4 -7
index 1b9348b..d3a0985 100644
@@ -16,13 +16,10 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-		.macro	addruart, rx, tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx, #0x80000000	@ physical base address
-		addeq	\rx, \rx, #0x00070000
-		movne	\rx, #0xf0000000	@ virtual base
-		addne	\rx, \rx, #0x00070000
+		.macro	addruart, rp, rv
+		mov	\rp,      #0x00070000
+		add	\rv, \rp, #0xf0000000	@ virtual base
+		add	\rp, \rp, #0x80000000	@ physical base
 		.endm
 
 		.macro	senduart,rd,rx
#3 lore raw

PATCH 2/3 arm: return both physical and virtual addresses from addruart

Quoted 19 lines · Jeremy Kerr
---
 arch/arm/kernel/debug.S                             |   22 +-
 arch/arm/mach-aaec2000/include/mach/debug-macro.S   |   10 
 arch/arm/mach-at91/include/mach/debug-macro.S       |    8 
 arch/arm/mach-clps711x/include/mach/debug-macro.S   |   12 -
 arch/arm/mach-cns3xxx/include/mach/debug-macro.S    |   10 
 arch/arm/mach-davinci/include/mach/debug-macro.S    |   46 ++--
 arch/arm/mach-dove/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-ebsa110/include/mach/debug-macro.S    |    7 
 arch/arm/mach-ep93xx/include/mach/debug-macro.S     |   11 -
 arch/arm/mach-footbridge/include/mach/debug-macro.S |   22 --
 arch/arm/mach-gemini/include/mach/debug-macro.S     |    8 
 arch/arm/mach-h720x/include/mach/debug-macro.S      |   10 
 arch/arm/mach-integrator/include/mach/debug-macro.S |   10 
 arch/arm/mach-iop13xx/include/mach/debug-macro.S    |   16 -
 arch/arm/mach-iop32x/include/mach/debug-macro.S     |    7 
 arch/arm/mach-iop33x/include/mach/debug-macro.S     |   12 -
 arch/arm/mach-ixp2000/include/mach/debug-macro.S    |   14 -
 arch/arm/mach-ixp23xx/include/mach/debug-macro.S    |   11 -
Quoted 8 lines
 arch/arm/mach-ixp4xx/include/mach/debug-macro.S     |   16 -
 arch/arm/mach-kirkwood/include/mach/debug-macro.S   |   11 -
 arch/arm/mach-ks8695/include/mach/debug-macro.S     |    8 
 arch/arm/mach-l7200/include/mach/debug-macro.S      |   38 +++
 arch/arm/mach-lh7a40x/include/mach/debug-macro.S    |   10 
 arch/arm/mach-loki/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-mmp/include/mach/debug-macro.S        |   11 -
 arch/arm/mach-msm/include/mach/debug-macro.S        |   10 

Firstly, you should try to break this kind of patch up if you can. Secondly, you need to CC all the effected sub-architecture maintainers. It's not acceptable to assume that everyone effected will magically stumble onto this patch and know you modifying their sub-architecture ..

Please do those things with future patches.

Daniel

Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#4 lore raw

PATCH 2/3 arm: return both physical and virtual addresses from addruart

Quoted 30 lines · Daniel Walker
Quoted 19 lines · Jeremy Kerr
---
 arch/arm/kernel/debug.S                             |   22 +-
 arch/arm/mach-aaec2000/include/mach/debug-macro.S   |   10 
 arch/arm/mach-at91/include/mach/debug-macro.S       |    8 
 arch/arm/mach-clps711x/include/mach/debug-macro.S   |   12 -
 arch/arm/mach-cns3xxx/include/mach/debug-macro.S    |   10 
 arch/arm/mach-davinci/include/mach/debug-macro.S    |   46 ++--
 arch/arm/mach-dove/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-ebsa110/include/mach/debug-macro.S    |    7 
 arch/arm/mach-ep93xx/include/mach/debug-macro.S     |   11 -
 arch/arm/mach-footbridge/include/mach/debug-macro.S |   22 --
 arch/arm/mach-gemini/include/mach/debug-macro.S     |    8 
 arch/arm/mach-h720x/include/mach/debug-macro.S      |   10 
 arch/arm/mach-integrator/include/mach/debug-macro.S |   10 
 arch/arm/mach-iop13xx/include/mach/debug-macro.S    |   16 -
 arch/arm/mach-iop32x/include/mach/debug-macro.S     |    7 
 arch/arm/mach-iop33x/include/mach/debug-macro.S     |   12 -
 arch/arm/mach-ixp2000/include/mach/debug-macro.S    |   14 -
 arch/arm/mach-ixp23xx/include/mach/debug-macro.S    |   11 -
Quoted 8 lines
 arch/arm/mach-ixp4xx/include/mach/debug-macro.S     |   16 -
 arch/arm/mach-kirkwood/include/mach/debug-macro.S   |   11 -
 arch/arm/mach-ks8695/include/mach/debug-macro.S     |    8 
 arch/arm/mach-l7200/include/mach/debug-macro.S      |   38 +++
 arch/arm/mach-lh7a40x/include/mach/debug-macro.S    |   10 
 arch/arm/mach-loki/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-mmp/include/mach/debug-macro.S        |   11 -
 arch/arm/mach-msm/include/mach/debug-macro.S        |   10 
Quoted 1 line

Firstly, you should try to break this kind of patch up if you can.

That's already been covered today with you. You're not listening. It can not be split up. It is one logical change. Splitting it up will break the build for everything until the entire patch is merged.

Quoted 3 lines

Secondly, you need to CC all the effected sub-architecture maintainers. It's not acceptable to assume that everyone effected will magically stumble onto this patch and know you modifying their sub-architecture ..

Read the friggin subject line. linux-arm-kernel is where generic changes get discussed all the time. These changes will impact platform support. Sometimes that's not going to be obvious that it affects your platform. You need to be reading those changes. Look at the subject line of each mail and decide whether it's something that you need to look at.

In any case, it's not practical to copy a patch to 209 people - with some 8K of CC or To line.

Why aren't you using this time which I've given you to resolve your problem?

#5 lore raw

PATCH 2/3 arm: return both physical and virtual addresses from addruart

Quoted 31 lines · Russell King - ARM Linux
Quoted 30 lines · Daniel Walker
Quoted 27 lines · Jeremy Kerr
---
 arch/arm/kernel/debug.S                             |   22 +-
 arch/arm/mach-aaec2000/include/mach/debug-macro.S   |   10 
 arch/arm/mach-at91/include/mach/debug-macro.S       |    8 
 arch/arm/mach-clps711x/include/mach/debug-macro.S   |   12 -
 arch/arm/mach-cns3xxx/include/mach/debug-macro.S    |   10 
 arch/arm/mach-davinci/include/mach/debug-macro.S    |   46 ++--
 arch/arm/mach-dove/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-ebsa110/include/mach/debug-macro.S    |    7 
 arch/arm/mach-ep93xx/include/mach/debug-macro.S     |   11 -
 arch/arm/mach-footbridge/include/mach/debug-macro.S |   22 --
 arch/arm/mach-gemini/include/mach/debug-macro.S     |    8 
 arch/arm/mach-h720x/include/mach/debug-macro.S      |   10 
 arch/arm/mach-integrator/include/mach/debug-macro.S |   10 
 arch/arm/mach-iop13xx/include/mach/debug-macro.S    |   16 -
 arch/arm/mach-iop32x/include/mach/debug-macro.S     |    7 
 arch/arm/mach-iop33x/include/mach/debug-macro.S     |   12 -
 arch/arm/mach-ixp2000/include/mach/debug-macro.S    |   14 -
 arch/arm/mach-ixp23xx/include/mach/debug-macro.S    |   11 -
 arch/arm/mach-ixp4xx/include/mach/debug-macro.S     |   16 -
 arch/arm/mach-kirkwood/include/mach/debug-macro.S   |   11 -
 arch/arm/mach-ks8695/include/mach/debug-macro.S     |    8 
 arch/arm/mach-l7200/include/mach/debug-macro.S      |   38 +++
 arch/arm/mach-lh7a40x/include/mach/debug-macro.S    |   10 
 arch/arm/mach-loki/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-mmp/include/mach/debug-macro.S        |   11 -
 arch/arm/mach-msm/include/mach/debug-macro.S        |   10 
Quoted 5 lines
Quoted 1 line

Firstly, you should try to break this kind of patch up if you can.

That's already been covered today with you. You're not listening. It can not be split up. It is one logical change. Splitting it up will break the build for everything until the entire patch is merged.

I said "if you can" I didn't say "break this patch up." I also said "in the future" so I'm not talking about this patch anymore..

Quoted 9 lines
Quoted 3 lines

Secondly, you need to CC all the effected sub-architecture maintainers. It's not acceptable to assume that everyone effected will magically stumble onto this patch and know you modifying their sub-architecture ..

Read the friggin subject line. linux-arm-kernel is where generic changes get discussed all the time. These changes will impact platform support. Sometimes that's not going to be obvious that it affects your platform. You need to be reading those changes. Look at the subject line of each mail and decide whether it's something that you need to look at.

That's not addressing the problem .. I don't actually care about this change, all I care about is that it's changing files in my tree and I need to keep aware of it so it doesn't cause problems down the line. It's not about patch content.

I can't look at the subject line and know that this patches is modifying files in my tree.

Quoted 2 lines

In any case, it's not practical to copy a patch to 209 people - with some 8K of CC or To line.

Then don't CC 8k people, no one is saying you have to CC all 209. You just have to CC the maintainers.

Quoted 2 lines

Why aren't you using this time which I've given you to resolve your problem?

I will send you a pull request by your deadline, even if I don't I understand the consequences (which you have alerted me too).

Daniel

Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#6 lore raw

PATCH 2/3 arm: return both physical and virtual addresses from addruart

Hi Daniel,

Quoted 2 lines

I can't look at the subject line and know that this patches is modifying files in my tree.

You could use procmail to sort patches that touch your code in a different mailbox (or copy if you prefer that).

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#7 lore raw

PATCH 2/3 arm: return both physical and virtual addresses from addruart

In reply to Daniel Walker
Quoted 30 lines · Daniel Walker
Quoted 19 lines · Jeremy Kerr
---
 arch/arm/kernel/debug.S                             |   22 +-
 arch/arm/mach-aaec2000/include/mach/debug-macro.S   |   10 
 arch/arm/mach-at91/include/mach/debug-macro.S       |    8 
 arch/arm/mach-clps711x/include/mach/debug-macro.S   |   12 -
 arch/arm/mach-cns3xxx/include/mach/debug-macro.S    |   10 
 arch/arm/mach-davinci/include/mach/debug-macro.S    |   46 ++--
 arch/arm/mach-dove/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-ebsa110/include/mach/debug-macro.S    |    7 
 arch/arm/mach-ep93xx/include/mach/debug-macro.S     |   11 -
 arch/arm/mach-footbridge/include/mach/debug-macro.S |   22 --
 arch/arm/mach-gemini/include/mach/debug-macro.S     |    8 
 arch/arm/mach-h720x/include/mach/debug-macro.S      |   10 
 arch/arm/mach-integrator/include/mach/debug-macro.S |   10 
 arch/arm/mach-iop13xx/include/mach/debug-macro.S    |   16 -
 arch/arm/mach-iop32x/include/mach/debug-macro.S     |    7 
 arch/arm/mach-iop33x/include/mach/debug-macro.S     |   12 -
 arch/arm/mach-ixp2000/include/mach/debug-macro.S    |   14 -
 arch/arm/mach-ixp23xx/include/mach/debug-macro.S    |   11 -
Quoted 8 lines
 arch/arm/mach-ixp4xx/include/mach/debug-macro.S     |   16 -
 arch/arm/mach-kirkwood/include/mach/debug-macro.S   |   11 -
 arch/arm/mach-ks8695/include/mach/debug-macro.S     |    8 
 arch/arm/mach-l7200/include/mach/debug-macro.S      |   38 +++
 arch/arm/mach-lh7a40x/include/mach/debug-macro.S    |   10 
 arch/arm/mach-loki/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-mmp/include/mach/debug-macro.S        |   11 -
 arch/arm/mach-msm/include/mach/debug-macro.S        |   10 
Quoted 1 line

Firstly, you should try to break this kind of patch up if you can.

It was split as much as possible already.

Quoted 1 line

Secondly, you need to CC all the effected sub-architecture maintainers.

There are 367 different machines affected. Please get real. Sorry but you are not more special than the others. The MSM is only one of the many subarchitectures that the core ARM code serves.

Quoted 2 lines

It's not acceptable to assume that everyone effected will magically stumble onto this patch and know you modifying their sub-architecture ..

This is precisely why RMK asked for those patches to be merged at the end of his merge cycle. Bypassing RMK for your own merge requests is only going to cause you similar trouble in the future.

Quoted 1 line

Please do those things with future patches.

I'm sorry Daniel, but you are not in a position to lecture people with such language in this case. You were told repeatedly so far about what you should do right now. Everyone involved did their best except you at this point.

Nicolas

#8 lore raw

PATCH 2/3 arm: return both physical and virtual addresses from addruart

Quoted 34 lines · Nicolas Pitre
Quoted 30 lines · Daniel Walker
Quoted 19 lines · Jeremy Kerr
---
 arch/arm/kernel/debug.S                             |   22 +-
 arch/arm/mach-aaec2000/include/mach/debug-macro.S   |   10 
 arch/arm/mach-at91/include/mach/debug-macro.S       |    8 
 arch/arm/mach-clps711x/include/mach/debug-macro.S   |   12 -
 arch/arm/mach-cns3xxx/include/mach/debug-macro.S    |   10 
 arch/arm/mach-davinci/include/mach/debug-macro.S    |   46 ++--
 arch/arm/mach-dove/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-ebsa110/include/mach/debug-macro.S    |    7 
 arch/arm/mach-ep93xx/include/mach/debug-macro.S     |   11 -
 arch/arm/mach-footbridge/include/mach/debug-macro.S |   22 --
 arch/arm/mach-gemini/include/mach/debug-macro.S     |    8 
 arch/arm/mach-h720x/include/mach/debug-macro.S      |   10 
 arch/arm/mach-integrator/include/mach/debug-macro.S |   10 
 arch/arm/mach-iop13xx/include/mach/debug-macro.S    |   16 -
 arch/arm/mach-iop32x/include/mach/debug-macro.S     |    7 
 arch/arm/mach-iop33x/include/mach/debug-macro.S     |   12 -
 arch/arm/mach-ixp2000/include/mach/debug-macro.S    |   14 -
 arch/arm/mach-ixp23xx/include/mach/debug-macro.S    |   11 -
Quoted 8 lines
 arch/arm/mach-ixp4xx/include/mach/debug-macro.S     |   16 -
 arch/arm/mach-kirkwood/include/mach/debug-macro.S   |   11 -
 arch/arm/mach-ks8695/include/mach/debug-macro.S     |    8 
 arch/arm/mach-l7200/include/mach/debug-macro.S      |   38 +++
 arch/arm/mach-lh7a40x/include/mach/debug-macro.S    |   10 
 arch/arm/mach-loki/include/mach/debug-macro.S       |   11 -
 arch/arm/mach-mmp/include/mach/debug-macro.S        |   11 -
 arch/arm/mach-msm/include/mach/debug-macro.S        |   10 
Quoted 1 line

Firstly, you should try to break this kind of patch up if you can.

Quoted 7 lines

It was split as much as possible already.

Quoted 1 line

Secondly, you need to CC all the effected sub-architecture maintainers.

There are 367 different machines affected. Please get real. Sorry but you are not more special than the others. The MSM is only one of the many subarchitectures that the core ARM code serves.

We're not talking about machines, we're talking about maintainers. There are only 70 mach- directories and as far as I can tell your only changing a sub-set of those.

Quoted 6 lines
Quoted 2 lines

It's not acceptable to assume that everyone effected will magically stumble onto this patch and know you modifying their sub-architecture ..

This is precisely why RMK asked for those patches to be merged at the end of his merge cycle. Bypassing RMK for your own merge requests is only going to cause you similar trouble in the future.

I don't want to get into this discussion ..

Quoted 6 lines
Quoted 1 line

Please do those things with future patches.

I'm sorry Daniel, but you are not in a position to lecture people with such language in this case. You were told repeatedly so far about what you should do right now. Everyone involved did their best except you at this point.

I'm doing what I need to do.

Daniel

Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#9 lore raw

PATCH 3/3 arm: use addruart macro to establish debug mappings

In reply to Jeremy Kerr

Since we can get both physical and virtual addresses from the addruart macro, we can use this to establish the debug mappings.

In the case of CONFIG_DEBUG_ICEDCC, we don't need any mappings, but may still need to setup r7 correctly.

Incorporating ASM changes from Nicolas Pitre <[email protected]>.

---
 arch/arm/kernel/head.S |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
arch/arm/kernel/head.S +19 -4
index eb62bf9..1def822 100644
@@ -22,6 +22,10 @@
 #include <asm/thread_info.h>
 #include <asm/system.h>
 
+#ifdef CONFIG_DEBUG_LL
+#include <mach/debug-macro.S>
+#endif
+
 #if (PHYS_OFFSET & 0x001fffff)
 #error "PHYS_OFFSET must be at an even 2MiB boundary!"
 #endif
@@ -289,24 +293,35 @@ __create_page_tables:
 	str	r6, [r0]
 
 #ifdef CONFIG_DEBUG_LL
-	ldr	r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags
+#ifndef CONFIG_DEBUG_ICEDCC
 	/*
 	 * Map in IO space for serial debugging.
 	 * This allows debug messages to be output
 	 * via a serial console before paging_init.
 	 */
-	ldr	r3, [r8, #MACHINFO_PGOFFIO]
+	addruart r7, r3
+
+	mov	r3, r3, lsr #20
+	mov	r3, r3, lsl #2
+
 	add	r0, r4, r3
 	rsb	r3, r3, #0x4000			@ PTRS_PER_PGD*sizeof(long)
 	cmp	r3, #0x0800			@ limit to 512MB
 	movhi	r3, #0x0800
 	add	r6, r0, r3
-	ldr	r3, [r8, #MACHINFO_PHYSIO]
-	orr	r3, r3, r7
+	mov	r3, r7, lsr #20
+	ldr	r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags
+	orr	r3, r7, r3, lsl #20
 1:	str	r3, [r0], #4
 	add	r3, r3, #1 << 20
 	teq	r0, r6
 	bne	1b
+
+#else /* CONFIG_DEBUG_ICEDCC */
+	/* we don't need any serial debugging mappings for ICEDCC */
+	ldr	r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags
+#endif /* !CONFIG_DEBUG_ICEDCC */
+
 #if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS)
 	/*
 	 * If we're using the NetWinder or CATS, we also need to map