From patchwork Mon Dec 13 09:26:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1567196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JCGNh4nx2z9sRN for ; Mon, 13 Dec 2021 20:26:43 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mwhbL-0001la-Cp; Mon, 13 Dec 2021 09:26:31 +0000 Received: from mail-pj1-f50.google.com ([209.85.216.50]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mwhbJ-0001l8-DD for kernel-team@lists.ubuntu.com; Mon, 13 Dec 2021 09:26:29 +0000 Received: by mail-pj1-f50.google.com with SMTP id x7so11460897pjn.0 for ; Mon, 13 Dec 2021 01:26:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oSJo7r52bDGROXGHexAVIcR5zrF0tHwZK8tHl8Wspbo=; b=WFNFCuZSkBuqpCTmPTnYN9karsV2TeLFGz/8vXlxHoAXObFjcwPZ+2+Kdmn06niBoo CoXOEj6uh31/TjCCE4up2LPXXzRxHb1JLKj3O+tqDWQVVjNbdUQwF+mE34PBpbnSm+dB ujTfBSAvcOtiOtqseyz51YpnIJ7lON8W40Lxz6Txg/ZMk7CzscQUaEX7P0a1zmLL/Hqf Eu0Mt3V3AYKwbo/pEulk64h838YLuqn5YyvVmlzAVa51MIBvRDgLfz3X9fmqtNdsmiFq Q35oLyyJ7FiPHQ8opdYThohpD5nVRB5pcpRuYMiUX6zxvfURsmf6m9M7EkV6DUw0tg8h e0jA== X-Gm-Message-State: AOAM532C24+kC8mIlaE9o7S5KzqENVZPrUr5Asj98ApxcAff3LePxdrW rGmTAj+ImtkP6X/M0ef2dDdfSiXGUxwGoQ== X-Google-Smtp-Source: ABdhPJwP7WwG9DsjMNVYJYsYJ7UZ5craB0UZzqaopalLOEXUe2tDnRRn3Ey6fcu6Ir2j9eQBJ3/yoA== X-Received: by 2002:a17:902:e8d8:b0:142:5622:f9e5 with SMTP id v24-20020a170902e8d800b001425622f9e5mr95307095plg.42.1639387587328; Mon, 13 Dec 2021 01:26:27 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id f19sm11480477pfv.76.2021.12.13.01.26.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 01:26:27 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][OEM-5.13/OEM-5.14/Impish] UBUNTU: SAUCE: Bluetooth: btusb: Handle download_firmware failure cases Date: Mon, 13 Dec 2021 17:26:19 +0800 Message-Id: <20211213092622.3508694-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211213092622.3508694-1-vicamo.yang@canonical.com> References: <20211213092622.3508694-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.50; envelope-from=vicamo@gmail.com; helo=mail-pj1-f50.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Mark Chen BugLink: https://bugs.launchpad.net/bugs/1954300 For Mediatek chipset, it can not enabled if there are something wrong in btmtk_setup_firmware_79xx(). Thus, the process must be terminated and returned error code. Fixes: fc342c4dc4087 ("Bluetooth: btusb: Add protocol support for MediaTek MT7921U USB devices") Co-developed-by: Sean Wang Signed-off-by: Sean Wang Signed-off-by: Mark Chen Signed-off-by: Marcel Holtmann (backported from https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=00c0ee9850b7b0cb7c40b8daba806ae2245e59d4) Signed-off-by: You-Sheng Yang --- drivers/bluetooth/btusb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 70754138ebff..96b2401106d5 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3792,6 +3792,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev) "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin", dev_id & 0xffff, (fw_version & 0xff) + 1); err = btusb_mtk_setup_firmware_79xx(hdev, fw_bin_name); + if (err < 0) { + bt_dev_err(hdev, "Failed to set up firmware (%d)", err); + return err; + } /* Enable Bluetooth protocol */ param = 1;