brcmfmac: reserve tx credit only when txctl is ready to send
PATCH 1/1 brcmfmac: reserve tx credit only when txctl is ready to send
The 4329 throughput drops from 40.2 Mbits/sec to 190 Kbits/sec in 2G 11n mode because the commit b41c232d33666 ("brcmfmac: reserve 2 credits for host tx control path"). To fix the issue, host driver only reserves tx control credit when there is a txctl frame is pending to send. And we also check available credit by using "not equal to 0" instead of "greater than 0" because tx_max and tx_seq are circled positive numbers.
path")
--- .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +9 -3
@@ -664,9 +664,15 @@ static void pkt_align(struct sk_buff *p, int len, int align)/* To check if there's window offered */ static bool data_ok (struct brcmf_sdio *bus) { -/* Reserve TXCTL_CREDITS credits for txctl */ -return (bus->tx_max - bus->tx_seq) >TXCTL_CREDITS && - ((bus->tx_max - bus->tx_seq) &0x80 ) ==0 ; +u8 tx_rsv =0 ; + +/* Reserve TXCTL_CREDITS credits for txctl when it is ready to send */ +if (bus->ctrl_frame_stat) + tx_rsv =TXCTL_CREDITS ; + +return (bus->tx_max - bus->tx_seq - tx_rsv) !=0 && + ((bus->tx_max - bus->tx_seq - tx_rsv) &0x80 ) ==0 ; + }/* To check if there's window offered */
Signature · 1 line
2.25.0
Quoted 10 lines · Wright Feng
The 4329 throughput drops from 40.2 Mbits/sec to 190 Kbits/sec in 2G 11n mode because the commit
b41c232d33666("brcmfmac: reserve 2 credits for host tx control path"). To fix the issue, host driver only reserves tx control credit when there is a txctl frame is pending to send. And we also check available credit by using "not equal to 0" instead of "greater than 0" becausetx_maxandtx_seqare circled positive numbers.Reported-by Dmitry Osipenko <[email protected]>Fixes b41c232d33666 ("brcmfmac: reserve 2 credits for host tx controlpath")
Fixes tag should be in one line, but I can fix it.
Quoted 2 lines
Signed-off-by Wright Feng <[email protected]>Tested-by Dmitry Osipenko <[email protected]>
And I'll queue this to v5.9.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 11 lines · Wright Feng
The 4329 throughput drops from 40.2 Mbits/sec to 190 Kbits/sec in 2G 11n mode because the commit
b41c232d33666("brcmfmac: reserve 2 credits for host tx control path"). To fix the issue, host driver only reserves tx control credit when there is a txctl frame is pending to send. And we also check available credit by using "not equal to 0" instead of "greater than 0" becausetx_maxandtx_seqare circled positive numbers.Reported-by Dmitry Osipenko <[email protected]>Fixes b41c232d33666 ("brcmfmac: reserve 2 credits for host tx control path")Signed-off-by Wright Feng <[email protected]>Tested-by Dmitry Osipenko <[email protected]>
Patch applied to wireless-drivers.git, thanks.
9a2a0862d973 brcmfmac: reserve tx credit only when txctl is ready to send
Signature · 3 lines
https://patchwork.kernel.org/patch/11711809/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches