ALSA: cs35l56: Fix for races when soft-resetting on SPI
Subsystems (4)
Richard Fitzgerald
maintainercover ALSA: cs35l56: Fix for races when soft-resetting on SPI
These two patches fix a race condition between driver and amp when issuing a soft-reset over SPI. The main problem with the race is that the driver could read the amp status as fully booted, when in fact the amp is about to reset or is in the process of resetting.
This is mainly contained within the ASoC driver code but a small change is needed to the HDA driver.
The first patch, to cs_dsp, is to remove async regmap writes so that the cs35l56 driver can call spi_bus_lock() without breaking firmware download to other amps on the same SPI bus.
Richard Fitzgerald (2):
firmware: cs_dsp: Remove async regmap writes
ASoC: cs35l56: Prevent races when soft-resetting using SPI control
drivers/firmware/cirrus/cs_dsp.c | 24 +++------- include/sound/cs35l56.h | 31 ++++++++++++ sound/pci/hda/cs35l56_hda_spi.c | 3 ++ sound/soc/codecs/cs35l56-shared.c | 80 +++++++++++++++++++++++++++++++ sound/soc/codecs/cs35l56-spi.c | 3 ++ 5 files changed, 123 insertions(+), 18 deletions(-)
Signature · 1 line
2.39.5
Richard Fitzgerald
maintainerPATCH 1/2 firmware: cs_dsp: Remove async regmap writes
Change calls to async regmap write functions to use the normal blocking writes so that the cs35l56 driver can use spi_bus_lock() to gain exclusive access to the SPI bus.
As this is part of a fix, it makes only the minimal change to swap the functions to the blocking equivalents. There's no need to risk reworking the buffer allocation logic that is now partially redundant.
The async writes are a 12-year-old workaround for inefficiency of synchronous writes in the SPI subsystem. The SPI subsystem has since been changed to avoid the overheads, so this workaround should not be necessary.
The cs35l56 driver needs to use spi_bus_lock() prevent bus activity while it is soft-resetting the cs35l56. But spi_bus_lock() is incompatible with spi_async() calls, which will fail with -EBUSY.
--- drivers/firmware/cirrus/cs_dsp.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
drivers/firmware/cirrus/cs_dsp.c +6 -18
@@ -1609,8 +1609,8 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware, goto out_fw; } - ret =regmap_raw_write_async (regmap, reg, buf->buf, -le32_to_cpu (region->len)); + ret =regmap_raw_write (regmap, reg, buf->buf, +le32_to_cpu (region->len));if (ret !=0 ) { cs_dsp_err(dsp, "%s.%d: Failed to write %d bytes at %d in %s: %d\n",
@@ -1625,12 +1625,6 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware, regions++; } - ret =regmap_async_complete (regmap); -if (ret !=0 ) { -cs_dsp_err (dsp,"Failed to complete async write: %d\n" , ret); - goto out_fw; - } -if (pos > firmware->size)cs_dsp_warn (dsp,"%s.%d: %zu bytes at end of file\n" , file, regions, pos - firmware->size);
@@ -1638,7 +1632,6 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware,cs_dsp_debugfs_save_wmfwname (dsp, file); out_fw: -regmap_async_complete (regmap);cs_dsp_buf_free (&buf_list);if (ret == -EOVERFLOW )
@@ -2326,8 +2319,8 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmwarecs_dsp_dbg (dsp,"%s.%d: Writing %d bytes at %x\n" , file, blocks,le32_to_cpu (blk->len), reg); - ret =regmap_raw_write_async (regmap, reg, buf->buf, -le32_to_cpu (blk->len)); + ret =regmap_raw_write (regmap, reg, buf->buf, +le32_to_cpu (blk->len));if (ret !=0 ) { cs_dsp_err(dsp, "%s.%d: Failed to write to %x in %s: %d\n",
@@ -2339,10 +2332,6 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware blocks++; } - ret =regmap_async_complete (regmap); -if (ret !=0 ) -cs_dsp_err (dsp,"Failed to complete async write: %d\n" , ret); -if (pos > firmware->size)cs_dsp_warn (dsp,"%s.%d: %zu bytes at end of file\n" , file, blocks, pos - firmware->size);
@@ -2350,7 +2339,6 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmwarecs_dsp_debugfs_save_binname (dsp, file); out_fw: -regmap_async_complete (regmap);cs_dsp_buf_free (&buf_list);if (ret == -EOVERFLOW )
@@ -2561,8 +2549,8 @@ static int cs_dsp_adsp2_enable_core(struct cs_dsp *dsp) {int ret; - ret =regmap_update_bits_async (dsp->regmap, dsp->base +ADSP2_CONTROL , -ADSP2_SYS_ENA ,ADSP2_SYS_ENA ); + ret =regmap_update_bits (dsp->regmap, dsp->base +ADSP2_CONTROL , +ADSP2_SYS_ENA ,ADSP2_SYS_ENA );if (ret !=0 )return ret;
Signature · 1 line
2.39.5
Mark Brown
maintainerRe: [PATCH 1/2] firmware: cs_dsp: Remove async regmap writes
Quoted 4 lines · Richard Fitzgerald
The async writes are a 12-year-old workaround for inefficiency of synchronous writes in the SPI subsystem. The SPI subsystem has since been changed to avoid the overheads, so this workaround should not be necessary.
That wasn't really the issue, it was that on systems with low numbers of slower cores (especially single core but there were some dual core systems too) there was a surprisingly low threashold where it was useful to overlap the marshalling of data to send to the device with transmitting already marshalled data. SMP adds locking requirements which loose a lot of the gains, and it's controller dependent where the cuttoff points for interrupts and/or DMA are.
Richard Fitzgerald
maintainerRe: [PATCH 1/2] firmware: cs_dsp: Remove async regmap writes
Quoted 7 lines · Mark Brown
Quoted 4 lines · Richard Fitzgerald
The async writes are a 12-year-old workaround for inefficiency of synchronous writes in the SPI subsystem. The SPI subsystem has since been changed to avoid the overheads, so this workaround should not be necessary.
Quoted 7 lines
That wasn't really the issue, it was that on systems with low numbers of slower cores (especially single core but there were some dual core systems too) there was a surprisingly low threashold where it was useful to overlap the marshalling of data to send to the device with transmitting already marshalled data. SMP adds locking requirements which loose a lot of the gains, and it's controller dependent where the cuttoff points for interrupts and/or DMA are.
Ok. It was a very long time ago.
Do you want a V2 with a commit message that doesn't libel the SPI framework?
FWIW switching to sync write reduced the download of small amp firmware by 200ms on a 1.67MHz SPI bus.
Mark Brown
maintainerRe: [PATCH 1/2] firmware: cs_dsp: Remove async regmap writes
Quoted 3 lines · Richard Fitzgerald
Ok. It was a very long time ago.
Do you want a V2 with a commit message that doesn't libel the SPI framework?
No, it's fine - it's in CI already.
Quoted 2 lines
FWIW switching to sync write reduced the download of small amp firmware by 200ms on a 1.67MHz SPI bus.
Yeah, with modern multi-core systems that's unsurprising especially with a controller that does small writes synchronously - the cost of locking on modern CPUs tends to blow out the overlapping of the formatting with the I/O. It's part of why maple tree caches don't do async writes during sync.
Richard Fitzgerald
maintainerPATCH 2/2 ASoC: cs35l56: Prevent races when soft-resetting using SPI control
In reply to Richard FitzgeraldWhen SPI is used for control, the driver must hold the SPI bus lock while issuing the sequence of writes to perform a soft reset.
From the time the driver writes the SYSTEM_RESET command until the driver does a write to terminate the reset, there must not be any activity on the SPI bus lines. If there is any SPI activity during the soft-reset, another soft-reset will be triggered. The state of the SPI chip select is irrelevant.
A repeated soft-reset does not in itself cause any problems, and it is not an infinite loop. The problem is a race between these resets and the driver polling for boot completion. There is a time window between soft resets where the driver could read HALO_STATE as 2 (fully booted) while the chip is actually soft-resetting. Although this window is small, it is long enough that it is possible to hit it in normal operation.
To prevent this race and ensure the chip really is fully booted, the driver calls spi_bus_lock() to prevent other activity while resetting. It then issues the SYSTEM_RESET mailbox command. After allowing sufficient time for reset to take effect, the driver issues a PING mailbox command, which will force completion of the full soft-reset sequence. The SPI bus lock can then be released. The mailbox is checked for any boot or wakeup response from the firmware, before the value in HALO_STATE will be trusted.
This does not affect SoundWire or I2C control.
--- include/sound/cs35l56.h | 31 ++++++++++++ sound/pci/hda/cs35l56_hda_spi.c | 3 ++ sound/soc/codecs/cs35l56-shared.c | 80 +++++++++++++++++++++++++++++++ sound/soc/codecs/cs35l56-spi.c | 3 ++ 4 files changed, 117 insertions(+)
include/sound/cs35l56.h +31 -0
@@ -12,6 +12,7 @@#include <linux/firmware/cirrus/cs_dsp.h> #include <linux/regulator/consumer.h> #include <linux/regmap.h> +#include <linux/spi/spi.h> #include <sound/cs-amp-lib.h> #define CS35L56_DEVID 0x0000000
@@ -61,6 +62,7 @@#define CS35L56_IRQ1_MASK_8 0x000E0AC#define CS35L56_IRQ1_MASK_18 0x000E0D4#define CS35L56_IRQ1_MASK_20 0x000E0DC +#define CS35L56_DSP_MBOX_1_RAW 0x0011000#define CS35L56_DSP_VIRTUAL1_MBOX_1 0x0011020#define CS35L56_DSP_VIRTUAL1_MBOX_2 0x0011024#define CS35L56_DSP_VIRTUAL1_MBOX_3 0x0011028
@@ -224,6 +226,7 @@#define CS35L56_HALO_STATE_SHUTDOWN 1#define CS35L56_HALO_STATE_BOOT_DONE 2 +#define CS35L56_MBOX_CMD_PING 0x0A000000#define CS35L56_MBOX_CMD_AUDIO_PLAY 0x0B000001#define CS35L56_MBOX_CMD_AUDIO_PAUSE 0x0B000002#define CS35L56_MBOX_CMD_AUDIO_REINIT 0x0B000003
@@ -254,6 +257,16 @@#define CS35L56_NUM_BULK_SUPPLIES 3#define CS35L56_NUM_DSP_REGIONS 5 +/* Additional margin for SYSTEM_RESET to control port ready on SPI */ +#define CS35L56_SPI_RESET_TO_PORT_READY_US (CS35L56_CONTROL_PORT_READY_US + 2500) + +struct cs35l56_spi_payload { +__be32 addr; +__be16 pad; +__be32 value; +} __packed; +static_assert (sizeof (struct cs35l56_spi_payload ) ==10 ); +struct cs35l56_base {struct device *dev;struct regmap *regmap;
@@ -269,6 +282,7 @@ struct cs35l56_base {s8 cal_index;struct cirrus_amp_cal_data cal_data;struct gpio_desc *reset_gpio; +struct cs35l56_spi_payload *spi_payload_buf; };static inline bool cs35l56_is_otp_register (unsigned int reg)
@@ -276,6 +290,23 @@ static inline bool cs35l56_is_otp_register(unsigned int reg)return (reg >>16 ) ==3 ; } +static inline int cs35l56_init_config_for_spi (struct cs35l56_base *cs35l56, +struct spi_device *spi) +{ + cs35l56->spi_payload_buf =devm_kzalloc (&spi->dev, +sizeof (*cs35l56->spi_payload_buf), +GFP_KERNEL |GFP_DMA ); +if (!cs35l56->spi_payload_buf) +return -ENOMEM ; + +return 0 ; +} + +static inline bool cs35l56_is_spi (struct cs35l56_base *cs35l56) +{ +return IS_ENABLED (CONFIG_SPI_MASTER ) && !!cs35l56->spi_payload_buf; +} +extern const struct regmap_config cs35l56_regmap_i2c;extern const struct regmap_config cs35l56_regmap_spi;extern const struct regmap_config cs35l56_regmap_sdw;
sound/pci/hda/cs35l56_hda_spi.c +3 -0
@@ -22,6 +22,9 @@ static int cs35l56_hda_spi_probe(struct spi_device *spi)return -ENOMEM ; cs35l56->base.dev = &spi->dev; + ret =cs35l56_init_config_for_spi (&cs35l56->base, spi); +if (ret) +return ret;#ifdef CS35L56_WAKE_HOLD_TIME_US cs35l56->base.can_hibernate = true;
sound/soc/codecs/cs35l56-shared.c +80 -0
98 lines not on this page · raw message
sound/soc/codecs/cs35l56-spi.c +3 -0
@@ -33,6 +33,9 @@ static int cs35l56_spi_probe(struct spi_device *spi) cs35l56->base.dev = &spi->dev; cs35l56->base.can_hibernate = true; + ret =cs35l56_init_config_for_spi (&cs35l56->base, spi); +if (ret) +return ret; ret =cs35l56_common_probe (cs35l56);if (ret !=0 )
Signature · 1 line
2.39.5
Mark Brown
maintainerQuoted 9 lines · Richard Fitzgerald
These two patches fix a race condition between driver and amp when issuing a soft-reset over SPI. The main problem with the race is that the driver could read the amp status as fully booted, when in fact the amp is about to reset or is in the process of resetting.
This is mainly contained within the ASoC driver code but a small change is needed to the HDA driver.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] firmware: cs_dsp: Remove async regmap writes
commit: fe08b7d5085a9774abc30c26d5aebc5b9cdd6091
[2/2] ASoC: cs35l56: Prevent races when soft-resetting using SPI control
commit: 769c1b79295c38d60fde4c0a8f5f31e01360c54fAll 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