Commit 39d0f1b0 authored by Ajay Singh's avatar Ajay Singh Committed by Kalle Valo
Browse files

wifi: wilc1000: add 'isinit' flag for SDIO bus similar to SPI 



Similar to SPI priv data, add 'isinit' variable in SDIO priv. Make use
of the state to invoke hif_init() once, and acquire the lock before
accessing hif function.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220720160302.231516-7-ajay.kathat@microchip.com
parent ad3e683a

drivers/net/wireless/microchip/wilc1000/sdio.c

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ static const struct sdio_device_id wilc_sdio_ids[] = { 
struct wilc_sdio {

	bool irq_gpio;

	u32 block_size;

	bool isinit;

	int has_thrpt_enh3;

};
@@ -193,6 +194,13 @@ static int wilc_sdio_reset(struct wilc *wilc) 
	return 0;

}



static bool wilc_sdio_is_init(struct wilc *wilc)

{

	struct wilc_sdio *sdio_priv = wilc->bus_data;



	return sdio_priv->isinit;

}



static int wilc_sdio_suspend(struct device *dev)

{

	struct sdio_func *func = dev_to_sdio_func(dev);
@@ -581,6 +589,9 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) 


static int wilc_sdio_deinit(struct wilc *wilc)

{

	struct wilc_sdio *sdio_priv = wilc->bus_data;



	sdio_priv->isinit = false;

	return 0;

}
@@ -700,6 +711,7 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume) 
			 sdio_priv->has_thrpt_enh3);

	}



	sdio_priv->isinit = true;

	return 0;

}
@@ -981,6 +993,7 @@ static const struct wilc_hif_func wilc_hif_sdio = { 
	.enable_interrupt = wilc_sdio_enable_interrupt,

	.disable_interrupt = wilc_sdio_disable_interrupt,

	.hif_reset = wilc_sdio_reset,

	.hif_is_init = wilc_sdio_is_init,

};



static int wilc_sdio_resume(struct device *dev)

drivers/net/wireless/microchip/wilc1000/spi.c

+8 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,13 @@ static int wilc_spi_reset(struct wilc *wilc) 
	return result;

}



static bool wilc_spi_is_init(struct wilc *wilc)

{

	struct wilc_spi *spi_priv = wilc->bus_data;



	return spi_priv->isinit;

}



static int wilc_spi_deinit(struct wilc *wilc)

{

	struct wilc_spi *spi_priv = wilc->bus_data;
@@ -1250,4 +1257,5 @@ static const struct wilc_hif_func wilc_hif_spi = { 
	.hif_block_rx_ext = wilc_spi_read,

	.hif_sync_ext = wilc_spi_sync_ext,

	.hif_reset = wilc_spi_reset,

	.hif_is_init = wilc_spi_is_init,

};

drivers/net/wireless/microchip/wilc1000/wlan.c

+6 −3
Original line number Diff line number Diff line
@@ -1481,8 +1481,11 @@ int wilc_wlan_init(struct net_device *dev) 


	wilc->quit = 0;



	if (wilc->hif_func->hif_init(wilc, false)) {

		ret = -EIO;

	if (!wilc->hif_func->hif_is_init(wilc)) {

		acquire_bus(wilc, WILC_BUS_ACQUIRE_ONLY);

		ret = wilc->hif_func->hif_init(wilc, false);

		release_bus(wilc, WILC_BUS_RELEASE_ONLY);

		if (ret)

			goto fail;

	}

drivers/net/wireless/microchip/wilc1000/wlan.h

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ struct wilc_hif_func { 
	int (*enable_interrupt)(struct wilc *nic);

	void (*disable_interrupt)(struct wilc *nic);

	int (*hif_reset)(struct wilc *wilc);

	bool (*hif_is_init)(struct wilc *wilc);

};



#define WILC_MAX_CFG_FRAME_SIZE		1468