[alsa-devel] [PATCH 1/1] ASoC: fsl_ssi: add CCSR_SSI_SOR to volatile register list
Due to caching, SOR wasn't written when it should have been. This patch simply adds SOR to the volatile list.
Signed-off-by: Caleb Crome caleb@crome.org --- sound/soc/fsl/fsl_ssi.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 216e3cb..2f3bf9c 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -151,6 +151,7 @@ static bool fsl_ssi_volatile_reg(struct device *dev, unsigned int reg) case CCSR_SSI_SACDAT: case CCSR_SSI_SATAG: case CCSR_SSI_SACCST: + case CCSR_SSI_SOR: return true; default: return false;
On Mon, Apr 25, 2016 at 10:50:24AM -0700, Caleb Crome wrote:
Due to caching, SOR wasn't written when it should have been. This patch simply adds SOR to the volatile list.
Could you expand on when it wasn't written and why it needed to be please?
On Mon, Apr 25, 2016 at 11:06 AM, Mark Brown broonie@kernel.org wrote:
On Mon, Apr 25, 2016 at 10:50:24AM -0700, Caleb Crome wrote:
Due to caching, SOR wasn't written when it should have been. This patch simply adds SOR to the volatile list.
Could you expand on when it wasn't written and why it needed to be please?
Yes, sorry.
The CCSR_SSI_SOR is a register that clears the TX and/or the RX fifo on the i.MX6 SSI port. The fsl_ssi_trigger writes this register in order to clear the fifo at trigger time.
However, since the CCSR_SSI_SOR register is not in the volatile list, the caching mechanism prevented the register write in the trigger function. This caused the fifo to not be cleared (because the value was unchanged from the last time the register was written), and thus causes the channels in both TDM or simple I2S mode to slip and be in the wrong time slots on SSI restart.
By adding CCSR_SSI_SOR to the volatile list, along with arnaud's patches that I just tested (and sent tested-by slugs), fix most of the problems with the SSI port drivers for multi-channel operation (there is one more to come that I think really fixes the last bit).
Most people never noticed the problem because with simple stereo mode, the consequence is that left and right are swapped, which isn't that noticeable.
I can re-submit the patch if you like with this more descriptive comment.
Thanks, -Caleb
The patch
ASoC: fsl_ssi: add CCSR_SSI_SOR to volatile register list
has been applied to the asoc tree at
git://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 3cc6185bcccff32df41faa97d592a99d258db185 Mon Sep 17 00:00:00 2001
From: Caleb Crome caleb@crome.org Date: Mon, 25 Apr 2016 11:36:18 -0700 Subject: [PATCH] ASoC: fsl_ssi: add CCSR_SSI_SOR to volatile register list
The CCSR_SSI_SOR is a register that clears the TX and/or the RX fifo on the i.MX SSI port. The fsl_ssi_trigger writes this register in order to clear the fifo at trigger time.
However, since the CCSR_SSI_SOR register is not in the volatile list, the caching mechanism prevented the register write in the trigger function. This caused the fifo to not be cleared (because the value was unchanged from the last time the register was written), and thus causes the channels in both TDM or simple I2S mode to slip and be in the wrong time slots on SSI restart.
This has gone unnoticed for so long because with simple stereo mode, the consequence is that left and right are swapped, which isn't that noticeable. However, it's catestrophic in some systems that require the channels to be in the right slots.
Signed-off-by: Caleb Crome caleb@crome.org Suggested-by: Arnaud Mouiche arnaud.mouiche@invoxia.com Reviewed-by: Fabio Estevam fabio.estevam@nxp.com Acked-by: Nicolin Chen nicoleotsuka@gmail.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/fsl/fsl_ssi.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index ed8de1035cda..08dcbbf60adb 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -137,6 +137,7 @@ static bool fsl_ssi_volatile_reg(struct device *dev, unsigned int reg) case CCSR_SSI_SACDAT: case CCSR_SSI_SATAG: case CCSR_SSI_SACCST: + case CCSR_SSI_SOR: return true; default: return false;
participants (2)
-
Caleb Crome -
Mark Brown