RE: [PATCH v8 4/6] wifi: rtw88: sdio: track free TX pages and OQT credits for RTL8723BS

[Ping-Ke Shih]

luka.gejak@xxxxxxxxx <luka.gejak@xxxxxxxxx> wrote:
[...]

> +static int rtw_sdio_write_port(struct rtw_dev *rtwdev, struct sk_buff *skb,
> +                              enum rtw_tx_queue_type queue)
> +{
> +       struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv;
> +       size_t write_size;
> +       size_t txsize;
> +       u32 txaddr;
> +       int ret;
> +
> +       txaddr = rtw_sdio_get_tx_addr(rtwdev, skb->len, queue);
> +       if (!txaddr)
> +               return -EINVAL;
> +
> +       if (!rtw_is_8723bs(rtwdev)) {
> +               txsize = sdio_align_size(rtwsdio->sdio_func, skb->len);
> +
> +               ret = rtw_sdio_check_free_txpg(rtwdev, queue, txsize);
> +               if (ret)
> +                       return ret;
> +
> +               if (!IS_ALIGNED((unsigned long)skb->data,
> +                               RTW_SDIO_DATA_PTR_ALIGN))
> +                       rtw_warn(rtwdev,
> +                                "Got unaligned SKB in %s() for queue %u\n",
> +                                __func__, queue);
> +
> +               return rtw_sdio_write_to_port(rtwdev, skb, txaddr, txsize);

Since you have two branches for RTL8723BS and others, let's implement them
by individual functions. Here can just dispatch, like

int rtw_sdio_write_port()
{
    if (rtw_is_8723bs(rtwdev))
        return rtw_sdio_write_port_8723bs();
    else
        return rtw_sdio_write_port_common(); 
}

> +       }
> +
> +       txsize = round_up(skb->len, 4);
> +       write_size = txsize > RTW_SDIO_BLOCK_SIZE ?
> +                    round_up(txsize, RTW_SDIO_BLOCK_SIZE) : txsize;
> +
> +       if (write_size > skb->len) {
> +               size_t pad_size = write_size - skb->len;
> +
> +               /*
> +                * __skb_pad() must not free the skb on failure: both callers
> +                * still own it, one requeues it and the other frees it.
> +                */
> +               ret = __skb_pad(skb, pad_size, false);
> +               if (ret)
> +                       return ret;
> +       }
> +
> +       guard(mutex)(&rtwsdio->tx_credit_lock);
> +
> +       return rtw_sdio_8723bs_write_port(rtwdev, skb, queue, txaddr, txsize,
> +                                         write_size);
> +}
> +