From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 7ABB1470E84; Sat, 12 Sep 2026 10:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789210239; cv=none; b=AQnNwbduBvSOiEjf20uKypIQqYDZWCmpDfpt4k702qz5i5V5gCIFDMowmRURrcjKjvluvp/bY/4pHJSPUk6yM5FHJIHrLmm3e3z3J/7FJsbP+9CqoE9fWYVQfdPEQ+8KrPrVRf6krth8z+cMaWj8++pO1fhuHVQOl3ESbrLGX3c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789210239; c=relaxed/simple; bh=gba1iiPZXDUm0IVo+FK/6nJhlJ27FHc80k6P6XKVmz0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NB4ieSHlFYtI4kZ705THUsMlRdCRyPoqVuKoPPCumeQUmQLoGwSnP9MikdaRglRU6VDwjGvkoifzwKaCB31mzArBavKBwlomlTtcwThSZJ6S2KmkDaej8vZ43vg1Gtp4OvpK5Gww9cfUE2hG0Vga0akrN5SJPFzh8w7sY+s5fjY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zv6Kd6wr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zv6Kd6wr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2C761F000FF; Sat, 12 Sep 2026 10:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789210237; bh=p97s6DWW8chnkOTkGrI0sJm5BaEuw4JEc0gmhM2xHtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zv6Kd6wr84+Hz93o3i320Drh9gxeTfCpNdRTu/ekAgXg9zvn+CagXvhWIeL9MpuW2 l+/CLwnXKTX4Dg0C1YRP1DIwKyexACE5XOtPCOu/68qecfxcdsf9e7MJCpgZgAZnEW 5p4Ee2EMm2awgCUuQFoTl3/RUSjVdM6gej8HJC4g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bartosz Golaszewski , Zijun Hu , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.18 0985/1518] Bluetooth: btqca: Fix qca_set_bdaddr() waiting for wrong HCI event Date: Sat, 12 Sep 2026 08:52:34 +0200 Message-ID: <20260912065645.741534217@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zijun Hu [ Upstream commit cf81f0a3db2a5c34ee6e4ea379c631fab6d13e01 ] qca_set_bdaddr() waits for HCI_EV_VENDOR when sending EDL_WRITE_BD_ADDR_OPCODE (0xFC14), but the controller responds with Command Complete event as confirmed by btmon on WCN7850: < HCI Command: Vendor (0x3f|0x0014) plen 6 #3 [hci0] 11 22 33 44 55 66 > HCI Event: Command Complete (0x0e) plen 4 #4 [hci0] Vendor (0x3f|0x0014) ncmd 1 Status: Success (0x00) Fix by passing 0 as the event parameter to __hci_cmd_sync_ev() to wait for the command complete event instead. Fixes: 5c0a1001c8be ("Bluetooth: hci_qca: Add helper to set device address") Reviewed-by: Bartosz Golaszewski Signed-off-by: Zijun Hu Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/btqca.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index afab479ac8944..f404eefbfc85b 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -1014,8 +1014,7 @@ int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) baswap(&bdaddr_swapped, bdaddr); skb = __hci_cmd_sync_ev(hdev, EDL_WRITE_BD_ADDR_OPCODE, 6, - &bdaddr_swapped, HCI_EV_VENDOR, - HCI_INIT_TIMEOUT); + &bdaddr_swapped, 0, HCI_INIT_TIMEOUT); if (IS_ERR(skb)) { err = PTR_ERR(skb); bt_dev_err(hdev, "QCA Change address cmd failed (%d)", err); -- 2.53.0