| From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com> |
| Date: Tue, 3 Apr 2018 09:04:57 +0100 |
| Subject: ARM: 8753/1: decompressor: add a missing parameter to the addruart |
| macro |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit e07e3c33b9c0b5751ade624f44325c9bf2487ea6 upstream. |
| |
| In commit 639da5ee374b ("ARM: add an extra temp register to the low |
| level debugging addruart macro") an additional temporary register was |
| added to the addruart macro, but the decompressor code wasn't updated. |
| |
| Fixes: 639da5ee374b ("ARM: add an extra temp register to the low level debugging addruart macro") |
| Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com> |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/arm/boot/compressed/head.S | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| --- a/arch/arm/boot/compressed/head.S |
| +++ b/arch/arm/boot/compressed/head.S |
| @@ -24,19 +24,19 @@ |
| #if defined(CONFIG_DEBUG_ICEDCC) |
| |
| #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) |
| - .macro loadsp, rb, tmp |
| + .macro loadsp, rb, tmp1, tmp2 |
| .endm |
| .macro writeb, ch, rb |
| mcr p14, 0, \ch, c0, c5, 0 |
| .endm |
| #elif defined(CONFIG_CPU_XSCALE) |
| - .macro loadsp, rb, tmp |
| + .macro loadsp, rb, tmp1, tmp2 |
| .endm |
| .macro writeb, ch, rb |
| mcr p14, 0, \ch, c8, c0, 0 |
| .endm |
| #else |
| - .macro loadsp, rb, tmp |
| + .macro loadsp, rb, tmp1, tmp2 |
| .endm |
| .macro writeb, ch, rb |
| mcr p14, 0, \ch, c1, c0, 0 |
| @@ -52,7 +52,7 @@ |
| .endm |
| |
| #if defined(CONFIG_ARCH_SA1100) |
| - .macro loadsp, rb, tmp |
| + .macro loadsp, rb, tmp1, tmp2 |
| mov \rb, #0x80000000 @ physical base address |
| #ifdef CONFIG_DEBUG_LL_SER3 |
| add \rb, \rb, #0x00050000 @ Ser3 |
| @@ -61,8 +61,8 @@ |
| #endif |
| .endm |
| #else |
| - .macro loadsp, rb, tmp |
| - addruart \rb, \tmp |
| + .macro loadsp, rb, tmp1, tmp2 |
| + addruart \rb, \tmp1, \tmp2 |
| .endm |
| #endif |
| #endif |
| @@ -1219,7 +1219,7 @@ phex: adr r3, phexbuf |
| b 1b |
| |
| @ puts corrupts {r0, r1, r2, r3} |
| -puts: loadsp r3, r1 |
| +puts: loadsp r3, r2, r1 |
| 1: ldrb r2, [r0], #1 |
| teq r2, #0 |
| moveq pc, lr |
| @@ -1236,8 +1236,8 @@ puts: loadsp r3, r1 |
| @ putc corrupts {r0, r1, r2, r3} |
| putc: |
| mov r2, r0 |
| + loadsp r3, r1, r0 |
| mov r0, #0 |
| - loadsp r3, r1 |
| b 2b |
| |
| @ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr} |
