brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg support

If the SDIO host controller does not support scatter-gather the glom
superframe must be transfered from the device and the data for each
packet in the queue must be extracted from it.

Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 21 insertions, 4 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 1103dc1cc9dc..3e10b801eee8 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -569,8 +569,10 @@ done:
 }
 
 int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                            uint flags, struct sk_buff_head *pktq)
+                            uint flags, struct sk_buff_head *pktq, uint totlen)
 {
+        struct sk_buff *glom_skb;
+        struct sk_buff *skb;
         uint width;
         int err = 0;
 
@@ -582,7 +584,22 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
         if (err)
                 goto done;
 
-        err = brcmf_sdio_sglist_rw(sdiodev, fn, false, addr, pktq);
+        if (pktq->qlen == 1)
+                err = brcmf_sdio_buffrw(sdiodev, fn, false, addr, pktq->next);
+        else if (!sdiodev->sg_support) {
+                glom_skb = brcmu_pkt_buf_get_skb(totlen);
+                if (!glom_skb)
+                        return -ENOMEM;
+                err = brcmf_sdio_buffrw(sdiodev, fn, false, addr, glom_skb);
+                if (err)
+                        goto done;
+
+                skb_queue_walk(pktq, skb) {
+                        memcpy(skb->data, glom_skb->data, skb->len);
+                        skb_pull(glom_skb, skb->len);
+                }
+        } else
+                err = brcmf_sdio_sglist_rw(sdiodev, fn, false, addr, pktq);
 
 done:
         return err;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index c9277011a1bc..b02953c4ade7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -1392,7 +1392,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                 sdio_claim_host(bus->sdiodev->func[1]);
                 errcode = brcmf_sdcard_recv_chain(bus->sdiodev,
                                 bus->sdiodev->sbwad,
-                                SDIO_FUNC_2, F2SYNC, &bus->glom);
+                                SDIO_FUNC_2, F2SYNC, &bus->glom, dlen);
                 sdio_release_host(bus->sdiodev->func[1]);
                 bus->sdcnt.f2rxdata++;
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index 59c456f7eb12..1b034ea46f93 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -225,7 +225,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
                       uint flags, u8 *buf, uint nbytes);
 extern int
 brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                        uint flags, struct sk_buff_head *pktq);
+                        uint flags, struct sk_buff_head *pktq, uint totlen);
 
 /* Flags bits */