From ea882d6c99efc683bf65e141d3f5c5237e4264e3 Mon Sep 17 00:00:00 2001 From: Kiran K Date: Fri, 5 Jul 2024 15:59:23 +0530 Subject: [PATCH 1/6] Bluetooth: btintel: Add support for Whale Peak2 from /sys/kernel/debug/usb/devices: T: Bus=03 Lev=01 Prnt=01 Port=09 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=8087 ProdID=0039 Rev= 0.00 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms Signed-off-by: Kiran K Signed-off-by: Luiz Augusto von Dentz (cherry picked from commit f6dc9214e526c2f735d93b5330f4dcd42a2b5308) --- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 13f3762cdcb3..e1eb5dd605c2 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -478,6 +478,7 @@ static const struct usb_device_id quirks_table[] = { { USB_DEVICE(0x8087, 0x0035), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0036), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0038), .driver_info = BTUSB_INTEL_COMBINED }, + { USB_DEVICE(0x8087, 0x0039), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED | BTUSB_INTEL_NO_WBS_SUPPORT | From ec91ebef2e842d219e09d8b7a0148dab1c8831b9 Mon Sep 17 00:00:00 2001 From: Kiran K Date: Thu, 2 May 2024 10:53:55 +0530 Subject: [PATCH 2/6] Bluetooth: btintel: Add support for BlazarI Add support for BlazarI (cnvi) bluetooth core. Signed-off-by: Kiran K Signed-off-by: Luiz Augusto von Dentz (cherry picked from commit 87ad06a20f1c8b521070ebe4cb78f68673c14a8c) --- drivers/bluetooth/btintel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 08ceae5f68c6..1dcb4ab94477 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -471,6 +471,7 @@ static int btintel_version_info_tlv(struct hci_dev *hdev, case 0x19: /* Slr-F */ case 0x1b: /* Mgr */ case 0x1c: /* Gale Peak (GaP) */ + case 0x1e: /* BlazarI (Bzr) */ break; default: bt_dev_err(hdev, "Unsupported Intel hardware variant (0x%x)", @@ -2611,6 +2612,7 @@ static void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant) case 0x19: case 0x1b: case 0x1c: + case 0x1e: hci_set_msft_opcode(hdev, 0xFC1E); break; default: @@ -2832,6 +2834,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) case 0x19: case 0x1b: case 0x1c: + case 0x1e: /* Display version information of TLV type */ btintel_version_info_tlv(hdev, &ver_tlv); From 82d402cc9c9d6cd5ac026996ff1457201e24c02e Mon Sep 17 00:00:00 2001 From: Kiran K Date: Fri, 5 Jul 2024 15:59:22 +0530 Subject: [PATCH 3/6] Bluetooth: btintel: Add support for BlazarU core Add support for BlazarU core (CNVi). Signed-off-by: Kiran K Signed-off-by: Luiz Augusto von Dentz (cherry picked from commit 880120d5f12e3e9af6472f2ddddb33a6c2648418) --- drivers/bluetooth/btintel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 1dcb4ab94477..22c739dc9f24 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -471,6 +471,7 @@ static int btintel_version_info_tlv(struct hci_dev *hdev, case 0x19: /* Slr-F */ case 0x1b: /* Mgr */ case 0x1c: /* Gale Peak (GaP) */ + case 0x1d: /* BlazarU (BzrU) */ case 0x1e: /* BlazarI (Bzr) */ break; default: @@ -2612,6 +2613,7 @@ static void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant) case 0x19: case 0x1b: case 0x1c: + case 0x1d: case 0x1e: hci_set_msft_opcode(hdev, 0xFC1E); break; @@ -2834,6 +2836,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) case 0x19: case 0x1b: case 0x1c: + case 0x1d: case 0x1e: /* Display version information of TLV type */ btintel_version_info_tlv(hdev, &ver_tlv); From 14086646bdced72c116bbbbe84223612605480e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=98=E6=80=80?= Date: Fri, 25 Oct 2024 02:50:06 +0000 Subject: [PATCH 4/6] wifi: rtw89: get release driver version via more convenient method We add below methods to show release driver version. 1. Use modinfo command 2. Print version in kernel log when loading modules Change-Id: I524c0537bc76643231ae411436ab19583aeb32b4 Signed-off-by: Dian-Syuan Yang --- drivers/net/wireless/realtek/rtw89/drv_ver.c | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/drv_ver.c b/drivers/net/wireless/realtek/rtw89/drv_ver.c index 3686899e1641..ffe099959948 100644 --- a/drivers/net/wireless/realtek/rtw89/drv_ver.c +++ b/drivers/net/wireless/realtek/rtw89/drv_ver.c @@ -1,3 +1,22 @@ -static char drv_ver[] = "v6.8-backport-6.6-1-g809f4dd07"; +#define VERSTR "v6.8-backport-6.6-1-g809f4dd07" + +static char *drv_ver = VERSTR; #include module_param_string(drv_ver, drv_ver, sizeof(drv_ver), 0444); + +MODULE_PARM_DESC(drv_ver, VERSTR); + +static int __init rtw89_drv_init(void) +{ + printk("rtw89 drv init version: %s\n", VERSTR); + + return 0; +} + +static void __exit rtw89_drv_exit(void) +{ + printk("rtw89 drv exit\n"); +} + +module_init(rtw89_drv_init); +module_exit(rtw89_drv_exit); From 6a1e581b8154b871e47fbc9e364208e69e9259b8 Mon Sep 17 00:00:00 2001 From: Wentao Guan Date: Mon, 18 Nov 2024 15:28:47 +0800 Subject: [PATCH 5/6] config: enable support for firmware loader debug --- arch/arm64/configs/deepin_arm64_desktop_defconfig | 1 - arch/loongarch/configs/deepin_loongarch_desktop_defconfig | 1 - arch/x86/configs/deepin_x86_desktop_defconfig | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/arm64/configs/deepin_arm64_desktop_defconfig b/arch/arm64/configs/deepin_arm64_desktop_defconfig index 93c44e8b96ce..b9d6f80ee779 100644 --- a/arch/arm64/configs/deepin_arm64_desktop_defconfig +++ b/arch/arm64/configs/deepin_arm64_desktop_defconfig @@ -804,7 +804,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_FW_LOADER_DEBUG is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_FW_LOADER_COMPRESS=y diff --git a/arch/loongarch/configs/deepin_loongarch_desktop_defconfig b/arch/loongarch/configs/deepin_loongarch_desktop_defconfig index 423155c0ae4c..98eddc4f422e 100644 --- a/arch/loongarch/configs/deepin_loongarch_desktop_defconfig +++ b/arch/loongarch/configs/deepin_loongarch_desktop_defconfig @@ -770,7 +770,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_FW_LOADER_DEBUG is not set CONFIG_FW_LOADER_COMPRESS=y CONFIG_FW_LOADER_COMPRESS_ZSTD=y CONFIG_MOXTET=m diff --git a/arch/x86/configs/deepin_x86_desktop_defconfig b/arch/x86/configs/deepin_x86_desktop_defconfig index cbf1e15bdb9a..6dbdf83ab1b3 100644 --- a/arch/x86/configs/deepin_x86_desktop_defconfig +++ b/arch/x86/configs/deepin_x86_desktop_defconfig @@ -768,7 +768,6 @@ CONFIG_UEVENT_HELPER=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set -# CONFIG_FW_LOADER_DEBUG is not set CONFIG_FW_LOADER_COMPRESS=y CONFIG_FW_LOADER_COMPRESS_ZSTD=y CONFIG_DEBUG_DEVRES=y From fc35d6b1c25f1d68b02f849ac3e71d270ea2ec2e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 30 May 2024 13:14:32 +0100 Subject: [PATCH 6/6] debian: firmware_loader: Log direct loading failures as info for d-i On an installed Debian system, firmware packages will normally be installed automatically based on a mapping of device IDs to firmware. Within the Debian installer this has not yet happened and we need a way to detect missing firmware. Although many/most drivers log firmware loading failures, they do so using many different formats. This adds a single log message to the firmware loader, which the installer's hw-detect package will look for. The log level is set to "info" because some failures are expected and we do not want to confuse users with bogus error messages (like in bug #966218). NOTE: The log message format must not be changed without coordinating this with the check-missing-firmware.sh in hw-detect. Link: https://salsa.debian.org/kernel-team/linux/-/blob/debian/6.11/trixie/debian/patches/debian/firmware_loader-log-direct-loading-failures-as-info-for-d-i.path Signed-off-by: Wentao Guan --- drivers/base/firmware_loader/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index 0b18c6b46e65..c164f066fe05 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -585,6 +585,10 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, } __putname(path); + if (rc) + dev_info(device, "firmware: failed to load %s (%d)\n", + fw_priv->fw_name, rc); + return rc; }