ARM: OMAP2+: allow DEBUG_UNCOMPRESS for OMAP2+

PATCH In review Yong Li 2 participants 4 messages Dec 29, 2015 – Feb 21, 2016 Arm (32-bit)

Share & tools

Yong Li

author

2015-12-29 04:09 UTC #0 lore raw

PATCH 1/1 ARM: OMAP2+: allow DEBUG_UNCOMPRESS for OMAP2+

Based on the below
commit ae3c99a26c60 ("ARM: 7806/1: allow DEBUG_UNCOMPRESS for Tegra"), change the .data section to .text section,
to enable DEBUG_UNCOMPRESS for OMAP2+ platforms
Tested okay using BeagleBone Black

Signed-off-by Yong Li <[email protected]>

---
 arch/arm/Kconfig.debug             |  2 +-
 arch/arm/include/debug/omap2plus.S | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

arch/arm/Kconfig.debug +1 -1

index 259c0ca..e5ae36a 100644
@@ -1596,7 +1596,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 config DEBUG_UNCOMPRESS
 	bool
 	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
-	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
+	default y if DEBUG_LL && (!DEBUG_OMAP2PLUS_UART || !ZBOOT_ROM) && \
 		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
 	help
 	  This option influences the normal decompressor output for

arch/arm/include/debug/omap2plus.S +10 -3

index 6d867ae..12421f9 100644
@@ -58,11 +58,18 @@
 
 #define UART_OFFSET(addr)	((addr) & 0x00ffffff)
 
+#if defined(ZIMAGE)
+	omap_uart_phys:	.word	0
+	omap_uart_virt:	.word	0
+	omap_uart_lsr:	.word	0
+#else
+
 		.pushsection .data
-omap_uart_phys:	.word	0
-omap_uart_virt:	.word	0
-omap_uart_lsr:	.word	0
+	omap_uart_phys:	.word	0
+	omap_uart_virt:	.word	0
+	omap_uart_lsr:	.word	0
 		.popsection
+#endif
 
 		.macro	addruart, rp, rv, tmp

Signature · 1 line

2.1.4

Tony Lindgren

2016-02-19 18:02 UTC #1 lore raw

Hi,

Quoted 5 lines · Yong Li

Based on the below
commit ae3c99a26c60 ("ARM: 7806/1: allow DEBUG_UNCOMPRESS for Tegra"), change the .data section to .text section,
to enable DEBUG_UNCOMPRESS for OMAP2+ platforms
Tested okay using BeagleBone Black

Sorry for the delay, I just noticed this one while looking through my inbox for pending patches.

I think we should first simplify things by moving things over to use the generic DEBUG_UART_8250 code where the addresses need to be specified in the .config. It's been on my list of things to do for quite a while but I keep getting interrupted.

My guess is that if we do that, this patch is no longer needed :) Yong, care to take a look at that?

Regards,

Tony

Quoted 53 lines

Signed-off-by Yong Li <[email protected]>

---
 arch/arm/Kconfig.debug             |  2 +-
 arch/arm/include/debug/omap2plus.S | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

arch/arm/Kconfig.debug +1 -1

index 259c0ca..e5ae36a 100644
@@ -1596,7 +1596,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 config DEBUG_UNCOMPRESS
 	bool
 	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
-	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
+	default y if DEBUG_LL && (!DEBUG_OMAP2PLUS_UART || !ZBOOT_ROM) && \
 		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
 	help
 	  This option influences the normal decompressor output for

arch/arm/include/debug/omap2plus.S +10 -3

index 6d867ae..12421f9 100644
@@ -58,11 +58,18 @@
 
 #define UART_OFFSET(addr)	((addr) & 0x00ffffff)
 
+#if defined(ZIMAGE)
+	omap_uart_phys:	.word	0
+	omap_uart_virt:	.word	0
+	omap_uart_lsr:	.word	0
+#else
+
 		.pushsection .data
-omap_uart_phys:	.word	0
-omap_uart_virt:	.word	0
-omap_uart_lsr:	.word	0
+	omap_uart_phys:	.word	0
+	omap_uart_virt:	.word	0
+	omap_uart_lsr:	.word	0
 		.popsection
+#endif
 
 		.macro	addruart, rp, rv, tmp

Signature · 6 lines

2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

LIYONG

author

2016-02-21 12:19 UTC #2 lore raw

no problem, let me submit another patch

Quoted 79 lines

? 2016?2?20??02:02?Tony Lindgren <[email protected]> ???
Hi,
Quoted 5 lines · Yong Li
Based on the below
commit ae3c99a26c60 ("ARM: 7806/1: allow DEBUG_UNCOMPRESS for Tegra"), change the .data section to .text section,
to enable DEBUG_UNCOMPRESS for OMAP2+ platforms
Tested okay using BeagleBone Black
Sorry for the delay, I just noticed this one while looking through my inbox for pending patches.
I think we should first simplify things by moving things over to use the generic DEBUG_UART_8250 code where the addresses need to be specified in the .config. It's been on my list of things to do for quite a while but I keep getting interrupted.
My guess is that if we do that, this patch is no longer needed :) Yong, care to take a look at that?
Regards,
Tony
Quoted 53 lines
Signed-off-by Yong Li <[email protected]>
---
arch/arm/Kconfig.debug | 2 +-
arch/arm/include/debug/omap2plus.S | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
arch/arm/Kconfig.debug +0 -0
index 259c0ca..e5ae36a 100644
@@ -1596,7 +1596,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
config DEBUG_UNCOMPRESS
bool
depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
arch/arm/Kconfig.debug +1 -1
-    default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
+    default y if DEBUG_LL && (!DEBUG_OMAP2PLUS_UART || !ZBOOT_ROM) && \
            (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
   help
     This option influences the normal decompressor output for
arch/arm/include/debug/omap2plus.S +10 -3
index 6d867ae..12421f9 100644
@@ -58,11 +58,18 @@
 
 #define UART_OFFSET(addr)    ((addr) & 0x00ffffff)
 
+#if defined(ZIMAGE)
+    omap_uart_phys:    .word    0
+    omap_uart_virt:    .word    0
+    omap_uart_lsr:    .word    0
+#else
+
       .pushsection .data
-omap_uart_phys:    .word    0
-omap_uart_virt:    .word    0
-omap_uart_lsr:    .word    0
+    omap_uart_phys:    .word    0
+    omap_uart_virt:    .word    0
+    omap_uart_lsr:    .word    0
       .popsection
+#endif
 
       .macro    addruart, rp, rv, tmp
 
Signature · 6 lines
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Tony Lindgren

2016-02-21 15:34 UTC #3 lore raw

Quoted 1 line · LIYONG

no problem, let me submit another patch

OK thanks!

Tony