ARM: mach-omap2: apply the errata at run time rather

Signed-off-by srinidhi kasagar <[email protected]>

---
 arch/arm/mach-omap2/sleep44xx.S |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

arch/arm/mach-omap2/sleep44xx.S +21 -4

index 88ff83a..071ca1f 100644
@@ -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

Signature · 6 lines

1.7.2.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

* srinidhi kasagar <[email protected]> [130121 05:19]:

Forgot to complete the subject and add the description?

Quoted 3 lines · Tony Lindgren

* srinidhi kasagar <[email protected]> [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..

Quoted 9 lines · Srinidhi Kasagar

Quoted 3 lines · Tony Lindgren

* srinidhi kasagar <[email protected]> [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