10.06.2020 18:21, Chi-Hsien Lin пишет:
> From: Amar Shankar <amsr@xxxxxxxxxxx>
>
> It is observed that sometimes when sdiod is low in tx credits in low
> rssi scenarios, the data path consumes all sdiod rx all credits and
> there is no sdiod rx credit available for control path causing host
> and card to go out of sync resulting in link loss between host and
> card. So in order to prevent it some credits are reserved for control
> path.
>
> Note that TXCTL_CREDITS can't be larger than the firmware default
> credit update threshold 2; otherwise there will be a deadlock for both
> side waiting for each other.
>
> Signed-off-by: Amar Shankar <amsr@xxxxxxxxxxx>
> Signed-off-by: Jia-Shyr Chuang <joseph.chuang@xxxxxxxxxxx>
> Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@xxxxxxxxxxx>
> ---
> .../broadcom/brcm80211/brcmfmac/sdio.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index ce6f15284277..4da40436b4ab 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -635,6 +635,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
> BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012)
> };
>
> +#define TXCTL_CREDITS 2
> +
> static void pkt_align(struct sk_buff *p, int len, int align)
> {
> uint datalign;
> @@ -648,8 +650,16 @@ 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)
> {
> - return (u8)(bus->tx_max - bus->tx_seq) != 0 &&
> - ((u8)(bus->tx_max - bus->tx_seq) & 0x80) == 0;
> + /* Reserve TXCTL_CREDITS credits for txctl */
> + return (bus->tx_max - bus->tx_seq) > TXCTL_CREDITS &&
> + ((bus->tx_max - bus->tx_seq) & 0x80) == 0;
> +}
> +
> +/* To check if there's window offered */
> +static bool txctl_ok(struct brcmf_sdio *bus)
> +{
> + return (bus->tx_max - bus->tx_seq) != 0 &&
> + ((bus->tx_max - bus->tx_seq) & 0x80) == 0;
> }
>
> static int
> @@ -2655,7 +2665,7 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus)
> brcmf_sdio_clrintr(bus);
>
> if (bus->ctrl_frame_stat && (bus->clkstate == CLK_AVAIL) &&
> - data_ok(bus)) {
> + txctl_ok(bus)) {
> sdio_claim_host(bus->sdiodev->func1);
> if (bus->ctrl_frame_stat) {
> err = brcmf_sdio_tx_ctrlframe(bus, bus->ctrl_frame_buf,
> @@ -2663,6 +2673,9 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus)
> bus->ctrl_frame_err = err;
> wmb();
> bus->ctrl_frame_stat = false;
> + if (err)
> + brcmf_err("sdio ctrlframe tx failed err=%d\n",
> + err);
> }
> sdio_release_host(bus->sdiodev->func1);
> brcmf_sdio_wait_event_wakeup(bus);
>
Hello,
This patch causes a severe WiFi performance regression on BCM4329.
Please fix or revert this patch, thanks in advance.
Before this patch:
- - - - - - - - - - - - - - - - - - - - - - - - -
[ ID] Interval Transfer Bitrate Retr
[ 5] 0.00-10.00 sec 17.2 MBytes 14.4 Mbits/sec 0 sender
[ 5] 0.00-10.04 sec 16.9 MBytes 14.1 Mbits/sec
receiver
After this patch:
- - - - - - - - - - - - - - - - - - - - - - - - -
[ ID] Interval Transfer Bitrate Retr
[ 5] 0.00-10.00 sec 1.05 MBytes 881 Kbits/sec 3 sender
[ 5] 0.00-14.01 sec 959 KBytes 561 Kbits/sec
receiver
