[PATCH] x86/build: use the proper name CONFIG_FW_LOADER

[PATCH] x86/build: use the proper name CONFIG_FW_LOADER

[Lukas Bulwahn]

Commit c8dcf655ec81 ("x86/build: Tuck away built-in firmware under
FW_LOADER") intends to add the expression regex only when FW_LOADER is
built-in, not a module or disabled.

The config is called CONFIG_FW_LOADER when it is built-in; and
CONFIG_FW_LOADER_MODULE when it is a module.

So, adjust the condition to the actual name of the config.

Fixes: c8dcf655ec81 ("x86/build: Tuck away built-in firmware under FW_LOADER")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---

I am wondering if this regular expression needs to be made differently
depending on the build configuration at all.

Could this not just be added unconditionally anyway or is not needed at all?
It seems that is was broken since its initial inclusion and nobody ever noticed.


 arch/x86/tools/relocs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index c736cf2ac76b..e2c5b296120d 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -68,7 +68,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
 	"(__parainstructions|__alt_instructions)(_end)?|"
 	"(__iommu_table|__apicdrivers|__smp_locks)(_end)?|"
 	"__(start|end)_pci_.*|"
-#if CONFIG_FW_LOADER_BUILTIN
+#if CONFIG_FW_LOADER
 	"__(start|end)_builtin_fw|"
 #endif
 	"__(start|stop)___ksymtab(_gpl)?|"
-- 
2.17.1

Re: [PATCH] x86/build: use the proper name CONFIG_FW_LOADER

[Greg Kroah-Hartman]

On Wed, Dec 29, 2021 at 12:15:53PM +0100, Lukas Bulwahn wrote:
> Commit c8dcf655ec81 ("x86/build: Tuck away built-in firmware under
> FW_LOADER") intends to add the expression regex only when FW_LOADER is
> built-in, not a module or disabled.
> 
> The config is called CONFIG_FW_LOADER when it is built-in; and
> CONFIG_FW_LOADER_MODULE when it is a module.
> 
> So, adjust the condition to the actual name of the config.
> 
> Fixes: c8dcf655ec81 ("x86/build: Tuck away built-in firmware under FW_LOADER")
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> 
> I am wondering if this regular expression needs to be made differently
> depending on the build configuration at all.
> 
> Could this not just be added unconditionally anyway or is not needed at all?
> It seems that is was broken since its initial inclusion and nobody ever noticed.

Very few people use built-in firmware, which is why no one probably ever
noticed this :(

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH] x86/build: use the proper name CONFIG_FW_LOADER

[Borislav Petkov]

On Wed, Dec 29, 2021 at 12:15:53PM +0100, Lukas Bulwahn wrote:
> Commit c8dcf655ec81 ("x86/build: Tuck away built-in firmware under
> FW_LOADER") intends to add the expression regex only when FW_LOADER is
> built-in, not a module or disabled.
> 
> The config is called CONFIG_FW_LOADER when it is built-in; and
> CONFIG_FW_LOADER_MODULE when it is a module.

$ git grep FW_LOADER_MODULE
include/linux/firmware.h:37:#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))

So either I'm not grepping right or that FW_LOADER_MODULE thing belongs
to the past...

Greg, Luis, what's up?

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

[tip: x86/urgent] x86/build: Use the proper name CONFIG_FW_LOADER

[tip-bot2 for Lukas Bulwahn]

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     d6f12f83989bb356ac6880a954f62c7667e35066
Gitweb:        https://git.kernel.org/tip/d6f12f83989bb356ac6880a954f62c7667e35066
Author:        Lukas Bulwahn <lukas.bulwahn@gmail.com>
AuthorDate:    Wed, 29 Dec 2021 12:15:53 +01:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 29 Dec 2021 22:20:38 +01:00

x86/build: Use the proper name CONFIG_FW_LOADER

Commit in Fixes intends to add the expression regex only when FW_LOADER
is enabled - not FW_LOADER_BUILTIN. Latter is a leftover from a previous
patchset and not a valid config item.

So, adjust the condition to the actual name of the config.

  [ bp: Cleanup commit message. ]

Fixes: c8dcf655ec81 ("x86/build: Tuck away built-in firmware under FW_LOADER")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20211229111553.5846-1-lukas.bulwahn@gmail.com
---
 arch/x86/tools/relocs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index c736cf2..e2c5b29 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -68,7 +68,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
 	"(__parainstructions|__alt_instructions)(_end)?|"
 	"(__iommu_table|__apicdrivers|__smp_locks)(_end)?|"
 	"__(start|end)_pci_.*|"
-#if CONFIG_FW_LOADER_BUILTIN
+#if CONFIG_FW_LOADER
 	"__(start|end)_builtin_fw|"
 #endif
 	"__(start|stop)___ksymtab(_gpl)?|"

Re: [PATCH] x86/build: use the proper name CONFIG_FW_LOADER

[Greg Kroah-Hartman]

On Wed, Dec 29, 2021 at 08:36:11PM +0100, Borislav Petkov wrote:
> On Wed, Dec 29, 2021 at 12:15:53PM +0100, Lukas Bulwahn wrote:
> > Commit c8dcf655ec81 ("x86/build: Tuck away built-in firmware under
> > FW_LOADER") intends to add the expression regex only when FW_LOADER is
> > built-in, not a module or disabled.
> > 
> > The config is called CONFIG_FW_LOADER when it is built-in; and
> > CONFIG_FW_LOADER_MODULE when it is a module.
> 
> $ git grep FW_LOADER_MODULE
> include/linux/firmware.h:37:#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))
> 
> So either I'm not grepping right or that FW_LOADER_MODULE thing belongs
> to the past...
> 
> Greg, Luis, what's up?

Looks like a pre-git thing, it is obviously not a valid config option,
so it can be removed.  I'll go make a patch for it...

thanks,

greg k-h