[PATCH 2/3] mt76: sdio: honor the largest Tx buffer the hardware can support

[Lorenzo Bianconi]

> From: Deren Wu <deren.wu at mediatek.com>
> 
> We should take it into account the actual the host and the device MMC
> capability to determine what the appropriate xmit_buf_size can be.
> 
> Both MT7921S and MT7663 can support up to Tx FIFO size of 0x3fe00 which
> means the device can receive 511 blocks of block size 512 in a row from
> the host. So if the driver aggregates the frames as many as possible the
> the device can support, we can merge multiple MMC requests into a single
> one to get rid of the overhead of the handling and synchronizing in those
> unnecessary MMC requests and reduce the SDIO lock contention with the
> Bluetooth concurrent traffic and finally to have the higher bus
> utilization with less idle cycle.
> 
> With the patch, it is helpful for WiFi to have steady throughput
> performance especially while running Bluetooth concurrently.
> 
> Co-developed-by: Sean Wang <sean.wang at mediatek.com>
> Signed-off-by: Sean Wang <sean.wang at mediatek.com>
> Signed-off-by: Deren Wu <deren.wu at mediatek.com>
> ---
>  drivers/net/wireless/mediatek/mt76/mt76.h        |  4 +++-
>  drivers/net/wireless/mediatek/mt76/mt7615/sdio.c |  3 ++-
>  drivers/net/wireless/mediatek/mt76/mt7921/sdio.c |  3 ++-
>  drivers/net/wireless/mediatek/mt76/sdio.c        | 13 +++++++++++++
>  drivers/net/wireless/mediatek/mt76/sdio_txrx.c   |  2 +-
>  5 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index 4029a2217397..8703ecd6396f 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -497,7 +497,7 @@ struct mt76_usb {
>  	} mcu;
>  };
>  
> -#define MT76S_XMIT_BUF_SZ	(16 * PAGE_SIZE)
> +#define MT76S_XMIT_BUF_SZ	0x3fe00
>  #define MT76S_NUM_TX_ENTRIES	256
>  #define MT76S_NUM_RX_ENTRIES	512
>  struct mt76_sdio {
> @@ -508,6 +508,7 @@ struct mt76_sdio {
>  	struct work_struct stat_work;
>  
>  	u8 *xmit_buf;
> +	u32 xmit_buf_sz;
>  
>  	struct sdio_func *func;
>  	void *intr_data;
> @@ -1280,6 +1281,7 @@ void mt76u_queues_deinit(struct mt76_dev *dev);
>  
>  int mt76s_init(struct mt76_dev *dev, struct sdio_func *func,
>  	       const struct mt76_bus_ops *bus_ops);
> +u32 mt76s_get_xmit_buf_sz(struct mt76_dev *dev, u32 dev_xmit_sz);
>  int mt76s_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid);
>  int mt76s_alloc_tx(struct mt76_dev *dev);
>  void mt76s_deinit(struct mt76_dev *dev);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
> index 554160b0ea9a..ed778b635391 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
> @@ -140,7 +140,8 @@ static int mt7663s_probe(struct sdio_func *func,
>  		goto error;
>  	}
>  
> -	mdev->sdio.xmit_buf = devm_kmalloc(mdev->dev, MT76S_XMIT_BUF_SZ,
> +	mdev->sdio.xmit_buf_sz = mt76s_get_xmit_buf_sz(mdev, MT76S_XMIT_BUF_SZ);
> +	mdev->sdio.xmit_buf = devm_kmalloc(mdev->dev, mdev->sdio.xmit_buf_sz,
>  					   GFP_KERNEL);
>  	if (!mdev->sdio.xmit_buf) {
>  		ret = -ENOMEM;
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
> index c58c14e28430..6e5d9e9459ad 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
> @@ -154,7 +154,8 @@ static int mt7921s_probe(struct sdio_func *func,
>  		goto error;
>  	}
>  
> -	mdev->sdio.xmit_buf = devm_kmalloc(mdev->dev, MT76S_XMIT_BUF_SZ,
> +	mdev->sdio.xmit_buf_sz = mt76s_get_xmit_buf_sz(mdev, MT76S_XMIT_BUF_SZ);
> +	mdev->sdio.xmit_buf = devm_kmalloc(mdev->dev, mdev->sdio.xmit_buf_sz,
>  					   GFP_KERNEL);
>  	if (!mdev->sdio.xmit_buf) {
>  		ret = -ENOMEM;
> diff --git a/drivers/net/wireless/mediatek/mt76/sdio.c b/drivers/net/wireless/mediatek/mt76/sdio.c
> index 54f72d215948..bd0027152026 100644
> --- a/drivers/net/wireless/mediatek/mt76/sdio.c
> +++ b/drivers/net/wireless/mediatek/mt76/sdio.c
> @@ -12,6 +12,8 @@
>  #include <linux/kernel.h>
>  #include <linux/module.h>
>  #include <linux/mmc/sdio_func.h>
> +#include <linux/mmc/card.h>
> +#include <linux/mmc/host.h>
>  #include <linux/sched.h>
>  #include <linux/kthread.h>
>  
> @@ -299,6 +301,17 @@ int mt76s_hw_init(struct mt76_dev *dev, struct sdio_func *func, int hw_ver)
>  }
>  EXPORT_SYMBOL_GPL(mt76s_hw_init);
>  
> +u32 mt76s_get_xmit_buf_sz(struct mt76_dev *dev, u32 dev_max_len)
> +{
> +	struct sdio_func *func = dev->sdio.func;
> +	u32 host_max_len = min_t(u32, func->card->host->max_req_size,
> +				 func->cur_blksize *
> +				 func->card->host->max_blk_count);
> +
> +	return min_t(u32, host_max_len, dev_max_len);
> +}
> +EXPORT_SYMBOL_GPL(mt76s_get_xmit_buf_sz);

I think we can squash this patch with the previous one and move the code above
in mt76s_init(). Agree?

Regards,
Lorenzo

> +
>  int mt76s_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid)
>  {
>  	struct mt76_queue *q = &dev->q_rx[qid];
> diff --git a/drivers/net/wireless/mediatek/mt76/sdio_txrx.c b/drivers/net/wireless/mediatek/mt76/sdio_txrx.c
> index a04cd2444247..9fcf507e09bd 100644
> --- a/drivers/net/wireless/mediatek/mt76/sdio_txrx.c
> +++ b/drivers/net/wireless/mediatek/mt76/sdio_txrx.c
> @@ -254,7 +254,7 @@ static int mt76s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
>  		}
>  
>  		pad = roundup(e->skb->len, 4) - e->skb->len;
> -		if (len + e->skb->len + pad + 4 > MT76S_XMIT_BUF_SZ)
> +		if (len + e->skb->len + pad + 4 > dev->sdio.xmit_buf_sz)
>  			break;
>  
>  		if (mt76s_tx_pick_quota(sdio, mcu, e->buf_sz, &pse_sz,
> -- 
> 2.25.1
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-mediatek/attachments/20220113/60b5dd72/attachment.sig>