diff options
author | Arend van Spriel <arend@broadcom.com> | 2013-10-15 09:44:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-10-18 14:06:57 -0400 |
commit | 4aef267e24b89baedfd3e01c38bafc47aa976946 (patch) | |
tree | b153a3103c476934edf58d5c0f190cc03a0f6368 /drivers/net | |
parent | 0d7d98216d390ce8beb602b1a20464c8a5e6c2e0 (diff) |
brcmfmac: rework single packet transfers
The function brcmf_sdio_sglist_rw() does a different code path
when packet queue length is 1. Move this to a separate function
reducing overhead in the calling context.
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 81 |
1 files changed, 40 insertions, 41 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c index 344b2d2b1863..da0281625e9e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | |||
@@ -314,6 +314,34 @@ void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr, | |||
314 | *ret = retval; | 314 | *ret = retval; |
315 | } | 315 | } |
316 | 316 | ||
317 | static int brcmf_sdio_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn, | ||
318 | bool write, u32 addr, struct sk_buff *pkt) | ||
319 | { | ||
320 | unsigned int req_sz; | ||
321 | |||
322 | brcmf_pm_resume_wait(sdiodev, &sdiodev->request_buffer_wait); | ||
323 | if (brcmf_pm_resume_error(sdiodev)) | ||
324 | return -EIO; | ||
325 | |||
326 | /* Single skb use the standard mmc interface */ | ||
327 | req_sz = pkt->len + 3; | ||
328 | req_sz &= (uint)~3; | ||
329 | |||
330 | if (write) | ||
331 | return sdio_memcpy_toio(sdiodev->func[fn], addr, | ||
332 | ((u8 *)(pkt->data)), | ||
333 | req_sz); | ||
334 | else if (fn == 1) | ||
335 | return sdio_memcpy_fromio(sdiodev->func[fn], | ||
336 | ((u8 *)(pkt->data)), | ||
337 | addr, req_sz); | ||
338 | else | ||
339 | /* function 2 read is FIFO operation */ | ||
340 | return sdio_readsb(sdiodev->func[fn], | ||
341 | ((u8 *)(pkt->data)), addr, | ||
342 | req_sz); | ||
343 | } | ||
344 | |||
317 | /** | 345 | /** |
318 | * brcmf_sdio_sglist_rw - SDIO interface function for block data access | 346 | * brcmf_sdio_sglist_rw - SDIO interface function for block data access |
319 | * @sdiodev: brcmfmac sdio device | 347 | * @sdiodev: brcmfmac sdio device |
@@ -350,27 +378,6 @@ static int brcmf_sdio_sglist_rw(struct brcmf_sdio_dev *sdiodev, uint fn, | |||
350 | if (brcmf_pm_resume_error(sdiodev)) | 378 | if (brcmf_pm_resume_error(sdiodev)) |
351 | return -EIO; | 379 | return -EIO; |
352 | 380 | ||
353 | /* Single skb use the standard mmc interface */ | ||
354 | if (pktlist->qlen == 1) { | ||
355 | pkt_next = pktlist->next; | ||
356 | req_sz = pkt_next->len + 3; | ||
357 | req_sz &= (uint)~3; | ||
358 | |||
359 | if (write) | ||
360 | return sdio_memcpy_toio(sdiodev->func[fn], addr, | ||
361 | ((u8 *)(pkt_next->data)), | ||
362 | req_sz); | ||
363 | else if (fn == 1) | ||
364 | return sdio_memcpy_fromio(sdiodev->func[fn], | ||
365 | ((u8 *)(pkt_next->data)), | ||
366 | addr, req_sz); | ||
367 | else | ||
368 | /* function 2 read is FIFO operation */ | ||
369 | return sdio_readsb(sdiodev->func[fn], | ||
370 | ((u8 *)(pkt_next->data)), addr, | ||
371 | req_sz); | ||
372 | } | ||
373 | |||
374 | target_list = pktlist; | 381 | target_list = pktlist; |
375 | /* for host with broken sg support, prepare a page aligned list */ | 382 | /* for host with broken sg support, prepare a page aligned list */ |
376 | __skb_queue_head_init(&local_list); | 383 | __skb_queue_head_init(&local_list); |
@@ -543,7 +550,6 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, | |||
543 | { | 550 | { |
544 | uint width; | 551 | uint width; |
545 | int err = 0; | 552 | int err = 0; |
546 | struct sk_buff_head pkt_list; | ||
547 | 553 | ||
548 | brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n", | 554 | brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n", |
549 | fn, addr, pkt->len); | 555 | fn, addr, pkt->len); |
@@ -553,10 +559,7 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, | |||
553 | if (err) | 559 | if (err) |
554 | goto done; | 560 | goto done; |
555 | 561 | ||
556 | skb_queue_head_init(&pkt_list); | 562 | err = brcmf_sdio_buffrw(sdiodev, fn, false, addr, pkt); |
557 | skb_queue_tail(&pkt_list, pkt); | ||
558 | err = brcmf_sdio_sglist_rw(sdiodev, fn, false, addr, &pkt_list); | ||
559 | skb_dequeue_tail(&pkt_list); | ||
560 | 563 | ||
561 | done: | 564 | done: |
562 | return err; | 565 | return err; |
@@ -589,7 +592,7 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, | |||
589 | uint flags, u8 *buf, uint nbytes) | 592 | uint flags, u8 *buf, uint nbytes) |
590 | { | 593 | { |
591 | struct sk_buff *mypkt; | 594 | struct sk_buff *mypkt; |
592 | struct sk_buff_head pktq; | 595 | uint width; |
593 | int err; | 596 | int err; |
594 | 597 | ||
595 | mypkt = brcmu_pkt_buf_get_skb(nbytes); | 598 | mypkt = brcmu_pkt_buf_get_skb(nbytes); |
@@ -600,10 +603,11 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, | |||
600 | } | 603 | } |
601 | 604 | ||
602 | memcpy(mypkt->data, buf, nbytes); | 605 | memcpy(mypkt->data, buf, nbytes); |
603 | __skb_queue_head_init(&pktq); | 606 | |
604 | __skb_queue_tail(&pktq, mypkt); | 607 | width = (flags & SDIO_REQ_4BYTE) ? 4 : 2; |
605 | err = brcmf_sdcard_send_pkt(sdiodev, addr, fn, flags, &pktq); | 608 | brcmf_sdio_addrprep(sdiodev, width, &addr); |
606 | __skb_dequeue_tail(&pktq); | 609 | |
610 | err = brcmf_sdio_buffrw(sdiodev, fn, true, addr, mypkt); | ||
607 | 611 | ||
608 | brcmu_pkt_buf_free_skb(mypkt); | 612 | brcmu_pkt_buf_free_skb(mypkt); |
609 | return err; | 613 | return err; |
@@ -615,7 +619,6 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, | |||
615 | uint flags, struct sk_buff_head *pktq) | 619 | uint flags, struct sk_buff_head *pktq) |
616 | { | 620 | { |
617 | uint width; | 621 | uint width; |
618 | int err = 0; | ||
619 | 622 | ||
620 | brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n", | 623 | brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n", |
621 | fn, addr, pktq->qlen); | 624 | fn, addr, pktq->qlen); |
@@ -623,9 +626,9 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, | |||
623 | width = (flags & SDIO_REQ_4BYTE) ? 4 : 2; | 626 | width = (flags & SDIO_REQ_4BYTE) ? 4 : 2; |
624 | brcmf_sdio_addrprep(sdiodev, width, &addr); | 627 | brcmf_sdio_addrprep(sdiodev, width, &addr); |
625 | 628 | ||
626 | err = brcmf_sdio_sglist_rw(sdiodev, fn, true, addr, pktq); | 629 | if (pktq->qlen == 1) |
627 | 630 | return brcmf_sdio_buffrw(sdiodev, fn, true, addr, pktq->next); | |
628 | return err; | 631 | return brcmf_sdio_sglist_rw(sdiodev, fn, true, addr, pktq); |
629 | } | 632 | } |
630 | 633 | ||
631 | int | 634 | int |
@@ -636,7 +639,6 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, | |||
636 | struct sk_buff *pkt; | 639 | struct sk_buff *pkt; |
637 | u32 sdaddr; | 640 | u32 sdaddr; |
638 | uint dsize; | 641 | uint dsize; |
639 | struct sk_buff_head pkt_list; | ||
640 | 642 | ||
641 | dsize = min_t(uint, SBSDIO_SB_OFT_ADDR_LIMIT, size); | 643 | dsize = min_t(uint, SBSDIO_SB_OFT_ADDR_LIMIT, size); |
642 | pkt = dev_alloc_skb(dsize); | 644 | pkt = dev_alloc_skb(dsize); |
@@ -645,7 +647,6 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, | |||
645 | return -EIO; | 647 | return -EIO; |
646 | } | 648 | } |
647 | pkt->priority = 0; | 649 | pkt->priority = 0; |
648 | skb_queue_head_init(&pkt_list); | ||
649 | 650 | ||
650 | /* Determine initial transfer parameters */ | 651 | /* Determine initial transfer parameters */ |
651 | sdaddr = address & SBSDIO_SB_OFT_ADDR_MASK; | 652 | sdaddr = address & SBSDIO_SB_OFT_ADDR_MASK; |
@@ -673,10 +674,8 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, | |||
673 | skb_put(pkt, dsize); | 674 | skb_put(pkt, dsize); |
674 | if (write) | 675 | if (write) |
675 | memcpy(pkt->data, data, dsize); | 676 | memcpy(pkt->data, data, dsize); |
676 | skb_queue_tail(&pkt_list, pkt); | 677 | bcmerror = brcmf_sdio_buffrw(sdiodev, SDIO_FUNC_1, write, |
677 | bcmerror = brcmf_sdio_sglist_rw(sdiodev, SDIO_FUNC_1, write, | 678 | sdaddr, pkt); |
678 | sdaddr, &pkt_list); | ||
679 | skb_dequeue_tail(&pkt_list); | ||
680 | if (bcmerror) { | 679 | if (bcmerror) { |
681 | brcmf_err("membytes transfer failed\n"); | 680 | brcmf_err("membytes transfer failed\n"); |
682 | break; | 681 | break; |