Skip to contentSkip to conversation

[2.6.37] ARM: tegra: fix regression from addruart rewrite

PATCH New Olof Johansson 2 participants 5 messages Dec 7, 2010

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

PATCH 1/1 [2.6.37] ARM: tegra: fix regression from addruart rewrite

0ea1293009826da45e1019f45dfde1e557bb30df took out the test for MMU on/off but didn't switch the ldr instructions to no longer be conditionals based on said test.

Fix that.

---
 arch/arm/mach-tegra/include/mach/debug-macro.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-tegra/include/mach/debug-macro.S +2 -2
index 8ea3bff..a0e7c12 100644
@@ -21,8 +21,8 @@
 #include <mach/io.h>
 
 	.macro  addruart, rp, rv
-        ldreq   \rp, =IO_APB_PHYS       @ physical
-        ldrne   \rv, =IO_APB_VIRT        @ virtual
+        ldr     \rp, =IO_APB_PHYS       @ physical
+        ldr     \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)
Signature · 1 line
1.7.3.1
#1 lore raw

PATCH 1/1 [2.6.37] ARM: tegra: fix regression from addruart rewrite

Quoted 5 lines · Olof Johansson

0ea1293009826da45e1019f45dfde1e557bb30df took out the test for MMU on/off but didn't switch the ldr instructions to no longer be conditionals based on said test.

Fix that.

This is fixed in the uart macro consolidation patch I posted yesterday.

#2 lore raw

PATCH 1/1 [2.6.37] ARM: tegra: fix regression from addruart rewrite

Quoted 8 lines · Colin Cross
Quoted 5 lines · Olof Johansson

0ea1293009826da45e1019f45dfde1e557bb30df took out the test for MMU on/off but didn't switch the ldr instructions to no longer be conditionals based on said test.

Fix that.

This is fixed in the uart macro consolidation patch I posted yesterday.

Yep, which is scheduled for .38, not .37. I'm actually trying to boot a mainline kernel instead of the one from the android tree right now, so I hit this...

-Olof

#3 lore raw

PATCH 1/1 [2.6.37] ARM: tegra: fix regression from addruart rewrite

Quoted 6 lines · Olof Johansson
Quoted 5 lines · Colin Cross
Quoted 4 lines · Olof Johansson

0ea1293009826da45e1019f45dfde1e557bb30df took out the test for MMU on/off but didn't switch the ldr instructions to no longer be conditionals based on said test.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Fix that.

This is fixed in the uart macro consolidation patch I posted yesterday.

Yep, which is scheduled for .38, not .37. I'm actually trying to boot a mainline kernel instead of the one from the android tree right now, so I hit this...

Ah, I forgot that problem was introduced in .37.
Ack, I'll put it in a tegra-fixes branch and send a .37 pull request.

#4 lore raw

PATCH 1/1 [2.6.37] ARM: tegra: fix regression from addruart rewrite

Quoted 9 lines · Colin Cross
Quoted 8 lines · Olof Johansson
Quoted 7 lines · Colin Cross
Quoted 5 lines · Olof Johansson

0ea1293009826da45e1019f45dfde1e557bb30df took out the test for MMU on/off but didn't switch the ldr instructions to no longer be conditionals based on said test.

Fix that.

Quoted 9 lines
Quoted 5 lines
Quoted 1 line

This is fixed in the uart macro consolidation patch I posted yesterday.

Yep, which is scheduled for .38, not .37. I'm actually trying to boot a mainline kernel instead of the one from the android tree right now, so I hit this...

Ah, I forgot that problem was introduced in .37.
Ack, I'll put it in a tegra-fixes branch and send a .37 pull request.

I see this went directly to Linus, so I won't send a pull request.