diff mbox

ARM: exynos: fix UART address selection for DEBUG_LL

Message ID 1411728234-29705-1-git-send-email-jy0922.shim@samsung.com
State Accepted
Headers show

Commit Message

Joonyoung Shim Sept. 26, 2014, 10:43 a.m. UTC
The exynos5 SoCs using A15+A7 can boot to A15 or A7. If it boots using
A7, it can't detect right UART physical address only the part number of
CP15. It's possible to solve as checking Cluster ID additionally.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
 arch/arm/include/debug/exynos.S | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Joonyoung Shim Jan. 19, 2015, 6:55 a.m. UTC | #1
Hi kukjin,

On 09/26/2014 07:43 PM, Joonyoung Shim wrote:
> The exynos5 SoCs using A15+A7 can boot to A15 or A7. If it boots using
> A7, it can't detect right UART physical address only the part number of
> CP15. It's possible to solve as checking Cluster ID additionally.
> 
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
> ---
>  arch/arm/include/debug/exynos.S | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/debug/exynos.S b/arch/arm/include/debug/exynos.S
> index b17fdb7..60bf3c2 100644
> --- a/arch/arm/include/debug/exynos.S
> +++ b/arch/arm/include/debug/exynos.S
> @@ -24,7 +24,11 @@
>  		mrc	p15, 0, \tmp, c0, c0, 0
>  		and	\tmp, \tmp, #0xf0
>  		teq	\tmp, #0xf0		@@ A15
> -		ldreq	\rp, =EXYNOS5_PA_UART
> +		beq	100f
> +		mrc	p15, 0, \tmp, c0, c0, 5
> +		and	\tmp, \tmp, #0xf00
> +		teq	\tmp, #0x100		@@ A15 + A7 but boot to A7
> +100:		ldreq	\rp, =EXYNOS5_PA_UART
>  		movne	\rp, #EXYNOS4_PA_UART	@@ EXYNOS4
>  		ldr	\rv, =S3C_VA_UART
>  #if CONFIG_DEBUG_S3C_UART != 0
> 

Any comments?

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski June 22, 2016, 6:24 a.m. UTC | #2
On Mon, Jan 19, 2015 at 7:55 AM, Joonyoung Shim <jy0922.shim@samsung.com> wrote:
> Hi kukjin,
>
> On 09/26/2014 07:43 PM, Joonyoung Shim wrote:
>> The exynos5 SoCs using A15+A7 can boot to A15 or A7. If it boots using
>> A7, it can't detect right UART physical address only the part number of
>> CP15. It's possible to solve as checking Cluster ID additionally.
>>
>> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
>> ---
>>  arch/arm/include/debug/exynos.S | 6 +++++-
>>  1 file changed, 5 insertions(+), 1 deletion(-)
>>

This is an old patch... but still valid and needed on Odroid XU
family. Tested by Marek Szyprowski.

Applied, thanks!

BR,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/include/debug/exynos.S b/arch/arm/include/debug/exynos.S
index b17fdb7..60bf3c2 100644
--- a/arch/arm/include/debug/exynos.S
+++ b/arch/arm/include/debug/exynos.S
@@ -24,7 +24,11 @@ 
 		mrc	p15, 0, \tmp, c0, c0, 0
 		and	\tmp, \tmp, #0xf0
 		teq	\tmp, #0xf0		@@ A15
-		ldreq	\rp, =EXYNOS5_PA_UART
+		beq	100f
+		mrc	p15, 0, \tmp, c0, c0, 5
+		and	\tmp, \tmp, #0xf00
+		teq	\tmp, #0x100		@@ A15 + A7 but boot to A7
+100:		ldreq	\rp, =EXYNOS5_PA_UART
 		movne	\rp, #EXYNOS4_PA_UART	@@ EXYNOS4
 		ldr	\rv, =S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0