LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Daniel Kurtz <djkurtz@chromium.org>
To: Vijendar.Mukunda@amd.com
Cc: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	perex@perex.cz, tiwai@suse.com, alexander.deucher@amd.com,
	Akshu Agrawal <akshu.agrawal@amd.com>,
	jclinton@chromium.org, Guenter Roeck <linux@roeck-us.net>,
	kstewart@linuxfoundation.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 06/11] ASoC: amd: sram bank update changes
Date: Sun, 29 Apr 2018 21:47:53 +0000	[thread overview]
Message-ID: <CAGS+omCG+=UL-ZFA6STjnDrnG2L5jqwUGjcE+Db2P+VYyzFL9A@mail.gmail.com> (raw)
In-Reply-To: <1524741374-13523-6-git-send-email-Vijendar.Mukunda@amd.com>

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>

> ---
>   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

  reply	other threads:[~2018-04-29 21:47 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26 11:15 [PATCH 01/11] ASoC: amd: rename audio_substream_data variable Vijendar Mukunda
2018-04-26 11:15 ` [PATCH 02/11] ASoC: amd: dma config parameters changes Vijendar Mukunda
2018-04-29 21:49   ` Daniel Kurtz
2018-04-30  8:09     ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 03/11] ASoC: amd: added byte count register offset variables to rtd Vijendar Mukunda
2018-04-29 21:39   ` Daniel Kurtz
2018-04-30  7:24     ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 04/11] ASoC: amd: removed separate byte count variables for playback and capture Vijendar Mukunda
2018-04-29 21:41   ` Daniel Kurtz
2018-04-30  7:25     ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 05/11] ASoC: amd: pte offset related dma driver changes Vijendar Mukunda
2018-04-29 21:48   ` Daniel Kurtz
2018-04-30  8:19     ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 06/11] ASoC: amd: sram bank update changes Vijendar Mukunda
2018-04-29 21:47   ` Daniel Kurtz [this message]
2018-04-30  8:17     ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 07/11] ASoC: amd: memory freeing for rtd structure Vijendar Mukunda
2018-05-21 15:48   ` Applied "ASoC: amd: memory release for rtd structure" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH 08/11] ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown Vijendar Mukunda
2018-05-21 15:48   ` Applied "ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH 09/11] ASoC: AMD: Fix clocks in CZ DA7219 machine driver Vijendar Mukunda
2018-04-29 21:51   ` Daniel Kurtz
2018-05-21 15:48   ` Applied "ASoC: AMD: Fix clocks in CZ DA7219 machine driver" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH 10/11] ASoC: AMD: Add const to snd_soc_ops instances Vijendar Mukunda
2018-04-29 21:52   ` Daniel Kurtz
2018-05-21 15:48   ` Applied "ASoC: AMD: Add const to snd_soc_ops instances" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH v2 11/11] ASoC: amd: dma driver changes for bt i2s instance Vijendar Mukunda
2018-04-26 14:19 ` Applied "ASoC: amd: rename audio_substream_data variable" to the asoc tree Mark Brown

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='CAGS+omCG+=UL-ZFA6STjnDrnG2L5jqwUGjcE+Db2P+VYyzFL9A@mail.gmail.com' \
    --to=djkurtz@chromium.org \
    --cc=Vijendar.Mukunda@amd.com \
    --cc=akshu.agrawal@amd.com \
    --cc=alexander.deucher@amd.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jclinton@chromium.org \
    --cc=kstewart@linuxfoundation.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    --subject='Re: [PATCH 06/11] ASoC: amd: sram bank update changes' \
    /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

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).