Commit ed4bc189 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

hal2: convert to dma_alloc_noncoherent 



Use the new non-coherent DMA API including proper ownership transfers.
This also means we can allocate the buffer memory with the proper
direction instead of bidirectional.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent bd9b8485

sound/mips/hal2.c

+27 −31
Original line number Diff line number Diff line
@@ -441,7 +441,8 @@ 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 snd_hal2 *hal2, struct hal2_codec *codec)

static int hal2_alloc_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec,

		enum dma_data_direction buffer_dir)

{

	struct device *dev = hal2->card->dev;

	struct hal2_desc *desc;
@@ -449,15 +450,15 @@ static int hal2_alloc_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec) 
	int count = H2_BUF_SIZE / H2_BLOCK_SIZE;

	int i;



	codec->buffer = dma_alloc_attrs(dev, H2_BUF_SIZE, &buffer_dma,

					GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);

	codec->buffer = dma_alloc_noncoherent(dev, H2_BUF_SIZE, &buffer_dma,

					buffer_dir, GFP_KERNEL);

	if (!codec->buffer)

		return -ENOMEM;

	desc = dma_alloc_attrs(dev, count * sizeof(struct hal2_desc),

			       &desc_dma, GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);

	desc = dma_alloc_noncoherent(dev, count * sizeof(struct hal2_desc),

			&desc_dma, DMA_BIDIRECTIONAL, GFP_KERNEL);

	if (!desc) {

		dma_free_attrs(dev, H2_BUF_SIZE, codec->buffer, buffer_dma,

			       DMA_ATTR_NON_CONSISTENT);

		dma_free_noncoherent(dev, H2_BUF_SIZE, codec->buffer, buffer_dma,

				buffer_dir);

		return -ENOMEM;

	}

	codec->buffer_dma = buffer_dma;
@@ -470,20 +471,22 @@ static int hal2_alloc_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec) 
		      desc_dma : desc_dma + (i + 1) * sizeof(struct hal2_desc);

		desc++;

	}

	dma_cache_sync(dev, codec->desc, count * sizeof(struct hal2_desc),

		       DMA_TO_DEVICE);

	dma_sync_single_for_device(dev, codec->desc_dma,

				   count * sizeof(struct hal2_desc),

				   DMA_BIDIRECTIONAL);

	codec->desc_count = count;

	return 0;

}



static void hal2_free_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec)

static void hal2_free_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec,

		enum dma_data_direction buffer_dir)

{

	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(dev, H2_BUF_SIZE, codec->buffer, codec->buffer_dma,

		       DMA_ATTR_NON_CONSISTENT);

	dma_free_noncoherent(dev, codec->desc_count * sizeof(struct hal2_desc),

		       codec->desc, codec->desc_dma, DMA_BIDIRECTIONAL);

	dma_free_noncoherent(dev, H2_BUF_SIZE, codec->buffer, codec->buffer_dma,

			buffer_dir);

}



static const struct snd_pcm_hardware hal2_pcm_hw = {
@@ -509,21 +512,16 @@ static int hal2_playback_open(struct snd_pcm_substream *substream) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);

	int err;



	runtime->hw = hal2_pcm_hw;



	err = hal2_alloc_dmabuf(hal2, &hal2->dac);

	if (err)

		return err;

	return 0;

	return hal2_alloc_dmabuf(hal2, &hal2->dac, DMA_TO_DEVICE);

}



static int hal2_playback_close(struct snd_pcm_substream *substream)

{

	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);



	hal2_free_dmabuf(hal2, &hal2->dac);

	hal2_free_dmabuf(hal2, &hal2->dac, DMA_TO_DEVICE);

	return 0;

}
@@ -579,7 +577,9 @@ 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(hal2->card->dev, buf, bytes, DMA_TO_DEVICE);

	dma_sync_single_for_device(hal2->card->dev,

			hal2->dac.buffer_dma + rec->hw_data, bytes,

			DMA_TO_DEVICE);



}
@@ -597,22 +597,16 @@ static int hal2_capture_open(struct snd_pcm_substream *substream) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);

	struct hal2_codec *adc = &hal2->adc;

	int err;



	runtime->hw = hal2_pcm_hw;



	err = hal2_alloc_dmabuf(hal2, adc);

	if (err)

		return err;

	return 0;

	return hal2_alloc_dmabuf(hal2, &hal2->adc, DMA_FROM_DEVICE);

}



static int hal2_capture_close(struct snd_pcm_substream *substream)

{

	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);



	hal2_free_dmabuf(hal2, &hal2->adc);

	hal2_free_dmabuf(hal2, &hal2->adc, DMA_FROM_DEVICE);

	return 0;

}
@@ -667,7 +661,9 @@ 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(hal2->card->dev, buf, bytes, DMA_FROM_DEVICE);

	dma_sync_single_for_cpu(hal2->card->dev,

			hal2->adc.buffer_dma + rec->hw_data, bytes,

			DMA_FROM_DEVICE);

	memcpy(substream->runtime->dma_area + rec->sw_data, buf, bytes);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE