Skip to contentSkip to conversation

orion5x: optimize window size computation

PATCH Superseded Albert Aribaud 3 participants 5 messages Oct 6, 2010 Arm (32-bit)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 orion5x: optimize window size computation

---
V1 Initial submission
V2 Double Signed-off-by as requested

 arch/arm/cpu/arm926ejs/orion5x/cpu.c |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)
arch/arm/cpu/arm926ejs/orion5x/cpu.c +21 -11
index 260f88b..a49d926 100644
@@ -48,24 +48,34 @@ void reset_cpu(unsigned long ignored)
 }
 
 /*
- * Window Size
+ * Compute Window Size field value from size expressed in bytes
  * Used with the Base register to set the address window size and location.
  * Must be programmed from LSB to MSB as sequence of ones followed by
  * sequence of zeros. The number of ones specifies the size of the window in
  * 64 KByte granularity (e.g., a value of 0x00FF specifies 256 = 16 MByte).
- * NOTE: A value of 0x0 specifies 64-KByte size.
+ * NOTES:
+ * 1) A sizeval equal to 0x0 specifies 4 TB.
+ * 2) A return value of 0x0 specifies 64 KB.
  */
 unsigned int orion5x_winctrl_calcsize(unsigned int sizeval)
 {
-	int i;
-	unsigned int j = 0;
-	u32 val = sizeval >> 1;
-
-	for (i = 0; val >= 0x10000; i++) {
-		j |= (1 << i);
-		val = val >> 1;
-	}
-	return 0x0000ffff & j;
+	/*
+	 * Calculate the number of 64 KiB blocks needed minus one (rounding up).
+	 * For sizeval > 0 this is equivalent to:
+	 * sizeval = (u32) ceil((double) sizeval / 65536.0) - 1
+	 */
+	sizeval = (sizeval - 1) >> 16;
+
+	/*
+	 * Propagate 'one' bits to the right by 'oring' them.
+	 * We need only treat bits 15-0.
+	 */
+	sizeval |= sizeval >> 1;  /* 'Or' bit 15 onto bit 14 */
+	sizeval |= sizeval >> 2;  /* 'Or' bits 15-14 onto bits 13-12 */
+	sizeval |= sizeval >> 4;  /* 'Or' bits 15-12 onto bits 11-8 */
+	sizeval |= sizeval >> 8;  /* 'Or' bits 15-8 onto bits 7-0*/
+
+	return sizeval;
 }
 
 /*
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v2 1/1 orion5x: optimize window size computation

Hi,

Sorry Albert I missed this one last time :(

Le 06/10/2010 16:46, Albert Aribaud a ?crit :

Quoted 1 line

+ * 1) A sizeval equal to 0x0 specifies 4 TB

s/TB/GB/ or maybe even s/TB/GiB/

Question: are MB, GB, ... or MiB, GiB, ... preferred in U-Boot?

I generally try to use the "i" versions where appropriate. In fact I used a KiB below:

arch/arm/cpu/arm926ejs/orion5x/cpu.c void reset_cpu(unsigned long ignored) · line 63

Quoted 1 line
arch/arm/cpu/arm926ejs/orion5x/cpu.c +1 -0
+	 * Calculate the number of 64 KiB blocks needed minus one (rounding up).

IMHO whatever the choice, it would be preferable to be consistent throughout.

Cheers,
Chris

#2 lore raw

PATCH v2 1/1 orion5x: optimize window size computation

Le 06/10/2010 20:01, Chris Moore a ?crit :

Quoted 10 lines

Hi,

Sorry Albert I missed this one last time :(

Le 06/10/2010 16:46, Albert Aribaud a ?crit :

Quoted 1 line

+ * 1) A sizeval equal to 0x0 specifies 4 TB

s/TB/GB/ or maybe even s/TB/GiB/

Question: are MB, GB, ... or MiB, GiB, ... preferred in U-Boot?

/me slaps himself.

One day, I'll get this one right the first time around, you'll see.

Quoted 7 lines

I generally try to use the "i" versions where appropriate. In fact I used a KiB below:

Quoted 1 line

+ * Calculate the number of 64 KiB blocks needed minus one (rounding up).

IMHO whatever the choice, it would be preferable to be consistent throughout.

Indeed, and as always, I prefer the les ambiguous choice: 4 TiB it is.

Quoted 2 lines

Cheers,
Chris

Amicalement,

Signature · 1 line
Albert.
#3 lore raw

PATCH v2 1/1 orion5x: optimize window size computation

Le 06/10/2010 20:35, Albert ARIBAUD a ?crit :

Quoted 1 line

Indeed, and as always, I prefer the les ambiguous choice: 4 TiB it is.

Argh!!! 4 *GiB* it is.

Amicalement,

Signature · 1 line
Albert.
#4 lore raw

PATCH v2 1/1 orion5x: optimize window size computation

In reply to Chris Moore

Dear Chris Moore,

Quoted 2 lines · In message <[email protected]> you wrote:

Question: are MB, GB, ... or MiB, GiB, ... preferred in U-Boot?

We try to use standard units, i. e. MiB, GiB

Quoted 2 lines

I generally try to use the "i" versions where appropriate. In fact I used a KiB below:

ACK.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In the pitiful, multipage, connection-boxed form to which  the  flow-
chart  has  today  been  elaborated, it has proved to be useless as a
design tool -- programmers draw flowcharts after, not before, writing
the programs they describe.                        - Fred Brooks, Jr.