ASoC: codecs: ad193x: Fix memory corruption on BE 64b systems
Subsystems (3)
PATCH 1/2 ASoC: codecs: ad193x: Fix memory corruption on BE 64b systems
Since change_bit() requires unsigned long*, making this cast on an unsigned int variable will change a wrong bit on BE platforms, causing memory corruption. Replace this function with a simple XOR.
--- sound/soc/codecs/ad193x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/codecs/ad193x.c +2 -4
@@ -240,10 +240,8 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, }/* For DSP_*, LRCLK's polarity must be inverted */ -if (fmt &SND_SOC_DAIFMT_DSP_A ) { -change_bit (ffs (AD193X_DAC_LEFT_HIGH ) -1 , - (unsigned long *)&dac_fmt); - } +if (fmt &SND_SOC_DAIFMT_DSP_A ) + dac_fmt ^=AD193X_DAC_LEFT_HIGH ;switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) {case SND_SOC_DAIFMT_CBM_CFM :/* codec clk & frm master */
Signature · 1 line
2.20.1
PATCH 2/2 ASoC: codecs: ad193x: Reset DAC Control 1 register at probe
Since the ad193x codecs have no software reset, we have to reinitialize the registers after a hardware reset. For example, if we change the device-tree between these resets, changing the audio format of the DAI link from DSP_A with 8 TDM channels to I2S 2 channels, DAC Control 1 register will remain configured for 8 channels. This patch resets this register at probe to its default value.
--- sound/soc/codecs/ad193x.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/ad193x.c +2 -0
@@ -427,6 +427,8 @@ static int ad193x_component_probe(struct snd_soc_component *component)regmap_write (ad193x->regmap,AD193X_DAC_CTRL2 ,0x1A );/* dac in tdm mode */ regmap_write (ad193x->regmap,AD193X_DAC_CTRL0 ,0x40 ); +/* reset DAC ctrl1 */ +regmap_write (ad193x->regmap,AD193X_DAC_CTRL1 ,0x00 );/* adc only */ if (ad193x_has_adc (ad193x)) {
Signature · 1 line
2.20.1
Mark Brown
maintainerRe: [PATCH 2/2] ASoC: codecs: ad193x: Reset DAC Control 1 register at probe
Quoted 6 lines · Codrin Ciubotariu
Since the ad193x codecs have no software reset, we have to reinitialize the registers after a hardware reset. For example, if we change the device-tree between these resets, changing the audio format of the DAI link from
DSP_Awith 8 TDM channels to I2S 2 channels, DAC Control 1 register will remain configured for 8 channels. This patch resets this register at probe to its default value.
Would it not be more robust/complete to have a set of register defaults and write the whole lot out rather than individually going through and adding writes for specific registers as needed?
Re: [PATCH 2/2] ASoC: codecs: ad193x: Reset DAC Control 1 register at probe
Quoted 8 lines · Mark Brown
Quoted 6 lines · Codrin Ciubotariu
Since the ad193x codecs have no software reset, we have to reinitialize the registers after a hardware reset. For example, if we change the device-tree between these resets, changing the audio format of the DAI link from
DSP_Awith 8 TDM channels to I2S 2 channels, DAC Control 1 register will remain configured for 8 channels. This patch resets this register at probe to its default value.
Quoted 4 lines
Would it not be more robust/complete to have a set of register defaults and write the whole lot out rather than individually going through and adding writes for specific registers as needed?
It would indeed. I will make two patches, one that implements what you suggested, for the registers that we touch only, and another one that will add AD193X_DAC_CTRL1 to these defaults. You can drop this patch.
Thanks and best regards,
Codrin
Mark Brown
maintainerApplied "ASoC: codecs: ad193x: Fix memory corruption on BE 64b systems" to the asoc tree
In reply to Codrin CiubotariuThe patch
ASoC: codecs: ad193x: Fix memory corruption on BE 64b systems
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.2
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
Quoted 1 line
From
da7260cc8d1dc3564eb4f33550b0525541d71a47Mon Sep 17 00:00:00 2001
From: Codrin Ciubotariu <[email protected]>
Date: Wed, 26 Jun 2019 13:49:46 +0300
Subject: [PATCH] ASoC: codecs: ad193x: Fix memory corruption on BE 64b systems
Since change_bit() requires unsigned long*, making this cast on an unsigned int variable will change a wrong bit on BE platforms, causing memory corruption. Replace this function with a simple XOR.
--- sound/soc/codecs/ad193x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/codecs/ad193x.c +2 -4
@@ -241,10 +241,8 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, }/* For DSP_*, LRCLK's polarity must be inverted */ -if (fmt &SND_SOC_DAIFMT_DSP_A ) { -change_bit (ffs (AD193X_DAC_LEFT_HIGH ) -1 , - (unsigned long *)&dac_fmt); - } +if (fmt &SND_SOC_DAIFMT_DSP_A ) + dac_fmt ^=AD193X_DAC_LEFT_HIGH ;switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) {case SND_SOC_DAIFMT_CBM_CFM :/* codec clk & frm master */
Signature · 1 line
2.20.1
Quoted 16 lines · Codrin Ciubotariu
Since
change_bit()requires unsigned long*, making this cast on an unsigned int variable will change a wrong bit on BE platforms, causing memory corruption. Replace this function with a simple XOR.Fixes 90f6e6803139 ("ASoC: codecs: ad193x: Fix frame polarity for DSP_A format")Reported-by Dan Carpenter <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>--- sound/soc/codecs/ad193x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)sound/soc/codecs/ad193x.c +0
-0
sound/soc/codecs/ad193x.c static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, · line 245
Quoted 10 lines
sound/soc/codecs/ad193x.c +2
-4@@ -240,10 +240,8 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, }/* For DSP_*, LRCLK's polarity must be inverted */ -if (fmt &SND_SOC_DAIFMT_DSP_A ) { -change_bit (ffs (AD193X_DAC_LEFT_HIGH ) -1 , - (unsigned long *)&dac_fmt); - } +if (fmt &SND_SOC_DAIFMT_DSP_A ) + dac_fmt ^=AD193X_DAC_LEFT_HIGH ;
BigEndian RULEZ! ;-P
Signature · 4 lines
Eurek s.r.l. | Electronic Engineering | http://www.eurek.it via Celletta 8/B, 40026 Imola, Italy | Phone: +39-(0)542-609120 p.iva 00690621206 - c.f. 04020030377 | Fax: +39-(0)542-609212