summary refs log tree commit diff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-06-03 15:46:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-06-03 15:46:03 -0700
commit07953c54a10567e484cefd8f8c782025dc68b3b1 (patch)
tree61c13f39f96b1141d7010941d6dcbe775b45b45a /drivers
parent744983d8784214c4f184be7448efb216315b48ae (diff)
downloadlinux-07953c54a10567e484cefd8f8c782025dc68b3b1.tar.gz
firmware_loader: enable XZ by default if compressed support is enabled
Commit 23cfbc6ec44e ("firmware: Add the support for ZSTD-compressed
firmware files") added support for ZSTD compression, but in the process
also made the previously default XZ compression a config option.

That means that anybody who upgrades their kernel and does a

    make oldconfig

to update their configuration, will end up without the XZ compression
that the configuration used to have.

Add the 'default y' to make sure this doesn't happen.

The whole compression question should probably be improved upon, since
it is now possible to "enable" compression in the kernel config but not
enable any actual compression algorithm, which makes it all very
useless.  It makes no sense to ask Kconfig questions that enable
situations that are nonsensical like that.

This at least fixes the immediate problem of a kernel update resulting
in a nonbootable machine because of a missed option.

Fixes: 23cfbc6ec44e ("firmware: Add the support for ZSTD-compressed  firmware files")
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/firmware_loader/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/firmware_loader/Kconfig b/drivers/base/firmware_loader/Kconfig
index 7e663dd972a7..5166b323a0f8 100644
--- a/drivers/base/firmware_loader/Kconfig
+++ b/drivers/base/firmware_loader/Kconfig
@@ -177,6 +177,7 @@ config FW_LOADER_COMPRESS_XZ
 	bool "Enable XZ-compressed firmware support"
 	select FW_LOADER_PAGED_BUF
 	select XZ_DEC
+	default y
 	help
 	  This option adds the support for XZ-compressed files.
 	  The files have to be compressed with either none or crc32