diff mbox series

drm/ast: Update the sequence of Clearing Fast-reset

Message ID 20210118085755.107804-1-kuohsiang_chou@aspeedtech.com (mailing list archive)
State New, archived
Headers show
Series drm/ast: Update the sequence of Clearing Fast-reset | expand

Commit Message

Kuo-Hsiang Chou Jan. 18, 2021, 8:57 a.m. UTC
[Bug][AST2500]
If SCU00 is not unlocked, just enter its password again.
It is unnecessary to clear AHB lock condition and restore WDT default
setting again, before Fast-reset clearing.

Signed-off-by: KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>
---
 drivers/gpu/drm/ast/ast_post.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--
2.18.4

Comments

Thomas Zimmermann Jan. 21, 2021, 7:55 a.m. UTC | #1
Hi

Am 18.01.21 um 09:57 schrieb KuoHsiang Chou:
> [Bug][AST2500]
> If SCU00 is not unlocked, just enter its password again.
> It is unnecessary to clear AHB lock condition and restore WDT default
> setting again, before Fast-reset clearing.
> 
> Signed-off-by: KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>

Is this a separate issue? This patch looks like a fix for the previous 
patch. [1] Can you add this change to v3 of the other patch?

Best regards
Thomas

[1] 
https://lore.kernel.org/dri-devel/20210112075811.9354-1-kuohsiang_chou@aspeedtech.com/

> ---
>   drivers/gpu/drm/ast/ast_post.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 1f0007daa005..4f194c5fd2c2 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -2030,7 +2030,6 @@ void ast_patch_ahb_2500(struct ast_private *ast)
>   {
>   	u32	data;
> 
> -patch_ahb_lock:
>   	/* Clear bus lock condition */
>   	ast_moutdwm(ast, 0x1e600000, 0xAEED1A03);
>   	ast_moutdwm(ast, 0x1e600084, 0x00010000);
> @@ -2044,11 +2043,9 @@ void ast_patch_ahb_2500(struct ast_private *ast)
>   		ast_moutdwm(ast, 0x1E78500c, 0x00000033);
>   		udelay(1000);
>   	}
> -	ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
>   	do {
> +		ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
>   		data = ast_mindwm(ast, 0x1e6e2000);
> -		if (data == 0xffffffff)
> -			goto patch_ahb_lock;
>   	}	while (data != 1);
>   	ast_moutdwm(ast, 0x1e6e207c, 0x08000000);	/* clear fast reset */
>   }
> --
> 2.18.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Kuo-Hsiang Chou Jan. 21, 2021, 8:42 a.m. UTC | #2
-----Original Message-----
From: Thomas Zimmermann [mailto:tzimmermann@suse.de] 
Sent: Thursday, January 21, 2021 3:56 PM
To: Kuo-Hsiang Chou <kuohsiang_chou@aspeedtech.com>; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/ast: Update the sequence of Clearing Fast-reset

Hi

Am 18.01.21 um 09:57 schrieb KuoHsiang Chou:
> [Bug][AST2500]
> If SCU00 is not unlocked, just enter its password again.
> It is unnecessary to clear AHB lock condition and restore WDT default 
> setting again, before Fast-reset clearing.
> 
> Signed-off-by: KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>

Is this a separate issue? This patch looks like a fix for the previous patch. [1] Can you add this change to v3 of the other patch?

Hi, 
Based on the result of driver released, this patch is a fix for previous one [1], so that I will merge this two patches into a single one as v3 of [1]. Thanks!

Regards,
	Kuo-Hsiang Chou

Best regards
Thomas

[1]
https://lore.kernel.org/dri-devel/20210112075811.9354-1-kuohsiang_chou@aspeedtech.com/

> ---
>   drivers/gpu/drm/ast/ast_post.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_post.c 
> b/drivers/gpu/drm/ast/ast_post.c index 1f0007daa005..4f194c5fd2c2 
> 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -2030,7 +2030,6 @@ void ast_patch_ahb_2500(struct ast_private *ast)
>   {
>   	u32	data;
> 
> -patch_ahb_lock:
>   	/* Clear bus lock condition */
>   	ast_moutdwm(ast, 0x1e600000, 0xAEED1A03);
>   	ast_moutdwm(ast, 0x1e600084, 0x00010000); @@ -2044,11 +2043,9 @@ 
> void ast_patch_ahb_2500(struct ast_private *ast)
>   		ast_moutdwm(ast, 0x1E78500c, 0x00000033);
>   		udelay(1000);
>   	}
> -	ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
>   	do {
> +		ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
>   		data = ast_mindwm(ast, 0x1e6e2000);
> -		if (data == 0xffffffff)
> -			goto patch_ahb_lock;
>   	}	while (data != 1);
>   	ast_moutdwm(ast, 0x1e6e207c, 0x08000000);	/* clear fast reset */
>   }
> --
> 2.18.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
diff mbox series

Patch

diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 1f0007daa005..4f194c5fd2c2 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -2030,7 +2030,6 @@  void ast_patch_ahb_2500(struct ast_private *ast)
 {
 	u32	data;

-patch_ahb_lock:
 	/* Clear bus lock condition */
 	ast_moutdwm(ast, 0x1e600000, 0xAEED1A03);
 	ast_moutdwm(ast, 0x1e600084, 0x00010000);
@@ -2044,11 +2043,9 @@  void ast_patch_ahb_2500(struct ast_private *ast)
 		ast_moutdwm(ast, 0x1E78500c, 0x00000033);
 		udelay(1000);
 	}
-	ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
 	do {
+		ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
 		data = ast_mindwm(ast, 0x1e6e2000);
-		if (data == 0xffffffff)
-			goto patch_ahb_lock;
 	}	while (data != 1);
 	ast_moutdwm(ast, 0x1e6e207c, 0x08000000);	/* clear fast reset */
 }