diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-26 09:04:24 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-27 04:15:23 -0500 |
| commit | 6985c8877a711c7c307af05203858cb7c3c89d0d (patch) | |
| tree | 9b7ca278250a3fe159cb9f763dc04fc492eb7e19 | |
| parent | 66b6cfacfc5aa2fda37b0d40cd54931ca5ef8cd7 (diff) | |
ALSA: pcm - fix page conversion on non-coherent PPC arch
The non-cohernet PPC arch doesn't give the correct address by a simple
virt_to_page() for pages allocated via dma_alloc_coherent().
This patch adds a hack to fix the conversion similarly like MIPS.
Note that this doesn't fix perfectly: the pages should be marked with
proper pgprot value. This will be done in a future implementation like
the conversion to dma_mmap_coherent().
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/core/pcm_native.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index e48c5f618578..29ab46a12e11 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -3070,6 +3070,16 @@ snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs) | |||
| 3070 | if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) | 3070 | if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) |
| 3071 | return virt_to_page(CAC_ADDR(vaddr)); | 3071 | return virt_to_page(CAC_ADDR(vaddr)); |
| 3072 | #endif | 3072 | #endif |
| 3073 | #if defined(CONFIG_PPC32) && defined(CONFIG_NOT_COHERENT_CACHE) | ||
| 3074 | if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) { | ||
| 3075 | dma_addr_t addr = substream->runtime->dma_addr + ofs; | ||
| 3076 | addr -= get_dma_offset(substream->dma_buffer.dev.dev); | ||
| 3077 | /* assume dma_handle set via pfn_to_phys() in | ||
| 3078 | * mm/dma-noncoherent.c | ||
| 3079 | */ | ||
| 3080 | return pfn_to_page(addr >> PAGE_SHIFT); | ||
| 3081 | } | ||
| 3082 | #endif | ||
| 3073 | return virt_to_page(vaddr); | 3083 | return virt_to_page(vaddr); |
| 3074 | } | 3084 | } |
| 3075 | 3085 | ||
