Skip to contentSkip to conversation

ARM:rmobile: Correct get_time_ms / get_time_us to use lldiv

PATCH New Tom Rini 3 participants 11 messages Dec 5, 2013 – Dec 16, 2013

Subsystems (3)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/5 ARM:rmobile: Correct get_time_ms / get_time_us to use lldiv

Cc Nobuhiro Iwamatsu <[email protected]>
---
 arch/arm/cpu/armv7/rmobile/timer.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/rmobile/timer.c +3 -3
index 72e0c12..67a5a7a 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <div64.h>
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
 #include <asm/arch/rmobile.h>
@@ -38,13 +39,12 @@ static u64 get_time_us(void)
 	u64 timer = get_cpu_global_timer();
 
 	timer = ((timer << 2) + (CLK2MHZ(CONFIG_SYS_CPU_CLK) >> 1));
-	timer /= (u64)CLK2MHZ(CONFIG_SYS_CPU_CLK);
-	return timer;
+	return lldiv(timer, CLK2MHZ(CONFIG_SYS_CPU_CLK));
 }
 
 static ulong get_time_ms(void)
 {
-	return (ulong)(get_time_us() / 1000);
+	return lldiv(get_time_us(), 1000);
 }
 
 int timer_init(void)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/5 ARM:zynq: Correct __udelay to use lldiv

Cc Michal Simek <[email protected]>
---
 arch/arm/cpu/armv7/zynq/timer.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/cpu/armv7/zynq/timer.c +1 -2
index 636322a..2be253c 100644
@@ -107,8 +107,7 @@ void __udelay(unsigned long usec)
 	if (usec == 0)
 		return;
 
-	countticks = (u32) (((unsigned long long) TIMER_TICK_HZ * usec) /
-								1000000);
+	countticks = lldiv(TIMER_TICK_HZ * usec, 1000000);
 
 	/* decrementing timer */
 	timeend = readl(&timer_base->counter) - countticks;
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/5 ARM:zynq: Correct __udelay to use lldiv

Quoted 6 lines · Tom Rini
Cc Michal Simek <[email protected]>

---
arch/arm/cpu/armv7/zynq/timer.c | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131216/e240dcae/attachment.pgp>
author
#3 lore raw

PATCH 3/5 ARM:PXA: Correct tick_to_time / us_to_tick to use lldiv

In reply to Tom Rini
---
 arch/arm/cpu/pxa/timer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/pxa/timer.c +2 -2
index 78d9f32..c4717de 100644
@@ -28,12 +28,12 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static unsigned long long tick_to_time(unsigned long long tick)
 {
-	return tick * CONFIG_SYS_HZ / TIMER_FREQ_HZ;
+	return lldiv(tick * CONFIG_SYS_HZ, TIMER_FREQ_HZ);
 }
 
 static unsigned long long us_to_tick(unsigned long long us)
 {
-	return (us * TIMER_FREQ_HZ) / 1000000;
+	return lldiv(us * TIMER_FREQ_HZ, 1000000);
 }
 
 int timer_init(void)
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 3/5 ARM:PXA: Correct tick_to_time / us_to_tick to use lldiv

Quoted 2 lines · Tom Rini

btw. how come you still CC this old address ? ;-)

Quoted 13 lines
---
 arch/arm/cpu/pxa/timer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/pxa/timer.c +0 -1
index 78d9f32..c4717de 100644
@@ -28,12 +28,12 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static unsigned long long tick_to_time(unsigned long long tick)
 {
-	return tick * CONFIG_SYS_HZ / TIMER_FREQ_HZ;

arch/arm/cpu/pxa/timer.c DECLARE_GLOBAL_DATA_PTR; · line 39

Quoted 10 lines
arch/arm/cpu/pxa/timer.c +2 -1
+	return lldiv(tick * CONFIG_SYS_HZ, TIMER_FREQ_HZ);
 }
 
 static unsigned long long us_to_tick(unsigned long long us)
 {
-	return (us * TIMER_FREQ_HZ) / 1000000;
+	return lldiv(us * TIMER_FREQ_HZ, 1000000);
 }
 
 int timer_init(void)

Best regards,
Marek Vasut

author
#5 lore raw

PATCH 3/5 ARM:PXA: Correct tick_to_time / us_to_tick to use lldiv

In reply to Tom Rini
Quoted 3 lines · Tom Rini

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131216/c54ddfdd/attachment.pgp>
author
#6 lore raw

PATCH 4/5 JFFS2: Correct jffs2_1pass_build_lists to use lldiv

In reply to Tom Rini

Since part_info size became 64bit we need to use lldiv here.

---
 fs/jffs2/jffs2_1pass.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
fs/jffs2/jffs2_1pass.c +3 -1
index c856983..3fb5db3 100644
@@ -114,6 +114,7 @@
 #include <common.h>
 #include <config.h>
 #include <malloc.h>
+#include <div64.h>
 #include <linux/stat.h>
 #include <linux/time.h>
 #include <watchdog.h>
@@ -1438,7 +1439,7 @@ jffs2_1pass_build_lists(struct part_info * part)
 {
 	struct b_lists *pL;
 	struct jffs2_unknown_node *node;
-	u32 nr_sectors = part->size/part->sector_size;
+	u32 nr_sectors;
 	u32 i;
 	u32 counter4 = 0;
 	u32 counterF = 0;
@@ -1447,6 +1448,7 @@ jffs2_1pass_build_lists(struct part_info * part)
 	u32 buf_size = DEFAULT_EMPTY_SCAN_SIZE;
 	char *buf;
 
+	nr_sectors = lldiv(part->size, part->sector_size);
 	/* turn off the lcd.  Refreshing the lcd adds 50% overhead to the */
 	/* jffs2 list building enterprise nope.  in newer versions the overhead is */
 	/* only about 5 %.  not enough to inconvenience people for. */
Signature · 1 line
1.7.9.5
author
#7 lore raw

PATCH 4/5 JFFS2: Correct jffs2_1pass_build_lists to use lldiv

Quoted 7 lines · Tom Rini

Since part_info size became 64bit we need to use lldiv here.

---
fs/jffs2/jffs2_1pass.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131216/6f7ef4f5/attachment.pgp>
author
#8 lore raw

PATCH 5/5 yaffs2: Use lldiv for 64bit division

In reply to Tom Rini
---
 fs/yaffs2/yaffs_uboot_glue.c |    3 ++-
 fs/yaffs2/yaffsfs.c          |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)
fs/yaffs2/yaffs_uboot_glue.c +2 -1
index e113e40..50000a1 100644
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <div64.h>
 
 #include <config.h>
 #include "nand.h"
@@ -184,7 +185,7 @@ void cmd_yaffs_devconfig(char *_mp, int flash_dev,
 	}
 
 	if (end_block == 0)
-		end_block = mtd->size / mtd->erasesize - 1;
+		end_block = lldiv(mtd->size, mtd->erasesize - 1);
 
 	if (end_block < start_block) {
 		printf("Bad start/end\n");
fs/yaffs2/yaffsfs.c +3 -2
index ac4a010..334598e 100644
@@ -11,6 +11,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <div64.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
@@ -1603,8 +1604,8 @@ static int yaffsfs_DoStat(struct yaffs_obj *obj, struct yaffs_stat *buf)
 		buf->st_rdev = obj->yst_rdev;
 		buf->st_size = yaffs_get_obj_length(obj);
 		buf->st_blksize = obj->my_dev->data_bytes_per_chunk;
-		buf->st_blocks = (buf->st_size + buf->st_blksize - 1) /
-		    buf->st_blksize;
+		buf->st_blocks = lldiv(buf->st_size + buf->st_blksize - 1,
+		    buf->st_blksize);
 #if CONFIG_YAFFS_WINCE
 		buf->yst_wince_atime[0] = obj->win_atime[0];
 		buf->yst_wince_atime[1] = obj->win_atime[1];
Signature · 1 line
1.7.9.5
author
#9 lore raw

PATCH 5/5 yaffs2: Use lldiv for 64bit division

Quoted 6 lines · Tom Rini

---
fs/yaffs2/yaffs_uboot_glue.c | 3 ++-

 fs/yaffs2/yaffsfs.c          |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131216/61621518/attachment.pgp>
#10 lore raw

PATCH 1/5 ARM:rmobile: Correct get_time_ms / get_time_us to use lldiv

In reply to Tom Rini

Hi, Tom.

Thanks for your patch.
But I already sent a same patch as yours.
http://patchwork.ozlabs.org/patch/294819/

Best regards,
Nobuhiro

2013/12/6 Tom Rini <[email protected]>:

Quoted 41 lines
Cc Nobuhiro Iwamatsu <[email protected]>
---
 arch/arm/cpu/armv7/rmobile/timer.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/rmobile/timer.c +3 -4
index 72e0c12..67a5a7a 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <div64.h>
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
 #include <asm/arch/rmobile.h>
@@ -38,13 +39,12 @@ static u64 get_time_us(void)
        u64 timer = get_cpu_global_timer();
 
        timer = ((timer << 2) + (CLK2MHZ(CONFIG_SYS_CPU_CLK) >> 1));
-       timer /= (u64)CLK2MHZ(CONFIG_SYS_CPU_CLK);
-       return timer;
+       return lldiv(timer, CLK2MHZ(CONFIG_SYS_CPU_CLK));
 }
 
 static ulong get_time_ms(void)
 {
-       return (ulong)(get_time_us() / 1000);
+       return lldiv(get_time_us(), 1000);
 }
 
 int timer_init(void)
--

1.7.9.5

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 1 line
Nobuhiro Iwamatsu