On Monday 30 April 2018 03:19 AM, Daniel Kurtz wrote:

Hi Vijendar,

On Thu, Apr 26, 2018 at 5:14 AM Vijendar Mukunda Vijendar.Mukunda@amd.com wrote:

...

Added dma configuration parameters to rtd structure. Moved dma configuration parameters intialization to hw_params callback. Removed hard coding in prepare and trigger callbacks.

...

Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com

sound/soc/amd/acp-pcm-dma.c | 97

+++++++++++++++++----------------------------

...

sound/soc/amd/acp.h         |  5 +++
2 files changed, 41 insertions(+), 61 deletions(-)

...

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 9c026c4..f18ed9a 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -321,19 +321,12 @@ static void config_acp_dma(void __iomem *acp_mmio, u32 asic_type) { u32 pte_offset, sram_bank;

•   u16 ch1, ch2, destination, dma_dscr_idx;
  

...

       if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK) {
               pte_offset = ACP_PLAYBACK_PTE_OFFSET;

•           ch1 = SYSRAM_TO_ACP_CH_NUM;
  

•           ch2 = ACP_TO_I2S_DMA_CH_NUM;
               sram_bank = ACP_SHARED_RAM_BANK_1_ADDRESS;
  

•           destination = TO_ACP_I2S_1;
  

•      } else {
               pte_offset = ACP_CAPTURE_PTE_OFFSET;
  

•           ch1 = SYSRAM_TO_ACP_CH_NUM;
  

•           ch2 = ACP_TO_I2S_DMA_CH_NUM;
  

Wait... since this is the capture stream, shouldn't the channels have been:

 ch1 = ACP_TO_SYSRAM_CH_NUM; /* 14 */
 ch2 = I2S_TO_ACP_DMA_CH_NUM; /* 15 */

Is this an existing bug? Why does everything still work if these are wrong?

You are correct. We Will fix it and share fresh patch.

...

               switch (asic_type) {
               case CHIP_STONEY:
                       sram_bank = ACP_SHARED_RAM_BANK_3_ADDRESS;

@@ -341,30 +334,19 @@ static void config_acp_dma(void __iomem *acp_mmio, default: sram_bank = ACP_SHARED_RAM_BANK_5_ADDRESS; }

•           destination = FROM_ACP_I2S_1;
       }
  

•      acp_pte_config(acp_mmio, rtd->pg, rtd->num_of_pages,
                      pte_offset);
  

•   if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK)
  

•           dma_dscr_idx = PLAYBACK_START_DMA_DESCR_CH12;
  

•   else
  

•           dma_dscr_idx = CAPTURE_START_DMA_DESCR_CH14;
  

•      /* Configure System memory <-> ACP SRAM DMA descriptors */
       set_acp_sysmem_dma_descriptors(acp_mmio, rtd->size,
  

•                                  rtd->direction, pte_offset, ch1,
  

•                                  sram_bank, dma_dscr_idx,
  

asic_type);

...

•   if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK)
  

•           dma_dscr_idx = PLAYBACK_START_DMA_DESCR_CH13;
  

•   else
  

•           dma_dscr_idx = CAPTURE_START_DMA_DESCR_CH15;
  

•                                  rtd->direction, pte_offset,
  

•                                  rtd->ch1, sram_bank,
  

•                                  rtd->dma_dscr_idx_1, asic_type);
       /* Configure ACP SRAM <-> I2S DMA descriptors */
       set_acp_to_i2s_dma_descriptors(acp_mmio, rtd->size,
                                      rtd->direction, sram_bank,
  

•                                  destination, ch2, dma_dscr_idx,
  

•                                  asic_type);
  

•                                  rtd->destination, rtd->ch2,
  

•                                  rtd->dma_dscr_idx_2, asic_type);
  

  }

...

/* Start a given DMA channel transfer */

@@ -804,6 +786,21 @@ static int acp_dma_hw_params(struct

snd_pcm_substream *substream,

...

               acp_reg_write(val, adata->acp_mmio,
                             mmACP_I2S_16BIT_RESOLUTION_EN);
       }

•   if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
  

•           rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
  

•           rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
  

•           rtd->destination = TO_ACP_I2S_1;
  

•           rtd->dma_dscr_idx_1 = PLAYBACK_START_DMA_DESCR_CH12;
  

•           rtd->dma_dscr_idx_2 = PLAYBACK_START_DMA_DESCR_CH13;
  

•   } else {
  

•           rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
  

•           rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
  

•           rtd->destination = FROM_ACP_I2S_1;
  

•           rtd->dma_dscr_idx_1 = CAPTURE_START_DMA_DESCR_CH14;
  

•           rtd->dma_dscr_idx_2 = CAPTURE_START_DMA_DESCR_CH15;
  

•   }
  

I think you should do this initialization in acp_dma_open(), where the audio_substream_data is kzalloc'ed and otherwise initialized to match the provided snd_pcm_substream.

The idea to move initialization from acp_dma_open() to acp_dma_hw_params() callback is to exchange platform data between machine driver and dma driver. So that during initialization we can use data from machine driver and do platform specific initialization where and when required. In Current scenario, by the time new stream open call invoked, dma driver is not aware of which i2s_instance sub stream refers to . We have added logic in machine driver to pass I2S instance information as sound card private data in subsequent patch. We implemented logic to set the I2S Instance value in Codec startup api's in machine driver. If we do initialization in dma driver open call , its not possible to extend the idea of switching between two i2s instances.

...

       size = params_buffer_bytes(params);
       status = snd_pcm_lib_malloc_pages(substream, size);
       if (status < 0)

@@ -898,21 +895,15 @@ static int acp_dma_prepare(struct snd_pcm_substream

*substream)

...

       if (!rtd)
               return -EINVAL;

•   if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
  

•           config_acp_dma_channel(rtd->acp_mmio,
  

SYSRAM_TO_ACP_CH_NUM,

...

•                                  PLAYBACK_START_DMA_DESCR_CH12,
  

•                                  NUM_DSCRS_PER_CHANNEL, 0);
  

•           config_acp_dma_channel(rtd->acp_mmio,
  

ACP_TO_I2S_DMA_CH_NUM,

...

•                                  PLAYBACK_START_DMA_DESCR_CH13,
  

•                                  NUM_DSCRS_PER_CHANNEL, 0);
  

•   } else {
  

•           config_acp_dma_channel(rtd->acp_mmio,
  

ACP_TO_SYSRAM_CH_NUM,

...

•                                  CAPTURE_START_DMA_DESCR_CH14,
  

•                                  NUM_DSCRS_PER_CHANNEL, 0);
  

•           config_acp_dma_channel(rtd->acp_mmio,
  

I2S_TO_ACP_DMA_CH_NUM,

...

•                                  CAPTURE_START_DMA_DESCR_CH15,
  

•                                  NUM_DSCRS_PER_CHANNEL, 0);
  

•   }
  

•   config_acp_dma_channel(rtd->acp_mmio,
  

•                          rtd->ch1,
  

•                          rtd->dma_dscr_idx_1,
  

•                          NUM_DSCRS_PER_CHANNEL, 0);
  

•   config_acp_dma_channel(rtd->acp_mmio,
  

•                          rtd->ch2,
  

The original code was using ACP_TO_SYSRAM_CH_NUM for the capture case, but now you are using SYSRAM_TO_ACP_CH_NUM as just initialized in acp_dma_hw_params(). I think the old config_acp_dma() was wrong, and it should still be ACP_TO_SYSRAM_CH_NUM. When you make this fix, either do it in a separate preliminary patch (preferred), or at least call it out in the commit message.

You are correct. We will fix it and will post fresh patch.

Also, instead of "ch1" and "ch2", perhaps we can use the more descriptive "ch_i2s" and "ch_sysram" [and same for dma_descr].

If we change ch1, ch2 channels naming convention , it will be quite confusing in rest of code. playback use case ch1 refers to sysram to acp and ch2 refers to acp to i2s fifo where as for capture ch1 refers to acp to sysram and ch2 refers to i2s to acp. Rather than we will add comment what ch1, ch2 refers to improve readability. same applies for dma descriptor idx also.

...

•                          rtd->dma_dscr_idx_2,
  

•                          NUM_DSCRS_PER_CHANNEL, 0);
       return 0;
  

  }

...

@@ -939,10 +930,9 @@ static int acp_dma_trigger(struct snd_pcm_substream

*substream, int cmd)

...

               if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                       if (rtd->i2ssp_renderbytescount == 0)
                               rtd->i2ssp_renderbytescount = bytescount;

•                   acp_dma_start(rtd->acp_mmio,
  

•                                 SYSRAM_TO_ACP_CH_NUM, false);
  

•                   acp_dma_start(rtd->acp_mmio, rtd->ch1, false);
                       while (acp_reg_read(rtd->acp_mmio,
  

mmACP_DMA_CH_STS) &

...

BIT(SYSRAM_TO_ACP_CH_NUM)) {

...

•                           BIT(rtd->ch1)) {
                               if (!loops--) {
                                       dev_err(component->dev,
                                               "acp dma start
  

timeout\n");

...

@@ -950,38 +940,23 @@ static int acp_dma_trigger(struct snd_pcm_substream

*substream, int cmd)

...

                               }
                               cpu_relax();
                       }

•                   acp_dma_start(rtd->acp_mmio,
  

•                                 ACP_TO_I2S_DMA_CH_NUM, true);
  

•              } else {
                       if (rtd->i2ssp_capturebytescount == 0)
                               rtd->i2ssp_capturebytescount =
  

bytescount;

...

•                   acp_dma_start(rtd->acp_mmio,
  

•                                 I2S_TO_ACP_DMA_CH_NUM, true);
               }
  

•           acp_dma_start(rtd->acp_mmio, rtd->ch2, true);
               ret = 0;
               break;
       case SNDRV_PCM_TRIGGER_STOP:
       case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
       case SNDRV_PCM_TRIGGER_SUSPEND:
  

•           /*
  

•            * Need to stop only circular DMA channels :
  

•            * ACP_TO_I2S_DMA_CH_NUM / I2S_TO_ACP_DMA_CH_NUM.
  

Non-circular

...

•            * channels will stopped automatically after its transfer
  

•            * completes : SYSRAM_TO_ACP_CH_NUM / ACP_TO_SYSRAM_CH_NUM
  

•            */
               if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
  

•                   ret = acp_dma_stop(rtd->acp_mmio,
  

•                                      SYSRAM_TO_ACP_CH_NUM);
  

•                   ret = acp_dma_stop(rtd->acp_mmio,
  

•                                      ACP_TO_I2S_DMA_CH_NUM);
  

•                   acp_dma_stop(rtd->acp_mmio, rtd->ch1);
  

•                   ret =  acp_dma_stop(rtd->acp_mmio, rtd->ch2);
                       rtd->i2ssp_renderbytescount = 0;
               } else {
  

•                   ret = acp_dma_stop(rtd->acp_mmio,
  

•                                      I2S_TO_ACP_DMA_CH_NUM);
  

•                   ret = acp_dma_stop(rtd->acp_mmio,
  

•                                      ACP_TO_SYSRAM_CH_NUM);
  

•                   acp_dma_stop(rtd->acp_mmio, rtd->ch2);
  

•                   ret = acp_dma_stop(rtd->acp_mmio, rtd->ch1);
  

Using "ch_i2s" and "ch_sysram" would help here, since then it wouldn't need to do the slightly confusing "stop 2 then stop 1".

same comments apply as mentioned in above review comment.

-Dan

...

                       rtd->i2ssp_capturebytescount = 0;
               }
               break;

diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 0e6089b..5e25428 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -85,6 +85,11 @@ struct audio_substream_data { unsigned int order; u16 num_of_pages; u16 direction;

•   u16 ch1;
  

•   u16 ch2;
  

•   u16 destination;
  

•   u16 dma_dscr_idx_1;
  

•   u16 dma_dscr_idx_2;
       uint64_t size;
       u64 i2ssp_renderbytescount;
       u64 i2ssp_capturebytescount;
  

-- 2.7.4

Hi Vijendar,

On Thu, Apr 26, 2018 at 5:14 AM Vijendar Mukunda Vijendar.Mukunda@amd.com wrote:

Added byte count register offset variables to audio_substream_data structure. Modified dma pointer callback.

Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com

Please fix the small indentation nits, otherwise this one is:

Reviewed-by: Daniel Kurtz djkurtz@chromium.org

---

sound/soc/amd/acp-pcm-dma.c | 36 +++++++++++++++--------------------- sound/soc/amd/acp.h | 2 ++ 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index f18ed9a..019f696 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -793,12 +793,18 @@ static int acp_dma_hw_params(struct

snd_pcm_substream *substream,

             rtd->destination = TO_ACP_I2S_1;
             rtd->dma_dscr_idx_1 = PLAYBACK_START_DMA_DESCR_CH12;
             rtd->dma_dscr_idx_2 = PLAYBACK_START_DMA_DESCR_CH13;

•           rtd->byte_cnt_high_reg_offset =
  

•           mmACP_I2S_TRANSMIT_BYTE_CNT_HIGH;
  

Indent relative to line above with 2 tabs.

•           rtd->byte_cnt_low_reg_offset =
  

mmACP_I2S_TRANSMIT_BYTE_CNT_LOW;

     } else {
             rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
             rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
             rtd->destination = FROM_ACP_I2S_1;
             rtd->dma_dscr_idx_1 = CAPTURE_START_DMA_DESCR_CH14;
             rtd->dma_dscr_idx_2 = CAPTURE_START_DMA_DESCR_CH15;

•           rtd->byte_cnt_high_reg_offset =
  

•           mmACP_I2S_RECEIVED_BYTE_CNT_HIGH;
  

here too.

•           rtd->byte_cnt_low_reg_offset =
  

mmACP_I2S_RECEIVED_BYTE_CNT_LOW;

     }

     size = params_buffer_bytes(params);

@@ -834,26 +840,15 @@ static int acp_dma_hw_free(struct snd_pcm_substream

*substream)

     return snd_pcm_lib_free_pages(substream);

}

-static u64 acp_get_byte_count(void __iomem *acp_mmio, int stream) +static u64 acp_get_byte_count(struct audio_substream_data *rtd) {

•   union acp_dma_count playback_dma_count;
  

•   union acp_dma_count capture_dma_count;
  

•   u64 bytescount = 0;
  

•   union acp_dma_count byte_count;
  

•   if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
  

•           playback_dma_count.bcount.high = acp_reg_read(acp_mmio,
  

•                                   mmACP_I2S_TRANSMIT_BYTE_CNT_HIGH);
  

•           playback_dma_count.bcount.low  = acp_reg_read(acp_mmio,
  

•                                   mmACP_I2S_TRANSMIT_BYTE_CNT_LOW);
  

•           bytescount = playback_dma_count.bytescount;
  

•   } else {
  

•           capture_dma_count.bcount.high = acp_reg_read(acp_mmio,
  

•                                   mmACP_I2S_RECEIVED_BYTE_CNT_HIGH);
  

•           capture_dma_count.bcount.low  = acp_reg_read(acp_mmio,
  

•                                   mmACP_I2S_RECEIVED_BYTE_CNT_LOW);
  

•           bytescount = capture_dma_count.bytescount;
  

•   }
  

•   return bytescount;
  

•   byte_count.bcount.high = acp_reg_read(rtd->acp_mmio,
  

rtd->byte_cnt_high_reg_offset);

•   byte_count.bcount.low  = acp_reg_read(rtd->acp_mmio,
  

rtd->byte_cnt_low_reg_offset);

•   return byte_count.bytescount;
  

  }

static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream

*substream)

@@ -869,7 +864,7 @@ static snd_pcm_uframes_t acp_dma_pointer(struct

snd_pcm_substream *substream)

             return -EINVAL;

     buffersize = frames_to_bytes(runtime, runtime->buffer_size);

•   bytescount = acp_get_byte_count(rtd->acp_mmio, substream->stream);
  

•   bytescount = acp_get_byte_count(rtd);
  

     if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
             if (bytescount > rtd->i2ssp_renderbytescount)

@@ -925,8 +920,7 @@ static int acp_dma_trigger(struct snd_pcm_substream

*substream, int cmd)

     case SNDRV_PCM_TRIGGER_START:
     case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
     case SNDRV_PCM_TRIGGER_RESUME:

•           bytescount = acp_get_byte_count(rtd->acp_mmio,
  

•                                           substream->stream);
  

•           bytescount = acp_get_byte_count(rtd);
             if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                     if (rtd->i2ssp_renderbytescount == 0)
                             rtd->i2ssp_renderbytescount = bytescount;
  

diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 5e25428..3b076c6 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -90,6 +90,8 @@ struct audio_substream_data { u16 destination; u16 dma_dscr_idx_1; u16 dma_dscr_idx_2;

•   u32 byte_cnt_high_reg_offset;
  

•   u32 byte_cnt_low_reg_offset;
     uint64_t size;
     u64 i2ssp_renderbytescount;
     u64 i2ssp_capturebytescount;
  

-- 2.7.4

On Monday 30 April 2018 03:11 AM, Daniel Kurtz wrote:

Hi Vijendar,

On Thu, Apr 26, 2018 at 5:15 AM Vijendar Mukunda Vijendar.Mukunda@amd.com wrote:

...

Removed separate byte count variables for playback and capture.

...

Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com

Reviewed-by: Daniel Kurtz djkurtz@chromium.org

...

---

sound/soc/amd/acp-pcm-dma.c | 19 +++++-------------- sound/soc/amd/acp.h | 3 +-- 2 files changed, 6 insertions(+), 16 deletions(-)

...

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 019f696..5f34be1 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -866,13 +866,8 @@ static snd_pcm_uframes_t acp_dma_pointer(struct

snd_pcm_substream *substream)

...

      buffersize = frames_to_bytes(runtime, runtime->buffer_size);
      bytescount = acp_get_byte_count(rtd);

...

•   if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
  

•           if (bytescount > rtd->i2ssp_renderbytescount)
  

•                   bytescount = bytescount -
  

rtd->i2ssp_renderbytescount;

...

•   } else {
  

•           if (bytescount > rtd->i2ssp_capturebytescount)
  

•                   bytescount = bytescount -
  

rtd->i2ssp_capturebytescount;

...

•   }
  

•   if (bytescount > rtd->bytescount)
  

•           bytescount = bytescount - rtd->bytescount;
  

nit, this could be: bytescount -= rtd->bytescount;

we will fix it and will share fresh patch.

...

      pos = do_div(bytescount, buffersize);
      return bytes_to_frames(runtime, pos);

} @@ -921,9 +916,9 @@ static int acp_dma_trigger(struct snd_pcm_substream

*substream, int cmd)

...

      case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
      case SNDRV_PCM_TRIGGER_RESUME:
              bytescount = acp_get_byte_count(rtd);

•           if (rtd->bytescount == 0)
  

•                   rtd->bytescount = bytescount;
              if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
  

•                   if (rtd->i2ssp_renderbytescount == 0)
  

•                           rtd->i2ssp_renderbytescount = bytescount;
                      acp_dma_start(rtd->acp_mmio, rtd->ch1, false);
                      while (acp_reg_read(rtd->acp_mmio,
  

mmACP_DMA_CH_STS) &

...

                              BIT(rtd->ch1)) {

@@ -934,9 +929,6 @@ static int acp_dma_trigger(struct snd_pcm_substream

*substream, int cmd)

...

                              }
                              cpu_relax();
                      }

•           } else {
  

•                   if (rtd->i2ssp_capturebytescount == 0)
  

•                           rtd->i2ssp_capturebytescount = bytescount;
              }
              acp_dma_start(rtd->acp_mmio, rtd->ch2, true);
              ret = 0;
  

@@ -947,12 +939,11 @@ static int acp_dma_trigger(struct snd_pcm_substream

*substream, int cmd)

...

              if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                      acp_dma_stop(rtd->acp_mmio, rtd->ch1);
                      ret =  acp_dma_stop(rtd->acp_mmio, rtd->ch2);

•                   rtd->i2ssp_renderbytescount = 0;
              } else {
                      acp_dma_stop(rtd->acp_mmio, rtd->ch2);
                      ret = acp_dma_stop(rtd->acp_mmio, rtd->ch1);
  

•                   rtd->i2ssp_capturebytescount = 0;
              }
  

•           rtd->bytescount = 0;
              break;
      default:
              ret = -EINVAL;
  

diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 3b076c6..82470bc 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -93,8 +93,7 @@ struct audio_substream_data { u32 byte_cnt_high_reg_offset; u32 byte_cnt_low_reg_offset; uint64_t size;

•   u64 i2ssp_renderbytescount;
  

•   u64 i2ssp_capturebytescount;
  

•   u64 bytescount;
      void __iomem *acp_mmio;
  

  };

...

-- 2.7.4

On Thu, Apr 26, 2018 at 5:16 AM Vijendar Mukunda Vijendar.Mukunda@amd.com wrote:

Added pte offset variable in audio_substream_data structure. Added Stoney related PTE offset macros in acp header file. Modified hw_params callback to assign the pte offset value based on asic_type.

Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com

sound/soc/amd/acp-pcm-dma.c | 26 +++++++++++++++++++------- sound/soc/amd/acp.h | 5 +++++ 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 5f34be1..cb22653 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -320,13 +320,11 @@ static void config_acp_dma(void __iomem *acp_mmio, struct audio_substream_data *rtd, u32 asic_type) {

•   u32 pte_offset, sram_bank;
  

•   u32 sram_bank;
  

•   if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK) {
  

•           pte_offset = ACP_PLAYBACK_PTE_OFFSET;
  

•   if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK)
             sram_bank = ACP_SHARED_RAM_BANK_1_ADDRESS;
  

•   } else {
  

•           pte_offset = ACP_CAPTURE_PTE_OFFSET;
  

•   else {
             switch (asic_type) {
             case CHIP_STONEY:
                     sram_bank = ACP_SHARED_RAM_BANK_3_ADDRESS;
  

@@ -336,10 +334,10 @@ static void config_acp_dma(void __iomem *acp_mmio, } } acp_pte_config(acp_mmio, rtd->pg, rtd->num_of_pages,

•                  pte_offset);
  

•                  rtd->pte_offset);
     /* Configure System memory <-> ACP SRAM DMA descriptors */
     set_acp_sysmem_dma_descriptors(acp_mmio, rtd->size,
  

•                                  rtd->direction, pte_offset,
  

•                                  rtd->direction, rtd->pte_offset,
                                    rtd->ch1, sram_bank,
                                    rtd->dma_dscr_idx_1, asic_type);
     /* Configure ACP SRAM <-> I2S DMA descriptors */
  

@@ -788,6 +786,13 @@ static int acp_dma_hw_params(struct

snd_pcm_substream *substream,

     }

     if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

•           switch (adata->asic_type) {
  

•           case CHIP_STONEY:
  

•                   rtd->pte_offset = ACP_ST_PLAYBACK_PTE_OFFSET;
  

•                   break;
  

•           default:
  

•                   rtd->pte_offset = ACP_PLAYBACK_PTE_OFFSET;
  

•           }
  

As in patch 2, I believe this would be better done in acp_dma_open().

Why does Stoney use a different PTE_OFFSET? Please answer this question in the commit message.

-Dan

             rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
             rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
             rtd->destination = TO_ACP_I2S_1;

@@ -797,6 +802,13 @@ static int acp_dma_hw_params(struct

snd_pcm_substream *substream,

             mmACP_I2S_TRANSMIT_BYTE_CNT_HIGH;
             rtd->byte_cnt_low_reg_offset =

mmACP_I2S_TRANSMIT_BYTE_CNT_LOW;

     } else {

•           switch (adata->asic_type) {
  

•           case CHIP_STONEY:
  

•                   rtd->pte_offset = ACP_ST_CAPTURE_PTE_OFFSET;
  

•                   break;
  

•           default:
  

•                   rtd->pte_offset = ACP_CAPTURE_PTE_OFFSET;
  

•           }
             rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
             rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
             rtd->destination = FROM_ACP_I2S_1;
  

diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 82470bc..2f48d1d 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -10,6 +10,10 @@ #define ACP_PLAYBACK_PTE_OFFSET 10 #define ACP_CAPTURE_PTE_OFFSET 0

+/* Playback and Capture Offset for Stoney */ +#define ACP_ST_PLAYBACK_PTE_OFFSET 0x04 +#define ACP_ST_CAPTURE_PTE_OFFSET 0x00

• #define ACP_GARLIC_CNTL_DEFAULT 0x00000FB4 #define ACP_ONION_CNTL_DEFAULT 0x00000FB4

@@ -90,6 +94,7 @@ struct audio_substream_data { u16 destination; u16 dma_dscr_idx_1; u16 dma_dscr_idx_2;

•   u32 pte_offset;
     u32 byte_cnt_high_reg_offset;
     u32 byte_cnt_low_reg_offset;
     uint64_t size;
  

-- 2.7.4

On Monday 30 April 2018 03:17 AM, Daniel Kurtz wrote:

On Thu, Apr 26, 2018 at 5:16 AM Vijendar Mukunda Vijendar.Mukunda@amd.com wrote:

...

Added sram bank variable to audio_substream_data structure.

...

Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com

Move initialization to acp_dma_open(), otherwise this is: Reviewed-by: Daniel Kurtz djkurtz@chromium.org

As explained in Patch 2 review comments, initialization part we moved to acp_dma_hw_params() callback.

...

---

sound/soc/amd/acp-pcm-dma.c | 20 +++++--------------- sound/soc/amd/acp.h | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 21 deletions(-)

...

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index cb22653..b7bffc7 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -320,29 +320,16 @@ static void config_acp_dma(void __iomem *acp_mmio, struct audio_substream_data *rtd, u32 asic_type) {

•   u32 sram_bank;
  

•   if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK)
  

•           sram_bank = ACP_SHARED_RAM_BANK_1_ADDRESS;
  

•   else {
  

•           switch (asic_type) {
  

•           case CHIP_STONEY:
  

•                   sram_bank = ACP_SHARED_RAM_BANK_3_ADDRESS;
  

•                   break;
  

•           default:
  

•                   sram_bank = ACP_SHARED_RAM_BANK_5_ADDRESS;
  

•           }
  

•   }
      acp_pte_config(acp_mmio, rtd->pg, rtd->num_of_pages,
                     rtd->pte_offset);
      /* Configure System memory <-> ACP SRAM DMA descriptors */
      set_acp_sysmem_dma_descriptors(acp_mmio, rtd->size,
                                     rtd->direction, rtd->pte_offset,
  

•                                  rtd->ch1, sram_bank,
  

•                                  rtd->ch1, rtd->sram_bank,
                                     rtd->dma_dscr_idx_1, asic_type);
      /* Configure ACP SRAM <-> I2S DMA descriptors */
      set_acp_to_i2s_dma_descriptors(acp_mmio, rtd->size,
  

•                                  rtd->direction, sram_bank,
  

•                                  rtd->direction, rtd->sram_bank,
                                     rtd->destination, rtd->ch2,
                                     rtd->dma_dscr_idx_2, asic_type);
  

  }

@@ -795,6 +782,7 @@ static int acp_dma_hw_params(struct snd_pcm_substream

*substream,

...

              }
              rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
              rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;

•           rtd->sram_bank = ACP_SRAM_BANK_1_ADDRESS;
              rtd->destination = TO_ACP_I2S_1;
              rtd->dma_dscr_idx_1 = PLAYBACK_START_DMA_DESCR_CH12;
              rtd->dma_dscr_idx_2 = PLAYBACK_START_DMA_DESCR_CH13;
  

@@ -805,9 +793,11 @@ static int acp_dma_hw_params(struct

snd_pcm_substream *substream,

...

              switch (adata->asic_type) {
              case CHIP_STONEY:
                      rtd->pte_offset = ACP_ST_CAPTURE_PTE_OFFSET;

•                   rtd->sram_bank = ACP_SRAM_BANK_2_ADDRESS;
                      break;
              default:
                      rtd->pte_offset = ACP_CAPTURE_PTE_OFFSET;
  

•                   rtd->sram_bank = ACP_SRAM_BANK_5_ADDRESS;
              }
              rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
              rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
  

diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 2f48d1d..62695ed 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -19,12 +19,19 @@

...

#define ACP_PHYSICAL_BASE 0x14000

...

-/* Playback SRAM address (as a destination in dma descriptor) */ -#define ACP_SHARED_RAM_BANK_1_ADDRESS 0x4002000

-/* Capture SRAM address (as a source in dma descriptor) */ -#define ACP_SHARED_RAM_BANK_5_ADDRESS 0x400A000 -#define ACP_SHARED_RAM_BANK_3_ADDRESS 0x4006000 +/*

• • In case of I2S SP controller instance, Stoney uses SRAM bank 1 for
• • playback and SRAM Bank 2 for capture where as in case of BT I2S
• • Instance, Stoney uses SRAM Bank 3 for playback & SRAM Bank 4 will
• • be used for capture. Carrizo uses I2S SP controller instance. SRAM

Banks

...

• • 1, 2, 3, 4 will be used for playback & SRAM Banks 5, 6, 7, 8 will be

used

...

• • for capture scenario.
• */

+#define ACP_SRAM_BANK_1_ADDRESS 0x4002000 +#define ACP_SRAM_BANK_2_ADDRESS 0x4004000 +#define ACP_SRAM_BANK_3_ADDRESS 0x4006000 +#define ACP_SRAM_BANK_4_ADDRESS 0x4008000 +#define ACP_SRAM_BANK_5_ADDRESS 0x400A000

...

#define ACP_DMA_RESET_TIME 10000 #define ACP_CLOCK_EN_TIME_OUT_VALUE 0x000000FF @@ -95,6 +102,7 @@ struct audio_substream_data { u16 dma_dscr_idx_1; u16 dma_dscr_idx_2; u32 pte_offset;

•   u32 sram_bank;
      u32 byte_cnt_high_reg_offset;
      u32 byte_cnt_low_reg_offset;
      uint64_t size;
  

-- 2.7.4

The patch

ASoC: amd: memory release for rtd structure

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From cac6f59717e1084552e509172d40d5c9d278feb9 Mon Sep 17 00:00:00 2001

From: "Mukunda, Vijendar" Vijendar.Mukunda@amd.com Date: Tue, 8 May 2018 10:17:49 +0530 Subject: [PATCH] ASoC: amd: memory release for rtd structure

rtd structure freed early may result in kernel panic in dma close call back. moved releasing memory for rtd structure to the end of dma close callback.

Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com Reviewed-by: Daniel Kurtz djkurtz@chromium.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/amd/acp-pcm-dma.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 39cd54f1b493..1c44b26ad2db 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -998,8 +998,6 @@ static int acp_dma_close(struct snd_pcm_substream *substream) DRV_NAME); struct audio_drv_data *adata = dev_get_drvdata(component->dev);

- kfree(rtd); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_i2ssp_stream = NULL; /* @@ -1028,7 +1026,7 @@ static int acp_dma_close(struct snd_pcm_substream *substream) */ if (!adata->play_i2ssp_stream && !adata->capture_i2ssp_stream) acp_reg_write(0, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB); - + kfree(rtd); return 0; }

The patch

ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From e9716ff3dcd052d8640047860a78c948629c6c70 Mon Sep 17 00:00:00 2001

From: Akshu Agrawal akshu.agrawal@amd.com Date: Tue, 8 May 2018 10:17:50 +0530 Subject: [PATCH] ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown

hw_param can be called multiple times and thus we can have more clk enable. The clk may not get diabled due to refcounting. startup/shutdown ensures single clk enable/disable call.

Signed-off-by: Akshu Agrawal akshu.agrawal@amd.com Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com Reviewed-by: Daniel Kurtz djkurtz@chromium.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/amd/acp-da7219-max98357a.c | 49 ++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 215b06bf2039..6495eedc3d4c 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -91,8 +91,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) return 0; }

-static int cz_da7219_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) +static int da7219_clk_enable(struct snd_pcm_substream *substream) { int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -106,11 +105,9 @@ static int cz_da7219_hw_params(struct snd_pcm_substream *substream, return ret; }

-static int cz_da7219_hw_free(struct snd_pcm_substream *substream) +static void da7219_clk_disable(void) { clk_disable_unprepare(da7219_dai_clk); - - return 0; }

static const unsigned int channels[] = { @@ -133,7 +130,7 @@ static const struct snd_pcm_hw_constraint_list constraints_channels = { .mask = 0, };

-static int cz_fe_startup(struct snd_pcm_substream *substream) +static int cz_da7219_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime;

@@ -147,23 +144,47 @@ static int cz_fe_startup(struct snd_pcm_substream *substream) snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);

- return 0; + return da7219_clk_enable(substream); +} + +static void cz_da7219_shutdown(struct snd_pcm_substream *substream) +{ + da7219_clk_disable(); +} + +static int cz_max_startup(struct snd_pcm_substream *substream) +{ + return da7219_clk_enable(substream); +} + +static void cz_max_shutdown(struct snd_pcm_substream *substream) +{ + da7219_clk_disable(); +} + +static int cz_dmic_startup(struct snd_pcm_substream *substream) +{ + return da7219_clk_enable(substream); +} + +static void cz_dmic_shutdown(struct snd_pcm_substream *substream) +{ + da7219_clk_disable(); }

static struct snd_soc_ops cz_da7219_cap_ops = { - .hw_params = cz_da7219_hw_params, - .hw_free = cz_da7219_hw_free, - .startup = cz_fe_startup, + .startup = cz_da7219_startup, + .shutdown = cz_da7219_shutdown, };

static struct snd_soc_ops cz_max_play_ops = { - .hw_params = cz_da7219_hw_params, - .hw_free = cz_da7219_hw_free, + .startup = cz_max_startup, + .shutdown = cz_max_shutdown, };

static struct snd_soc_ops cz_dmic_cap_ops = { - .hw_params = cz_da7219_hw_params, - .hw_free = cz_da7219_hw_free, + .startup = cz_dmic_startup, + .shutdown = cz_dmic_shutdown, };

static struct snd_soc_dai_link cz_dai_7219_98357[] = {

On Thu, Apr 26, 2018 at 5:17 AM Vijendar Mukunda Vijendar.Mukunda@amd.com wrote:

From: Akshu Agrawal akshu.agrawal@amd.com

System clock on the platform is 25Mhz and not 24Mhz.

PLL_OUT for da7219 codec to use DA7219_PLL_FREQ_OUT_98304 as it is for 48KHz SR.

Signed-off-by: Akshu Agrawal akshu.agrawal@amd.com Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com

Reviewed-by: Daniel Kurtz djkurtz@chromium.org

---

sound/soc/amd/acp-da7219-max98357a.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sound/soc/amd/acp-da7219-max98357a.c

b/sound/soc/amd/acp-da7219-max98357a.c

index 6495eed..fa5ad5b 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -39,8 +39,7 @@ #include "../codecs/da7219.h" #include "../codecs/da7219-aad.h"

-#define CZ_PLAT_CLK 24000000 -#define MCLK_RATE 24576000 +#define CZ_PLAT_CLK 25000000 #define DUAL_CHANNEL 2

static struct snd_soc_jack cz_jack; @@ -63,7 +62,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime

*rtd)

     }

     ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_PLL,

•                             CZ_PLAT_CLK, MCLK_RATE);
  

•                             CZ_PLAT_CLK, DA7219_PLL_FREQ_OUT_98304);
     if (ret < 0) {
             dev_err(rtd->dev, "can't set codec pll: %d\n", ret);
             return ret;
  

-- 2.7.4

The patch

ASoC: AMD: Add const to snd_soc_ops instances

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From 839a12c79963d042632df24b7c8d6498285d10b0 Mon Sep 17 00:00:00 2001

From: Akshu Agrawal akshu.agrawal@amd.com Date: Tue, 8 May 2018 10:17:52 +0530 Subject: [PATCH] ASoC: AMD: Add const to snd_soc_ops instances

Marking snd_soc_ops instances const

Signed-off-by: Akshu Agrawal akshu.agrawal@amd.com Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com Reviewed-by: Daniel Kurtz djkurtz@chromium.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/amd/acp-da7219-max98357a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index fa5ad5b468a2..133139dbcb06 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -171,17 +171,17 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream) da7219_clk_disable(); }

-static struct snd_soc_ops cz_da7219_cap_ops = { +static const struct snd_soc_ops cz_da7219_cap_ops = { .startup = cz_da7219_startup, .shutdown = cz_da7219_shutdown, };

-static struct snd_soc_ops cz_max_play_ops = { +static const struct snd_soc_ops cz_max_play_ops = { .startup = cz_max_startup, .shutdown = cz_max_shutdown, };

-static struct snd_soc_ops cz_dmic_cap_ops = { +static const struct snd_soc_ops cz_dmic_cap_ops = { .startup = cz_dmic_startup, .shutdown = cz_dmic_shutdown, };