hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath9k: convert to use bus-agnostic DMA routines 

Convert to use bus-agnostic DMA routines to make it usable on AHB bus as well.

Changes-licensed-under: ISC

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Tested-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gabor Juhos 2009-01-14 20:17:03 +01:00 committed by John W. Linville
parent f5870acb3a
commit 7da3c55ce8
4 changed files with 38 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/wireless/ath9k/beacon.c
View File

@ -164,9 +164,9 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
bf = avp->av_bcbuf; bf = avp->av_bcbuf;
skb = (struct sk_buff *)bf->bf_mpdu; skb = (struct sk_buff *)bf->bf_mpdu;
if (skb) { if (skb) {
pci_unmap_single(to_pci_dev(sc->dev), bf->bf_dmacontext, dma_unmap_single(sc->dev, bf->bf_dmacontext,
skb->len, skb->len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
@ -188,15 +188,14 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
} }
bf->bf_buf_addr = bf->bf_dmacontext = bf->bf_buf_addr = bf->bf_dmacontext =
pci_map_single(to_pci_dev(sc->dev), skb->data, dma_map_single(sc->dev, skb->data,
skb->len, skb->len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev), if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {
bf->bf_buf_addr))) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
bf->bf_mpdu = NULL; bf->bf_mpdu = NULL;
DPRINTF(sc, ATH_DBG_CONFIG, DPRINTF(sc, ATH_DBG_CONFIG,
"pci_dma_mapping_error() on beaconing\n"); "dma_mapping_error() on beaconing\n");
return NULL; return NULL;
} }
@ -344,9 +343,9 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
bf = avp->av_bcbuf; bf = avp->av_bcbuf;
if (bf->bf_mpdu != NULL) { if (bf->bf_mpdu != NULL) {
skb = (struct sk_buff *)bf->bf_mpdu; skb = (struct sk_buff *)bf->bf_mpdu;
pci_unmap_single(to_pci_dev(sc->dev), bf->bf_dmacontext, dma_unmap_single(sc->dev, bf->bf_dmacontext,
skb->len, skb->len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
bf->bf_mpdu = NULL; bf->bf_mpdu = NULL;
} }
@ -403,15 +402,14 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
bf->bf_mpdu = skb; bf->bf_mpdu = skb;
bf->bf_buf_addr = bf->bf_dmacontext = bf->bf_buf_addr = bf->bf_dmacontext =
pci_map_single(to_pci_dev(sc->dev), skb->data, dma_map_single(sc->dev, skb->data,
skb->len, skb->len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev), if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {
bf->bf_buf_addr))) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
bf->bf_mpdu = NULL; bf->bf_mpdu = NULL;
DPRINTF(sc, ATH_DBG_CONFIG, DPRINTF(sc, ATH_DBG_CONFIG,
"pci_dma_mapping_error() on beacon alloc\n"); "dma_mapping_error() on beacon alloc\n");
return -ENOMEM; return -ENOMEM;
} }
@ -431,10 +429,9 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp)
bf = avp->av_bcbuf; bf = avp->av_bcbuf;
if (bf->bf_mpdu != NULL) { if (bf->bf_mpdu != NULL) {
struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu; struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu;
pci_unmap_single(to_pci_dev(sc->dev), dma_unmap_single(sc->dev, bf->bf_dmacontext,
bf->bf_dmacontext,
skb->len, skb->len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
bf->bf_mpdu = NULL; bf->bf_mpdu = NULL;
} }

13
drivers/net/wireless/ath9k/main.c
View File

@ -1715,9 +1715,8 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
} }
/* allocate descriptors */ /* allocate descriptors */
dd->dd_desc = pci_alloc_consistent(to_pci_dev(sc->dev), dd->dd_desc = dma_alloc_coherent(sc->dev, dd->dd_desc_len,
dd->dd_desc_len, &dd->dd_desc_paddr, GFP_ATOMIC);
&dd->dd_desc_paddr);
if (dd->dd_desc == NULL) { if (dd->dd_desc == NULL) {
error = -ENOMEM; error = -ENOMEM;
goto fail; goto fail;
@ -1763,8 +1762,8 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
} }
return 0; return 0;
fail2: fail2:
pci_free_consistent(to_pci_dev(sc->dev), dma_free_coherent(sc->dev, dd->dd_desc_len, dd->dd_desc,
dd->dd_desc_len, dd->dd_desc, dd->dd_desc_paddr); dd->dd_desc_paddr);
fail: fail:
memset(dd, 0, sizeof(*dd)); memset(dd, 0, sizeof(*dd));
return error; return error;
@ -1777,8 +1776,8 @@ void ath_descdma_cleanup(struct ath_softc *sc,
struct ath_descdma *dd, struct ath_descdma *dd,
struct list_head *head) struct list_head *head)
{ {
pci_free_consistent(to_pci_dev(sc->dev), dma_free_coherent(sc->dev, dd->dd_desc_len, dd->dd_desc,
dd->dd_desc_len, dd->dd_desc, dd->dd_desc_paddr); dd->dd_desc_paddr);
INIT_LIST_HEAD(head); INIT_LIST_HEAD(head);
kfree(dd->dd_bufptr); kfree(dd->dd_bufptr);

27
drivers/net/wireless/ath9k/recv.c
View File

@ -291,16 +291,15 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
} }
bf->bf_mpdu = skb; bf->bf_mpdu = skb;
bf->bf_buf_addr = pci_map_single(to_pci_dev(sc->dev), bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
skb->data,
sc->rx.bufsize, sc->rx.bufsize,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev), if (unlikely(dma_mapping_error(sc->dev,
bf->bf_buf_addr))) { bf->bf_buf_addr))) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
bf->bf_mpdu = NULL; bf->bf_mpdu = NULL;
DPRINTF(sc, ATH_DBG_CONFIG, DPRINTF(sc, ATH_DBG_CONFIG,
"pci_dma_mapping_error() on RX init\n"); "dma_mapping_error() on RX init\n");
error = -ENOMEM; error = -ENOMEM;
break; break;
} }
@ -525,10 +524,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
* 1. accessing the frame * 1. accessing the frame
* 2. requeueing the same buffer to h/w * 2. requeueing the same buffer to h/w
*/ */
pci_dma_sync_single_for_cpu(to_pci_dev(sc->dev), dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
bf->bf_buf_addr,
sc->rx.bufsize, sc->rx.bufsize,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
/* /*
* If we're asked to flush receive queue, directly * If we're asked to flush receive queue, directly
@ -559,9 +557,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
goto requeue; goto requeue;
/* Unmap the frame */ /* Unmap the frame */
pci_unmap_single(to_pci_dev(sc->dev), bf->bf_buf_addr, dma_unmap_single(sc->dev, bf->bf_buf_addr,
sc->rx.bufsize, sc->rx.bufsize,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
skb_put(skb, ds->ds_rxstat.rs_datalen); skb_put(skb, ds->ds_rxstat.rs_datalen);
skb->protocol = cpu_to_be16(ETH_P_CONTROL); skb->protocol = cpu_to_be16(ETH_P_CONTROL);
@ -607,16 +605,15 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
/* We will now give hardware our shiny new allocated skb */ /* We will now give hardware our shiny new allocated skb */
bf->bf_mpdu = requeue_skb; bf->bf_mpdu = requeue_skb;
bf->bf_buf_addr = pci_map_single(to_pci_dev(sc->dev), bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
requeue_skb->data,
sc->rx.bufsize, sc->rx.bufsize,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev), if (unlikely(dma_mapping_error(sc->dev,
bf->bf_buf_addr))) { bf->bf_buf_addr))) {
dev_kfree_skb_any(requeue_skb); dev_kfree_skb_any(requeue_skb);
bf->bf_mpdu = NULL; bf->bf_mpdu = NULL;
DPRINTF(sc, ATH_DBG_CONFIG, DPRINTF(sc, ATH_DBG_CONFIG,
"pci_dma_mapping_error() on RX\n"); "dma_mapping_error() on RX\n");
break; break;
} }
bf->bf_dmacontext = bf->bf_buf_addr; bf->bf_dmacontext = bf->bf_buf_addr;

15
drivers/net/wireless/ath9k/xmit.c
View File

@ -340,10 +340,8 @@ static void ath_tx_complete_buf(struct ath_softc *sc,
} }
/* Unmap this frame */ /* Unmap this frame */
pci_unmap_single(to_pci_dev(sc->dev), dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
bf->bf_dmacontext,
skb->len,
PCI_DMA_TODEVICE);
/* complete this frame */ /* complete this frame */
ath_tx_complete(sc, skb, &tx_status); ath_tx_complete(sc, skb, &tx_status);
@ -1716,13 +1714,12 @@ static int ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf,
/* DMA setup */ /* DMA setup */
bf->bf_mpdu = skb; bf->bf_mpdu = skb;
bf->bf_dmacontext = pci_map_single(to_pci_dev(sc->dev), skb->data, bf->bf_dmacontext = dma_map_single(sc->dev, skb->data,
skb->len, PCI_DMA_TODEVICE); skb->len, DMA_TO_DEVICE);
if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev), if (unlikely(dma_mapping_error(sc->dev, bf->bf_dmacontext))) {
bf->bf_dmacontext))) {
bf->bf_mpdu = NULL; bf->bf_mpdu = NULL;
DPRINTF(sc, ATH_DBG_CONFIG, DPRINTF(sc, ATH_DBG_CONFIG,
"pci_dma_mapping_error() on TX\n"); "dma_mapping_error() on TX\n");
return -ENOMEM; return -ENOMEM;
} }