From patchwork Mon Dec 13 09:26:20 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: 1567193 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 4JCGNh4vGFz9t4b 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 1mwhbM-0001nS-JS; Mon, 13 Dec 2021 09:26:32 +0000 Received: from mail-pl1-f170.google.com ([209.85.214.170]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mwhbL-0001lU-Bz for kernel-team@lists.ubuntu.com; Mon, 13 Dec 2021 09:26:31 +0000 Received: by mail-pl1-f170.google.com with SMTP id y8so10753004plg.1 for ; Mon, 13 Dec 2021 01:26:31 -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=a6owxQPPLyYuI7BvEB3+o+69MOD1kK6X7jYiSTUevjY=; b=uVj3qB/wk4gykUZg7ucg2JMw/IoL6gosT96B2tBIVBmZMmCCNeloQQhJLEYWgnJtTT ceQrdQhI2pvCcFUwUV2/kSA4MMdLNwqQqlS2nDc9NVof/af6cN9Z+y5glzpWlE3LYmZC ION5sL3Z2dqBlc+7vGstY05ZVXHzWr53lmmzDDuhombaQLDY7DsqVYm7PGg4wOFN0oDS +q5HTmsDbEb1QRpoFVbK3K+2sXb3RezbfCu73DoZ0kjDxfIDZ582KLTcQ9GHlGGiiM2c Xt1Rq3pXA4spo+7q3exvi7WLep86mwn9FdYIDygIuXvzyIcOUGHkcLlQ/gw7BIJiba7j 6XUQ== X-Gm-Message-State: AOAM530PS1sVytXaxQIv6rambWZtxeFFxQvdTrvjs4WNecLTHDvqa6Bx uG5cLM8czMgSTuE/Q+8LE1xwQirdrMCDaA== X-Google-Smtp-Source: ABdhPJzidnuj7klYwvWUeBqMNGsDi+Z4m/7Euwzt7SZM1WPAQmZBogFaufMhrh8TJd+FjA6WESiBeg== X-Received: by 2002:a17:902:d488:b0:141:f3a3:d2f4 with SMTP id c8-20020a170902d48800b00141f3a3d2f4mr94992599plg.86.1639387589360; Mon, 13 Dec 2021 01:26:29 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id q10sm11739776pfk.180.2021.12.13.01.26.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 01:26:29 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][Jammy] UBUNTU: SAUCE: Bluetooth: btusb: Handle download_firmware failure cases Date: Mon, 13 Dec 2021 17:26:20 +0800 Message-Id: <20211213092622.3508694-3-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.214.170; envelope-from=vicamo@gmail.com; helo=mail-pl1-f170.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 6cb63f4d639a..1c750a327b68 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2823,6 +2823,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; + } /* It's Device EndPoint Reset Option Register */ btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT); From patchwork Mon Dec 13 09:26:22 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: 1567195 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 4JCGNh4sYLz9t2p 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 1mwhbR-0001rB-3e; Mon, 13 Dec 2021 09:26:37 +0000 Received: from mail-pj1-f53.google.com ([209.85.216.53]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mwhbP-0001ov-54 for kernel-team@lists.ubuntu.com; Mon, 13 Dec 2021 09:26:35 +0000 Received: by mail-pj1-f53.google.com with SMTP id k6-20020a17090a7f0600b001ad9d73b20bso12805563pjl.3 for ; Mon, 13 Dec 2021 01:26:34 -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=WVx8D+MG78YWPM8SYezsIldgJBDo5v7WbXFiC7BBY9g=; b=2Zn664VYhwsKKBUCPBpO82+vzHhSZbwyrG9VKWUFSoJbPsHOKnFaUVeTgxV0myahKT anHPB2CUfRI0paaeRhn4ixxqqC+6P+zktGHEd6hOTRvLsqlPQ7it+DVPkgn0t51SsFAO i5aIwXMSLTdayf/SaafG06Hhcy+aLpxjJAi/KXlzFtgslLMSwTua1YFxNcN8hyFE2B+5 h4jW/p36ZyyIKAk5QHz021nQ3J6zUZRC2hALidZln7C4X4cGXPU0ii8KsGN/s1uBvH8p F7EL98tQJDov6k9l3wMDFx104NwuExpGRbiD5d7tdj2l4pDO0rEpn/bKbqzZ2FY+vu5T OJGQ== X-Gm-Message-State: AOAM532tK+88biRyhIPcwIqOu+vAshffkTOjl5Mhot9nkeed8gX0KgPi jNElrrDxg7ZJ+bsfhM+1/1HwVH3B3GYrTQ== X-Google-Smtp-Source: ABdhPJynhoSHsg47tExcgycHdyYiqj3K0y4vSGaMtVz087OAjwQb3m1BRoxZbteU2TJZJrt7uQ3Yqg== X-Received: by 2002:a17:90b:2412:: with SMTP id nr18mr44444204pjb.233.1639387593080; Mon, 13 Dec 2021 01:26:33 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id h15sm12319253pfc.134.2021.12.13.01.26.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 01:26:32 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2][Jammy] UBUNTU: SAUCE: Bluetooth: btusb: Return error code when getting patch status failed Date: Mon, 13 Dec 2021 17:26:22 +0800 Message-Id: <20211213092622.3508694-5-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.53; envelope-from=vicamo@gmail.com; helo=mail-pj1-f53.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 1c750a327b68..b16ab2e4c70e 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2529,6 +2529,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; } }