[PATCH] arm: remove unused code in delay.S

[schen@mvista.com (Steve Chen)]

On Wed, 2009-09-16 at 00:47 +0200, Krzysztof Halasa wrote:
> Steve Chen <schen@mvista.com> writes:
> 
> > If I know for sure that these are the processors that need that block of
> > code, your suggestion makes perfect sense.  Unfortunately, I don't know.
> 
> Then I wouldn't write "Accurate delays". "Different", maybe.
> "Accurate", we don't know.
You are right.  "Accurate delays" isn't appropriate.  Probably want
something along the lines of "try this and see if helps".

> 
> > My primary goals are
> >
> > 1.  Put a stop to this thread (so far I have failed miserably)
> > 2.  Document that block of code.
> > 3.  If it makes someone's life easier.. it would be a bonus.
> 
> Uncertain comments don't make life easier. Just write what's certain,
> or nothing if nothing is.
Makes sense.  Based on both yours and Marek's inputs, I changed the
wording.  The patch is below.

Document #if 0 code block in delay.S and make it selectable for compile.

Signed-off-by: Steve Chen <schen@mvista.com>

---

 arch/arm/Kconfig     |    8 ++++++++
 arch/arm/lib/delay.S |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aef63c8..ca8d535 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -813,6 +813,14 @@ config ARM_ERRATA_460075
 	  ACTLR register. Note that setting specific bits in the ACTLR
register
 	  may not be available in non-secure mode.
 
+config OLD_CPU_DELAY
+	depends on CPU_32v3 || CPU_32v4 || CPU_32v4T
+	bool "Accurate delays for some older CPUs"
+	def_bool n
+	help
+	  Try enable this if observing longer than expected delays and need
+	  more accuracy.  May cause instability in some CPUs.
+
 endmenu
 
 source "arch/arm/common/Kconfig"
diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S
index 8d6a876..67e679b 100644
--- a/arch/arm/lib/delay.S
+++ b/arch/arm/lib/delay.S
@@ -42,7 +42,7 @@ ENTRY(__const_udelay)				@ 0 <= r0 <= 0x7fffff06
 @ Delay routine
 ENTRY(__delay)
 		subs	r0, r0, #1
-#if 0
+#ifdef CONFIG_OLD_CPU_DELAY
 		movls	pc, lr
 		subs	r0, r0, #1
 		movls	pc, lr