marvell: Fix firmware filenames for sd8977/sd8997 chipsets
Subsystems (2)
cover marvell: Fix firmware filenames for sd8977/sd8997 chipsets
This patch series fixes mwifiex and btmrvl drivers to load firmware for sd8977 and sd8997 chipsets from correct filename.
Both Marvell distribution package and linux-firmware repository [1] contain firmware for these chipsets in files sdsd8977_combo_v2.bin/sdsd8997_combo_v4.bin.
Linux drivers mwifiex and btmrvl try to load firmware for these chipsets from sd8977_uapsta.bin/sd8997_uapsta.bin files which obviously fails as these files do not exist neither in linux-firmware [1] nor in Marvell distribution packages.
So the result is that Marvell sd8977 and sd8997 chipsets via mainline kernel drivers (mwifiex and btmrvl) do not work out of box.
Each patch in this series fixes particular git commit which introduced usage of incorrect firmware filename. Also each patch contains Fixes: line for easier backporting to stable kernels.
mwifiex (1/4, 2/4) and btmrvl (3/4, 4/4) parts of this patch series can be applied separately via wireless and bluetooth trees. I'm sending all four patches in one patch series for easier review.
[1] - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/mrvl
Pali Rohár (4):
mwifiex: Fix firmware filename for sd8977 chipset
mwifiex: Fix firmware filename for sd8997 chipset
btmrvl: Fix firmware filename for sd8977 chipset
btmrvl: Fix firmware filename for sd8997 chipset
drivers/bluetooth/btmrvl_sdio.c | 8 ++++---- drivers/net/wireless/marvell/mwifiex/sdio.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/4 mwifiex: Fix firmware filename for sd8977 chipset
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.
--- drivers/net/wireless/marvell/mwifiex/sdio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/sdio.h +1 -1
@@ -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"
Signature · 1 line
2.20.1
PATCH 2/4 mwifiex: Fix firmware filename for sd8997 chipset
In reply to Pali RohárFirmware 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.
--- drivers/net/wireless/marvell/mwifiex/sdio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/sdio.h +1 -1
@@ -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
Signature · 1 line
2.20.1
PATCH 3/4 btmrvl: Fix firmware filename for sd8977 chipset
In reply to Pali RohárFirmware 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.
--- drivers/bluetooth/btmrvl_sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/btmrvl_sdio.c +2 -2
@@ -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" );
Signature · 1 line
2.20.1
PATCH 4/4 btmrvl: Fix firmware filename for sd8997 chipset
In reply to Pali RohárFirmware 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.
--- drivers/bluetooth/btmrvl_sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/btmrvl_sdio.c +2 -2
@@ -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" );
Signature · 1 line
2.20.1
Hi Pali,
Quoted 2 lines
This patch series fixes mwifiex and btmrvl drivers to load firmware for sd8977 and sd8997 chipsets from correct filename.
Thanks you for the changes, I will ack each patch;
Regards,
Ganapathi
RE: [EXT] [PATCH 2/4] mwifiex: Fix firmware filename for sd8997 chipset
In reply to Pali RohárRE: [EXT] [PATCH 1/4] mwifiex: Fix firmware filename for sd8977 chipset
In reply to Pali RohárRE: [EXT] [PATCH 3/4] btmrvl: Fix firmware filename for sd8977 chipset
In reply to Pali RohárRE: [EXT] [PATCH 4/4] btmrvl: Fix firmware filename for sd8997 chipset
In reply to Pali RohárMarcel Holtmann
maintainerHi Pali,
Quoted 29 lines
This patch series fixes mwifiex and btmrvl drivers to load firmware for sd8977 and sd8997 chipsets from correct filename.
Both Marvell distribution package and linux-firmware repository [1] contain firmware for these chipsets in files sdsd8977_combo_v2.bin/sdsd8997_combo_v4.bin.
Linux drivers mwifiex and btmrvl try to load firmware for these chipsets from sd8977_uapsta.bin/sd8997_uapsta.bin files which obviously fails as these files do not exist neither in linux-firmware [1] nor in Marvell distribution packages.
So the result is that Marvell sd8977 and sd8997 chipsets via mainline kernel drivers (mwifiex and btmrvl) do not work out of box.
Each patch in this series fixes particular git commit which introduced usage of incorrect firmware filename. Also each patch contains Fixes: line for easier backporting to stable kernels.
mwifiex (1/4, 2/4) and btmrvl (3/4, 4/4) parts of this patch series can be applied separately via wireless and bluetooth trees. I'm sending all four patches in one patch series for easier review.
[1] - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/mrvl
Pali Rohár (4):
mwifiex: Fix firmware filename for sd8977 chipset
mwifiex: Fix firmware filename for sd8997 chipset
btmrvl: Fix firmware filename for sd8977 chipset
btmrvl: Fix firmware filename for sd8997 chipset
Quoted 3 lines
drivers/bluetooth/btmrvl_sdio.c| 8 ++++----drivers/net/wireless/marvell/mwifiex/sdio.h| 4 ++--2 files changed, 6 insertions(+), 6 deletions(-)
all 4 patches have been applied to bluetooth-next tree.
Regards
Marcel