Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 173109cf authored by Łukasz Stelmach's avatar Łukasz Stelmach Committed by Greg Kroah-Hartman
Browse files

ARM: 8753/1: decompressor: add a missing parameter to the addruart macro 



[ Upstream commit e07e3c33b9c0b5751ade624f44325c9bf2487ea6 ]

In commit 639da5ee ("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: 639da5ee ("ARM: add an extra temp register to the low level debugging addruart macro")
Signed-off-by: default avatarŁukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78ec0643

arch/arm/boot/compressed/head.S

+8 −8
Original line number Diff line number Diff line
@@ -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
@@ -1221,7 +1221,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
@@ -1238,8 +1238,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}