[linux-next,v2,9/9] ASoC: rsnd: add busif property to dai stream

Message ID	20181003090136.4556-1-jiada_wang@mentor.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <alsa-devel-bounces@alsa-project.org> From: <jiada_wang@mentor.com> To: <lgirdwood@gmail.com>, <broonie@kernel.org>, <perex@perex.cz>, <tiwai@suse.com>, <kuninori.morimoto.gx@renesas.com> Date: Wed, 3 Oct 2018 18:01:36 +0900 Message-ID: <20181003090136.4556-1-jiada_wang@mentor.com> MIME-Version: 1.0 Cc: jiada_wang@mentor.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 9/9] ASoC: rsnd: add busif property to dai stream Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org
Series	ASoC: rsnd: support to use different BUSIF for GEN3 \| expand [linux-next,v2,0/9] ASoC: rsnd: support to use different BUSIF for GEN3 [linux-next,v2,1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7 [linux-next,v2,2/9] arm64: r8a7796: add dma request number for busif0 ~ busif7 [linux-next,v2,3/9] arm64: r8a774a1: add dma request number for busif0 ~ busif7 [linux-next,v2,4/9] arm64: r8a7795: change to use extended audio dmac register [linux-next,v2,5/9] arm64: r8a7796: change to use extended audio dmac register [linux-next,v2,6/9] arm64: r8a774a1: change to use extended audio dmac register [linux-next,v2,7/9] arm64: r8a77965: change to use extended audio dmac register [linux-next,v2,8/9] ASoC: rsnd: ssi: Request dedicated dma channels for busif0 to 7 [linux-next,v2,9/9] ASoC: rsnd: add busif property to dai stream

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 40d7dc4f7839..5e3e6e65bcdf 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1158,6 +1158,9 @@ static int rsnd_hw_params(struct snd_pcm_substream *substream, struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); int ret; + int chan = rsnd_runtime_channel_for_ssi_with_params(io, hw_params); + + rsnd_ssi_select_busif(io, chan); ret = rsnd_dai_call(hw_params, io, substream, hw_params); if (ret) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 6d1947515dc8..bf87939f79bb 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -792,6 +792,37 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, return rsnd_dai_connect(*dma_mod, io, (*dma_mod)->type); } +void rsnd_dma_addr_update(struct rsnd_dai_stream *io) +{ + struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io); + struct rsnd_mod *mod_from = NULL; + struct rsnd_mod *mod_to = NULL; + struct rsnd_priv *priv = rsnd_io_to_priv(io); + struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); + struct device *dev = rsnd_priv_to_dev(priv); + int is_play = rsnd_io_is_play(io); + struct rsnd_dma *dma = rsnd_mod_to_dma(io->dma); + + if (!dmac) + return; + + rsnd_dma_of_path(ssi_mod, io, is_play, &mod_from, &mod_to); + + dma->src_addr = rsnd_dma_addr(io, mod_from, is_play, 1); + dma->dst_addr = rsnd_dma_addr(io, mod_to, is_play, 0); + + if (mod_from && mod_to) { + struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma); + + dmapp->chcr = rsnd_dmapp_get_chcr(io, mod_from, mod_to) | + PDMACHCR_DE; + } + + dev_dbg(dev, "%s[%d] %pad -> %pad\n", + rsnd_mod_name(ssi_mod), rsnd_mod_id(ssi_mod), + &dma->src_addr, &dma->dst_addr); +} + int rsnd_dma_probe(struct rsnd_priv *priv) { struct platform_device *pdev = rsnd_priv_to_pdev(priv); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 4464d1d0a042..7ce10267c87b 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -227,12 +227,14 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg, u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io); u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod); +void rsnd_ssi_select_busif(struct rsnd_dai_stream *io, int chan); /* * R-Car DMA */ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, struct rsnd_mod **dma_mod); +void rsnd_dma_addr_update(struct rsnd_dai_stream *io); int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); @@ -457,6 +459,7 @@ struct rsnd_dai_stream { struct rsnd_dai *rdai; struct device *dmac_dev; /* for IPMMU */ u32 parent_ssi_status; + u32 busif; }; #define rsnd_io_to_mod(io, i) ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL) #define rsnd_io_to_mod_ssi(io) rsnd_io_to_mod((io), RSND_MOD_SSI) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 992aeac09e76..d515ee192276 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -154,7 +154,35 @@ int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) int rsnd_ssi_get_busif(struct rsnd_dai_stream *io) { - return 0; /* BUSIF0 only for now */ + struct rsnd_priv *priv = rsnd_io_to_priv(io); + + if (!rsnd_is_gen3(priv)) + return 0; + + if (!rsnd_ssi_use_busif(io)) + return 0; + + return io->busif; +} + +void rsnd_ssi_select_busif(struct rsnd_dai_stream *io, int chan) +{ + struct rsnd_priv *priv = rsnd_io_to_priv(io); + u32 busif = 0; /* BUSIF0 only for now */ + + if (!rsnd_is_gen3(priv)) + return; + + if (!rsnd_ssi_use_busif(io)) + return; + + /* FIXME: calcuate BUSIF based on SSI mode in future */ + if (io->busif == busif) + return; + + io->busif = busif; + + rsnd_dma_addr_update(io); } static void rsnd_ssi_status_clear(struct rsnd_mod *mod)

[linux-next,v2,9/9] ASoC: rsnd: add busif property to dai stream

Commit Message

Comments

Patch