From patchwork Tue Mar 15 09:51:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meng Tang X-Patchwork-Id: 551473 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B744C433F5 for ; Tue, 15 Mar 2022 09:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243962AbiCOJxA (ORCPT ); Tue, 15 Mar 2022 05:53:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239448AbiCOJw7 (ORCPT ); Tue, 15 Mar 2022 05:52:59 -0400 Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13ACA4F45B for ; Tue, 15 Mar 2022 02:51:46 -0700 (PDT) X-QQ-mid: bizesmtp90t1647337897tiinsj2l Received: from localhost.localdomain ( [58.240.82.166]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 15 Mar 2022 17:51:31 +0800 (CST) X-QQ-SSF: 01400000002000D0H000B00A0000000 X-QQ-FEAT: Mzskoac49OhYKIdzJedMNQcLV79ZiXzWAmUbFs9mZ40dgHWSdAWqId88qn+ci 1cgZrdmoJzPnX/zN6aUKOkGsiYlpnE4QiwZ3BPkDi2O+REGcasT9B6Z82Q7JC2k8+luc/R4 2KeEom0gCLV56l30KUgqnmoRtnHeVp+t1kv7DHwUe3Q5wVvQKBk2mceB9gFRLpR2qMrFk0k 2pqhFtymVIgo5rd9RuRt8sAKTOeP8YIA79Jjlj3QiKceuF1HxEHkTah7Sdo2YPyxE9idHNX B9ou3REBJ4OjynvEDoRhXGPoA2bvFmJyNxV3l2cA77ef2pQz+1bGyJCMT1+l0epk46LB0Ib GD7UNzGp4aJbQKJ3XMLJa57EJEJFsUpTZcWvWSL X-QQ-GoodBg: 2 From: Meng Tang To: marcel@holtmann.org, johan.hedberg@gmail.com, luiz.dentz@gmail.com Cc: martin.blumenstingl@googlemail.com, linux-bluetooth@vger.kernel.org, Meng Tang Subject: [PATCH v3 1/2] Bluetooth: btrtl: btmrvl: Fix firmware filename for rtl8723bs chipset Date: Tue, 15 Mar 2022 17:51:28 +0800 Message-Id: <20220315095129.15254-1-tangmeng@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Firmware for rtl8723bs chipset is as part of the linux-firmware repository in filename rtl8723bs_config-OBDA8723.bin. This patch fixes mwifiex driver to load correct firmware file for rtl8723bs. Fixes: c50903e3ee1b5 (Bluetooth: btrtl: add support for the RTL8723BS and RTL8723DS chips) Signed-off-by: Meng Tang --- drivers/bluetooth/btrtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index c2030f7e25b4..449858b65e8e 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -88,7 +88,7 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723bs_fw.bin", - .cfg_name = "rtl_bt/rtl8723bs_config" }, + .cfg_name = "rtl_bt/rtl8723bs_config-OBDA8723" }, /* 8723B */ { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_USB), @@ -923,7 +923,7 @@ MODULE_FIRMWARE("rtl_bt/rtl8723a_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723b_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723b_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723bs_fw.bin"); -MODULE_FIRMWARE("rtl_bt/rtl8723bs_config.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8723bs_config-OBDA8723.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin"); From patchwork Tue Mar 15 09:51:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meng Tang X-Patchwork-Id: 552659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48AACC433FE for ; Tue, 15 Mar 2022 09:52:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346724AbiCOJxh (ORCPT ); Tue, 15 Mar 2022 05:53:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346719AbiCOJxf (ORCPT ); Tue, 15 Mar 2022 05:53:35 -0400 Received: from smtpbgsg1.qq.com (smtpbgsg1.qq.com [54.254.200.92]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D8264F45B for ; Tue, 15 Mar 2022 02:52:23 -0700 (PDT) X-QQ-mid: bizesmtp90t1647337913tmnd84bi Received: from localhost.localdomain ( [58.240.82.166]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 15 Mar 2022 17:51:39 +0800 (CST) X-QQ-SSF: 01400000002000D0H000B00A0000000 X-QQ-FEAT: Mzskoac49Oj6w5+UYV3oqZVb/U2XFB1ApMF8/taX6Z6lrTuuaioY7ytSdmbkA RnSbsPPRxP2MGLG/r9Qms0lb4Dk/N/g4WZ/E7ruIYLO4oFamswG7TA2elUUI2T0yOvAm87h 00SYyJ0G373WLSiVtbRw2nhLFEd4CVXMIGaV2j5nATfcMFYQQ1JmZ4xsmu8Jbh1CCYK8KJc rrU1E/6fJn8f0wbZrWSppRt6HhqQoxeNpZk7p3BcDJgqTypxEnnrVX20LzmhEliCnyFgKLl KYXr5/cskB/fGe+jLtoTyqQn/6v69Ggfzaw4YFPPy30szeR9D4+2oR68RwOAGdSFYTs4X+u n5UdiK5fJWkEbrCgXgM6rhc9s02k6/yGqviRNqO X-QQ-GoodBg: 2 From: Meng Tang To: marcel@holtmann.org, johan.hedberg@gmail.com, luiz.dentz@gmail.com Cc: martin.blumenstingl@googlemail.com, linux-bluetooth@vger.kernel.org, Meng Tang Subject: [PATCH v3 2/2] Bluetooth: btrtl: btmrvl: Fix firmware filename for some rtl chipsets Date: Tue, 15 Mar 2022 17:51:29 +0800 Message-Id: <20220315095129.15254-2-tangmeng@uniontech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220315095129.15254-1-tangmeng@uniontech.com> References: <20220315095129.15254-1-tangmeng@uniontech.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Firmware for rtl chipset is as part of the linux-firmware repository in dir linux-firmware/rtl_bt. Today, the rtl8761a_config, rtl8821a_config and rtl8723b_config files are used in btrtl, but it doesn't actually exist, which causes errors like: bluetooth: Direct firmware load for rtl_bt/rtl8821a_config.bin failed with error -2 According to the files in the rtl_bt directory in the Linux firmware, fixes the driver to load correct firmware file for rtl. Fixes: f96dbd322a8f1 (Bluetooth: btrtl: add MODULE_FIRMWARE declarations) Signed-off-by: Meng Tang --- drivers/bluetooth/btrtl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index 449858b65e8e..56cec18475f7 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -921,15 +921,12 @@ MODULE_VERSION(VERSION); MODULE_LICENSE("GPL"); MODULE_FIRMWARE("rtl_bt/rtl8723a_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723b_fw.bin"); -MODULE_FIRMWARE("rtl_bt/rtl8723b_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723bs_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723bs_config-OBDA8723.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin"); -MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin"); -MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");