From: Nicolin Chen <nicoleotsuka@gmail.com> To: timur@tabi.org, broonie@kernel.org, mail@maciej.szmigiero.name Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org, lgirdwood@gmail.com, fabio.estevam@nxp.com, caleb@crome.org, arnaud.mouiche@invoxia.com, lukma@denx.de, kernel@pengutronix.de Subject: [PATCH v5 04/17] ASoC: fsl_ssi: Maintain a mask of active streams Date: Tue, 16 Jan 2018 22:51:29 -0800 [thread overview] Message-ID: <1516171902-32669-5-git-send-email-nicoleotsuka@gmail.com> (raw) In-Reply-To: <1516171902-32669-1-git-send-email-nicoleotsuka@gmail.com> Checking TE and RE bits in SCR register doesn't work for AC97 mode which enables SSIEN, TE and RE in the fsl_ssi_setup_ac97() that's called during probe(). So when running into the trigger(), it will always get the result of both TE and RE being enabled already, even if actually there is no active stream. This patch fixes this issue by adding a variable to log the active streams manually. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Tested-by: Caleb Crome <caleb@crome.org> --- Changelog v3 * Replaced "bool dir" with "int dir" v2 * Replaced bool tx with bool dir sound/soc/fsl/fsl_ssi.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 8984ee2..51e7405 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -205,6 +205,7 @@ struct fsl_ssi_soc_data { * @cpu_dai_drv: CPU DAI driver for this device * * @dai_fmt: DAI configuration this device is currently used with + * @streams: Mask of current active streams: BIT(TX) and BIT(RX) * @i2s_net: I2S and Network mode configurations of SCR register * @use_dma: DMA is used or FIQ with stream filter * @use_dual_fifo: DMA with support for dual FIFO mode @@ -249,6 +250,7 @@ struct fsl_ssi { struct snd_soc_dai_driver cpu_dai_drv; unsigned int dai_fmt; + u8 streams; u8 i2s_net; bool use_dma; bool use_dual_fifo; @@ -444,15 +446,14 @@ static void fsl_ssi_fifo_clear(struct fsl_ssi *ssi, bool is_rx) static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, struct fsl_ssi_regvals *vals) { + int dir = (&ssi->regvals[TX] == vals) ? TX : RX; struct regmap *regs = ssi->regs; struct fsl_ssi_regvals *avals; int nr_active_streams; - u32 scr; int keep_active; - regmap_read(regs, REG_SSI_SCR, &scr); - - nr_active_streams = !!(scr & SSI_SCR_TE) + !!(scr & SSI_SCR_RE); + nr_active_streams = !!(ssi->streams & BIT(TX)) + + !!(ssi->streams & BIT(RX)); if (nr_active_streams - 1 > 0) keep_active = 1; @@ -474,6 +475,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, keep_active); /* Safely disable SCR register for the stream */ regmap_update_bits(regs, REG_SSI_SCR, scr, 0); + + /* Log the disabled stream to the mask */ + ssi->streams &= ~BIT(dir); } /* @@ -549,6 +553,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, } /* Enable all remaining bits */ regmap_update_bits(regs, REG_SSI_SCR, vals->scr, vals->scr); + + /* Log the enabled stream to the mask */ + ssi->streams |= BIT(dir); } } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicoleotsuka@gmail.com> To: timur@tabi.org, broonie@kernel.org, mail@maciej.szmigiero.name Cc: alsa-devel@alsa-project.org, kernel@pengutronix.de, linux-kernel@vger.kernel.org, caleb@crome.org, lgirdwood@gmail.com, arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 04/17] ASoC: fsl_ssi: Maintain a mask of active streams Date: Tue, 16 Jan 2018 22:51:29 -0800 [thread overview] Message-ID: <1516171902-32669-5-git-send-email-nicoleotsuka@gmail.com> (raw) In-Reply-To: <1516171902-32669-1-git-send-email-nicoleotsuka@gmail.com> Checking TE and RE bits in SCR register doesn't work for AC97 mode which enables SSIEN, TE and RE in the fsl_ssi_setup_ac97() that's called during probe(). So when running into the trigger(), it will always get the result of both TE and RE being enabled already, even if actually there is no active stream. This patch fixes this issue by adding a variable to log the active streams manually. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Tested-by: Caleb Crome <caleb@crome.org> --- Changelog v3 * Replaced "bool dir" with "int dir" v2 * Replaced bool tx with bool dir sound/soc/fsl/fsl_ssi.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 8984ee2..51e7405 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -205,6 +205,7 @@ struct fsl_ssi_soc_data { * @cpu_dai_drv: CPU DAI driver for this device * * @dai_fmt: DAI configuration this device is currently used with + * @streams: Mask of current active streams: BIT(TX) and BIT(RX) * @i2s_net: I2S and Network mode configurations of SCR register * @use_dma: DMA is used or FIQ with stream filter * @use_dual_fifo: DMA with support for dual FIFO mode @@ -249,6 +250,7 @@ struct fsl_ssi { struct snd_soc_dai_driver cpu_dai_drv; unsigned int dai_fmt; + u8 streams; u8 i2s_net; bool use_dma; bool use_dual_fifo; @@ -444,15 +446,14 @@ static void fsl_ssi_fifo_clear(struct fsl_ssi *ssi, bool is_rx) static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, struct fsl_ssi_regvals *vals) { + int dir = (&ssi->regvals[TX] == vals) ? TX : RX; struct regmap *regs = ssi->regs; struct fsl_ssi_regvals *avals; int nr_active_streams; - u32 scr; int keep_active; - regmap_read(regs, REG_SSI_SCR, &scr); - - nr_active_streams = !!(scr & SSI_SCR_TE) + !!(scr & SSI_SCR_RE); + nr_active_streams = !!(ssi->streams & BIT(TX)) + + !!(ssi->streams & BIT(RX)); if (nr_active_streams - 1 > 0) keep_active = 1; @@ -474,6 +475,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, keep_active); /* Safely disable SCR register for the stream */ regmap_update_bits(regs, REG_SSI_SCR, scr, 0); + + /* Log the disabled stream to the mask */ + ssi->streams &= ~BIT(dir); } /* @@ -549,6 +553,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, } /* Enable all remaining bits */ regmap_update_bits(regs, REG_SSI_SCR, vals->scr, vals->scr); + + /* Log the enabled stream to the mask */ + ssi->streams |= BIT(dir); } } -- 2.7.4
next prev parent reply other threads:[~2018-01-17 6:55 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-17 6:51 [PATCH v5 00/17] ASoC: fsl_ssi: Clean up - program flow level Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 01/17] ASoC: fsl_ssi: Redefine RX and TX macros Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 02/17] ASoC: fsl_ssi: Keep ssi->i2s_net updated Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 03/17] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen [this message] 2018-01-17 6:51 ` [PATCH v5 04/17] ASoC: fsl_ssi: Maintain a mask of active streams Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 05/17] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 06/17] ASoC: fsl_ssi: Clear FIFO directly in fsl_ssi_config() Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 07/17] ASoC: fsl_ssi: Clean up helper functions of trigger() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 08/17] ASoC: fsl_ssi: Add DAIFMT define for AC97 Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 09/17] ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 10/17] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 11/17] ASoC: fsl_ssi: Use snd_soc_init_dma_data instead Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 12/17] ASoC: fsl_ssi: Move one-time configurations to probe() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 13/17] ASoC: fsl_ssi: Setup AC97 in fsl_ssi_hw_init() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 14/17] ASoC: fsl_ssi: Clean up _fsl_ssi_set_dai_fmt() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 15/17] ASoC: fsl_ssi: Add bool synchronous to mark synchronous mode Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 16/17] ASoC: fsl_ssi: Move DT related code to a separate probe() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 17/17] ASoC: fsl_ssi: Use ssi->streams instead of reading register Nicolin Chen 2018-01-17 15:19 ` [PATCH v5 00/17] ASoC: fsl_ssi: Clean up - program flow level Caleb Crome 2018-01-17 15:19 ` Caleb Crome 2018-01-17 19:38 ` Maciej S. Szmigiero 2018-01-17 19:38 ` Maciej S. Szmigiero 2018-01-17 20:02 ` Nicolin Chen 2018-01-17 20:02 ` Nicolin Chen 2018-01-17 20:27 ` Maciej S. Szmigiero 2018-01-17 20:27 ` Maciej S. Szmigiero
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=1516171902-32669-5-git-send-email-nicoleotsuka@gmail.com \ --to=nicoleotsuka@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=arnaud.mouiche@invoxia.com \ --cc=broonie@kernel.org \ --cc=caleb@crome.org \ --cc=fabio.estevam@nxp.com \ --cc=kernel@pengutronix.de \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=lukma@denx.de \ --cc=mail@maciej.szmigiero.name \ --cc=timur@tabi.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.