From nobody Tue Oct 7 01:58:27 2025 Received: from outbound.pv.icloud.com (p-west1-cluster1-host3-snip4-10.eps.apple.com [57.103.64.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D80C42E172A for ; Tue, 15 Jul 2025 12:40:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=57.103.64.113 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752583238; cv=none; b=CCftqVfm/niXqJNocZFaoNF5QMPJek6MJbmfkoGIC2QoHFtTLufRlM6jglSEl6aAPA5wurWlhu5avQuCQg7uaR7UihagSrUYFSf1UoyQbjQhR6+vY+PNkMqX4J7hd1JdbW5sC5sEusxwoBSN9HOEm1P1GEUziBZmVwes30qW41M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752583238; c=relaxed/simple; bh=D1W//qNw2jcSwxeFY6cnAciQNTc3BMzCNuI0IekI7B8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Un8CP5VwT0c0Y5wJzYvOos9hWomE5EqqimdEStkh2VubWHEORisulUTNhenMVUUYXkxh7IcWK5mFjGKIxvrsq4u0MBa8jLdvqlTMZBeM8i+P6MLnUHWIucOsm+TpakaGCtBYzLBRJb3pnQun0wAVebNBIctFsrYlK2FbokKvdm8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com; spf=pass smtp.mailfrom=icloud.com; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b=mqaAejcm; arc=none smtp.client-ip=57.103.64.113 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=icloud.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b="mqaAejcm" Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by outbound.pv.icloud.com (Postfix) with ESMTPS id 5E01118002CD; Tue, 15 Jul 2025 12:40:33 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=vC8NO5NWY6I9G6YPYsJKZtUVLHXUh6Jv8sOvV4tOqV0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:x-icloud-hme; b=mqaAejcmDZdKt1S74ppbnqY8oCs/fDM3Vjg7+CnVMxJj5Kjo8XeiaqNnV6kkAEtAC/A1P3AKjnLRAFtw4rchddlvg9ShtTHG8Psaca3+Pspp3ohsa0iEFyYheTmq93O5cuI15Hg5gYp/JCxwuFcHnq0XlVS+O8tUr1cXiwI3u+De5DvlXrw+cWAFIWT7lHJol7Qun8FL92ghSJp3s3a3RWjL9QaKPJ5WZmAEGHRdklJYxPzrw1G9I4JVmU1urHHXVmQwXHY475lV+Ydq8Tgh9Hql4m2HIJ9lhcr5W/+2kHR4bOn18outHqmDzSXP2mZPuhlepf2wRnM8SF9V6rkWXw== Received: from [192.168.1.26] (pv-asmtp-me-k8s.p00.prod.me.com [17.56.9.36]) by outbound.pv.icloud.com (Postfix) with ESMTPSA id 4558918002DF; Tue, 15 Jul 2025 12:40:31 +0000 (UTC) From: Zijun Hu Date: Tue, 15 Jul 2025 20:40:13 +0800 Subject: [PATCH 1/2] Bluetooth: btusb: QCA: Fix downloading wrong NVM for WCN6855 GF variant without board ID Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250715-bt_quec-v1-1-c519cf7a0e16@oss.qualcomm.com> References: <20250715-bt_quec-v1-0-c519cf7a0e16@oss.qualcomm.com> In-Reply-To: <20250715-bt_quec-v1-0-c519cf7a0e16@oss.qualcomm.com> To: Marcel Holtmann , Luiz Augusto von Dentz , Matthias Kaehlcke Cc: Zijun Hu , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE1MDExNiBTYWx0ZWRfX9c9mS9unVhor N47wAAdQUDLo+yHHPGlz/hjVKe9mzy/RXdVg8w/PRwXvNOrjEXxni+3RiMqRkT5F9BSacDywg1M EVaYBAE6AgjQx72kZbHsBdYgW31Gz37hHooU09CgvvnL/xM4r7wFtespcbAAtsuA/Tb3y2A45AJ mC+pc95VgX9Gw1wXcT6ZPA+F7HVGwcJxSmQZAL86Z//AB4QLcqoeOcOSoA9gnwBXbIBt2ZdV3QX HZLBXueTRZaDd9ntLcGSNXzgQBQG4RiOmT83iSEe8oQLIxq5K/4TyzCRKAXRmmdMNoEcXExzs= X-Proofpoint-GUID: s0qsG9FlS4uue-0j7Tf8quiHaaHTntIQ X-Proofpoint-ORIG-GUID: s0qsG9FlS4uue-0j7Tf8quiHaaHTntIQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-15_03,2025-07-15_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 clxscore=1015 bulkscore=0 adultscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2507150116 From: Zijun Hu For GF variant of WCN6855 without board ID programmed btusb_generate_qca_nvm_name() will chose wrong NVM 'qca/nvm_usb_00130201.bin' to download. Fix by choosing right NVM 'qca/nvm_usb_00130201_gf.bin'. Also simplify NVM choice logic of btusb_generate_qca_nvm_name(). Fixes: d6cba4e6d0e2 ("Bluetooth: btusb: Add support using different nvm for= variant WCN6855 controller") Signed-off-by: Zijun Hu --- drivers/bluetooth/btusb.c | 78 ++++++++++++++++++++++++++-----------------= ---- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index f302c3f1e4cfdf01610bbd3b9ae6be4724aeadad..2dd665bc5703bae3a14d8dd3ab6= d1f86e01cc559 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3203,6 +3203,32 @@ static const struct qca_device_info qca_devices_tabl= e[] =3D { { 0x00190200, 40, 4, 16 }, /* WCN785x 2.0 */ }; =20 +static u16 qca_extract_board_id(const struct qca_version *ver) +{ + u16 flag =3D le16_to_cpu(ver->flag); + u16 board_id =3D 0; + + if (((flag >> 8) & 0xff) =3D=3D QCA_FLAG_MULTI_NVM) { + /* The board_id should be split into two bytes + * The 1st byte is chip ID, and the 2nd byte is platform ID + * For example, board ID 0x010A, 0x01 is platform ID. 0x0A is chip ID + * we have several platforms, and platform IDs are continuously added + * Platform ID: + * 0x00 is for Mobile + * 0x01 is for X86 + * 0x02 is for Automotive + * 0x03 is for Consumer electronic + */ + board_id =3D (ver->chip_id << 8) + ver->platform_id; + } + + /* Take 0xffff as invalid board ID */ + if (board_id =3D=3D 0xffff) + board_id =3D 0; + + return board_id; +} + static int btusb_qca_send_vendor_req(struct usb_device *udev, u8 request, void *data, u16 size) { @@ -3359,44 +3385,28 @@ static void btusb_generate_qca_nvm_name(char *fwnam= e, size_t max_size, const struct qca_version *ver) { u32 rom_version =3D le32_to_cpu(ver->rom_version); - u16 flag =3D le16_to_cpu(ver->flag); + const char *variant; + int len; + u16 board_id; =20 - if (((flag >> 8) & 0xff) =3D=3D QCA_FLAG_MULTI_NVM) { - /* The board_id should be split into two bytes - * The 1st byte is chip ID, and the 2nd byte is platform ID - * For example, board ID 0x010A, 0x01 is platform ID. 0x0A is chip ID - * we have several platforms, and platform IDs are continuously added - * Platform ID: - * 0x00 is for Mobile - * 0x01 is for X86 - * 0x02 is for Automotive - * 0x03 is for Consumer electronic - */ - u16 board_id =3D (ver->chip_id << 8) + ver->platform_id; - const char *variant; + board_id =3D qca_extract_board_id(ver); =20 - switch (le32_to_cpu(ver->ram_version)) { - case WCN6855_2_0_RAM_VERSION_GF: - case WCN6855_2_1_RAM_VERSION_GF: - variant =3D "_gf"; - break; - default: - variant =3D ""; - break; - } - - if (board_id =3D=3D 0) { - snprintf(fwname, max_size, "qca/nvm_usb_%08x%s.bin", - rom_version, variant); - } else { - snprintf(fwname, max_size, "qca/nvm_usb_%08x%s_%04x.bin", - rom_version, variant, board_id); - } - } else { - snprintf(fwname, max_size, "qca/nvm_usb_%08x.bin", - rom_version); + switch (le32_to_cpu(ver->ram_version)) { + case WCN6855_2_0_RAM_VERSION_GF: + case WCN6855_2_1_RAM_VERSION_GF: + variant =3D "_gf"; + break; + default: + variant =3D NULL; + break; } =20 + len =3D snprintf(fwname, max_size, "qca/nvm_usb_%08x", rom_version); + if (variant) + len +=3D snprintf(fwname + len, max_size - len, "%s", variant); + if (board_id) + len +=3D snprintf(fwname + len, max_size - len, "_%04x", board_id); + len +=3D snprintf(fwname + len, max_size - len, ".bin"); } =20 static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, --=20 2.34.1 From nobody Tue Oct 7 01:58:27 2025 Received: from outbound.pv.icloud.com (p-west1-cluster3-host7-snip4-10.eps.apple.com [57.103.66.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BA382E03FC for ; Tue, 15 Jul 2025 12:40:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=57.103.66.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752583238; cv=none; b=iXt3cb0rUFnThG9m4y+scqdDOQhIs1IKiHwlzYEJ7XObCLXXdtx7v1jj031JySA1XMIEX3elIx3RYa4PY62PWMfB9wQfX+YzKq0NBO21DWKaHRl5Wkxwd8ssabD6VwQHFsxdvhl0dBn4STK53ztEjCqGM37Gk8CyY17cpZSaWtk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752583238; c=relaxed/simple; bh=H6dw3h5hq1YyHA9MgHeA7V7Qkd//GBRc+R2X1F5apdo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AJy3IVRF1DdhLC4OOQ4CVoMqYHpE/kFzTcdT4dNfh4llFBVt/SHD5GRBICElaP+uTQ+yKhyfav25BSZ21VtGBYrMxR7h23QhHdelhVYYZ2wdHVJin9SjFNHHL16xfExazm2WNz+mtxbdnhn0ky8O9eLawF6uKmxgd9LG46hI8f4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com; spf=pass smtp.mailfrom=icloud.com; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b=EzBsiRWL; arc=none smtp.client-ip=57.103.66.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=icloud.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b="EzBsiRWL" Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by outbound.pv.icloud.com (Postfix) with ESMTPS id 8AFC018002DF; Tue, 15 Jul 2025 12:40:35 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=XoyjlAkNkFBs8fTOlPVmI3g/uY0Xw9e5DKrJBuBVtxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:x-icloud-hme; b=EzBsiRWLRs2mR9lg5xtsHoaFv5iDXfpPpdpgV0PtW0alCjzQEme23omiQcEFlIwM0sC4Kd3gSLgKSkFgPsHwLBILJweKiT91pzRkTmnx+CSvDs806Ubvkr9EsuFOTvGYCSwz8PbLhKiTofOvTA13T6BTUF48GHjuiEXD8RmxFNdLL2VW/qzaTX/yCbqHEBodzw9DbdvKfQXeBRxGrETH/CpvhkAo0wpkMpL/6b4LP7kbbYkLef7clOaum/iRCcrZ1MnPtTxFWffLOFnmxJm7YYGCQg2bGLZEwlN98QKGvkryBycZ8NudBx/KWnLpOLK/DB8Q/oCO4t/Iu7G3LxibRQ== Received: from [192.168.1.26] (pv-asmtp-me-k8s.p00.prod.me.com [17.56.9.36]) by outbound.pv.icloud.com (Postfix) with ESMTPSA id 7A06F18001F6; Tue, 15 Jul 2025 12:40:33 +0000 (UTC) From: Zijun Hu Date: Tue, 15 Jul 2025 20:40:14 +0800 Subject: [PATCH 2/2] Bluetooth: btusb: QCA: Support downloading custom-made firmwares Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250715-bt_quec-v1-2-c519cf7a0e16@oss.qualcomm.com> References: <20250715-bt_quec-v1-0-c519cf7a0e16@oss.qualcomm.com> In-Reply-To: <20250715-bt_quec-v1-0-c519cf7a0e16@oss.qualcomm.com> To: Marcel Holtmann , Luiz Augusto von Dentz , Matthias Kaehlcke Cc: Zijun Hu , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE1MDExNiBTYWx0ZWRfXwGBWIdeICwfv XEQxal97lvnKy/6cwoxa3p+FgVr1wNfU5YLk0/SQeAX5n0oQRWJY5VfvtUuITrhfzSw6o28i+Jd aCj9X3oCoFALsDZYuOEWi8aeT9MLpPopPNgw9BOXz863DOjuuH62qhgw+B+JBn6D+3zeuo8Nwgu NhxzhOSyUwEvwVCPrXvj9yTLO8Sx/nfo8v7tVi9r1T2jj5BGpKTdycU9j7oODnqi00KaPHBRfWU sxAc0XWTDyy/GAwK/XtH2MuAIlWGC55Gbtxf4kseHnpt3Zp56sCA11GurfT9OGjPXWmpqXJ4c= X-Proofpoint-GUID: LL7sN2Ek42PC-fWFu2K9tH-w-V7ogSCQ X-Proofpoint-ORIG-GUID: LL7sN2Ek42PC-fWFu2K9tH-w-V7ogSCQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-15_03,2025-07-15_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 clxscore=1015 bulkscore=0 adultscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2507150116 From: Zijun Hu There are custom-made firmwares based on board ID for a given QCA BT chip sometimes, and they are different with existing firmwares and put in a separate subdirectory to avoid conflict, for example: QCA2066, as a variant of WCN6855, has firmwares under 'qca/QCA2066/' of linux-firmware repository. Support downloading custom-made firmwares based on a table newly added. Signed-off-by: Zijun Hu --- drivers/bluetooth/btusb.c | 54 ++++++++++++++++++++++++++++++++++++++++++-= ---- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 2dd665bc5703bae3a14d8dd3ab6d1f86e01cc559..6b3499b8a717a247f235c44e459= 037481747118e 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3190,6 +3190,12 @@ struct qca_device_info { u8 ver_offset; /* offset of version structure in rampatch */ }; =20 +struct qca_custom_firmware { + u32 rom_version; + u16 board_id; + const char *subdirectory; +}; + static const struct qca_device_info qca_devices_table[] =3D { { 0x00000100, 20, 4, 8 }, /* Rome 1.0 */ { 0x00000101, 20, 4, 8 }, /* Rome 1.1 */ @@ -3203,6 +3209,11 @@ static const struct qca_device_info qca_devices_tabl= e[] =3D { { 0x00190200, 40, 4, 16 }, /* WCN785x 2.0 */ }; =20 +static const struct qca_custom_firmware qca_custom_btfws[] =3D { + { 0x00130201, 0x030A, "QCA2066" }, + { }, +}; + static u16 qca_extract_board_id(const struct qca_version *ver) { u16 flag =3D le16_to_cpu(ver->flag); @@ -3229,6 +3240,26 @@ static u16 qca_extract_board_id(const struct qca_ver= sion *ver) return board_id; } =20 +static const char *qca_get_fw_subdirectory(const struct qca_version *ver) +{ + const struct qca_custom_firmware *ptr; + u32 rom_ver; + u16 board_id; + + rom_ver =3D le32_to_cpu(ver->rom_version); + board_id =3D qca_extract_board_id(ver); + if (!board_id) + return NULL; + + for (ptr =3D qca_custom_btfws; ptr->rom_version; ptr++) { + if (ptr->rom_version =3D=3D rom_ver && + ptr->board_id =3D=3D board_id) + return ptr->subdirectory; + } + + return NULL; +} + static int btusb_qca_send_vendor_req(struct usb_device *udev, u8 request, void *data, u16 size) { @@ -3333,15 +3364,22 @@ static int btusb_setup_qca_load_rampatch(struct hci= _dev *hdev, { struct qca_rampatch_version *rver; const struct firmware *fw; + const char *fw_subdir; u32 ver_rom, ver_patch, rver_rom; u16 rver_rom_low, rver_rom_high, rver_patch; - char fwname[64]; + char fwname[80]; int err; =20 ver_rom =3D le32_to_cpu(ver->rom_version); ver_patch =3D le32_to_cpu(ver->patch_version); =20 - snprintf(fwname, sizeof(fwname), "qca/rampatch_usb_%08x.bin", ver_rom); + fw_subdir =3D qca_get_fw_subdirectory(ver); + if (fw_subdir) + snprintf(fwname, sizeof(fwname), "qca/%s/rampatch_usb_%08x.bin", + fw_subdir, ver_rom); + else + snprintf(fwname, sizeof(fwname), "qca/rampatch_usb_%08x.bin", + ver_rom); =20 err =3D request_firmware(&fw, fwname, &hdev->dev); if (err) { @@ -3385,10 +3423,11 @@ static void btusb_generate_qca_nvm_name(char *fwnam= e, size_t max_size, const struct qca_version *ver) { u32 rom_version =3D le32_to_cpu(ver->rom_version); - const char *variant; + const char *variant, *fw_subdir; int len; u16 board_id; =20 + fw_subdir =3D qca_get_fw_subdirectory(ver); board_id =3D qca_extract_board_id(ver); =20 switch (le32_to_cpu(ver->ram_version)) { @@ -3401,7 +3440,12 @@ static void btusb_generate_qca_nvm_name(char *fwname= , size_t max_size, break; } =20 - len =3D snprintf(fwname, max_size, "qca/nvm_usb_%08x", rom_version); + if (fw_subdir) + len =3D snprintf(fwname, max_size, "qca/%s/nvm_usb_%08x", + fw_subdir, rom_version); + else + len =3D snprintf(fwname, max_size, "qca/nvm_usb_%08x", + rom_version); if (variant) len +=3D snprintf(fwname + len, max_size - len, "%s", variant); if (board_id) @@ -3414,7 +3458,7 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *h= dev, const struct qca_device_info *info) { const struct firmware *fw; - char fwname[64]; + char fwname[80]; int err; =20 btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver); --=20 2.34.1