[PATCH 1/3] MIPS: Loongson64: include asm/bootinfo.h

[PATCH 1/3] MIPS: Loongson64: include asm/bootinfo.h

[Genjian]

From: Genjian Zhang <zhanggenjian@kylinos.cn>

build-warning is printed:
arch/mips/loongson64/dma.c:25:13: error: no previous prototype for ‘plat_swiotlb_setup’ [-Werror=missing-prototypes]

Include the header to fix it.

Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
---
 arch/mips/loongson64/dma.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/mips/loongson64/dma.c b/arch/mips/loongson64/dma.c
index 8220a1bc0db6..5c5e524b9121 100644
--- a/arch/mips/loongson64/dma.c
+++ b/arch/mips/loongson64/dma.c
@@ -3,6 +3,7 @@
 #include <linux/init.h>
 #include <linux/swiotlb.h>
 #include <boot_param.h>
+#include <asm/bootinfo.h>
 
 dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
-- 
2.25.1

[PATCH 2/3] MIPS: sgi-ip22: Add prototypes for several functions to header

[Genjian]

From: Genjian Zhang <zhanggenjian@kylinos.cn>

This fixes the following build warning:

arch/mips/sgi-ip22/ip22-time.c:119:18: error: no previous prototype for ‘indy_8254timer_irq’ [-Werror=missing-prototypes]
arch/mips/sgi-ip22/ip22-berr.c:89:6: error: no previous prototype for ‘ip22_be_interrupt’ [-Werror=missing-prototypes]
arch/mips/sgi-ip22/ip22-berr.c:113:13: error: no previous prototype for ‘ip22_be_init’ [-Werror=missing-prototypes]

Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
---
 arch/mips/include/asm/sgi/ip22.h | 3 +++
 arch/mips/sgi-ip22/ip22-int.c    | 2 --
 arch/mips/sgi-ip22/ip22-setup.c  | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/mips/include/asm/sgi/ip22.h b/arch/mips/include/asm/sgi/ip22.h
index 87ec9eaa04e3..57942afb5c86 100644
--- a/arch/mips/include/asm/sgi/ip22.h
+++ b/arch/mips/include/asm/sgi/ip22.h
@@ -76,5 +76,8 @@
 
 extern unsigned short ip22_eeprom_read(unsigned int *ctrl, int reg);
 extern unsigned short ip22_nvram_read(int reg);
+extern void ip22_be_interrupt(int irq);
+extern void ip22_be_init(void) __init;
+extern void indy_8254timer_irq(void);
 
 #endif
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index 96798a4ab2de..11f8adc98cb5 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -165,8 +165,6 @@ static void __irq_entry indy_buserror_irq(void)
 #define SGI_INTERRUPTS	SGINT_LOCAL3
 #endif
 
-extern void indy_8254timer_irq(void);
-
 /*
  * IRQs on the INDY look basically (barring software IRQs which we don't use
  * at all) like:
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c
index b69daa02401b..e06a818fe792 100644
--- a/arch/mips/sgi-ip22/ip22-setup.c
+++ b/arch/mips/sgi-ip22/ip22-setup.c
@@ -26,8 +26,6 @@
 #include <asm/sgi/hpc3.h>
 #include <asm/sgi/ip22.h>
 
-extern void ip22_be_init(void) __init;
-
 void __init plat_mem_setup(void)
 {
 	char *ctype;
-- 
2.25.1

Re: [PATCH 2/3] MIPS: sgi-ip22: Add prototypes for several functions to header

[Thomas Bogendoerfer]

On Thu, May 16, 2024 at 07:59:05PM +0800, Genjian wrote:
> From: Genjian Zhang <zhanggenjian@kylinos.cn>
> 
> This fixes the following build warning:
> 
> arch/mips/sgi-ip22/ip22-time.c:119:18: error: no previous prototype for ‘indy_8254timer_irq’ [-Werror=missing-prototypes]
> arch/mips/sgi-ip22/ip22-berr.c:89:6: error: no previous prototype for ‘ip22_be_interrupt’ [-Werror=missing-prototypes]
> arch/mips/sgi-ip22/ip22-berr.c:113:13: error: no previous prototype for ‘ip22_be_init’ [-Werror=missing-prototypes]
> 
> Reported-by: k2ci <kernel-bot@kylinos.cn>
> Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
> ---
>  arch/mips/include/asm/sgi/ip22.h | 3 +++
>  arch/mips/sgi-ip22/ip22-int.c    | 2 --
>  arch/mips/sgi-ip22/ip22-setup.c  | 2 --
>  3 files changed, 3 insertions(+), 4 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

[PATCH 3/3] MIPS: ip22-gio: Make ip22_gio_set_64bit() and ip22_gio_init() static

[Genjian]

From: Genjian Zhang <zhanggenjian@kylinos.cn>

These functions are used in only one file.
Made them static to fix the following build error:

arch/mips/sgi-ip22/ip22-gio.c:249:6: error: no previous prototype for ‘ip22_gio_set_64bit’ [-Werror=missing-prototypes]
arch/mips/sgi-ip22/ip22-gio.c:398:12: error: no previous prototype for ‘ip22_gio_init’ [-Werror=missing-prototypes]

Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
---
 arch/mips/sgi-ip22/ip22-gio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c
index a3cdcb289941..2738325e98dd 100644
--- a/arch/mips/sgi-ip22/ip22-gio.c
+++ b/arch/mips/sgi-ip22/ip22-gio.c
@@ -246,7 +246,7 @@ void gio_set_master(struct gio_device *dev)
 }
 EXPORT_SYMBOL_GPL(gio_set_master);
 
-void ip22_gio_set_64bit(int slotno)
+static void ip22_gio_set_64bit(int slotno)
 {
 	u32 tmp = sgimc->giopar;
 
@@ -395,7 +395,7 @@ static struct resource gio_bus_resource = {
 	.flags = IORESOURCE_MEM,
 };
 
-int __init ip22_gio_init(void)
+static int __init ip22_gio_init(void)
 {
 	unsigned int pbdma __maybe_unused;
 	int ret;
-- 
2.25.1

Re: [PATCH 3/3] MIPS: ip22-gio: Make ip22_gio_set_64bit() and ip22_gio_init() static

[Thomas Bogendoerfer]

On Thu, May 16, 2024 at 07:59:06PM +0800, Genjian wrote:
> From: Genjian Zhang <zhanggenjian@kylinos.cn>
> 
> These functions are used in only one file.
> Made them static to fix the following build error:
> 
> arch/mips/sgi-ip22/ip22-gio.c:249:6: error: no previous prototype for ‘ip22_gio_set_64bit’ [-Werror=missing-prototypes]
> arch/mips/sgi-ip22/ip22-gio.c:398:12: error: no previous prototype for ‘ip22_gio_init’ [-Werror=missing-prototypes]
> 
> Reported-by: k2ci <kernel-bot@kylinos.cn>
> Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
> ---
>  arch/mips/sgi-ip22/ip22-gio.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

Re: [PATCH 1/3] MIPS: Loongson64: include asm/bootinfo.h

[Jiaxun Yang]

在2024年5月16日五月 下午12:59，Genjian写道：
> From: Genjian Zhang <zhanggenjian@kylinos.cn>
>
> build-warning is printed:
> arch/mips/loongson64/dma.c:25:13: error: no previous prototype for 
> ‘plat_swiotlb_setup’ [-Werror=missing-prototypes]
>
> Include the header to fix it.

Duplicated with my patch[1], but thanks for the patch anyway.

Thanks
[1]: https://lore.kernel.org/linux-mips/20240507-loongson64-warnings-v1-2-2cad88344e9e@flygoat.com/
>
> Reported-by: k2ci <kernel-bot@kylinos.cn>
> Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
> ---
>  arch/mips/loongson64/dma.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/mips/loongson64/dma.c b/arch/mips/loongson64/dma.c
> index 8220a1bc0db6..5c5e524b9121 100644
> --- a/arch/mips/loongson64/dma.c
> +++ b/arch/mips/loongson64/dma.c
> @@ -3,6 +3,7 @@
>  #include <linux/init.h>
>  #include <linux/swiotlb.h>
>  #include <boot_param.h>
> +#include <asm/bootinfo.h>
> 
>  dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
>  {
> -- 
> 2.25.1

-- 
- Jiaxun