All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 3/6] arm/l7200: fix debug macro compilation failure
  2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
                   ` (2 preceding siblings ...)
  2010-07-14  7:29 ` [PATCH 2/6] arm/h720x: " Jeremy Kerr
@ 2010-07-14  7:29 ` Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 6/6] arm/shark: " Jeremy Kerr
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  7:29 UTC (permalink / raw)
  To: linux-arm-kernel

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

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

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

diff --git a/arch/arm/mach-l7200/include/mach/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S
index b69ed34..872ca72 100644
--- a/arch/arm/mach-l7200/include/mach/debug-macro.S
+++ b/arch/arm/mach-l7200/include/mach/debug-macro.S
@@ -11,6 +11,8 @@
  *
 */
 
+#include <mach/hardware.h>
+
 		.equ	io_virt, IO_BASE
 		.equ	io_phys, IO_START
 

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 2/6] arm/h720x: fix debug macro compilation failure
  2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 1/6] arm/clps711x: fix debug macro compilation failure Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 4/6] arm/plat-spear: " Jeremy Kerr
@ 2010-07-14  7:29 ` Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 3/6] arm/l7200: " Jeremy Kerr
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  7:29 UTC (permalink / raw)
  To: linux-arm-kernel

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

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

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

diff --git a/arch/arm/mach-h720x/include/mach/debug-macro.S b/arch/arm/mach-h720x/include/mach/debug-macro.S
index a9ee8f0..27cafd1 100644
--- a/arch/arm/mach-h720x/include/mach/debug-macro.S
+++ b/arch/arm/mach-h720x/include/mach/debug-macro.S
@@ -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, rx, tmp
 		mrc     p15, 0, \rx, c1, c0

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 0/6] debug macro fixups, v2
@ 2010-07-14  7:29 Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 1/6] arm/clps711x: fix debug macro compilation failure Jeremy Kerr
                   ` (6 more replies)
  0 siblings, 7 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  7:29 UTC (permalink / raw)
  To: linux-arm-kernel

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.

Cheers,


Jeremy

v2:
 * rebased to remotes/rmk/master directly, without addruart changes

---
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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 4/6] arm/plat-spear: fix debug macro compilation failure
  2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 1/6] arm/clps711x: fix debug macro compilation failure Jeremy Kerr
@ 2010-07-14  7:29 ` Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 2/6] arm/h720x: " Jeremy Kerr
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  7:29 UTC (permalink / raw)
  To: linux-arm-kernel

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

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

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

diff --git a/arch/arm/plat-spear/include/plat/debug-macro.S b/arch/arm/plat-spear/include/plat/debug-macro.S
index 1670734..37fa593 100644
--- a/arch/arm/plat-spear/include/plat/debug-macro.S
+++ b/arch/arm/plat-spear/include/plat/debug-macro.S
@@ -17,8 +17,8 @@
 		.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
+		moveq	\rx, #SPEAR_DBG_UART_BASE		@ Physical base
+		movne	\rx, #VA_SPEAR_DBG_UART_BASE		@ Virtual base
 		.endm
 
 		.macro	senduart, rd, rx

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 1/6] arm/clps711x: fix debug macro compilation failure
  2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
@ 2010-07-14  7:29 ` Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 4/6] arm/plat-spear: " Jeremy Kerr
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  7:29 UTC (permalink / raw)
  To: linux-arm-kernel

We need mach/hardware.h for CLPS7111_VIRT_BASE.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

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

diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S
index fedd807..072cc6b 100644
--- a/arch/arm/mach-clps711x/include/mach/debug-macro.S
+++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S
@@ -11,6 +11,7 @@
  *
 */
 
+#include <mach/hardware.h>
 #include <asm/hardware/clps7111.h>
 
 		.macro	addruart, rx, tmp

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 6/6] arm/shark: fix debug macro compilation failure
  2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
                   ` (3 preceding siblings ...)
  2010-07-14  7:29 ` [PATCH 3/6] arm/l7200: " Jeremy Kerr
@ 2010-07-14  7:29 ` Jeremy Kerr
  2010-07-14  7:29 ` [PATCH 5/6] arm/ns9xxx: " Jeremy Kerr
  2010-07-14 14:10 ` [PATCH 0/6] debug macro fixups, v2 Nicolas Pitre
  6 siblings, 0 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  7:29 UTC (permalink / raw)
  To: linux-arm-kernel

We need a waituart macro.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

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

diff --git a/arch/arm/mach-shark/include/mach/debug-macro.S b/arch/arm/mach-shark/include/mach/debug-macro.S
index 50f071c..5ea24d4 100644
--- a/arch/arm/mach-shark/include/mach/debug-macro.S
+++ b/arch/arm/mach-shark/include/mach/debug-macro.S
@@ -20,6 +20,9 @@
 		strb	\rd, [\rx]
 		.endm
 
+		.macro waituart,rd,rx
+		.endm
+
 		.macro	busyuart,rd,rx
 		mov	\rd, #0
 1001:		add	\rd, \rd, #1

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 5/6] arm/ns9xxx: fix debug macro compilation failure
  2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
                   ` (4 preceding siblings ...)
  2010-07-14  7:29 ` [PATCH 6/6] arm/shark: " Jeremy Kerr
@ 2010-07-14  7:29 ` Jeremy Kerr
  2010-07-14 14:10 ` [PATCH 0/6] debug macro fixups, v2 Nicolas Pitre
  6 siblings, 0 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  7:29 UTC (permalink / raw)
  To: linux-arm-kernel

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

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

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

diff --git a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
index 0859336..9966807 100644
--- a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
+++ b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
@@ -8,6 +8,7 @@
  * the Free Software Foundation.
  */
 #include <mach/hardware.h>
+#include <mach/memory.h>
 
 #include <mach/regs-board-a9m9750dev.h>
 
diff --git a/arch/arm/mach-ns9xxx/include/mach/memory.h b/arch/arm/mach-ns9xxx/include/mach/memory.h
index 6107193..b5bbda5 100644
--- a/arch/arm/mach-ns9xxx/include/mach/memory.h
+++ b/arch/arm/mach-ns9xxx/include/mach/memory.h
@@ -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)
 

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 0/6] debug macro fixups, v2
  2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
                   ` (5 preceding siblings ...)
  2010-07-14  7:29 ` [PATCH 5/6] arm/ns9xxx: " Jeremy Kerr
@ 2010-07-14 14:10 ` Nicolas Pitre
  6 siblings, 0 replies; 9+ messages in thread
From: Nicolas Pitre @ 2010-07-14 14:10 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, 14 Jul 2010, Jeremy Kerr wrote:

> 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.

arch/arm/plat-mxc/include/mach/debug-macro.S:

#ifdef CONFIG_ARCH_MX1
#include <mach/mx1.h>
#define UART_PADDR      UART1_BASE_ADDR
#define UART_VADDR      IO_ADDRESS(UART1_BASE_ADDR)
#endif

arch/arm/plat-mxc/include/mach/mx1.h:

#define IO_ADDRESS(x) MX1_IO_ADDRESS(x)
#define MX1_IO_ADDRESS(x) (IMX_IO_ADDRESS(x, MX1_IO))
#define UART1_BASE_ADDR MX1_UART1_BASE_ADDR
#define MX1_UART1_BASE_ADDR (0x06000 + MX1_IO_BASE_ADDR)
#define MX1_IO_SIZE SZ_1M

arch/arm/plat-mxc/include/mach/hardware.h:

#define IMX_IO_ADDRESS(addr, module)                                    \
        ((void __force __iomem *)                                       \
         (((unsigned long)((addr) - (module ## _BASE_ADDR)) < module ## _SIZE) ?\
         (addr) - (module ## _BASE_ADDR) + (module ## _BASE_ADDR_VIRT) : 0))

So... given that 0x06000 is smaller than SZ_1M, you could simply do:

#define UART_PADDR      MX1_UART1_BASE_ADDR
#define UART_VADDR      (UART_PADDR - MX1_IO_BASE_ADDR + MX1_IO_BASE_ADDR_VIRT)

or add an assembly friendly version in hardware.h:

#ifndef __ASSEMBLY__
#define IMX_IO_ADDRESS(addr, module)                                    \
        ((void __force __iomem *)                                       \
         (((unsigned long)((addr) - (module ## _BASE_ADDR)) < module ## _SIZE) ?\
         (addr) - (module ## _BASE_ADDR) + (module ## _BASE_ADDR_VIRT) : 0))
#else
#define IMX_IO_ADDRESS(addr, module)                                    \
        ((addr) - (module ## _BASE_ADDR) + (module ## _BASE_ADDR_VIRT))
#endif

The later is probably preferable.


Nicolas

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 3/6] arm/l7200: fix debug macro compilation failure
  2010-07-14  2:32 [PATCH 0/6] debug macro fixups Jeremy Kerr
@ 2010-07-14  2:32 ` Jeremy Kerr
  0 siblings, 0 replies; 9+ messages in thread
From: Jeremy Kerr @ 2010-07-14  2:32 UTC (permalink / raw)
  To: linux-arm-kernel

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

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

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

diff --git a/arch/arm/mach-l7200/include/mach/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S
index b0a2db7..31be104 100644
--- a/arch/arm/mach-l7200/include/mach/debug-macro.S
+++ b/arch/arm/mach-l7200/include/mach/debug-macro.S
@@ -11,6 +11,8 @@
  *
 */
 
+#include <mach/hardware.h>
+
 		.equ	io_virt, IO_BASE
 		.equ	io_phys, IO_START
 

^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-07-14 14:10 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-14  7:29 [PATCH 0/6] debug macro fixups, v2 Jeremy Kerr
2010-07-14  7:29 ` [PATCH 1/6] arm/clps711x: fix debug macro compilation failure Jeremy Kerr
2010-07-14  7:29 ` [PATCH 4/6] arm/plat-spear: " Jeremy Kerr
2010-07-14  7:29 ` [PATCH 2/6] arm/h720x: " Jeremy Kerr
2010-07-14  7:29 ` [PATCH 3/6] arm/l7200: " Jeremy Kerr
2010-07-14  7:29 ` [PATCH 6/6] arm/shark: " Jeremy Kerr
2010-07-14  7:29 ` [PATCH 5/6] arm/ns9xxx: " Jeremy Kerr
2010-07-14 14:10 ` [PATCH 0/6] debug macro fixups, v2 Nicolas Pitre
  -- strict thread matches above, loose matches on Subject: below --
2010-07-14  2:32 [PATCH 0/6] debug macro fixups Jeremy Kerr
2010-07-14  2:32 ` [PATCH 3/6] arm/l7200: fix debug macro compilation failure Jeremy Kerr

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.