From patchwork Wed Jun 3 08:22:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 11585247 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1B121392 for ; Wed, 3 Jun 2020 08:22:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CADAA20823 for ; Wed, 3 Jun 2020 08:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172573; bh=iE6Gdr3BLRFDPHFQ3nGskGnayPtPL53jnGaYczx5h5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aUp9VRiEDspIkTBx7wL1ZOwrHHZMJA5ZQsU4M7NmsDv3/cvfeuNBvycwvFWMADoQP y9HHRGgq1B2URVxaCSewcMBnar/M4Y3iPCOjXRo+gi1VW5J2n1sQRJ+jvt2/TRYjwR YQ5fw+k6tr2ZV8WgpJSns19X3cwxSZfonkK/VRBA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726377AbgFCIWx (ORCPT ); Wed, 3 Jun 2020 04:22:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:48428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgFCIWw (ORCPT ); Wed, 3 Jun 2020 04:22:52 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ADBB320825; Wed, 3 Jun 2020 08:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172571; bh=iE6Gdr3BLRFDPHFQ3nGskGnayPtPL53jnGaYczx5h5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yhi3fSh2sk0eUvW5EOFLkUNUEGDg4t+vpsLsrzA4cKIyVSC6dAHTi0LPFtPGCHykF ayEBUCttUNn6Kzqv7ICJfK3P24nZt3zFIKaQRWPALd8temA8P8lK3R3m9w4mXboIIO Pu9MMzxG9Rj3Kw4crO+B9gCo6AeLQ23jjrJWiWCw= Received: by pali.im (Postfix) id 0C7E26F0; Wed, 3 Jun 2020 10:22:50 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Ganapathi Bhat , Amitkumar Karwar , Xinming Hu , Kalle Valo , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Hemantkumar Suthar , Rakesh Parmar , Zhaoyang Liu , Cathy Luo Subject: [PATCH 1/4] mwifiex: Fix firmware filename for sd8977 chipset Date: Wed, 3 Jun 2020 10:22:26 +0200 Message-Id: <20200603082229.15043-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200603082229.15043-1-pali@kernel.org> References: <20200603082229.15043-1-pali@kernel.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Firmware for sd8977 chipset is distributed by Marvell package and also as part of the linux-firmware repository in filename sdsd8977_combo_v2.bin. This patch fixes mwifiex driver to load correct firmware file for sd8977. Fixes: 1a0f547831dce ("mwifiex: add support for sd8977 chipset") Signed-off-by: Pali Rohár Acked-by: Ganapathi Bhat --- drivers/net/wireless/marvell/mwifiex/sdio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h index 71cd8629b28e..0cac2296ed53 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -36,7 +36,7 @@ #define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin" #define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin" #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin" -#define SD8977_DEFAULT_FW_NAME "mrvl/sd8977_uapsta.bin" +#define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin" #define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin" #define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin" From patchwork Wed Jun 3 08:22:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 11585253 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5DB8A1391 for ; Wed, 3 Jun 2020 08:23:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A30820825 for ; Wed, 3 Jun 2020 08:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172581; bh=uSmHbbvEYpZnPu0zZHvhJ/ANKlr8Qu+RlgX1/y92C3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VtU6pufxLojiCZVE50ecnHH8ZltBqmOFVFazlOxjisUZnfdkeayY1Kj9rSfPOFh4y rG+rUopKi0MmEBr5Ocy8OUjuOVOYmnG/jC00zLauGjLwJAk+K/JjISMaQvb50S67O6 N+zO6fKDI2UrIup7oI83vrvZoh0yhU3+hD027WMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726421AbgFCIW4 (ORCPT ); Wed, 3 Jun 2020 04:22:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgFCIWz (ORCPT ); Wed, 3 Jun 2020 04:22:55 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A352720810; Wed, 3 Jun 2020 08:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172574; bh=uSmHbbvEYpZnPu0zZHvhJ/ANKlr8Qu+RlgX1/y92C3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AunphaSwlq0g+Q8Eomu01vPzj/JObXQhZTQl72XC9PRfE6zbrVTCuc4HoPPk6n6Bp L8BnZK79phKO+jtVkF+Yz1a4DGJcrC9msz6SzyeOddEiqfC5YEQMUOWnjjnqOwDq2o 4vwXzDu5JwMFJdDsIi70zeYzRek591sZC3GI5zhA= Received: by pali.im (Postfix) id DF21A6F0; Wed, 3 Jun 2020 10:22:52 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Ganapathi Bhat , Amitkumar Karwar , Xinming Hu , Kalle Valo , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Hemantkumar Suthar , Rakesh Parmar , Zhaoyang Liu , Cathy Luo Subject: [PATCH 2/4] mwifiex: Fix firmware filename for sd8997 chipset Date: Wed, 3 Jun 2020 10:22:27 +0200 Message-Id: <20200603082229.15043-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200603082229.15043-1-pali@kernel.org> References: <20200603082229.15043-1-pali@kernel.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Firmware for sd8997 chipset is distributed by Marvell package and also as part of the linux-firmware repository in filename sdsd8997_combo_v4.bin. This patch fixes mwifiex driver to load correct firmware file for sd8997. Fixes: 6d85ef00d9dfe ("mwifiex: add support for 8997 chipset") Signed-off-by: Pali Rohár Acked-by: Ganapathi Bhat --- drivers/net/wireless/marvell/mwifiex/sdio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h index 0cac2296ed53..8b476b007c5e 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -38,7 +38,7 @@ #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin" #define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin" #define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin" -#define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin" +#define SD8997_DEFAULT_FW_NAME "mrvl/sdsd8997_combo_v4.bin" #define BLOCK_MODE 1 #define BYTE_MODE 0 From patchwork Wed Jun 3 08:22:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 11585259 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CEC611391 for ; Wed, 3 Jun 2020 08:23:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6BA120810 for ; Wed, 3 Jun 2020 08:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172592; bh=6rg6WOIWtJRVYT18qYbnB9TNZyjdNb6mtZSZLIOV0+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S5x5e3qnxLJ6FzI2RBFScln8hmT+Ud5K5+uo8DKI2aK2Org69z7n0BAW7XBMNSiJg jEz5oWzJjmSUpmiBvxOTy9shtaTmkmLsJtEVx/XDU6qLmcpBjnuImg1x5EHtvT3Ek0 E+X73AG6R/oRqYmTdV22GxY/4akvaof/b1CrOd14= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726480AbgFCIXB (ORCPT ); Wed, 3 Jun 2020 04:23:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:48574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgFCIW6 (ORCPT ); Wed, 3 Jun 2020 04:22:58 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04CEE207DA; Wed, 3 Jun 2020 08:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172578; bh=6rg6WOIWtJRVYT18qYbnB9TNZyjdNb6mtZSZLIOV0+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fgcDZ7wjJe3YVnUlQFd0bqrgd9sLgh0pxR+/YHUopUIuCr50prR2s2MASqTqOQ+ob VTlRPNWw54E/NO0bhQkkPISvc7BByyd2KS24DfdM4xkLcOfDCUPPI4cWMQKYptwm81 kMcVbUhJcq56rZso2UgXgM2aLLaNnu+ksMNrS//w= Received: by pali.im (Postfix) id 51F8D6F0; Wed, 3 Jun 2020 10:22:56 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Ganapathi Bhat , Amitkumar Karwar , Xinming Hu , Kalle Valo , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Hemantkumar Suthar , Rakesh Parmar , Zhaoyang Liu , Cathy Luo Subject: [PATCH 3/4] btmrvl: Fix firmware filename for sd8977 chipset Date: Wed, 3 Jun 2020 10:22:28 +0200 Message-Id: <20200603082229.15043-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200603082229.15043-1-pali@kernel.org> References: <20200603082229.15043-1-pali@kernel.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Firmware for sd8977 chipset is distributed by Marvell package and also as part of the linux-firmware repository in filename sdsd8977_combo_v2.bin. This patch fixes mwifiex driver to load correct firmware file for sd8977. Fixes: 8c57983bf7a79 ("Bluetooth: btmrvl: add support for sd8977 chipset") Signed-off-by: Pali Rohár Acked-by: Ganapathi Bhat --- drivers/bluetooth/btmrvl_sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 0f3a020703ab..7aa2c94720bc 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -328,7 +328,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = { static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = { .helper = NULL, - .firmware = "mrvl/sd8977_uapsta.bin", + .firmware = "mrvl/sdsd8977_combo_v2.bin", .reg = &btmrvl_reg_8977, .support_pscan_win_report = true, .sd_blksz_fw_dl = 256, @@ -1831,6 +1831,6 @@ MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin"); MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin"); MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin"); MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin"); -MODULE_FIRMWARE("mrvl/sd8977_uapsta.bin"); +MODULE_FIRMWARE("mrvl/sdsd8977_combo_v2.bin"); MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin"); MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin"); From patchwork Wed Jun 3 08:22:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 11585255 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 809651392 for ; Wed, 3 Jun 2020 08:23:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6748B20810 for ; Wed, 3 Jun 2020 08:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172587; bh=HZfPXve3yaKU6HtrT1R/7rlrPSqUP6lSnXUj3KLVipk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QxKSlLPf6tvjmJ9Fu8SLYCMtKKiKATkCwM6Ly53nls38oVlqqmBfa8nW+VMlZOlva xH/2fr1SVvHQH00Jmq8uX2VQATs0UlcUbgj60zxXrHXCcHmlemNYwdIR17qnhAKOFo KRj3U0e5U0+kAToj74b7MrcNj4L8uwZthUotdq1w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726563AbgFCIXD (ORCPT ); Wed, 3 Jun 2020 04:23:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726521AbgFCIXC (ORCPT ); Wed, 3 Jun 2020 04:23:02 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 68AD220825; Wed, 3 Jun 2020 08:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172581; bh=HZfPXve3yaKU6HtrT1R/7rlrPSqUP6lSnXUj3KLVipk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vpNpkjD3LuW2VjJA69M7/0Xy7utsk3RBgs9VNIafDIREKVBytjtCTQAdfS6miKWCm n5DlZAl/RPLNjCO8BJobF8UxKkkwHGdf2xjaMoAozFy5de6OCoNORIFsLMdZ2P9Sve +opX3Wrex4i0hzsV/P2OK2rQDIUBA1oU5zbbe/dc= Received: by pali.im (Postfix) id C3B796F0; Wed, 3 Jun 2020 10:22:59 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Ganapathi Bhat , Amitkumar Karwar , Xinming Hu , Kalle Valo , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Hemantkumar Suthar , Rakesh Parmar , Zhaoyang Liu , Cathy Luo Subject: [PATCH 4/4] btmrvl: Fix firmware filename for sd8997 chipset Date: Wed, 3 Jun 2020 10:22:29 +0200 Message-Id: <20200603082229.15043-5-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200603082229.15043-1-pali@kernel.org> References: <20200603082229.15043-1-pali@kernel.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Firmware for sd8997 chipset is distributed by Marvell package and also as part of the linux-firmware repository in filename sdsd8997_combo_v4.bin. This patch fixes mwifiex driver to load correct firmware file for sd8997. Fixes: f0ef67485f591 ("Bluetooth: btmrvl: add sd8997 chipset support") Signed-off-by: Pali Rohár Acked-by: Ganapathi Bhat --- drivers/bluetooth/btmrvl_sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 7aa2c94720bc..4c7978cb1786 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -346,7 +346,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = { static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = { .helper = NULL, - .firmware = "mrvl/sd8997_uapsta.bin", + .firmware = "mrvl/sdsd8997_combo_v4.bin", .reg = &btmrvl_reg_8997, .support_pscan_win_report = true, .sd_blksz_fw_dl = 256, @@ -1833,4 +1833,4 @@ MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin"); MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin"); MODULE_FIRMWARE("mrvl/sdsd8977_combo_v2.bin"); MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin"); -MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin"); +MODULE_FIRMWARE("mrvl/sdsd8997_combo_v4.bin");