From: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 3/4] ARM: mach-omap2: apply the errata at run time rather
Date: Mon, 21 Jan 2013 18:46:15 +0530 [thread overview]
Message-ID: <20130121131613.GA29876@bnru10> (raw)
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
WARNING: multiple messages have this Message-ID (diff)
From: srinidhi.kasagar@stericsson.com (srinidhi kasagar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] ARM: mach-omap2: apply the errata at run time rather
Date: Mon, 21 Jan 2013 18:46:15 +0530 [thread overview]
Message-ID: <20130121131613.GA29876@bnru10> (raw)
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
next reply other threads:[~2013-01-21 13:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 13:16 srinidhi kasagar [this message]
2013-01-21 13:16 ` [PATCH 3/4] ARM: mach-omap2: apply the errata at run time rather srinidhi kasagar
2013-01-21 18:22 ` Tony Lindgren
2013-01-21 18:22 ` Tony Lindgren
2013-01-22 6:01 ` Srinidhi Kasagar
2013-01-22 6:01 ` Srinidhi Kasagar
2013-01-22 6:43 ` Santosh Shilimkar
2013-01-22 6:43 ` Santosh Shilimkar
2013-01-22 6:49 ` Srinidhi Kasagar
2013-01-22 6:49 ` Srinidhi Kasagar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130121131613.GA29876@bnru10 \
--to=srinidhi.kasagar@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.