From: Nicolin Chen <nicoleotsuka@gmail.com> To: timur@tabi.org, broonie@kernel.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org, lgirdwood@gmail.com, fabio.estevam@nxp.com, mail@maciej.szmigiero.name, caleb@crome.org, arnaud.mouiche@invoxia.com, lukma@denx.de, kernel@pengutronix.de Subject: [PATCH v1 03/15] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Date: Tue, 19 Dec 2017 09:00:07 -0800 [thread overview] Message-ID: <1513702819-42310-4-git-send-email-nicoleotsuka@gmail.com> (raw) In-Reply-To: <1513702819-42310-1-git-send-email-nicoleotsuka@gmail.com> The define of fsl_ssi_disable_val is not so clear as it mixes two steps of calculations together. And those parameter names are also a bit long to read. Since it just tries to exclude the shared bits from the regvals of current stream while the opposite stream is active, it's better to use something like ssi_excl_shared_bits. This patch also bisects fsl_ssi_disable_val into two macros of two corresponding steps and then shortens its parameter names. It also updates callers in the fsl_ssi_config() accordingly. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> --- sound/soc/fsl/fsl_ssi.c | 54 ++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index f05f78d..6dda2e0 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -417,24 +417,24 @@ static void fsl_ssi_fifo_clear(struct fsl_ssi *ssi, bool is_rx) } /** - * Calculate the bits that have to be disabled for the current stream that is - * getting disabled. This keeps the bits enabled that are necessary for the - * second stream to work if 'stream_active' is true. + * Exclude bits that are used by the opposite stream * - * Detailed calculation: - * These are the values that need to be active after disabling. For non-active - * second stream, this is 0: - * vals_stream * !!stream_active + * When both streams are active, disabling some bits for the current stream + * might break the other stream if these bits are used by it. * - * The following computes the overall differences between the setup for the - * to-disable stream and the active stream, a simple XOR: - * vals_disable ^ (vals_stream * !!(stream_active)) + * @vals : regvals of the current stream + * @avals: regvals of the opposite stream + * @aactive: active state of the opposite stream * - * The full expression adds a mask on all values we care about + * 1) XOR vals and avals to get the differences if the other stream is active; + * Otherwise, return current vals if the other stream is not active + * 2) AND the result of 1) with the current vals */ -#define fsl_ssi_disable_val(vals_disable, vals_stream, stream_active) \ - ((vals_disable) & \ - ((vals_disable) ^ ((vals_stream) * (u32)!!(stream_active)))) +#define _ssi_xor_shared_bits(vals, avals, aactive) \ + ((vals) ^ ((avals) * (aactive))) + +#define ssi_excl_shared_bits(vals, avals, aactive) \ + ((vals) & _ssi_xor_shared_bits(vals, avals, aactive)) /** * Enable or disable SSI configuration. @@ -445,16 +445,10 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, bool tx = &ssi->regvals[TX] == vals; struct regmap *regs = ssi->regs; struct fsl_ssi_regvals *avals; - int nr_active_streams; - int keep_active; - - nr_active_streams = !!(ssi->streams & BIT(TX)) + - !!(ssi->streams & BIT(RX)); + bool aactive; - if (nr_active_streams - 1 > 0) - keep_active = 1; - else - keep_active = 0; + /* Check if the opposite stream is active */ + aactive = ssi->streams & BIT(!tx); /* Get the opposite direction to keep its values untouched */ if (&ssi->regvals[RX] == vals) @@ -467,8 +461,7 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, * To keep the other stream safe, exclude shared bits between * both streams, and get safe bits to disable current stream */ - u32 scr = fsl_ssi_disable_val(vals->scr, avals->scr, - keep_active); + u32 scr = ssi_excl_shared_bits(vals->scr, avals->scr, aactive); /* Safely disable SCR register for the stream */ regmap_update_bits(regs, REG_SSI_SCR, scr, 0); @@ -483,7 +476,7 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, * 2) Disable all remaining bits of both streams when last stream ends */ if (ssi->soc->offline_config) { - if ((enable && !nr_active_streams) || (!enable && !keep_active)) + if ((enable && !ssi->streams) || (!enable && !aactive)) fsl_ssi_rxtx_config(ssi, enable); goto config_done; @@ -505,12 +498,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, * To keep the other stream safe, exclude shared bits between * both streams, and get safe bits to disable current stream */ - sier = fsl_ssi_disable_val(vals->sier, avals->sier, - keep_active); - srcr = fsl_ssi_disable_val(vals->srcr, avals->srcr, - keep_active); - stcr = fsl_ssi_disable_val(vals->stcr, avals->stcr, - keep_active); + sier = ssi_excl_shared_bits(vals->sier, avals->sier, aactive); + srcr = ssi_excl_shared_bits(vals->srcr, avals->srcr, aactive); + stcr = ssi_excl_shared_bits(vals->stcr, avals->stcr, aactive); /* Safely disable other control registers for the stream */ regmap_update_bits(regs, REG_SSI_SRCR, srcr, 0); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicoleotsuka@gmail.com> To: timur@tabi.org, broonie@kernel.org Cc: mail@maciej.szmigiero.name, kernel@pengutronix.de, lgirdwood@gmail.com, alsa-devel@alsa-project.org, caleb@crome.org, linux-kernel@vger.kernel.org, arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v1 03/15] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Date: Tue, 19 Dec 2017 09:00:07 -0800 [thread overview] Message-ID: <1513702819-42310-4-git-send-email-nicoleotsuka@gmail.com> (raw) In-Reply-To: <1513702819-42310-1-git-send-email-nicoleotsuka@gmail.com> The define of fsl_ssi_disable_val is not so clear as it mixes two steps of calculations together. And those parameter names are also a bit long to read. Since it just tries to exclude the shared bits from the regvals of current stream while the opposite stream is active, it's better to use something like ssi_excl_shared_bits. This patch also bisects fsl_ssi_disable_val into two macros of two corresponding steps and then shortens its parameter names. It also updates callers in the fsl_ssi_config() accordingly. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> --- sound/soc/fsl/fsl_ssi.c | 54 ++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index f05f78d..6dda2e0 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -417,24 +417,24 @@ static void fsl_ssi_fifo_clear(struct fsl_ssi *ssi, bool is_rx) } /** - * Calculate the bits that have to be disabled for the current stream that is - * getting disabled. This keeps the bits enabled that are necessary for the - * second stream to work if 'stream_active' is true. + * Exclude bits that are used by the opposite stream * - * Detailed calculation: - * These are the values that need to be active after disabling. For non-active - * second stream, this is 0: - * vals_stream * !!stream_active + * When both streams are active, disabling some bits for the current stream + * might break the other stream if these bits are used by it. * - * The following computes the overall differences between the setup for the - * to-disable stream and the active stream, a simple XOR: - * vals_disable ^ (vals_stream * !!(stream_active)) + * @vals : regvals of the current stream + * @avals: regvals of the opposite stream + * @aactive: active state of the opposite stream * - * The full expression adds a mask on all values we care about + * 1) XOR vals and avals to get the differences if the other stream is active; + * Otherwise, return current vals if the other stream is not active + * 2) AND the result of 1) with the current vals */ -#define fsl_ssi_disable_val(vals_disable, vals_stream, stream_active) \ - ((vals_disable) & \ - ((vals_disable) ^ ((vals_stream) * (u32)!!(stream_active)))) +#define _ssi_xor_shared_bits(vals, avals, aactive) \ + ((vals) ^ ((avals) * (aactive))) + +#define ssi_excl_shared_bits(vals, avals, aactive) \ + ((vals) & _ssi_xor_shared_bits(vals, avals, aactive)) /** * Enable or disable SSI configuration. @@ -445,16 +445,10 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, bool tx = &ssi->regvals[TX] == vals; struct regmap *regs = ssi->regs; struct fsl_ssi_regvals *avals; - int nr_active_streams; - int keep_active; - - nr_active_streams = !!(ssi->streams & BIT(TX)) + - !!(ssi->streams & BIT(RX)); + bool aactive; - if (nr_active_streams - 1 > 0) - keep_active = 1; - else - keep_active = 0; + /* Check if the opposite stream is active */ + aactive = ssi->streams & BIT(!tx); /* Get the opposite direction to keep its values untouched */ if (&ssi->regvals[RX] == vals) @@ -467,8 +461,7 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, * To keep the other stream safe, exclude shared bits between * both streams, and get safe bits to disable current stream */ - u32 scr = fsl_ssi_disable_val(vals->scr, avals->scr, - keep_active); + u32 scr = ssi_excl_shared_bits(vals->scr, avals->scr, aactive); /* Safely disable SCR register for the stream */ regmap_update_bits(regs, REG_SSI_SCR, scr, 0); @@ -483,7 +476,7 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, * 2) Disable all remaining bits of both streams when last stream ends */ if (ssi->soc->offline_config) { - if ((enable && !nr_active_streams) || (!enable && !keep_active)) + if ((enable && !ssi->streams) || (!enable && !aactive)) fsl_ssi_rxtx_config(ssi, enable); goto config_done; @@ -505,12 +498,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, * To keep the other stream safe, exclude shared bits between * both streams, and get safe bits to disable current stream */ - sier = fsl_ssi_disable_val(vals->sier, avals->sier, - keep_active); - srcr = fsl_ssi_disable_val(vals->srcr, avals->srcr, - keep_active); - stcr = fsl_ssi_disable_val(vals->stcr, avals->stcr, - keep_active); + sier = ssi_excl_shared_bits(vals->sier, avals->sier, aactive); + srcr = ssi_excl_shared_bits(vals->srcr, avals->srcr, aactive); + stcr = ssi_excl_shared_bits(vals->stcr, avals->stcr, aactive); /* Safely disable other control registers for the stream */ regmap_update_bits(regs, REG_SSI_SRCR, srcr, 0); -- 2.7.4
next prev parent reply other threads:[~2017-12-19 17:06 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-19 17:00 [PATCH v1 00/15] ASoC: fsl_ssi: Clean up - program flow level Nicolin Chen 2017-12-19 17:00 ` Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 01/15] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Nicolin Chen 2018-01-01 18:39 ` Maciej S. Szmigiero 2018-01-01 18:39 ` Maciej S. Szmigiero 2018-01-04 19:08 ` Nicolin Chen 2018-01-04 19:08 ` Nicolin Chen 2018-02-22 13:17 ` Applied "ASoC: fsl_ssi: Clean up set_dai_tdm_slot()" to the asoc tree Mark Brown 2018-02-22 13:17 ` Mark Brown 2017-12-19 17:00 ` [PATCH v1 02/15] ASoC: fsl_ssi: Maintain a mask of active streams Nicolin Chen 2017-12-19 17:00 ` Nicolin Chen 2017-12-19 17:00 ` Nicolin Chen [this message] 2017-12-19 17:00 ` [PATCH v1 03/15] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Nicolin Chen 2018-01-01 21:29 ` Maciej S. Szmigiero 2018-01-04 19:42 ` Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 04/15] ASoC: fsl_ssi: Clear FIFO directly in fsl_ssi_config() Nicolin Chen 2017-12-19 17:00 ` Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 05/15] ASoC: fsl_ssi: Clean up helper functions of trigger() Nicolin Chen 2017-12-19 17:00 ` Nicolin Chen 2018-01-01 21:59 ` Maciej S. Szmigiero 2018-01-01 21:59 ` Maciej S. Szmigiero 2018-01-04 19:44 ` Nicolin Chen 2018-01-04 19:44 ` Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 06/15] ASoC: fsl_ssi: Add DAIFMT define for AC97 Nicolin Chen 2017-12-19 17:00 ` Nicolin Chen 2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Add DAIFMT define for AC97" to the asoc tree Mark Brown 2018-02-22 13:16 ` Mark Brown 2017-12-19 17:00 ` [PATCH v1 07/15] ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals() Nicolin Chen 2017-12-19 17:00 ` Nicolin Chen 2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals()" to the asoc tree Mark Brown 2018-02-22 13:16 ` Mark Brown 2017-12-19 17:00 ` [PATCH v1 08/15] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together Nicolin Chen 2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Set xFEN0 and xFEN1 together" to the asoc tree Mark Brown 2018-02-22 13:16 ` Mark Brown 2017-12-19 17:00 ` [PATCH v1 09/15] ASoC: fsl_ssi: Use snd_soc_init_dma_data instead Nicolin Chen 2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Use snd_soc_init_dma_data instead" to the asoc tree Mark Brown 2018-02-22 13:16 ` Mark Brown 2017-12-19 17:00 ` [PATCH v1 10/15] ASoC: fsl_ssi: Move one-time configurations to dai_probe() Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 11/15] ASoC: fsl_ssi: Setup AC97 in dai_probe() Nicolin Chen 2018-01-01 15:17 ` Maciej S. Szmigiero 2018-01-04 19:07 ` Nicolin Chen 2018-01-04 20:38 ` Maciej S. Szmigiero 2018-01-04 20:58 ` Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 12/15] ASoC: fsl_ssi: Clean up _fsl_ssi_set_dai_fmt() Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 13/15] ASoC: fsl_ssi: Remove cpu_dai_drv from fsl_ssi structure Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 14/15] ASoC: fsl_ssi: Move DT related code to a separate probe() Nicolin Chen 2017-12-19 17:00 ` [PATCH v1 15/15] ASoC: fsl_ssi: Use ssi->streams instead of reading register Nicolin Chen 2017-12-19 17:34 ` [PATCH v1 00/15] ASoC: fsl_ssi: Clean up - program flow level Timur Tabi 2018-01-02 23:28 ` Caleb Crome 2018-01-04 19:48 ` Nicolin Chen 2018-01-04 19:48 ` Nicolin Chen 2018-01-04 19:50 ` Caleb Crome 2018-01-04 19:50 ` Caleb Crome
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=1513702819-42310-4-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.