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 17/18] ALSA: hal2: pass struct device to DMA API functions
Date: Fri, 1 Feb 2019 09:48:00 +0100 [thread overview]
Message-ID: <20190201084801.10983-18-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.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
sound/mips/hal2.c | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index a4ed54aeaf1d..d63e1565b62b 100644
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -454,21 +454,22 @@ static inline void hal2_stop_adc(struct snd_hal2 *hal2)
hal2->adc.pbus.pbus->pbdma_ctrl = HPC3_PDMACTRL_LD;
}
-static int hal2_alloc_dmabuf(struct hal2_codec *codec)
+static int hal2_alloc_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec)
{
+ struct device *dev = hal2->card->dev;
struct hal2_desc *desc;
dma_addr_t desc_dma, buffer_dma;
int count = H2_BUF_SIZE / H2_BLOCK_SIZE;
int i;
- codec->buffer = dma_alloc_attrs(NULL, H2_BUF_SIZE, &buffer_dma,
+ codec->buffer = dma_alloc_attrs(dev, H2_BUF_SIZE, &buffer_dma,
GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
if (!codec->buffer)
return -ENOMEM;
- desc = dma_alloc_attrs(NULL, count * sizeof(struct hal2_desc),
+ desc = dma_alloc_attrs(dev, count * sizeof(struct hal2_desc),
&desc_dma, GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
if (!desc) {
- dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, buffer_dma,
+ dma_free_attrs(dev, H2_BUF_SIZE, codec->buffer, buffer_dma,
DMA_ATTR_NON_CONSISTENT);
return -ENOMEM;
}
@@ -482,17 +483,19 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec)
desc_dma : desc_dma + (i + 1) * sizeof(struct hal2_desc);
desc++;
}
- dma_cache_sync(NULL, codec->desc, count * sizeof(struct hal2_desc),
+ dma_cache_sync(dev, codec->desc, count * sizeof(struct hal2_desc),
DMA_TO_DEVICE);
codec->desc_count = count;
return 0;
}
-static void hal2_free_dmabuf(struct hal2_codec *codec)
+static void hal2_free_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec)
{
- dma_free_attrs(NULL, codec->desc_count * sizeof(struct hal2_desc),
+ struct device *dev = hal2->card->dev;
+
+ dma_free_attrs(dev, codec->desc_count * sizeof(struct hal2_desc),
codec->desc, codec->desc_dma, DMA_ATTR_NON_CONSISTENT);
- dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, codec->buffer_dma,
+ dma_free_attrs(dev, H2_BUF_SIZE, codec->buffer, codec->buffer_dma,
DMA_ATTR_NON_CONSISTENT);
}
@@ -540,7 +543,7 @@ static int hal2_playback_open(struct snd_pcm_substream *substream)
runtime->hw = hal2_pcm_hw;
- err = hal2_alloc_dmabuf(&hal2->dac);
+ err = hal2_alloc_dmabuf(hal2, &hal2->dac);
if (err)
return err;
return 0;
@@ -550,7 +553,7 @@ static int hal2_playback_close(struct snd_pcm_substream *substream)
{
struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);
- hal2_free_dmabuf(&hal2->dac);
+ hal2_free_dmabuf(hal2, &hal2->dac);
return 0;
}
@@ -606,7 +609,7 @@ static void hal2_playback_transfer(struct snd_pcm_substream *substream,
unsigned char *buf = hal2->dac.buffer + rec->hw_data;
memcpy(buf, substream->runtime->dma_area + rec->sw_data, bytes);
- dma_cache_sync(NULL, buf, bytes, DMA_TO_DEVICE);
+ dma_cache_sync(hal2->card->dev, buf, bytes, DMA_TO_DEVICE);
}
@@ -629,7 +632,7 @@ static int hal2_capture_open(struct snd_pcm_substream *substream)
runtime->hw = hal2_pcm_hw;
- err = hal2_alloc_dmabuf(adc);
+ err = hal2_alloc_dmabuf(hal2, adc);
if (err)
return err;
return 0;
@@ -639,7 +642,7 @@ static int hal2_capture_close(struct snd_pcm_substream *substream)
{
struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);
- hal2_free_dmabuf(&hal2->adc);
+ hal2_free_dmabuf(hal2, &hal2->adc);
return 0;
}
@@ -694,7 +697,7 @@ static void hal2_capture_transfer(struct snd_pcm_substream *substream,
struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);
unsigned char *buf = hal2->adc.buffer + rec->hw_data;
- dma_cache_sync(NULL, buf, bytes, DMA_FROM_DEVICE);
+ dma_cache_sync(hal2->card->dev, buf, bytes, DMA_FROM_DEVICE);
memcpy(substream->runtime->dma_area + rec->sw_data, buf, bytes);
}
--
2.20.1
next prev parent reply other threads:[~2019-02-01 8:49 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 ` [PATCH 09/18] meth: " Christoph Hellwig
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 ` Christoph Hellwig [this message]
2019-02-01 13:12 ` [alsa-devel] [PATCH 17/18] ALSA: hal2: pass struct device to DMA API functions 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-18-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).