Commit a64304f0 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville

brcmfmac: fix brcmf_sdio_txpkt_prep() for host without sg support

When running on a host controller that does not support scatter-gather
transfers the function brcmf_sdio_txpkt_prep() should not add tail
padding buffers.
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c8cce1f9
...@@ -1880,6 +1880,56 @@ brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus) ...@@ -1880,6 +1880,56 @@ brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus)
/* bit mask of data length chopped from the previous packet */ /* bit mask of data length chopped from the previous packet */
#define ALIGN_SKB_CHOP_LEN_MASK 0x7fff #define ALIGN_SKB_CHOP_LEN_MASK 0x7fff
static int brcmf_sdio_txpkt_prep_sg(struct brcmf_sdio_dev *sdiodev,
struct sk_buff_head *pktq,
struct sk_buff *pkt, uint chan)
{
struct sk_buff *pkt_pad;
u16 tail_pad, tail_chop, sg_align;
unsigned int blksize;
u8 *dat_buf;
int ntail;
blksize = sdiodev->func[SDIO_FUNC_2]->cur_blksize;
sg_align = 4;
if (sdiodev->pdata && sdiodev->pdata->sd_sgentry_align > 4)
sg_align = sdiodev->pdata->sd_sgentry_align;
/* sg entry alignment should be a divisor of block size */
WARN_ON(blksize % sg_align);
/* Check tail padding */
pkt_pad = NULL;
tail_chop = pkt->len % sg_align;
tail_pad = sg_align - tail_chop;
tail_pad += blksize - (pkt->len + tail_pad) % blksize;
if (skb_tailroom(pkt) < tail_pad && pkt->len > blksize) {
pkt_pad = brcmu_pkt_buf_get_skb(tail_pad + tail_chop);
if (pkt_pad == NULL)
return -ENOMEM;
memcpy(pkt_pad->data,
pkt->data + pkt->len - tail_chop,
tail_chop);
*(u32 *)(pkt_pad->cb) = ALIGN_SKB_FLAG + tail_chop;
skb_trim(pkt, pkt->len - tail_chop);
__skb_queue_after(pktq, pkt, pkt_pad);
} else {
ntail = pkt->data_len + tail_pad -
(pkt->end - pkt->tail);
if (skb_cloned(pkt) || ntail > 0)
if (pskb_expand_head(pkt, 0, ntail, GFP_ATOMIC))
return -ENOMEM;
if (skb_linearize(pkt))
return -ENOMEM;
dat_buf = (u8 *)(pkt->data);
__skb_put(pkt, tail_pad);
}
if (pkt_pad)
return pkt->len + tail_chop;
else
return pkt->len - tail_pad;
}
/** /**
* brcmf_sdio_txpkt_prep - packet preparation for transmit * brcmf_sdio_txpkt_prep - packet preparation for transmit
* @bus: brcmf_sdio structure pointer * @bus: brcmf_sdio structure pointer
...@@ -1896,24 +1946,16 @@ static int ...@@ -1896,24 +1946,16 @@ static int
brcmf_sdio_txpkt_prep(struct brcmf_sdio *bus, struct sk_buff_head *pktq, brcmf_sdio_txpkt_prep(struct brcmf_sdio *bus, struct sk_buff_head *pktq,
uint chan) uint chan)
{ {
u16 head_pad, tail_pad, tail_chop, head_align, sg_align; u16 head_pad, head_align;
int ntail; struct sk_buff *pkt_next;
struct sk_buff *pkt_next, *pkt_new;
u8 *dat_buf; u8 *dat_buf;
unsigned blksize = bus->sdiodev->func[SDIO_FUNC_2]->cur_blksize; int err;
struct brcmf_sdio_hdrinfo hd_info = {0}; struct brcmf_sdio_hdrinfo hd_info = {0};
/* SDIO ADMA requires at least 32 bit alignment */ /* SDIO ADMA requires at least 32 bit alignment */
head_align = 4; head_align = 4;
sg_align = 4; if (bus->sdiodev->pdata && bus->sdiodev->pdata->sd_head_align > 4)
if (bus->sdiodev->pdata) { head_align = bus->sdiodev->pdata->sd_head_align;
head_align = bus->sdiodev->pdata->sd_head_align > 4 ?
bus->sdiodev->pdata->sd_head_align : 4;
sg_align = bus->sdiodev->pdata->sd_sgentry_align > 4 ?
bus->sdiodev->pdata->sd_sgentry_align : 4;
}
/* sg entry alignment should be a divisor of block size */
WARN_ON(blksize % sg_align);
pkt_next = pktq->next; pkt_next = pktq->next;
dat_buf = (u8 *)(pkt_next->data); dat_buf = (u8 *)(pkt_next->data);
...@@ -1932,40 +1974,20 @@ brcmf_sdio_txpkt_prep(struct brcmf_sdio *bus, struct sk_buff_head *pktq, ...@@ -1932,40 +1974,20 @@ brcmf_sdio_txpkt_prep(struct brcmf_sdio *bus, struct sk_buff_head *pktq,
memset(dat_buf, 0, head_pad + bus->tx_hdrlen); memset(dat_buf, 0, head_pad + bus->tx_hdrlen);
} }
/* Check tail padding */ if (bus->sdiodev->sg_support && pktq->qlen > 1) {
pkt_new = NULL; err = brcmf_sdio_txpkt_prep_sg(bus->sdiodev, pktq,
tail_chop = pkt_next->len % sg_align; pkt_next, chan);
tail_pad = sg_align - tail_chop; if (err < 0)
tail_pad += blksize - (pkt_next->len + tail_pad) % blksize; return err;
if (skb_tailroom(pkt_next) < tail_pad && pkt_next->len > blksize) { hd_info.len = (u16)err;
pkt_new = brcmu_pkt_buf_get_skb(tail_pad + tail_chop);
if (pkt_new == NULL)
return -ENOMEM;
memcpy(pkt_new->data,
pkt_next->data + pkt_next->len - tail_chop,
tail_chop);
*(u32 *)(pkt_new->cb) = ALIGN_SKB_FLAG + tail_chop;
skb_trim(pkt_next, pkt_next->len - tail_chop);
__skb_queue_after(pktq, pkt_next, pkt_new);
} else { } else {
ntail = pkt_next->data_len + tail_pad - hd_info.len = pkt_next->len;
(pkt_next->end - pkt_next->tail);
if (skb_cloned(pkt_next) || ntail > 0)
if (pskb_expand_head(pkt_next, 0, ntail, GFP_ATOMIC))
return -ENOMEM;
if (skb_linearize(pkt_next))
return -ENOMEM;
dat_buf = (u8 *)(pkt_next->data);
__skb_put(pkt_next, tail_pad);
} }
/* Now prep the header */
if (pkt_new)
hd_info.len = pkt_next->len + tail_chop;
else
hd_info.len = pkt_next->len - tail_pad;
hd_info.channel = chan; hd_info.channel = chan;
hd_info.dat_offset = head_pad + bus->tx_hdrlen; hd_info.dat_offset = head_pad + bus->tx_hdrlen;
/* Now fill the header */
brcmf_sdio_hdpack(bus, dat_buf, &hd_info); brcmf_sdio_hdpack(bus, dat_buf, &hd_info);
if (BRCMF_BYTES_ON() && if (BRCMF_BYTES_ON() &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment