[PATCH] Bluetooth: btintel: Correctly declare all module firmware files.

[PATCH] Bluetooth: btintel: Correctly declare all module firmware files.

[Dimitri John Ledkov]

Correctly declare wildcard of module firmwares to include, as the
driver & linux-firmware ship many sfi/ddc files for many different
devices which are dynamically calculated and loaded by the driver.

This especially affects environments that only install firmware files
declared and referenced by the kernel module. In such environments,
only the declared firmware files were copied resulting in most Intel
Bluetooth devices not working. I.e. host-only dracut-install initrds,
or Ubuntu Core kernel snaps.

BugLink: https://bugs.launchpad.net/bugs/1970819
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 drivers/bluetooth/btintel.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 06514ed66022..9f5fc1ab154d 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -2654,7 +2654,5 @@ MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("intel/ibt-11-5.sfi");
-MODULE_FIRMWARE("intel/ibt-11-5.ddc");
-MODULE_FIRMWARE("intel/ibt-12-16.sfi");
-MODULE_FIRMWARE("intel/ibt-12-16.ddc");
+MODULE_FIRMWARE("intel/ibt-*.sfi");
+MODULE_FIRMWARE("intel/ibt-*.ddc");
-- 
2.32.0

Re: [PATCH] Bluetooth: btintel: Correctly declare all module firmware files.

[Marcel Holtmann]

Hi Dimitri,

> Correctly declare wildcard of module firmwares to include, as the
> driver & linux-firmware ship many sfi/ddc files for many different
> devices which are dynamically calculated and loaded by the driver.
> 
> This especially affects environments that only install firmware files
> declared and referenced by the kernel module. In such environments,
> only the declared firmware files were copied resulting in most Intel
> Bluetooth devices not working. I.e. host-only dracut-install initrds,
> or Ubuntu Core kernel snaps.
> 
> BugLink: https://bugs.launchpad.net/bugs/1970819
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> ---
> drivers/bluetooth/btintel.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
> index 06514ed66022..9f5fc1ab154d 100644
> --- a/drivers/bluetooth/btintel.c
> +++ b/drivers/bluetooth/btintel.c
> @@ -2654,7 +2654,5 @@ MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
> MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);
> MODULE_VERSION(VERSION);
> MODULE_LICENSE("GPL");
> -MODULE_FIRMWARE("intel/ibt-11-5.sfi");
> -MODULE_FIRMWARE("intel/ibt-11-5.ddc");
> -MODULE_FIRMWARE("intel/ibt-12-16.sfi");
> -MODULE_FIRMWARE("intel/ibt-12-16.ddc");
> +MODULE_FIRMWARE("intel/ibt-*.sfi");
> +MODULE_FIRMWARE("intel/ibt-*.ddc");

NAK, we should just declare any missing firmwares. The tables inside the driver are pretty clear on what hardware is marked as supported. It just seems someone forgot to add the firmware files for it.

Regards

Marcel