Messages in this thread | | | Subject | Re: [PATCH v7 4/8] firmware: Add new platform fallback mechanism and firmware_request_platform() | From | Hans de Goede <> | Date | Thu, 14 Nov 2019 12:32:11 +0100 |
| |
Hi,
On 11-10-2019 17:29, Luis Chamberlain wrote: > On Fri, Oct 04, 2019 at 04:50:52PM +0200, Hans de Goede wrote: >> diff --git a/drivers/base/firmware_loader/Makefile b/drivers/base/firmware_loader/Makefile >> index 0b2dfa6259c9..fec75895faae 100644 >> --- a/drivers/base/firmware_loader/Makefile >> +++ b/drivers/base/firmware_loader/Makefile >> @@ -3,7 +3,7 @@ >> >> obj-$(CONFIG_FW_LOADER_USER_HELPER) += fallback_table.o >> obj-$(CONFIG_FW_LOADER) += firmware_class.o >> -firmware_class-objs := main.o >> +firmware_class-objs := main.o fallback_platform.o >> firmware_class-$(CONFIG_FW_LOADER_USER_HELPER) += fallback.o > > Why not just: > > firmware_class-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += fallback_platform.o > >> obj-y += builtin/ >> diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h >> index 21063503e4ea..c4350f2e7cc2 100644 >> --- a/drivers/base/firmware_loader/fallback.h >> +++ b/drivers/base/firmware_loader/fallback.h >> @@ -66,4 +66,6 @@ static inline void unregister_sysfs_loader(void) >> } >> #endif /* CONFIG_FW_LOADER_USER_HELPER */ >> >> +int firmware_fallback_platform(struct fw_priv *fw_priv, enum fw_opt opt_flags); >> + > > Inline this if not defined. > >> #endif /* __FIRMWARE_FALLBACK_H */ >> diff --git a/drivers/base/firmware_loader/fallback_platform.c b/drivers/base/firmware_loader/fallback_platform.c >> new file mode 100644 >> index 000000000000..7e9d730e36bf >> --- /dev/null >> +++ b/drivers/base/firmware_loader/fallback_platform.c >> @@ -0,0 +1,33 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> + >> +#include <linux/efi_embedded_fw.h> >> +#include <linux/property.h> >> +#include <linux/security.h> >> +#include <linux/vmalloc.h> >> + >> +#include "fallback.h" >> +#include "firmware.h" >> + >> +int firmware_fallback_platform(struct fw_priv *fw_priv, enum fw_opt opt_flags) >> +{ >> +#ifdef CONFIG_EFI_EMBEDDED_FIRMWARE > > And we can do away with this eyesore.
Ok will fix for the next version.
> Otherwise looks good!
Thanks.
Regards,
Hans
| |