[PATCH -next] reset: starfive-jh7100: Fix 32bit compilation

Emil Renner Berthing posted 1 patch 4 years, 6 months ago
drivers/reset/reset-starfive-jh7100.c | 1 +
1 file changed, 1 insertion(+)
[PATCH -next] reset: starfive-jh7100: Fix 32bit compilation
Posted by Emil Renner Berthing 4 years, 6 months ago
We need to include linux/io-64-nonatomic-lo-hi.h or readq/writeq won't
be defined when compiling on 32bit architectures:

On i386:

../drivers/reset/reset-starfive-jh7100.c: In function ‘jh7100_reset_update’:
../drivers/reset/reset-starfive-jh7100.c:81:10: error: implicit declaration of function ‘readq’; did you mean ‘readl’? [-Werror=implicit-function-declaration]
  value = readq(reg_assert);
           ^~~~~
../drivers/reset/reset-starfive-jh7100.c:86:2: error: implicit declaration of function ‘writeq’; did you mean ‘writel’? [-Werror=implicit-function-declaration]
  writeq(value, reg_assert);
  ^~~~~~

On m68k:

drivers/reset/reset-starfive-jh7100.c:81:17: error: implicit declaration of function 'readq'; did you mean 'readb'? [-Werror=implicit-function-declaration]
drivers/reset/reset-starfive-jh7100.c:86:9: error: implicit declaration of function 'writeq'; did you mean 'writel'? [-Werror=implicit-function-declaration]
cc1: all warnings being treated as errors
make[3]: *** [scripts/Makefile.build:289: drivers/reset/reset-starfive-jh7100.o] Error 1
make[2]: *** [scripts/Makefile.build:572: drivers/reset] Error 2
make[1]: *** [Makefile:1969: drivers] Error 2
make: *** [Makefile:226: __sub-make] Error 2

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Fixes: 0be3a1595bf8 ("reset: starfive-jh7100: Add StarFive JH7100 reset driver")
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
---
 drivers/reset/reset-starfive-jh7100.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/reset/reset-starfive-jh7100.c b/drivers/reset/reset-starfive-jh7100.c
index e28a19d271cb..fc44b2fb3e03 100644
--- a/drivers/reset/reset-starfive-jh7100.c
+++ b/drivers/reset/reset-starfive-jh7100.c
@@ -7,6 +7,7 @@
 
 #include <linux/bitmap.h>
 #include <linux/io.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/iopoll.h>
 #include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
-- 
2.33.1

Re: [PATCH -next] reset: starfive-jh7100: Fix 32bit compilation
Posted by Randy Dunlap 4 years, 6 months ago

On 12/20/21 04:17, Emil Renner Berthing wrote:
> We need to include linux/io-64-nonatomic-lo-hi.h or readq/writeq won't
> be defined when compiling on 32bit architectures:
> 
> On i386:
> 
> ../drivers/reset/reset-starfive-jh7100.c: In function ‘jh7100_reset_update’:
> ../drivers/reset/reset-starfive-jh7100.c:81:10: error: implicit declaration of function ‘readq’; did you mean ‘readl’? [-Werror=implicit-function-declaration]
>   value = readq(reg_assert);
>            ^~~~~
> ../drivers/reset/reset-starfive-jh7100.c:86:2: error: implicit declaration of function ‘writeq’; did you mean ‘writel’? [-Werror=implicit-function-declaration]
>   writeq(value, reg_assert);
>   ^~~~~~
> 
> On m68k:
> 
> drivers/reset/reset-starfive-jh7100.c:81:17: error: implicit declaration of function 'readq'; did you mean 'readb'? [-Werror=implicit-function-declaration]
> drivers/reset/reset-starfive-jh7100.c:86:9: error: implicit declaration of function 'writeq'; did you mean 'writel'? [-Werror=implicit-function-declaration]
> cc1: all warnings being treated as errors
> make[3]: *** [scripts/Makefile.build:289: drivers/reset/reset-starfive-jh7100.o] Error 1
> make[2]: *** [scripts/Makefile.build:572: drivers/reset] Error 2
> make[1]: *** [Makefile:1969: drivers] Error 2
> make: *** [Makefile:226: __sub-make] Error 2
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Fixes: 0be3a1595bf8 ("reset: starfive-jh7100: Add StarFive JH7100 reset driver")
> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>

Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Thanks.

> ---
>  drivers/reset/reset-starfive-jh7100.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/reset/reset-starfive-jh7100.c b/drivers/reset/reset-starfive-jh7100.c
> index e28a19d271cb..fc44b2fb3e03 100644
> --- a/drivers/reset/reset-starfive-jh7100.c
> +++ b/drivers/reset/reset-starfive-jh7100.c
> @@ -7,6 +7,7 @@
>  
>  #include <linux/bitmap.h>
>  #include <linux/io.h>
> +#include <linux/io-64-nonatomic-lo-hi.h>
>  #include <linux/iopoll.h>
>  #include <linux/mod_devicetable.h>
>  #include <linux/platform_device.h>

-- 
~Randy