From patchwork Mon Dec 13 09:39:07 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: 1567205 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 4JCGgK1J0gz9sRN for ; Mon, 13 Dec 2021 20:39:25 +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 1mwhnj-0004KG-P6; Mon, 13 Dec 2021 09:39:19 +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 1mwhnf-0004I6-OT for kernel-team@lists.ubuntu.com; Mon, 13 Dec 2021 09:39:15 +0000 Received: by mail-pj1-f50.google.com with SMTP id p18-20020a17090ad31200b001a78bb52876so14218739pju.3 for ; Mon, 13 Dec 2021 01:39:15 -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=t5luY5MZ4IpcU4zKD3ljfmWMvuswL44Q4r8gJTWqZZ/WeE7o6A+XqOsLPrIYS138Fc +o86+dnpSggaVAobLAySVLWdUk56lR1JCB0q8O0fVGP2Vp1xtRMHHamA0Bq5w4iQjJZh d9/lndY6R0GGiGeTRu1fEjolZp4NKvfroXjhV8tnoFtpQZHsGvMC5rXfD+daDvFmF0G7 jZW0t016gro63slV3UHe6Kv32pne2YrbpaC3G8vhyX4EPeQQ7z4EahIoBrLNVstW3xO1 Q+McsErfWkdE5tecWPw28hA8gdRqKXe5gs9s7RNPeYYVkJChThOD36Y8Zt3AXmoSecDs CVAA== X-Gm-Message-State: AOAM5308PbK66McbnEGcmFTexRT88n1XTTcjNXfXK3ffYyFHQ4asME39 dEadUeM2tm8nNHnIDSwC52AJZHgZ+mt1yA== X-Google-Smtp-Source: ABdhPJxNl3cB+MJjGvb2Hym4uQah5sLN48Hp4b02UnZVmqq+awAQEvx3igmQjQlvXwaSOrapWmOE0Q== X-Received: by 2002:a17:90b:1c0f:: with SMTP id oc15mr43452404pjb.50.1639388353763; Mon, 13 Dec 2021 01:39:13 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id h13sm11468783pfv.84.2021.12.13.01.39.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 01:39:13 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][SRU][OEM-5.13/OEM-5.14/Impish] UBUNTU: SAUCE: Bluetooth: btusb: Handle download_firmware failure cases Date: Mon, 13 Dec 2021 17:39:07 +0800 Message-Id: <20211213093910.3521363-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211213093910.3521363-1-vicamo.yang@canonical.com> References: <20211213093910.3521363-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 Acked-by: Tim Gardner --- 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; From patchwork Mon Dec 13 09:39:09 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: 1567207 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 4JCGgN4GzDz9sRN for ; Mon, 13 Dec 2021 20:39:28 +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 1mwhnm-0004Nn-I0; Mon, 13 Dec 2021 09:39:22 +0000 Received: from mail-pj1-f49.google.com ([209.85.216.49]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mwhnj-0004JX-Gd for kernel-team@lists.ubuntu.com; Mon, 13 Dec 2021 09:39:19 +0000 Received: by mail-pj1-f49.google.com with SMTP id gf14-20020a17090ac7ce00b001a7a2a0b5c3so14210538pjb.5 for ; Mon, 13 Dec 2021 01:39:18 -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=kGJB67wslbQZ1u2QHE0VztHd/WmUAWjocTMdt/wzwUo=; b=dkLIJDFPFTPDsxxwDeI3afcpVSNoRlRdNGvF5H6NbjbaX4fyuCITaI9OuFA2jpIFXf MwR32dPrdZvXHK/KKyV5YThIVcOKRvfwT4wxCqMI3EntKBVCcvv0uEMMd3bY+VsqiHTF KYvkwJg4Cm7k4SbdTPq3dnIvP3lfi4lBwTLKcWUgntVoQXH7EXASpBwSzCFg08qeM9OX u/uVfA4UZvCdGN4X5uOfK9P8AAARNW7QoThxGN0n9gjr/zEXUHJjVdpCPKqYaGnmCawq W2xsJs+He6Qjp/nGmN00Dic5+qzVsB8DM9CtUmoC9OwBDZU9/JfdJgLnxD07k6pC70ih C22Q== X-Gm-Message-State: AOAM532PmmVUivzZl/gJsfj/3HLL/wFTBP3b8Q54fRICXBDwpc7NCEPU hie8oN2U4IA59IbbQebXFnyeGmgkQRfcvA== X-Google-Smtp-Source: ABdhPJz2xeyhndX76wUp9av2fv2JCFsAdBC8Wd6JFm56bF/FWO+SxxXXl0apnxvm7oJ4vvmhzBUftA== X-Received: by 2002:a17:90a:f002:: with SMTP id bt2mr42253824pjb.221.1639388357106; Mon, 13 Dec 2021 01:39:17 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id y25sm11367351pfa.12.2021.12.13.01.39.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 01:39:16 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2][SRU][OEM-5.13/OEM-5.14/Impish] UBUNTU: SAUCE: Bluetooth: btusb: Return error code when getting patch status failed Date: Mon, 13 Dec 2021 17:39:09 +0800 Message-Id: <20211213093910.3521363-4-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211213093910.3521363-1-vicamo.yang@canonical.com> References: <20211213093910.3521363-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.49; envelope-from=vicamo@gmail.com; helo=mail-pj1-f49.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 If there are failure cases in getting patch status, it should return the error code (-EIO). 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=995d948cf2e45834275f07afc1c9881a9902e73c) Signed-off-by: You-Sheng Yang --- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 96b2401106d5..8b84be970775 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3555,6 +3555,7 @@ static int btusb_mtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwnam } else { bt_dev_err(hdev, "Failed wmt patch dwnld status (%d)", status); + err = -EIO; goto err_release_fw; } }