From patchwork Wed Jul 17 07:49:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 11047375 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 799D013BD for ; Wed, 17 Jul 2019 07:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B337286F1 for ; Wed, 17 Jul 2019 07:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D42C286FF; Wed, 17 Jul 2019 07:49:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C60B7286F1 for ; Wed, 17 Jul 2019 07:49:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729361AbfGQHti (ORCPT ); Wed, 17 Jul 2019 03:49:38 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49711 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727019AbfGQHth (ORCPT ); Wed, 17 Jul 2019 03:49:37 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hnegv-00033E-Hg; Wed, 17 Jul 2019 07:49:34 +0000 From: Kai-Heng Feng To: johannes.berg@intel.com, emmanuel.grumbach@intel.com, luciano.coelho@intel.com, marcel@holtmann.org, johan.hedberg@gmail.com Cc: linuxwifi@intel.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH v2 1/3] Bluetooth: btintel: Add firmware lock function Date: Wed, 17 Jul 2019 15:49:18 +0800 Message-Id: <20190717074920.21624-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When Intel 8260 starts to load Bluetooth firmware and WiFi firmware, by calling btintel_download_firmware() and iwl_pcie_load_given_ucode_8000() respectively, the Bluetooth btintel_download_firmware() aborts half way: [ 11.950216] Bluetooth: hci0: Failed to send firmware data (-38) Let btusb and iwlwifi load firmwares exclusively can avoid the issue, so introduce a lock to use in btusb and iwlwifi. This issue still occurs with latest WiFi and Bluetooth firmwares. BugLink: https://bugs.launchpad.net/bugs/1832988 Signed-off-by: Kai-Heng Feng --- v2: - Add bug report link. - Rebase on latest wireless-next. drivers/bluetooth/btintel.c | 14 ++++++++++++++ drivers/bluetooth/btintel.h | 10 ++++++++++ include/linux/intel-wifi-bt.h | 8 ++++++++ 3 files changed, 32 insertions(+) create mode 100644 include/linux/intel-wifi-bt.h diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index bb99c8653aab..93ab18d6ddad 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -20,6 +20,8 @@ #define BDADDR_INTEL (&(bdaddr_t) {{0x00, 0x8b, 0x9e, 0x19, 0x03, 0x00}}) +static DEFINE_MUTEX(firmware_lock); + int btintel_check_bdaddr(struct hci_dev *hdev) { struct hci_rp_read_bd_addr *bda; @@ -709,6 +711,18 @@ int btintel_download_firmware(struct hci_dev *hdev, const struct firmware *fw, } EXPORT_SYMBOL_GPL(btintel_download_firmware); +void btintel_firmware_lock(void) +{ + mutex_lock(&firmware_lock); +} +EXPORT_SYMBOL_GPL(btintel_firmware_lock); + +void btintel_firmware_unlock(void) +{ + mutex_unlock(&firmware_lock); +} +EXPORT_SYMBOL_GPL(btintel_firmware_unlock); + MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION); MODULE_VERSION(VERSION); diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index 3d846190f2bf..b3682d27d2ee 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -87,6 +87,8 @@ int btintel_read_boot_params(struct hci_dev *hdev, struct intel_boot_params *params); int btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw, u32 *boot_param); +void btintel_firmware_lock(void); +void btintel_firmware_unlock(void); #else static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ -181,4 +183,12 @@ static inline int btintel_download_firmware(struct hci_dev *dev, { return -EOPNOTSUPP; } + +static inline void btintel_firmware_lock(void) +{ +} + +static inline void btintel_firmware_unlock(void) +{ +} #endif diff --git a/include/linux/intel-wifi-bt.h b/include/linux/intel-wifi-bt.h new file mode 100644 index 000000000000..260ed628d19b --- /dev/null +++ b/include/linux/intel-wifi-bt.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __INTEL_WIFI_BT_H__ +#define __INTEL_WIFI_BT_H__ + +void btintel_firmware_lock(void); +void btintel_firmware_unlock(void); + +#endif From patchwork Wed Jul 17 07:49:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 11047381 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A244E6C5 for ; Wed, 17 Jul 2019 07:49:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96AF8285A4 for ; Wed, 17 Jul 2019 07:49:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B080286FF; Wed, 17 Jul 2019 07:49:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B5E3286F1 for ; Wed, 17 Jul 2019 07:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729579AbfGQHto (ORCPT ); Wed, 17 Jul 2019 03:49:44 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49717 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727019AbfGQHtm (ORCPT ); Wed, 17 Jul 2019 03:49:42 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hneh0-00033M-P2; Wed, 17 Jul 2019 07:49:39 +0000 From: Kai-Heng Feng To: johannes.berg@intel.com, emmanuel.grumbach@intel.com, luciano.coelho@intel.com, marcel@holtmann.org, johan.hedberg@gmail.com Cc: linuxwifi@intel.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH v2 2/3] Bluetooth: btusb: Load firmware exclusively for Intel BT Date: Wed, 17 Jul 2019 15:49:19 +0800 Message-Id: <20190717074920.21624-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190717074920.21624-1-kai.heng.feng@canonical.com> References: <20190717074920.21624-1-kai.heng.feng@canonical.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To avoid the firmware loading race between Bluetooth and WiFi on Intel 8260, load firmware exclusively when IWLWIFI is enabled. BugLink: https://bugs.launchpad.net/bugs/1832988 Signed-off-by: Kai-Heng Feng --- v2: - Add bug report link. - Rebase on latest wireless-next. drivers/bluetooth/btusb.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 50aed5259c2b..ca7a5757a2ba 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2272,8 +2272,16 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) set_bit(BTUSB_DOWNLOADING, &data->flags); +#if IS_ENABLED(CONFIG_IWLWIFI) + btintel_firmware_lock(); +#endif + /* Start firmware downloading and get boot parameter */ err = btintel_download_firmware(hdev, fw, &boot_param); + +#if IS_ENABLED(CONFIG_IWLWIFI) + btintel_firmware_unlock(); +#endif if (err < 0) goto done; From patchwork Wed Jul 17 07:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 11047377 X-Patchwork-Delegate: luca@coelho.fi Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E2D8613BD for ; Wed, 17 Jul 2019 07:49:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8091286F1 for ; Wed, 17 Jul 2019 07:49:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBC67286FF; Wed, 17 Jul 2019 07:49:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 551D4286F1 for ; Wed, 17 Jul 2019 07:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729927AbfGQHtr (ORCPT ); Wed, 17 Jul 2019 03:49:47 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49723 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729686AbfGQHtq (ORCPT ); Wed, 17 Jul 2019 03:49:46 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hneh5-00033d-5M; Wed, 17 Jul 2019 07:49:43 +0000 From: Kai-Heng Feng To: johannes.berg@intel.com, emmanuel.grumbach@intel.com, luciano.coelho@intel.com, marcel@holtmann.org, johan.hedberg@gmail.com Cc: linuxwifi@intel.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH v2 3/3] iwlwifi: Load firmware exclusively for Intel WiFi Date: Wed, 17 Jul 2019 15:49:20 +0800 Message-Id: <20190717074920.21624-3-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190717074920.21624-1-kai.heng.feng@canonical.com> References: <20190717074920.21624-1-kai.heng.feng@canonical.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To avoid the firmware loading race between Bluetooth and WiFi on Intel 8260, load firmware exclusively when BT_INTEL is enabled. BugLink: https://bugs.launchpad.net/bugs/1832988 Signed-off-by: Kai-Heng Feng --- v2: - Add bug report link. - Rebase on latest wireless-next. .../net/wireless/intel/iwlwifi/pcie/trans.c | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c index 602c31b3992a..e10ff847b216 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c @@ -72,6 +72,7 @@ #include #include #include +#include #include "iwl-drv.h" #include "iwl-trans.h" @@ -1335,6 +1336,10 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, bool hw_rfkill; int ret; +#if IS_ENABLED(CONFIG_BT_INTEL) + void (*firmware_lock_func)(void); + void (*firmware_unlock_func)(void); +#endif /* This may fail if AMT took ownership of the device */ if (iwl_pcie_prepare_card_hw(trans)) { IWL_WARN(trans, "Exit HW not ready\n"); @@ -1394,6 +1399,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, * RF-Kill switch is toggled, we will find out after having loaded * the firmware and return the proper value to the caller. */ + iwl_enable_fw_load_int(trans); /* really make sure rfkill handshake bits are cleared */ @@ -1401,8 +1407,37 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL); /* Load the given image to the HW */ - if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_8000) + if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_8000) { +#if IS_ENABLED(CONFIG_BT_INTEL) + firmware_lock_func = symbol_request(btintel_firmware_lock); + firmware_unlock_func = symbol_request(btintel_firmware_unlock); + if (!firmware_lock_func || !firmware_unlock_func) { + if (firmware_lock_func) { + symbol_put(btintel_firmware_lock); + firmware_lock_func = NULL; + } + + if (firmware_unlock_func) { + symbol_put(btintel_firmware_unlock); + firmware_unlock_func = NULL; + } + } + + if (firmware_lock_func) + firmware_lock_func(); +#endif ret = iwl_pcie_load_given_ucode_8000(trans, fw); + +#if IS_ENABLED(CONFIG_BT_INTEL) + if (firmware_unlock_func) { + firmware_unlock_func(); + symbol_put(btintel_firmware_lock); + firmware_lock_func = NULL; + symbol_put(btintel_firmware_unlock); + firmware_unlock_func = NULL; + } +#endif + } else ret = iwl_pcie_load_given_ucode(trans, fw);