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

Commit 5b7de454 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

ARM: 6651/1: omap: Fix DEBUG_LL code for p2v changes 



These are needed for CONFIG_ARM_PATCH_PHYS_VIRT to work.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 72a20e22

arch/arm/mach-omap1/include/mach/debug-macro.S

+6 −3
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 


#include <plat/serial.h>



#define omap_uart_v2p(x)	((x) - PAGE_OFFSET + PLAT_PHYS_OFFSET)

#define omap_uart_p2v(x)	((x) - PLAT_PHYS_OFFSET + PAGE_OFFSET)



		.pushsection .data

omap_uart_phys:	.word	0x0

omap_uart_virt:	.word	0x0
@@ -33,7 +36,7 @@ omap_uart_virt: .word 0x0 
		/* Use omap_uart_phys/virt if already configured */

9:		mrc	p15, 0, \rp, c1, c0

		tst	\rp, #1			@ MMU enabled?

		ldreq	\rp, =__virt_to_phys(omap_uart_phys)	@ MMU not enabled

		ldreq	\rp, =omap_uart_v2p(omap_uart_phys)	@ MMU disabled

		ldrne	\rp, =omap_uart_phys	@ MMU enabled

		add	\rv, \rp, #4		@ omap_uart_virt

		ldr	\rp, [\rp, #0]
@@ -46,7 +49,7 @@ omap_uart_virt: .word 0x0 
		mrc	p15, 0, \rp, c1, c0

		tst	\rp, #1			@ MMU enabled?

		ldreq	\rp, =OMAP_UART_INFO	@ MMU not enabled

		ldrne	\rp, =__phys_to_virt(OMAP_UART_INFO)	@ MMU enabled

		ldrne	\rp, =omap_uart_p2v(OMAP_UART_INFO)	@ MMU enabled

		ldr	\rp, [\rp, #0]



		/* Select the UART to use based on the UART1 scratchpad value */
@@ -73,7 +76,7 @@ omap_uart_virt: .word 0x0 
98:		add	\rp, \rp, #0xff000000	@ phys base

		mrc	p15, 0, \rv, c1, c0

		tst	\rv, #1			@ MMU enabled?

		ldreq	\rv, =__virt_to_phys(omap_uart_phys)	@ MMU not enabled

		ldreq	\rv, =omap_uart_v2p(omap_uart_phys)	@ MMU disabled

		ldrne	\rv, =omap_uart_phys	@ MMU enabled

		str	\rp, [\rv, #0]

		sub	\rp, \rp, #0xff000000	@ phys base

arch/arm/mach-omap2/include/mach/debug-macro.S

+8 −5
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 


#define UART_OFFSET(addr)	((addr) & 0x00ffffff)



#define omap_uart_v2p(x)	((x) - PAGE_OFFSET + PLAT_PHYS_OFFSET)

#define omap_uart_p2v(x)	((x) - PLAT_PHYS_OFFSET + PAGE_OFFSET)



		.pushsection .data

omap_uart_phys:	.word	0

omap_uart_virt:	.word	0
@@ -36,7 +39,7 @@ omap_uart_lsr: .word 0 
		/* Use omap_uart_phys/virt if already configured */

10:		mrc	p15, 0, \rp, c1, c0

		tst	\rp, #1			@ MMU enabled?

		ldreq	\rp, =__virt_to_phys(omap_uart_phys)	@ MMU not enabled

		ldreq	\rp, =omap_uart_v2p(omap_uart_phys)	@ MMU disabled

		ldrne	\rp, =omap_uart_phys	@ MMU enabled

		add	\rv, \rp, #4		@ omap_uart_virt

		ldr	\rp, [\rp, #0]
@@ -49,7 +52,7 @@ omap_uart_lsr: .word 0 
		mrc	p15, 0, \rp, c1, c0

		tst	\rp, #1			@ MMU enabled?

		ldreq	\rp, =OMAP_UART_INFO	@ MMU not enabled

		ldrne	\rp, =__phys_to_virt(OMAP_UART_INFO)	@ MMU enabled

		ldrne	\rp, =omap_uart_p2v(OMAP_UART_INFO)	@ MMU enabled

		ldr	\rp, [\rp, #0]



		/* Select the UART to use based on the UART1 scratchpad value */
@@ -94,7 +97,7 @@ omap_uart_lsr: .word 0 
95:		ldr	\rp, =ZOOM_UART_BASE

		mrc	p15, 0, \rv, c1, c0

		tst	\rv, #1			@ MMU enabled?

		ldreq	\rv, =__virt_to_phys(omap_uart_phys)	@ MMU not enabled

		ldreq	\rv, =omap_uart_v2p(omap_uart_phys)	@ MMU disabled

		ldrne	\rv, =omap_uart_phys	@ MMU enabled

		str	\rp, [\rv, #0]

		ldr	\rp, =ZOOM_UART_VIRT
@@ -109,7 +112,7 @@ omap_uart_lsr: .word 0 
98:		add	\rp, \rp, #0x48000000	@ phys base

		mrc	p15, 0, \rv, c1, c0

		tst	\rv, #1			@ MMU enabled?

		ldreq	\rv, =__virt_to_phys(omap_uart_phys)	@ MMU not enabled

		ldreq	\rv, =omap_uart_v2p(omap_uart_phys)	@ MMU disabled

		ldrne	\rv, =omap_uart_phys	@ MMU enabled

		str	\rp, [\rv, #0]

		sub	\rp, \rp, #0x48000000	@ phys base
@@ -131,7 +134,7 @@ omap_uart_lsr: .word 0 
		.macro	busyuart,rd,rx

1001:		mrc	p15, 0, \rd, c1, c0

		tst	\rd, #1			@ MMU enabled?

		ldreq	\rd, =__virt_to_phys(omap_uart_lsr)	@ MMU not enabled

		ldreq	\rd, =omap_uart_v2p(omap_uart_lsr)	@ MMU disabled

		ldrne	\rd, =omap_uart_lsr	@ MMU enabled

		ldr	\rd, [\rd, #0]

		ldrb	\rd, [\rx, \rd]