m68k: Implement ndelay() as an inline function to force type checking/casting

Message ID 20180513140212.3961-1-boris.brezillon@bootlin.com
State Not Applicable
Headers show
Series
  • m68k: Implement ndelay() as an inline function to force type checking/casting
Related show

Commit Message

Boris Brezillon May 13, 2018, 2:02 p.m.
ndelay() is supposed to take an unsigned long, but if you define
ndelay() as a macro and the caller pass an unsigned long long instead
of an unsigned long, the unsigned long long to unsigned long cast is
not done and we end up with an "undefined reference to `__udivdi3'"
error at link time.

Fix that by making ndelay() an inline function and then defining dummy
ndelay() macro that redirects to the ndelay() function (it's how most
archs do to implement ndelay()).

Fixes: c8ee038bd148 ("m68k: Implement ndelay() based on the existing udelay() logic")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
Hello Geert,

This patch is fixing the bug reported by kbuild test robot here [1].
I could have patched the PSEC_TO_NSEC() macro to cast the result of
the division on a u32, but I thought making m68k consistent with what
other archs do would be preferable.

Let me know if don't like the solution, and I'll patch the ndelay()
caller instead.

Regards,

Boris

[1]https://lkml.org/lkml/2018/5/13/72
---
 arch/m68k/include/asm/delay.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Andy Shevchenko May 13, 2018, 10:38 p.m. | #1
On Sun, May 13, 2018 at 5:02 PM, Boris Brezillon
<boris.brezillon@bootlin.com> wrote:
> ndelay() is supposed to take an unsigned long, but if you define
> ndelay() as a macro and the caller pass an unsigned long long instead
> of an unsigned long, the unsigned long long to unsigned long cast is
> not done and we end up with an "undefined reference to `__udivdi3'"
> error at link time.

> -#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
> +static inline void ndelay(unsigned long nsec)
> +{
> +       __delay(DIV_ROUND_UP(nsec *
> +                            ((((HZSCALE) >> 11) *

One pair of parens is redundant.

> +                              (loops_per_jiffy >> 11)) >> 6),
> +                            1000));

Can't you keep as one line as in original?

> +}
> +#define ndelay(n) ndelay(n)
>
>  #endif /* defined(_M68K_DELAY_H) */
> --
> 2.14.1
>
Miquel Raynal May 14, 2018, 7:23 a.m. | #2
Hi Boris,

On Sun, 13 May 2018 16:02:12 +0200, Boris Brezillon
<boris.brezillon@bootlin.com> wrote:

> ndelay() is supposed to take an unsigned long, but if you define
> ndelay() as a macro and the caller pass an unsigned long long instead
> of an unsigned long, the unsigned long long to unsigned long cast is
> not done and we end up with an "undefined reference to `__udivdi3'"
> error at link time.
> 
> Fix that by making ndelay() an inline function and then defining dummy
> ndelay() macro that redirects to the ndelay() function (it's how most
> archs do to implement ndelay()).
> 
> Fixes: c8ee038bd148 ("m68k: Implement ndelay() based on the existing udelay() logic")
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>

Thanks for fixing it.

Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Geert Uytterhoeven May 14, 2018, 9:29 a.m. | #3
Hi Boris,

On Sun, May 13, 2018 at 4:02 PM, Boris Brezillon
<boris.brezillon@bootlin.com> wrote:
> ndelay() is supposed to take an unsigned long, but if you define
> ndelay() as a macro and the caller pass an unsigned long long instead
> of an unsigned long, the unsigned long long to unsigned long cast is
> not done and we end up with an "undefined reference to `__udivdi3'"
> error at link time.
>
> Fix that by making ndelay() an inline function and then defining dummy
> ndelay() macro that redirects to the ndelay() function (it's how most
> archs do to implement ndelay()).
>
> Fixes: c8ee038bd148 ("m68k: Implement ndelay() based on the existing udelay() logic")
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
> Hello Geert,
>
> This patch is fixing the bug reported by kbuild test robot here [1].
> I could have patched the PSEC_TO_NSEC() macro to cast the result of
> the division on a u32, but I thought making m68k consistent with what
> other archs do would be preferable.
>
> Let me know if don't like the solution, and I'll patch the ndelay()
> caller instead.

Thanks for your patch!

With the comment a few lines above removed:

    - * This is a macro so that the const version can factor out the first
    - * multiply and shift.

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

>
> Regards,
>
> Boris
>
> [1]https://lkml.org/lkml/2018/5/13/72
> ---
>  arch/m68k/include/asm/delay.h | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
> index 7f474121e4ca..66ba159002a3 100644
> --- a/arch/m68k/include/asm/delay.h
> +++ b/arch/m68k/include/asm/delay.h
> @@ -115,6 +115,13 @@ static inline void __udelay(unsigned long usecs)
>   */
>  #define        HZSCALE         (268435456 / (1000000 / HZ))
>
> -#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
> +static inline void ndelay(unsigned long nsec)
> +{
> +       __delay(DIV_ROUND_UP(nsec *
> +                            ((((HZSCALE) >> 11) *
> +                              (loops_per_jiffy >> 11)) >> 6),
> +                            1000));
> +}
> +#define ndelay(n) ndelay(n)
>
>  #endif /* defined(_M68K_DELAY_H) */

Gr{oetje,eeting}s,

                        Geert
Geert Uytterhoeven May 14, 2018, 10:52 a.m. | #4
Hi Boris,

On Mon, May 14, 2018 at 11:29 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Sun, May 13, 2018 at 4:02 PM, Boris Brezillon
> <boris.brezillon@bootlin.com> wrote:
>> ndelay() is supposed to take an unsigned long, but if you define
>> ndelay() as a macro and the caller pass an unsigned long long instead
>> of an unsigned long, the unsigned long long to unsigned long cast is
>> not done and we end up with an "undefined reference to `__udivdi3'"
>> error at link time.
>>
>> Fix that by making ndelay() an inline function and then defining dummy
>> ndelay() macro that redirects to the ndelay() function (it's how most
>> archs do to implement ndelay()).
>>
>> Fixes: c8ee038bd148 ("m68k: Implement ndelay() based on the existing udelay() logic")
>> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
>> ---
>> Hello Geert,
>>
>> This patch is fixing the bug reported by kbuild test robot here [1].
>> I could have patched the PSEC_TO_NSEC() macro to cast the result of
>> the division on a u32, but I thought making m68k consistent with what
>> other archs do would be preferable.
>>
>> Let me know if don't like the solution, and I'll patch the ndelay()
>> caller instead.
>
> Thanks for your patch!
>
> With the comment a few lines above removed:
>
>     - * This is a macro so that the const version can factor out the first
>     - * multiply and shift.
>
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

I've just posted a fix for the root cause ("[PATCH] mtd: nand: Fix return
type of __DIVIDE() when called with 32-bit",
https://lkml.org/lkml/2018/5/14/578), so the fix for m68k's ndelay() is not
that urgent anymore.

As your patch is still a valid fix, I'll apply it, and queue it up for v4.18.

Thanks!

Gr{oetje,eeting}s,

                        Geert

Patch

diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
index 7f474121e4ca..66ba159002a3 100644
--- a/arch/m68k/include/asm/delay.h
+++ b/arch/m68k/include/asm/delay.h
@@ -115,6 +115,13 @@  static inline void __udelay(unsigned long usecs)
  */
 #define	HZSCALE		(268435456 / (1000000 / HZ))
 
-#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
+static inline void ndelay(unsigned long nsec)
+{
+	__delay(DIV_ROUND_UP(nsec *
+			     ((((HZSCALE) >> 11) *
+			       (loops_per_jiffy >> 11)) >> 6),
+			     1000));
+}
+#define ndelay(n) ndelay(n)
 
 #endif /* defined(_M68K_DELAY_H) */