[PATCH] firmware: fix build errors in paged buffer handling code

[PATCH] firmware: fix build errors in paged buffer handling code

[Takashi Iwai]

From: Mauro Rossi <issor.oruam@gmail.com>

fw_{grow,map}_paged_buf() need to be defined as static inline
when CONFIG_FW_LOADER_PAGED_BUF is not enabled,
infact fw_free_paged_buf() is also defined as static inline
when CONFIG_FW_LOADER_PAGED_BUF is not enabled.

Fixes the following mutiple definition building errors for Android kernel:

drivers/base/firmware_loader/fallback_efi.o: In function `fw_grow_paged_buf':
fallback_efi.c:(.text+0x0): multiple definition of `fw_grow_paged_buf'
drivers/base/firmware_loader/main.o:(.text+0x73b): first defined here
drivers/base/firmware_loader/fallback_efi.o: In function `fw_map_paged_buf':
fallback_efi.c:(.text+0xf): multiple definition of `fw_map_paged_buf'
drivers/base/firmware_loader/main.o:(.text+0x74a): first defined here

[ slightly corrected the patch description -- tiwai ]

Fixes: 5342e7093ff2 ("firmware: Factor out the paged buffer handling code")
Fixes: 82fd7a8142a1 ("firmware: Add support for loading compressed files")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/base/firmware_loader/firmware.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmware_loader/firmware.h
index 7048a41973ed..842e63f19f22 100644
--- a/drivers/base/firmware_loader/firmware.h
+++ b/drivers/base/firmware_loader/firmware.h
@@ -141,8 +141,8 @@ int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed);
 int fw_map_paged_buf(struct fw_priv *fw_priv);
 #else
 static inline void fw_free_paged_buf(struct fw_priv *fw_priv) {}
-int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
-int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
+static int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
+static int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
 #endif
 
 #endif /* __FIRMWARE_LOADER_H */
-- 
2.16.4

Re: [PATCH] firmware: fix build errors in paged buffer handling code

[Takashi Iwai]

On Mon, 22 Jul 2019 07:55:36 +0200,
Takashi Iwai wrote:
> 
> From: Mauro Rossi <issor.oruam@gmail.com>
> 
> fw_{grow,map}_paged_buf() need to be defined as static inline
> when CONFIG_FW_LOADER_PAGED_BUF is not enabled,
> infact fw_free_paged_buf() is also defined as static inline
> when CONFIG_FW_LOADER_PAGED_BUF is not enabled.
> 
> Fixes the following mutiple definition building errors for Android kernel:
> 
> drivers/base/firmware_loader/fallback_efi.o: In function `fw_grow_paged_buf':
> fallback_efi.c:(.text+0x0): multiple definition of `fw_grow_paged_buf'
> drivers/base/firmware_loader/main.o:(.text+0x73b): first defined here
> drivers/base/firmware_loader/fallback_efi.o: In function `fw_map_paged_buf':
> fallback_efi.c:(.text+0xf): multiple definition of `fw_map_paged_buf'
> drivers/base/firmware_loader/main.o:(.text+0x74a): first defined here
> 
> [ slightly corrected the patch description -- tiwai ]
> 
> Fixes: 5342e7093ff2 ("firmware: Factor out the paged buffer handling code")
> Fixes: 82fd7a8142a1 ("firmware: Add support for loading compressed files")
> Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Please discard this one.  It's missing the inline, as Mauro already
suggested in another mail.

Will resubmit the revised one.  Sorry for inconvenience.


Takashi

Re: [PATCH] firmware: fix build errors in paged buffer handling code

[Greg Kroah-Hartman]

On Mon, Jul 22, 2019 at 01:55:20PM +0200, Takashi Iwai wrote:
> On Mon, 22 Jul 2019 07:55:36 +0200,
> Takashi Iwai wrote:
> > 
> > From: Mauro Rossi <issor.oruam@gmail.com>
> > 
> > fw_{grow,map}_paged_buf() need to be defined as static inline
> > when CONFIG_FW_LOADER_PAGED_BUF is not enabled,
> > infact fw_free_paged_buf() is also defined as static inline
> > when CONFIG_FW_LOADER_PAGED_BUF is not enabled.
> > 
> > Fixes the following mutiple definition building errors for Android kernel:
> > 
> > drivers/base/firmware_loader/fallback_efi.o: In function `fw_grow_paged_buf':
> > fallback_efi.c:(.text+0x0): multiple definition of `fw_grow_paged_buf'
> > drivers/base/firmware_loader/main.o:(.text+0x73b): first defined here
> > drivers/base/firmware_loader/fallback_efi.o: In function `fw_map_paged_buf':
> > fallback_efi.c:(.text+0xf): multiple definition of `fw_map_paged_buf'
> > drivers/base/firmware_loader/main.o:(.text+0x74a): first defined here
> > 
> > [ slightly corrected the patch description -- tiwai ]
> > 
> > Fixes: 5342e7093ff2 ("firmware: Factor out the paged buffer handling code")
> > Fixes: 82fd7a8142a1 ("firmware: Add support for loading compressed files")
> > Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> 
> Please discard this one.  It's missing the inline, as Mauro already
> suggested in another mail.
> 
> Will resubmit the revised one.  Sorry for inconvenience.

Ugh, I already applied it, if there is no code difference, can we just
leave what I have already committed in the tree?

thanks,

greg k-h

Re: [PATCH] firmware: fix build errors in paged buffer handling code

[Takashi Iwai]

On Mon, 22 Jul 2019 14:12:02 +0200,
Greg Kroah-Hartman wrote:
> 
> On Mon, Jul 22, 2019 at 01:55:20PM +0200, Takashi Iwai wrote:
> > On Mon, 22 Jul 2019 07:55:36 +0200,
> > Takashi Iwai wrote:
> > > 
> > > From: Mauro Rossi <issor.oruam@gmail.com>
> > > 
> > > fw_{grow,map}_paged_buf() need to be defined as static inline
> > > when CONFIG_FW_LOADER_PAGED_BUF is not enabled,
> > > infact fw_free_paged_buf() is also defined as static inline
> > > when CONFIG_FW_LOADER_PAGED_BUF is not enabled.
> > > 
> > > Fixes the following mutiple definition building errors for Android kernel:
> > > 
> > > drivers/base/firmware_loader/fallback_efi.o: In function `fw_grow_paged_buf':
> > > fallback_efi.c:(.text+0x0): multiple definition of `fw_grow_paged_buf'
> > > drivers/base/firmware_loader/main.o:(.text+0x73b): first defined here
> > > drivers/base/firmware_loader/fallback_efi.o: In function `fw_map_paged_buf':
> > > fallback_efi.c:(.text+0xf): multiple definition of `fw_map_paged_buf'
> > > drivers/base/firmware_loader/main.o:(.text+0x74a): first defined here
> > > 
> > > [ slightly corrected the patch description -- tiwai ]
> > > 
> > > Fixes: 5342e7093ff2 ("firmware: Factor out the paged buffer handling code")
> > > Fixes: 82fd7a8142a1 ("firmware: Add support for loading compressed files")
> > > Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> > > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > 
> > Please discard this one.  It's missing the inline, as Mauro already
> > suggested in another mail.
> > 
> > Will resubmit the revised one.  Sorry for inconvenience.
> 
> Ugh, I already applied it, if there is no code difference, can we just
> leave what I have already committed in the tree?

Well, the compiler would optimize it out, so the binary would be
almost same, but it's still ugly to keep the obvious mistake there...
If necessary, I'll resubmit a patch on top of the first version to
correct that.


thanks,

Takashi