diff mbox

[3/4] ARM: mach-omap2: apply the errata at run time rather

Message ID 20130121131613.GA29876@bnru10 (mailing list archive)
State New, archived
Headers show

Commit Message

srinidhi kasagar Jan. 21, 2013, 1:16 p.m. UTC
Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
---
 arch/arm/mach-omap2/sleep44xx.S |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

Comments

Tony Lindgren Jan. 21, 2013, 6:22 p.m. UTC | #1
* srinidhi kasagar <srinidhi.kasagar@stericsson.com> [130121 05:19]:

Forgot to complete the subject and add the description?

Regards,

Tony

> Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
> ---
>  arch/arm/mach-omap2/sleep44xx.S |   25 +++++++++++++++++++++----
>  1 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
> index 88ff83a..071ca1f 100644
> --- a/arch/arm/mach-omap2/sleep44xx.S
> +++ b/arch/arm/mach-omap2/sleep44xx.S
> @@ -157,11 +157,19 @@ skip_scu_gp_set:
>  	ldrne	r0, [r8, #L2X0_SAVE_OFFSET1]	@ memory.
>  	cmp	r0, #3
>  	bne	do_WFI
> -#ifdef CONFIG_PL310_ERRATA_727915
> +	/* Check for PL310_ERRATA_727915 */
> +	bl	l2x0_get_rtl_release
> +	cmp	r0, #0x4
> +	beq	dosmc
> +	cmp	r0, #0x5
> +	beq	dosmc
> +	b	nosmc
> +dosmc:
>  	mov	r0, #0x03
>  	mov	r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX
>  	DO_SMC
> -#endif
> +
> +nosmc:
>  	bl	omap4_get_l2cache_base
>  	mov	r2, r0
>  	ldr	r0, =0xffff
> @@ -171,11 +179,20 @@ wait:
>  	ldr	r1, =0xffff
>  	ands	r0, r0, r1
>  	bne	wait
> -#ifdef CONFIG_PL310_ERRATA_727915
> +
> +	/* Check for PL310_ERRATA_727915 */
> +	bl	l2x0_get_rtl_release
> +	cmp	r0, #0x4
> +	beq	dosmc2
> +	cmp	r0, #0x5
> +	beq	dosmc2
> +	b	nosmc2
> +dosmc2:
>  	mov	r0, #0x00
>  	mov	r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX
>  	DO_SMC
> -#endif
> +
> +nosmc2:
>  l2x_sync:
>  	bl	omap4_get_l2cache_base
>  	mov	r2, r0
> -- 
> 1.7.2.dirty
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
srinidhi kasagar Jan. 22, 2013, 6:01 a.m. UTC | #2
On Mon, Jan 21, 2013 at 19:22:37 +0100, Tony Lindgren wrote:
> * srinidhi kasagar <srinidhi.kasagar@stericsson.com> [130121 05:19]:
> 
> Forgot to complete the subject and add the description?

No :) It has the subject, but description is intentionally skipped
because subject has all the meaning and it is a part of the series
of patches I sent..

regards/srinidhi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Santosh Shilimkar Jan. 22, 2013, 6:43 a.m. UTC | #3
On Tuesday 22 January 2013 11:31 AM, Srinidhi Kasagar wrote:
> On Mon, Jan 21, 2013 at 19:22:37 +0100, Tony Lindgren wrote:
>> * srinidhi kasagar <srinidhi.kasagar@stericsson.com> [130121 05:19]:
>>
>> Forgot to complete the subject and add the description?
>
> No :) It has the subject, but description is intentionally skipped
> because subject has all the meaning and it is a part of the series
> of patches I sent..
>
"ARM: mach-omap2: apply the errata at run time rather"

Subject doesn't have all the meaning till you read the series ;)
Like, this is Pl310 XYZ errata etc. Anyway once you sort
out the concerns from RMK and with a few lines of
description on subject patch, you can add my ack on OMAP
patches.

Thanks a lot for doing this.

Regards,
Santosh
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
srinidhi kasagar Jan. 22, 2013, 6:49 a.m. UTC | #4
On Tue, Jan 22, 2013 at 07:43:24 +0100, Santosh Shilimkar wrote:
> On Tuesday 22 January 2013 11:31 AM, Srinidhi Kasagar wrote:
> > On Mon, Jan 21, 2013 at 19:22:37 +0100, Tony Lindgren wrote:
> >> * srinidhi kasagar <srinidhi.kasagar@stericsson.com> [130121 05:19]:
> >>
> >> Forgot to complete the subject and add the description?
> >
> > No :) It has the subject, but description is intentionally skipped
> > because subject has all the meaning and it is a part of the series
> > of patches I sent..
> >
> "ARM: mach-omap2: apply the errata at run time rather"
> 
> Subject doesn't have all the meaning till you read the series ;)
> Like, this is Pl310 XYZ errata etc. Anyway once you sort
> out the concerns from RMK and with a few lines of
> description on subject patch, you can add my ack on OMAP
> patches.

thanks, the description part will be fixed.
Can you check RMK's comment on set_debug patch, patch 1/4? I need
your comment on that to roll it over because set_debug is something
which is OMAP specific..

> 
> Thanks a lot for doing this.
> 
> Regards,
> Santosh
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" 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/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
index 88ff83a..071ca1f 100644
--- a/arch/arm/mach-omap2/sleep44xx.S
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -157,11 +157,19 @@  skip_scu_gp_set:
 	ldrne	r0, [r8, #L2X0_SAVE_OFFSET1]	@ memory.
 	cmp	r0, #3
 	bne	do_WFI
-#ifdef CONFIG_PL310_ERRATA_727915
+	/* Check for PL310_ERRATA_727915 */
+	bl	l2x0_get_rtl_release
+	cmp	r0, #0x4
+	beq	dosmc
+	cmp	r0, #0x5
+	beq	dosmc
+	b	nosmc
+dosmc:
 	mov	r0, #0x03
 	mov	r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX
 	DO_SMC
-#endif
+
+nosmc:
 	bl	omap4_get_l2cache_base
 	mov	r2, r0
 	ldr	r0, =0xffff
@@ -171,11 +179,20 @@  wait:
 	ldr	r1, =0xffff
 	ands	r0, r0, r1
 	bne	wait
-#ifdef CONFIG_PL310_ERRATA_727915
+
+	/* Check for PL310_ERRATA_727915 */
+	bl	l2x0_get_rtl_release
+	cmp	r0, #0x4
+	beq	dosmc2
+	cmp	r0, #0x5
+	beq	dosmc2
+	b	nosmc2
+dosmc2:
 	mov	r0, #0x00
 	mov	r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX
 	DO_SMC
-#endif
+
+nosmc2:
 l2x_sync:
 	bl	omap4_get_l2cache_base
 	mov	r2, r0