From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 DFD752BFC62; Mon, 12 May 2025 18:05:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747073137; cv=none; b=ocWIeqL0eYIxYE2RL2cDiNHhBbm52k72Z8r/Jrzj1eAg2V/g4AHVRL4MorwI9RX2WkK2+gvLmLTHg2jNm3zghI34LOXD2+c8eJ6Y8kRwBseQDAUtksEbbvz5MK9/kFtAjhlFBTb+Q9k7Myn2eiEMNZB3UZeTZKm3DoVuEa4Qguc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747073137; c=relaxed/simple; bh=5KNvXOgGXU3JGM3P8kBWVxu5dLSFm00jlriOi7R2lU0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VmmK07ZEdfB+3OojXNLKhoxP8KiIeMcLUR++0OPzucOfunIEEBl04sOyg8+VqrD5uZh5rHv4amRlqv2VPfoGxSeGT8l061Pn0pNPcDYGo8Ny6b6pOjQC/pnoc8VsFimOzNE9JqtAjxeRMiIzCg3NDt5UAvbK8J7c1u/1v6dPwQk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=H6odWjkW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="H6odWjkW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01300C4CEF1; Mon, 12 May 2025 18:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747073136; bh=5KNvXOgGXU3JGM3P8kBWVxu5dLSFm00jlriOi7R2lU0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H6odWjkWiBk9zV8fGWkxoyvmrHDLffv+RoKPenoXnNRJ5Y2RnBEkaSc1tB+YjLtHY 5UMHEdoRgjHGHooOOOAjwQjJqhcB/ohZGSOn3O6I5wbFZAwFzpWBMIReyIdfu+cJct LMVISbqvoMfr+M12je1i+Z3G5+XMnSFmJ4tzUwZ0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hao Qin , Luiz Augusto von Dentz , "Geoffrey D. Bennett" Subject: [PATCH 6.12 158/184] Bluetooth: btmtk: Remove the resetting step before downloading the fw Date: Mon, 12 May 2025 19:45:59 +0200 Message-ID: <20250512172048.250904585@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172041.624042835@linuxfoundation.org> References: <20250512172041.624042835@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hao Qin commit 33634e2ab7c6369391e0ca4b9b97dc861e33d20e upstream. Remove the resetting step before downloading the fw, as it may cause other usb devices to fail to initialise when connected during boot on kernels 6.11 and newer. Signed-off-by: Hao Qin Signed-off-by: Luiz Augusto von Dentz Cc: "Geoffrey D. Bennett" Signed-off-by: Greg Kroah-Hartman --- drivers/bluetooth/btmtk.c | 10 ---------- 1 file changed, 10 deletions(-) --- a/drivers/bluetooth/btmtk.c +++ b/drivers/bluetooth/btmtk.c @@ -1330,13 +1330,6 @@ int btmtk_usb_setup(struct hci_dev *hdev break; case 0x7922: case 0x7925: - /* Reset the device to ensure it's in the initial state before - * downloading the firmware to ensure. - */ - - if (!test_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags)) - btmtk_usb_subsys_reset(hdev, dev_id); - fallthrough; case 0x7961: btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id, fw_version, fw_flavor); @@ -1345,12 +1338,9 @@ int btmtk_usb_setup(struct hci_dev *hdev btmtk_usb_hci_wmt_sync); if (err < 0) { bt_dev_err(hdev, "Failed to set up firmware (%d)", err); - clear_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags); return err; } - set_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags); - /* It's Device EndPoint Reset Option Register */ err = btmtk_usb_uhw_reg_write(hdev, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT);