ARM: debug: use generic option for ep93xx PL10x debug port

PATCH New H Hartley Sweeten 2 participants 5 messages Jul 17, 2013 – Jul 26, 2013

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Cirrus logic EP93XX Arm architecture

lore

Share & tools

lore

H Hartley Sweeten

author

2013-07-17 17:48 UTC #0 lore raw

PATCH 1/1 ARM: debug: use generic option for ep93xx PL10x debug port

The generic option DEBUG_LL_UART_PL01X is now used to select the UART type for the kernel low-level debugging on the ep93xx platform. This enables two config options to provide the physical and virtual base address of the debug UART.

Use the generic options instead of providing platform specific options to select the debug UART.

UART1 is selected with: DEBUG_UART_PHYS = 0x808c0000

                         DEBUG_UART_VIRT = 0xfedc0000

UART2 is selected with: DEBUG_UART_PHYS = 0x808d0000

                         DEBUG_UART_VIRT = 0xfedd0000

UART3 is selected with: DEBUG_UART_PHYS = 0x808e0000

                         DEBUG_UART_VIRT = 0xfede0000

The selected UART must already be initialized by the bootloader. If it isn't setup nothing will appear (which might be desired).

Signed-off-by H Hartley Sweeten <[email protected]>

Cc Russell King <[email protected]>

Cc Ryan Mallon <[email protected]>

---
This applies on top of Russell King's "Clean up the debugging support".

 arch/arm/mach-ep93xx/Kconfig                   | 14 --------------
 arch/arm/mach-ep93xx/include/mach/uncompress.h | 14 ++------------
 2 files changed, 2 insertions(+), 26 deletions(-)

arch/arm/mach-ep93xx/Kconfig +0 ~~-14~~

index fe3c1fa..93e54fd 100644
@@ -194,20 +194,6 @@ config MACH_VISION_EP9307
 	  Say 'Y' here if you want your kernel to support the
 	  Vision Engraving Systems EP9307 SoM.
 
-choice
-	prompt "Select a UART for early kernel messages"
-
-config EP93XX_EARLY_UART1
-	bool "UART1"
-
-config EP93XX_EARLY_UART2
-	bool "UART2"
-
-config EP93XX_EARLY_UART3
-	bool "UART3"
-
-endchoice
-
 endmenu
 
 endif

arch/arm/mach-ep93xx/include/mach/uncompress.h +2 ~~-12~~

index b5cc77d..03c42e5 100644
@@ -31,18 +31,8 @@ static void __raw_writel(unsigned int value, unsigned int ptr)
 	*((volatile unsigned int *)ptr) = value;
 }
 
-#if defined(CONFIG_EP93XX_EARLY_UART1)
-#define UART_BASE		EP93XX_UART1_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART2)
-#define UART_BASE		EP93XX_UART2_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART3)
-#define UART_BASE		EP93XX_UART3_PHYS_BASE
-#else
-#define UART_BASE		EP93XX_UART1_PHYS_BASE
-#endif
-
-#define PHYS_UART_DATA		(UART_BASE + 0x00)
-#define PHYS_UART_FLAG		(UART_BASE + 0x18)
+#define PHYS_UART_DATA		(CONFIG_DEBUG_UART_PHYS + 0x00)
+#define PHYS_UART_FLAG		(CONFIG_DEBUG_UART_PHYS + 0x18)
 #define UART_FLAG_TXFF		0x20
 
 static inline void putc(int c)

Signature · 1 line

1.8.3.2

Russell King - ARM Linux

2013-07-22 11:24 UTC #1 lore raw

PATCH 1/1 ARM: debug: use generic option for ep93xx PL10x debug port

Quoted 17 lines · H Hartley Sweeten

The generic option DEBUG_LL_UART_PL01X is now used to select the UART type for the kernel low-level debugging on the ep93xx platform. This enables two config options to provide the physical and virtual base address of the debug UART.
Use the generic options instead of providing platform specific options to select the debug UART.
UART1 is selected with: DEBUG_UART_PHYS = 0x808c0000
                         DEBUG_UART_VIRT = 0xfedc0000
UART2 is selected with: DEBUG_UART_PHYS = 0x808d0000
                         DEBUG_UART_VIRT = 0xfedd0000
UART3 is selected with: DEBUG_UART_PHYS = 0x808e0000
                         DEBUG_UART_VIRT = 0xfede0000

Quoted 8 lines

The selected UART must already be initialized by the bootloader. If it isn't setup nothing will appear (which might be desired).
Signed-off-by H Hartley Sweeten <[email protected]>
Cc Russell King <[email protected]>
Cc Ryan Mallon <[email protected]>
---
This applies on top of Russell King's "Clean up the debugging support".

Please put this in the patch system; I'll get a round tuit maybe later this week, if not next week.

H Hartley Sweeten

author

2013-07-26 17:04 UTC #2 lore raw

PATCH 1/1 ARM: debug: use generic option for ep93xx PL10x debug port

In reply to H Hartley Sweeten

Russell,

Ping... Any comments on this?

Thanks,
Hartley

-----Original Message-----
From: linux-arm-kernel [mailto:linux-arm-kernel-bounces at lists.infradead.org] On Behalf Of H Hartley Sweeten
Sent: Wednesday, July 17, 2013 10:48 AM
To: ARM Kernel
Cc: Russell King; Ryan Mallon
Subject: [PATCH] ARM: debug: use generic option for ep93xx PL10x debug port

Use the generic options instead of providing platform specific options to select the debug UART.

UART1 is selected with: DEBUG_UART_PHYS = 0x808c0000

                         DEBUG_UART_VIRT = 0xfedc0000

UART2 is selected with: DEBUG_UART_PHYS = 0x808d0000

                         DEBUG_UART_VIRT = 0xfedd0000

UART3 is selected with: DEBUG_UART_PHYS = 0x808e0000

                         DEBUG_UART_VIRT = 0xfede0000

The selected UART must already be initialized by the bootloader. If it isn't setup nothing will appear (which might be desired).

Signed-off-by H Hartley Sweeten <[email protected]>

Cc Russell King <[email protected]>

Cc Ryan Mallon <[email protected]>

---
This applies on top of Russell King's "Clean up the debugging support".

 arch/arm/mach-ep93xx/Kconfig                   | 14 --------------
 arch/arm/mach-ep93xx/include/mach/uncompress.h | 14 ++------------
 2 files changed, 2 insertions(+), 26 deletions(-)

arch/arm/mach-ep93xx/Kconfig +0 ~~-14~~

index fe3c1fa..93e54fd 100644
@@ -194,20 +194,6 @@ config MACH_VISION_EP9307
 	  Say 'Y' here if you want your kernel to support the
 	  Vision Engraving Systems EP9307 SoM.
 
-choice
-	prompt "Select a UART for early kernel messages"
-
-config EP93XX_EARLY_UART1
-	bool "UART1"
-
-config EP93XX_EARLY_UART2
-	bool "UART2"
-
-config EP93XX_EARLY_UART3
-	bool "UART3"
-
-endchoice
-
 endmenu
 
 endif

arch/arm/mach-ep93xx/include/mach/uncompress.h +2 ~~-12~~

index b5cc77d..03c42e5 100644
@@ -31,18 +31,8 @@ static void __raw_writel(unsigned int value, unsigned int ptr)
 	*((volatile unsigned int *)ptr) = value;
 }
 
-#if defined(CONFIG_EP93XX_EARLY_UART1)
-#define UART_BASE		EP93XX_UART1_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART2)
-#define UART_BASE		EP93XX_UART2_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART3)
-#define UART_BASE		EP93XX_UART3_PHYS_BASE
-#else
-#define UART_BASE		EP93XX_UART1_PHYS_BASE
-#endif
-
-#define PHYS_UART_DATA		(UART_BASE + 0x00)
-#define PHYS_UART_FLAG		(UART_BASE + 0x18)
+#define PHYS_UART_DATA		(CONFIG_DEBUG_UART_PHYS + 0x00)
+#define PHYS_UART_FLAG		(CONFIG_DEBUG_UART_PHYS + 0x18)
 #define UART_FLAG_TXFF		0x20
 
 static inline void putc(int c)

Signature · 7 lines

1.8.3.2


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

Russell King - ARM Linux

2013-07-26 17:08 UTC #3 lore raw

PATCH 1/1 ARM: debug: use generic option for ep93xx PL10x debug port

Quoted 3 lines · H Hartley Sweeten

Russell,
Ping... Any comments on this?

I did reply on the 22nd, suggesting it gets put in the patch system.

Quoted 95 lines

-----Original Message-----
From: linux-arm-kernel [mailto:linux-arm-kernel-bounces at lists.infradead.org] On Behalf Of H Hartley Sweeten
Sent: Wednesday, July 17, 2013 10:48 AM
To: ARM Kernel
Cc: Russell King; Ryan Mallon
Subject: [PATCH] ARM: debug: use generic option for ep93xx PL10x debug port
The generic option DEBUG_LL_UART_PL01X is now used to select the UART type for the kernel low-level debugging on the ep93xx platform. This enables two config options to provide the physical and virtual base address of the debug UART.
Use the generic options instead of providing platform specific options to select the debug UART.
UART1 is selected with: DEBUG_UART_PHYS = 0x808c0000
                         DEBUG_UART_VIRT = 0xfedc0000
UART2 is selected with: DEBUG_UART_PHYS = 0x808d0000
                         DEBUG_UART_VIRT = 0xfedd0000
UART3 is selected with: DEBUG_UART_PHYS = 0x808e0000
                         DEBUG_UART_VIRT = 0xfede0000
The selected UART must already be initialized by the bootloader. If it isn't setup nothing will appear (which might be desired).
Signed-off-by H Hartley Sweeten <[email protected]>
Cc Russell King <[email protected]>
Cc Ryan Mallon <[email protected]>
---
This applies on top of Russell King's "Clean up the debugging support".
 arch/arm/mach-ep93xx/Kconfig                   | 14 --------------
 arch/arm/mach-ep93xx/include/mach/uncompress.h | 14 ++------------
 2 files changed, 2 insertions(+), 26 deletions(-)
arch/arm/mach-ep93xx/Kconfig +0 ~~-14~~
index fe3c1fa..93e54fd 100644
@@ -194,20 +194,6 @@ config MACH_VISION_EP9307
 	  Say 'Y' here if you want your kernel to support the
 	  Vision Engraving Systems EP9307 SoM.
 
-choice
-	prompt "Select a UART for early kernel messages"
-
-config EP93XX_EARLY_UART1
-	bool "UART1"
-
-config EP93XX_EARLY_UART2
-	bool "UART2"
-
-config EP93XX_EARLY_UART3
-	bool "UART3"
-
-endchoice
-
 endmenu
 
 endif
arch/arm/mach-ep93xx/include/mach/uncompress.h +2 ~~-12~~
index b5cc77d..03c42e5 100644
@@ -31,18 +31,8 @@ static void __raw_writel(unsigned int value, unsigned int ptr)
 	*((volatile unsigned int *)ptr) = value;
 }
 
-#if defined(CONFIG_EP93XX_EARLY_UART1)
-#define UART_BASE		EP93XX_UART1_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART2)
-#define UART_BASE		EP93XX_UART2_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART3)
-#define UART_BASE		EP93XX_UART3_PHYS_BASE
-#else
-#define UART_BASE		EP93XX_UART1_PHYS_BASE
-#endif
-
-#define PHYS_UART_DATA		(UART_BASE + 0x00)
-#define PHYS_UART_FLAG		(UART_BASE + 0x18)
+#define PHYS_UART_DATA		(CONFIG_DEBUG_UART_PHYS + 0x00)
+#define PHYS_UART_FLAG		(CONFIG_DEBUG_UART_PHYS + 0x18)
 #define UART_FLAG_TXFF		0x20
 
 static inline void putc(int c)
Signature · 7 lines
1.8.3.2


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

H Hartley Sweeten

author

2013-07-26 17:10 UTC #4 lore raw

PATCH 1/1 ARM: debug: use generic option for ep93xx PL10x debug port

Quoted 6 lines · Russell King

Quoted 3 lines · H Hartley Sweeten
Russell,
Ping... Any comments on this?
I did reply on the 22nd, suggesting it gets put in the patch system.

Hmm.. I never saw the reply.

I'll get it into the patch system shortly.

Thanks,
Hartley