From: Christoph Hellwig <hch@lst.de>
To: John Crispin <john@phrozen.org>, Vinod Koul <vkoul@kernel.org>,
Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Felipe Balbi <balbi@kernel.org>,
linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
dmaengine@vger.kernel.org, netdev@vger.kernel.org,
linux-usb@vger.kernel.org, linux-fbdev@vger.kernel.org,
alsa-devel@alsa-project.org
Cc: iommu@lists.linux-foundation.org
Subject: [PATCH 09/18] meth: pass struct device to DMA API functions
Date: Fri, 1 Feb 2019 09:47:52 +0100 [thread overview]
Message-ID: <20190201084801.10983-10-hch@lst.de> (raw)
In-Reply-To: <20190201084801.10983-1-hch@lst.de>
The DMA API generally relies on a struct device to work properly, and
only barely works without one for legacy reasons. Pass the easily
available struct device from the platform_device to remedy this.
Also use GFP_KERNEL instead of GFP_ATOMIC as the gfp_t for the memory
allocation, as we aren't in interrupt context or under a lock.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/net/ethernet/sgi/meth.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/sgi/meth.c b/drivers/net/ethernet/sgi/meth.c
index 0e1b7e960b98..67954a9e3675 100644
--- a/drivers/net/ethernet/sgi/meth.c
+++ b/drivers/net/ethernet/sgi/meth.c
@@ -68,6 +68,8 @@ module_param(timeout, int, 0);
* packets in and out, so there is place for a packet
*/
struct meth_private {
+ struct platform_device *pdev;
+
/* in-memory copy of MAC Control register */
u64 mac_ctrl;
@@ -211,8 +213,8 @@ static void meth_check_link(struct net_device *dev)
static int meth_init_tx_ring(struct meth_private *priv)
{
/* Init TX ring */
- priv->tx_ring = dma_alloc_coherent(NULL, TX_RING_BUFFER_SIZE,
- &priv->tx_ring_dma, GFP_ATOMIC);
+ priv->tx_ring = dma_alloc_coherent(&priv->pdev->dev,
+ TX_RING_BUFFER_SIZE, &priv->tx_ring_dma, GFP_KERNEL);
if (!priv->tx_ring)
return -ENOMEM;
@@ -236,7 +238,7 @@ static int meth_init_rx_ring(struct meth_private *priv)
priv->rx_ring[i]=(rx_packet*)(priv->rx_skbs[i]->head);
/* I'll need to re-sync it after each RX */
priv->rx_ring_dmas[i] =
- dma_map_single(NULL, priv->rx_ring[i],
+ dma_map_single(&priv->pdev->dev, priv->rx_ring[i],
METH_RX_BUFF_SIZE, DMA_FROM_DEVICE);
mace->eth.rx_fifo = priv->rx_ring_dmas[i];
}
@@ -253,7 +255,7 @@ static void meth_free_tx_ring(struct meth_private *priv)
dev_kfree_skb(priv->tx_skbs[i]);
priv->tx_skbs[i] = NULL;
}
- dma_free_coherent(NULL, TX_RING_BUFFER_SIZE, priv->tx_ring,
+ dma_free_coherent(&priv->pdev->dev, TX_RING_BUFFER_SIZE, priv->tx_ring,
priv->tx_ring_dma);
}
@@ -263,7 +265,7 @@ static void meth_free_rx_ring(struct meth_private *priv)
int i;
for (i = 0; i < RX_RING_ENTRIES; i++) {
- dma_unmap_single(NULL, priv->rx_ring_dmas[i],
+ dma_unmap_single(&priv->pdev->dev, priv->rx_ring_dmas[i],
METH_RX_BUFF_SIZE, DMA_FROM_DEVICE);
priv->rx_ring[i] = 0;
priv->rx_ring_dmas[i] = 0;
@@ -393,7 +395,8 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
fifo_rptr = (fifo_rptr - 1) & 0x0f;
}
while (priv->rx_write != fifo_rptr) {
- dma_unmap_single(NULL, priv->rx_ring_dmas[priv->rx_write],
+ dma_unmap_single(&priv->pdev->dev,
+ priv->rx_ring_dmas[priv->rx_write],
METH_RX_BUFF_SIZE, DMA_FROM_DEVICE);
status = priv->rx_ring[priv->rx_write]->status.raw;
#if MFE_DEBUG
@@ -454,7 +457,8 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
priv->rx_ring[priv->rx_write] = (rx_packet*)skb->head;
priv->rx_ring[priv->rx_write]->status.raw = 0;
priv->rx_ring_dmas[priv->rx_write] =
- dma_map_single(NULL, priv->rx_ring[priv->rx_write],
+ dma_map_single(&priv->pdev->dev,
+ priv->rx_ring[priv->rx_write],
METH_RX_BUFF_SIZE, DMA_FROM_DEVICE);
mace->eth.rx_fifo = priv->rx_ring_dmas[priv->rx_write];
ADVANCE_RX_PTR(priv->rx_write);
@@ -637,7 +641,7 @@ static void meth_tx_1page_prepare(struct meth_private *priv,
}
/* first page */
- catbuf = dma_map_single(NULL, buffer_data, buffer_len,
+ catbuf = dma_map_single(&priv->pdev->dev, buffer_data, buffer_len,
DMA_TO_DEVICE);
desc->data.cat_buf[0].form.start_addr = catbuf >> 3;
desc->data.cat_buf[0].form.len = buffer_len - 1;
@@ -663,12 +667,12 @@ static void meth_tx_2page_prepare(struct meth_private *priv,
}
/* first page */
- catbuf1 = dma_map_single(NULL, buffer1_data, buffer1_len,
+ catbuf1 = dma_map_single(&priv->pdev->dev, buffer1_data, buffer1_len,
DMA_TO_DEVICE);
desc->data.cat_buf[0].form.start_addr = catbuf1 >> 3;
desc->data.cat_buf[0].form.len = buffer1_len - 1;
/* second page */
- catbuf2 = dma_map_single(NULL, buffer2_data, buffer2_len,
+ catbuf2 = dma_map_single(&priv->pdev->dev, buffer2_data, buffer2_len,
DMA_TO_DEVICE);
desc->data.cat_buf[1].form.start_addr = catbuf2 >> 3;
desc->data.cat_buf[1].form.len = buffer2_len - 1;
@@ -840,6 +844,7 @@ static int meth_probe(struct platform_device *pdev)
memcpy(dev->dev_addr, o2meth_eaddr, ETH_ALEN);
priv = netdev_priv(dev);
+ priv->pdev = pdev;
spin_lock_init(&priv->meth_lock);
SET_NETDEV_DEV(dev, &pdev->dev);
--
2.20.1
next prev parent reply other threads:[~2019-02-01 8:50 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 8:47 don't pass a NULL struct device to DMA API functions Christoph Hellwig
2019-02-01 8:47 ` [PATCH 01/18] MIPS: lantiq: pass " Christoph Hellwig
2019-02-07 23:29 ` Paul Burton
2019-02-12 7:45 ` Christoph Hellwig
2019-02-12 17:41 ` Paul Burton
2019-02-01 8:47 ` [PATCH 02/18] dmaengine: imx-sdma: " Christoph Hellwig
2019-02-02 10:11 ` Vinod Koul
2019-02-02 17:21 ` Christoph Hellwig
2019-02-01 8:47 ` [PATCH 03/18] net: caif: " Christoph Hellwig
2019-02-01 13:53 ` Robin Murphy
2019-02-01 16:10 ` Christoph Hellwig
2019-02-01 8:47 ` [PATCH 04/18] au1000_eth: " Christoph Hellwig
2019-02-01 8:47 ` [PATCH 05/18] macb_main: " Christoph Hellwig
2019-02-01 13:34 ` Nicolas.Ferre
2019-02-01 8:47 ` [PATCH 06/18] lantiq_etop: " Christoph Hellwig
2019-02-01 8:47 ` [PATCH 07/18] pxa168_eth: " Christoph Hellwig
2019-02-01 8:47 ` [PATCH 08/18] moxart_ether: " Christoph Hellwig
2019-02-01 8:47 ` Christoph Hellwig [this message]
2019-02-01 8:47 ` [PATCH 10/18] smc911x: " Christoph Hellwig
2019-02-01 14:14 ` Robin Murphy
2019-02-01 16:11 ` Christoph Hellwig
2019-02-01 8:47 ` [PATCH 11/18] parport_ip32: " Christoph Hellwig
2019-02-01 8:47 ` [PATCH 12/18] fotg210-udc: remove a bogus dma_sync_single_for_device call Christoph Hellwig
2019-02-01 13:19 ` Felipe Balbi
2019-02-01 16:10 ` Christoph Hellwig
2019-02-11 13:12 ` Christoph Hellwig
2019-02-11 13:30 ` Felipe Balbi
2019-02-01 8:47 ` [PATCH 13/18] fotg210-udc: pass struct device to DMA API functions Christoph Hellwig
2019-02-01 13:20 ` Felipe Balbi
2019-02-01 8:47 ` [PATCH 14/18] da8xx-fb: " Christoph Hellwig
2019-02-01 8:47 ` [PATCH 15/18] gbefb: switch to managed version of the DMA allocator Christoph Hellwig
2019-02-01 8:47 ` [PATCH 16/18] pxa3xx-gcu: pass struct device to dma_mmap_coherent Christoph Hellwig
2019-02-01 8:48 ` [PATCH 17/18] ALSA: hal2: pass struct device to DMA API functions Christoph Hellwig
2019-02-01 13:12 ` [alsa-devel] " Takashi Iwai
2019-02-01 16:09 ` Christoph Hellwig
2019-02-01 16:17 ` Takashi Iwai
2019-02-01 8:48 ` [PATCH 18/18] ALSA: " Christoph Hellwig
2019-02-01 13:13 ` [alsa-devel] " Takashi Iwai
2019-02-01 13:16 ` [alsa-devel] don't pass a NULL " Takashi Iwai
2019-02-01 16:09 ` Christoph Hellwig
2019-02-01 16:18 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190201084801.10983-10-hch@lst.de \
--to=hch@lst.de \
--cc=alsa-devel@alsa-project.org \
--cc=balbi@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=dmitry.tarnyagin@lockless.no \
--cc=iommu@lists.linux-foundation.org \
--cc=john@phrozen.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=sudipm.mukherjee@gmail.com \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).