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

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

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

Signed-off-by: Olof Johansson <olof@lixom.net>
---
 arch/arm/mach-tegra/include/mach/debug-macro.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S
index 8ea3bff..a0e7c12 100644
--- a/arch/arm/mach-tegra/include/mach/debug-macro.S
+++ b/arch/arm/mach-tegra/include/mach/debug-macro.S
@@ -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)
-- 
1.7.3.1

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

[Colin Cross]

On Mon, Dec 6, 2010 at 5:36 PM, Olof Johansson <olof@lixom.net> wrote:
> 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.

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

[Olof Johansson]

On Mon, Dec 06, 2010 at 05:40:01PM -0800, Colin Cross wrote:
> On Mon, Dec 6, 2010 at 5:36 PM, Olof Johansson <olof@lixom.net> wrote:
> > 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

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

[Colin Cross]

On Mon, Dec 6, 2010 at 5:41 PM, Olof Johansson <olof@lixom.net> wrote:
> On Mon, Dec 06, 2010 at 05:40:01PM -0800, Colin Cross wrote:
>> On Mon, Dec 6, 2010 at 5:36 PM, Olof Johansson <olof@lixom.net> wrote:
>> > 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...

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.

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

[Colin Cross]

On Mon, Dec 6, 2010 at 5:44 PM, Colin Cross <ccross@android.com> wrote:
> On Mon, Dec 6, 2010 at 5:41 PM, Olof Johansson <olof@lixom.net> wrote:
>> On Mon, Dec 06, 2010 at 05:40:01PM -0800, Colin Cross wrote:
>>> On Mon, Dec 6, 2010 at 5:36 PM, Olof Johansson <olof@lixom.net> wrote:
>>> > 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...
>
> 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.
Acked-by: Colin Cross <ccross@android.com>