Merge branch 'linux-6.6.y' into bluetooth-mtk-update

deepin-community · Nov 19, 2024 · cb1c8dc · cb1c8dc
2 parents 4ff691b + fc35d6b
commit cb1c8dc
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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

diff --git 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;
 }
 

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
@@ -471,6 +471,8 @@ 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:
 		bt_dev_err(hdev, "Unsupported Intel hardware variant (0x%x)",
@@ -2611,6 +2613,8 @@ 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;
 	default:
@@ -2832,6 +2836,8 @@ 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);
 

diff --git 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 |

diff --git 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 <linux/module.h>
 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);