lkml.org 
[lkml]   [2021]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 05/62] ASoC: intel: atom: Fix reference to PCM buffer address
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 2e6b836312a477d647a7920b56810a5a25f6c856 upstream.

    PCM buffers might be allocated dynamically when the buffer
    preallocation failed or a larger buffer is requested, and it's not
    guaranteed that substream->dma_buffer points to the actually used
    buffer. The address should be retrieved from runtime->dma_addr,
    instead of substream->dma_buffer (and shouldn't use virt_to_phys).

    Also, remove the line overriding runtime->dma_area superfluously,
    which was already set up at the PCM buffer allocation.

    Cc: Cezary Rojewski <cezary.rojewski@intel.com>
    Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Link: https://lore.kernel.org/r/20210728112353.6675-3-tiwai@suse.de
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/intel/atom/sst-mfld-platform-pcm.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    @@ -127,7 +127,7 @@ static void sst_fill_alloc_params(struct
    snd_pcm_uframes_t period_size;
    ssize_t periodbytes;
    ssize_t buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
    - u32 buffer_addr = virt_to_phys(substream->dma_buffer.area);
    + u32 buffer_addr = substream->runtime->dma_addr;

    channels = substream->runtime->channels;
    period_size = substream->runtime->period_size;
    @@ -233,7 +233,6 @@ static int sst_platform_alloc_stream(str
    /* set codec params and inform SST driver the same */
    sst_fill_pcm_params(substream, &param);
    sst_fill_alloc_params(substream, &alloc_params);
    - substream->runtime->dma_area = substream->dma_buffer.area;
    str_params.sparams = param;
    str_params.aparams = alloc_params;
    str_params.codec = SST_CODEC_TYPE_PCM;

    \
     
     \ /
      Last update: 2021-08-16 15:06    [W:4.557 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site