Commit c613e219 authored by David Lin's avatar David Lin Committed by Ma Wupeng
Browse files

wifi: mwifiex: add extra delay for firmware ready 

stable inclusion
from stable-v6.6.14
commit 60220f0a551d4e5b1251c8d5f3727060ca969a25
bugzilla: https://gitee.com/openeuler/kernel/issues/I99TJK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=60220f0a551d4e5b1251c8d5f3727060ca969a25



--------------------------------

commit 1c5d463c0770c6fa2037511a24fb17966fd07d97 upstream.

For SDIO IW416, due to a bug, FW may return ready before complete full
initialization. Command timeout may occur at driver load after reboot.
Workaround by adding 100ms delay at checking FW status.

Signed-off-by: default avatarDavid Lin <yu-hao.lin@nxp.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarFrancesco Dolcini <francesco.dolcini@toradex.com>
Acked-by: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> # Verdin AM62 (IW416)
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231208234029.2197-1-yu-hao.lin@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent b3f6c345

drivers/net/wireless/marvell/mwifiex/sdio.c

+19 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = { 
	.can_dump_fw = false,

	.can_auto_tdls = false,

	.can_ext_scan = false,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {
@@ -346,6 +347,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = { 
	.can_dump_fw = false,

	.can_auto_tdls = false,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {
@@ -361,6 +363,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = { 
	.can_dump_fw = false,

	.can_auto_tdls = false,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {
@@ -376,6 +379,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = { 
	.can_dump_fw = true,

	.can_auto_tdls = false,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = {
@@ -392,6 +396,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = { 
	.fw_dump_enh = true,

	.can_auto_tdls = false,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8978 = {
@@ -408,6 +413,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8978 = { 
	.fw_dump_enh = true,

	.can_auto_tdls = false,

	.can_ext_scan = true,

	.fw_ready_extra_delay = true,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = {
@@ -425,6 +431,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = { 
	.fw_dump_enh = true,

	.can_auto_tdls = false,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {
@@ -440,6 +447,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = { 
	.can_dump_fw = false,

	.can_auto_tdls = true,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = {
@@ -456,6 +464,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = { 
	.fw_dump_enh = true,

	.can_auto_tdls = true,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {
@@ -471,6 +480,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = { 
	.can_dump_fw = false,

	.can_auto_tdls = false,

	.can_ext_scan = true,

	.fw_ready_extra_delay = false,

};



static struct memory_type_mapping generic_mem_type_map[] = {
@@ -563,6 +573,7 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) 
		card->fw_dump_enh = data->fw_dump_enh;

		card->can_auto_tdls = data->can_auto_tdls;

		card->can_ext_scan = data->can_ext_scan;

		card->fw_ready_extra_delay = data->fw_ready_extra_delay;

		INIT_WORK(&card->work, mwifiex_sdio_work);

	}
@@ -766,6 +777,7 @@ mwifiex_sdio_read_fw_status(struct mwifiex_adapter *adapter, u16 *dat) 
static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,

				   u32 poll_num)

{

	struct sdio_mmc_card *card = adapter->card;

	int ret = 0;

	u16 firmware_stat;

	u32 tries;
@@ -783,6 +795,13 @@ static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter, 
		ret = -1;

	}



	if (card->fw_ready_extra_delay &&

	    firmware_stat == FIRMWARE_READY_SDIO)

		/* firmware might pretend to be ready, when it's not.

		 * Wait a little bit more as a workaround.

		 */

		msleep(100);



	return ret;

}

drivers/net/wireless/marvell/mwifiex/sdio.h

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ struct sdio_mmc_card { 
	bool fw_dump_enh;

	bool can_auto_tdls;

	bool can_ext_scan;

	bool fw_ready_extra_delay;



	struct mwifiex_sdio_mpa_tx mpa_tx;

	struct mwifiex_sdio_mpa_rx mpa_rx;
@@ -281,6 +282,7 @@ struct mwifiex_sdio_device { 
	bool fw_dump_enh;

	bool can_auto_tdls;

	bool can_ext_scan;

	bool fw_ready_extra_delay;

};



/*