riscv: Fix udelay in RV32.
authorNick Hu <nickhu@andestech.com>
Thu, 30 May 2019 07:01:17 +0000 (15:01 +0800)
committerPaul Walmsley <paul.walmsley@sifive.com>
Tue, 11 Jun 2019 15:04:26 +0000 (08:04 -0700)
In RV32, udelay would delay the wrong cycle. When it shifts right
"UDELAY_SHIFT" bits, it either delays 0 cycle or 1 cycle. It only works
correctly in RV64. Because the 'ucycles' always needs to be 64 bits
variable.

Signed-off-by: Nick Hu <nickhu@andestech.com>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
[paul.walmsley@sifive.com: fixed minor spelling error]
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
arch/riscv/lib/delay.c

index dce8ae24c6d33b4ca3ebd0c19c3650f1ce890bde..ee6853c1e341c5455c9440cdb1cc585351b5541f 100644 (file)
@@ -88,7 +88,7 @@ EXPORT_SYMBOL(__delay);
 
 void udelay(unsigned long usecs)
 {
-       unsigned long ucycles = usecs * lpj_fine * UDELAY_MULT;
+       u64 ucycles = (u64)usecs * lpj_fine * UDELAY_MULT;
 
        if (unlikely(usecs > MAX_UDELAY_US)) {
                __delay((u64)usecs * riscv_timebase / 1000000ULL);