From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To: sean.wang@mediatek.com
Cc: nbd@nbd.name, Soul.Huang@mediatek.com, YN.Chen@mediatek.com,
Leon.Yen@mediatek.com, Eric-SY.Chang@mediatek.com,
Mark-YW.Chen@mediatek.com, Deren.Wu@mediatek.com,
km.lin@mediatek.com, jenhao.yang@mediatek.com,
robin.chiu@mediatek.com, Eddie.Chen@mediatek.com,
ch.yeh@mediatek.com, posh.sun@mediatek.com,
ted.huang@mediatek.com, Eric.Liang@mediatek.com,
Stella.Chang@mediatek.com, Tom.Chou@mediatek.com,
steve.lee@mediatek.com, jsiuda@google.com, frankgor@google.com,
jemele@google.com, abhishekpandit@google.com, shawnku@google.com,
linux-wireless@vger.kernel.org,
linux-mediatek@lists.infradead.org
Subject: Re: [PATCH 2/3] mt76: sdio: honor the largest Tx buffer the hardware can support
Date: Thu, 13 Jan 2022 10:09:53 +0100 [thread overview]
Message-ID: <Yd/sYYP1XJ3J8RuR@lore-desk> (raw)
In-Reply-To: <557712deb9fc0e78d9a8dd7c68177fe2ae2a38ec.1642061035.git.objelf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 5812 bytes --]
> From: Deren Wu <deren.wu@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@mediatek.com>
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> Signed-off-by: Deren Wu <deren.wu@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
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2022-01-13 9:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 8:23 [PATCH 1/3] mt76: sdio: remove those unnecessary buffers in sdio.xmit_buf sean.wang
2022-01-13 8:23 ` [PATCH 2/3] mt76: sdio: honor the largest Tx buffer the hardware can support sean.wang
2022-01-13 9:09 ` Lorenzo Bianconi [this message]
2022-01-13 8:23 ` [PATCH 3/3] mt76: mt7921s: run sleep mode by default sean.wang
2022-01-13 9:03 ` Lorenzo Bianconi
2022-01-13 9:09 ` [PATCH 1/3] mt76: sdio: remove those unnecessary buffers in sdio.xmit_buf Lorenzo Bianconi
[not found] <Yd/sYYP1XJ3J8RuR@lore-desk--annotate>
2022-01-13 22:43 ` [PATCH 2/3] mt76: sdio: honor the largest Tx buffer the hardware can support sean.wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yd/sYYP1XJ3J8RuR@lore-desk \
--to=lorenzo.bianconi@redhat.com \
--cc=Deren.Wu@mediatek.com \
--cc=Eddie.Chen@mediatek.com \
--cc=Eric-SY.Chang@mediatek.com \
--cc=Eric.Liang@mediatek.com \
--cc=Leon.Yen@mediatek.com \
--cc=Mark-YW.Chen@mediatek.com \
--cc=Soul.Huang@mediatek.com \
--cc=Stella.Chang@mediatek.com \
--cc=Tom.Chou@mediatek.com \
--cc=YN.Chen@mediatek.com \
--cc=abhishekpandit@google.com \
--cc=ch.yeh@mediatek.com \
--cc=frankgor@google.com \
--cc=jemele@google.com \
--cc=jenhao.yang@mediatek.com \
--cc=jsiuda@google.com \
--cc=km.lin@mediatek.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@nbd.name \
--cc=posh.sun@mediatek.com \
--cc=robin.chiu@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=shawnku@google.com \
--cc=steve.lee@mediatek.com \
--cc=ted.huang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).