August 2021 - Alsa-devel - mailman.alsa-project.org

usb-audio: New mixer control quirk for Digidesign Mbox
by Damien Zammit 08 Aug '21

08 Aug '21

Hi all, I just figured out how to toggle the input source between analog/spdif on the digidesign mbox. The problem is, when I toggle the spdif source, the hardware auto-updates to spdif clock sync as well, so I need to update the other mixer control to reflect the new hardware state or force an update to revert the clock source, but I need to know the current state of the other mixer control. How do I access a second mixer control from another one to synchronise the mixer states? Also, how would I access the current sample rate from inside a mixer control? Damien

1 0

[PATCH] ALSA: cs46xx: Fix possible mmap breakage
by Takashi Iwai 07 Aug '21

07 Aug '21

CS46xx driver switches the buffer depending on the number of periods, and in some cases it switches to the own buffer without updating the buffer type properly. This may cause a problem due to the recent introduced more strict mmap buffer check. This patch addresses the potential breakage by replacing the buffer setup with the proper macro. It also simplifies the source code, too. Fixes: c4824ae7db41 ("ALSA: pcm: Fix mmap capability check") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/cs46xx/cs46xx_lib.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 1e1eb17f8e07..d43927dcd61e 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -1121,9 +1121,7 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream, if (params_periods(hw_params) == CS46XX_FRAGS) { if (runtime->dma_area != cpcm->hw_buf.area) snd_pcm_lib_free_pages(substream); - runtime->dma_area = cpcm->hw_buf.area; - runtime->dma_addr = cpcm->hw_buf.addr; - runtime->dma_bytes = cpcm->hw_buf.bytes; + snd_pcm_set_runtime_buffer(substream, &cpcm->hw_buf); #ifdef CONFIG_SND_CS46XX_NEW_DSP @@ -1143,11 +1141,8 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream, #endif } else { - if (runtime->dma_area == cpcm->hw_buf.area) { - runtime->dma_area = NULL; - runtime->dma_addr = 0; - runtime->dma_bytes = 0; - } + if (runtime->dma_area == cpcm->hw_buf.area) + snd_pcm_set_runtime_buffer(substream, NULL); err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)); if (err < 0) { #ifdef CONFIG_SND_CS46XX_NEW_DSP @@ -1196,9 +1191,7 @@ static int snd_cs46xx_playback_hw_free(struct snd_pcm_substream *substream) if (runtime->dma_area != cpcm->hw_buf.area) snd_pcm_lib_free_pages(substream); - runtime->dma_area = NULL; - runtime->dma_addr = 0; - runtime->dma_bytes = 0; + snd_pcm_set_runtime_buffer(substream, NULL); return 0; } @@ -1287,16 +1280,11 @@ static int snd_cs46xx_capture_hw_params(struct snd_pcm_substream *substream, if (runtime->periods == CS46XX_FRAGS) { if (runtime->dma_area != chip->capt.hw_buf.area) snd_pcm_lib_free_pages(substream); - runtime->dma_area = chip->capt.hw_buf.area; - runtime->dma_addr = chip->capt.hw_buf.addr; - runtime->dma_bytes = chip->capt.hw_buf.bytes; + snd_pcm_set_runtime_buffer(substream, &chip->capt.hw_buf); substream->ops = &snd_cs46xx_capture_ops; } else { - if (runtime->dma_area == chip->capt.hw_buf.area) { - runtime->dma_area = NULL; - runtime->dma_addr = 0; - runtime->dma_bytes = 0; - } + if (runtime->dma_area == chip->capt.hw_buf.area) + snd_pcm_set_runtime_buffer(substream, NULL); err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)); if (err < 0) return err; @@ -1313,9 +1301,7 @@ static int snd_cs46xx_capture_hw_free(struct snd_pcm_substream *substream) if (runtime->dma_area != chip->capt.hw_buf.area) snd_pcm_lib_free_pages(substream); - runtime->dma_area = NULL; - runtime->dma_addr = 0; - runtime->dma_bytes = 0; + snd_pcm_set_runtime_buffer(substream, NULL); return 0; } -- 2.26.2

1 0

[PATCH] parisc: Make struct parisc_driver::remove() return void
by Uwe Kleine-König 07 Aug '21

07 Aug '21

The caller of this function (parisc_driver_remove() in arch/parisc/kernel/drivers.c) ignores the return value, so better don't return any value at all to not wake wrong expectations in driver authors. The only function that could return a non-zero value before was ipmi_parisc_remove() which returns the return value of ipmi_si_remove_by_dev(). Make this function return void, too, as for all other callers the value is ignored, too. Also fold in a small checkpatch fix for: WARNING: Unnecessary space before function pointer arguments + void (*remove) (struct parisc_device *dev); Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- arch/parisc/include/asm/parisc-device.h | 4 ++-- drivers/char/ipmi/ipmi_si_intf.c | 6 +----- drivers/char/ipmi/ipmi_si_parisc.c | 4 ++-- drivers/char/ipmi/ipmi_si_platform.c | 4 +++- drivers/input/keyboard/hilkbd.c | 4 +--- drivers/input/serio/gscps2.c | 3 +-- drivers/net/ethernet/i825xx/lasi_82596.c | 3 +-- drivers/parport/parport_gsc.c | 3 +-- drivers/scsi/lasi700.c | 4 +--- drivers/scsi/zalon.c | 4 +--- drivers/tty/serial/mux.c | 3 +-- sound/parisc/harmony.c | 3 +-- 12 files changed, 16 insertions(+), 29 deletions(-) diff --git a/arch/parisc/include/asm/parisc-device.h b/arch/parisc/include/asm/parisc-device.h index d02d144c6012..4de3b391d812 100644 --- a/arch/parisc/include/asm/parisc-device.h +++ b/arch/parisc/include/asm/parisc-device.h @@ -34,8 +34,8 @@ struct parisc_driver { struct parisc_driver *next; char *name; const struct parisc_device_id *id_table; - int (*probe) (struct parisc_device *dev); /* New device discovered */ - int (*remove) (struct parisc_device *dev); + int (*probe)(struct parisc_device *dev); /* New device discovered */ + void (*remove)(struct parisc_device *dev); struct device_driver drv; }; diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 62929a3e397e..bb466981dc1b 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -2228,22 +2228,18 @@ static void cleanup_one_si(struct smi_info *smi_info) kfree(smi_info); } -int ipmi_si_remove_by_dev(struct device *dev) +void ipmi_si_remove_by_dev(struct device *dev) { struct smi_info *e; - int rv = -ENOENT; mutex_lock(&smi_infos_lock); list_for_each_entry(e, &smi_infos, link) { if (e->io.dev == dev) { cleanup_one_si(e); - rv = 0; break; } } mutex_unlock(&smi_infos_lock); - - return rv; } struct device *ipmi_si_remove_by_data(int addr_space, enum si_type si_type, diff --git a/drivers/char/ipmi/ipmi_si_parisc.c b/drivers/char/ipmi/ipmi_si_parisc.c index 11c9160275df..2be2967f6b5f 100644 --- a/drivers/char/ipmi/ipmi_si_parisc.c +++ b/drivers/char/ipmi/ipmi_si_parisc.c @@ -29,9 +29,9 @@ static int __init ipmi_parisc_probe(struct parisc_device *dev) return ipmi_si_add_smi(&io); } -static int __exit ipmi_parisc_remove(struct parisc_device *dev) +static void __exit ipmi_parisc_remove(struct parisc_device *dev) { - return ipmi_si_remove_by_dev(&dev->dev); + ipmi_si_remove_by_dev(&dev->dev); } static const struct parisc_device_id ipmi_parisc_tbl[] __initconst = { diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c index 380a6a542890..505cc978c97a 100644 --- a/drivers/char/ipmi/ipmi_si_platform.c +++ b/drivers/char/ipmi/ipmi_si_platform.c @@ -411,7 +411,9 @@ static int ipmi_probe(struct platform_device *pdev) static int ipmi_remove(struct platform_device *pdev) { - return ipmi_si_remove_by_dev(&pdev->dev); + ipmi_si_remove_by_dev(&pdev->dev); + + return 0; } static int pdev_match_name(struct device *dev, const void *data) diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c index 62ccfebf2f60..c1a4d5055de6 100644 --- a/drivers/input/keyboard/hilkbd.c +++ b/drivers/input/keyboard/hilkbd.c @@ -316,11 +316,9 @@ static int __init hil_probe_chip(struct parisc_device *dev) return hil_keyb_init(); } -static int __exit hil_remove_chip(struct parisc_device *dev) +static void __exit hil_remove_chip(struct parisc_device *dev) { hil_keyb_exit(); - - return 0; } static const struct parisc_device_id hil_tbl[] __initconst = { diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 2f9775de3c5b..a9065c6ab550 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -411,7 +411,7 @@ static int __init gscps2_probe(struct parisc_device *dev) * @return: success/error report */ -static int __exit gscps2_remove(struct parisc_device *dev) +static void __exit gscps2_remove(struct parisc_device *dev) { struct gscps2port *ps2port = dev_get_drvdata(&dev->dev); @@ -425,7 +425,6 @@ static int __exit gscps2_remove(struct parisc_device *dev) #endif dev_set_drvdata(&dev->dev, NULL); kfree(ps2port); - return 0; } diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c index 96c6f4f36904..48e001881c75 100644 --- a/drivers/net/ethernet/i825xx/lasi_82596.c +++ b/drivers/net/ethernet/i825xx/lasi_82596.c @@ -196,7 +196,7 @@ lan_init_chip(struct parisc_device *dev) return retval; } -static int __exit lan_remove_chip(struct parisc_device *pdev) +static void __exit lan_remove_chip(struct parisc_device *pdev) { struct net_device *dev = parisc_get_drvdata(pdev); struct i596_private *lp = netdev_priv(dev); @@ -205,7 +205,6 @@ static int __exit lan_remove_chip(struct parisc_device *pdev) dma_free_noncoherent(&pdev->dev, sizeof(struct i596_private), lp->dma, lp->dma_addr, DMA_BIDIRECTIONAL); free_netdev (dev); - return 0; } static const struct parisc_device_id lan_tbl[] __initconst = { diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index 1e43b3f399a8..4332692ca4b8 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c @@ -378,7 +378,7 @@ static int __init parport_init_chip(struct parisc_device *dev) return 0; } -static int __exit parport_remove_chip(struct parisc_device *dev) +static void __exit parport_remove_chip(struct parisc_device *dev) { struct parport *p = dev_get_drvdata(&dev->dev); if (p) { @@ -397,7 +397,6 @@ static int __exit parport_remove_chip(struct parisc_device *dev) parport_put_port(p); kfree (ops); /* hope no-one cached it */ } - return 0; } static const struct parisc_device_id parport_tbl[] __initconst = { diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c index 6d14a7a94d0b..86fe19e0468d 100644 --- a/drivers/scsi/lasi700.c +++ b/drivers/scsi/lasi700.c @@ -134,7 +134,7 @@ lasi700_probe(struct parisc_device *dev) return -ENODEV; } -static int __exit +static void __exit lasi700_driver_remove(struct parisc_device *dev) { struct Scsi_Host *host = dev_get_drvdata(&dev->dev); @@ -146,8 +146,6 @@ lasi700_driver_remove(struct parisc_device *dev) free_irq(host->irq, host); iounmap(hostdata->base); kfree(hostdata); - - return 0; } static struct parisc_driver lasi700_driver __refdata = { diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c index 7eac76cccc4c..f1e5cf8a17d9 100644 --- a/drivers/scsi/zalon.c +++ b/drivers/scsi/zalon.c @@ -168,15 +168,13 @@ static const struct parisc_device_id zalon_tbl[] __initconst = { MODULE_DEVICE_TABLE(parisc, zalon_tbl); -static int __exit zalon_remove(struct parisc_device *dev) +static void __exit zalon_remove(struct parisc_device *dev) { struct Scsi_Host *host = dev_get_drvdata(&dev->dev); scsi_remove_host(host); ncr53c8xx_release(host); free_irq(dev->irq, host); - - return 0; } static struct parisc_driver zalon_driver __refdata = { diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c index be640d9863cd..643dfbcc43f9 100644 --- a/drivers/tty/serial/mux.c +++ b/drivers/tty/serial/mux.c @@ -496,7 +496,7 @@ static int __init mux_probe(struct parisc_device *dev) return 0; } -static int __exit mux_remove(struct parisc_device *dev) +static void __exit mux_remove(struct parisc_device *dev) { int i, j; int port_count = (long)dev_get_drvdata(&dev->dev); @@ -518,7 +518,6 @@ static int __exit mux_remove(struct parisc_device *dev) } release_mem_region(dev->hpa.start + MUX_OFFSET, port_count * MUX_LINE_OFFSET); - return 0; } /* Hack. This idea was taken from the 8250_gsc.c on how to properly order diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 1440db8b4177..2e3e5aa47682 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c @@ -968,11 +968,10 @@ snd_harmony_probe(struct parisc_device *padev) return err; } -static int __exit +static void __exit snd_harmony_remove(struct parisc_device *padev) { snd_card_free(parisc_get_drvdata(padev)); - return 0; } static struct parisc_driver snd_harmony_driver __refdata = { -- 2.30.2

3 3

Cyclic SDMA transfers to SAI haulting on imx6
by Andriy Fudimov 07 Aug '21

07 Aug '21

Hi, Im trying to set up a cyclic dma transfer to/from the sai on an imx6, but im noticing weird behavior. First of all if my buffer length is small the DMA transfer will just hault as soon as it reaches the end of the buffer. If I make my buffer length larger it wont hault however it seems that only one of the rx or tx transfers can be on at once. Once my rx callback starts getting called my tx callback stops being called. Any tips would be appreciated. #define HARDWARE_BUFFER_BYTES 64*2 //* 2 #define HARDWARE_BUFFER_PERIOD_BYTES 32*2 static void dma_rx_complete(void *data) { rxstacnt++; printk("rxstacnt: %u\n",txstacnt); } static void dma_tx_complete(void *data) { txstacnt++; printk("txstacnt: %u\n",txstacnt); } static int imx_tx_pingdma_init(struct imx_dma *master, struct device *dev) { int err; dma_addr_t pcm_hardware_reg_base; const __be32 *addr; addr = of_get_address(dev->of_node, 0, NULL, NULL); if (!addr) { dev_err(dev, "could not get pcm hardware register address\n"); } pcm_hardware_reg_base = be32_to_cpup(addr); master->dma_tx = dma_request_slave_channel(dev, "tx"); if (!master->dma_tx) { dev_err(dev, "no tx-dma configuration found - not using dma mode\n"); tdm_dma_release(master); return -1; } master->dma_rx = dma_request_slave_channel(dev, "rx"); if (!master->dma_rx) { dev_err(dev, "no rx-dma configuration found - not using dma mode\n"); tdm_dma_release(master); return -1; } /* configure DMAs */ master->tx_ping_buffer = dma_alloc_coherent(master->dma_tx->device->dev, HARDWARE_BUFFER_BYTES, &master->tx_ping_buffer_dma, GFP_KERNEL); if (!master->tx_ping_buffer) { dev_err(dev, "could not allocate dma address\n"); tdm_dma_release(master); return -1; } memset(master->tx_ping_buffer, 0, HARDWARE_BUFFER_BYTES); master->rx_ping_buffer = dma_alloc_coherent(master->dma_rx->device->dev, HARDWARE_BUFFER_BYTES, &master->rx_ping_buffer_dma, GFP_KERNEL); if (!master->rx_ping_buffer) { dev_err(dev, "could not allocate rx dma address\n"); tdm_dma_release(master); return -1; } memset(master->rx_ping_buffer, 0, HARDWARE_BUFFER_BYTES); master->dma_tx_slave_config.direction = DMA_MEM_TO_DEV; master->dma_tx_slave_config.dst_addr = 0x202c000 + 0x20; master->dma_tx_slave_config.dst_maxburst = 1; master->dma_tx_slave_config.dst_addr_width = 4; master->dma_tx_slave_config.src_addr = master->tx_ping_buffer_dma; master->dma_tx_slave_config.src_maxburst = 1; master->dma_tx_slave_config.src_addr_width = 4; err = dmaengine_slave_config(master->dma_tx, &master->dma_tx_slave_config); if (err < 0) { printk("could not setup slave_tx_config\n"); tdm_dma_release(master); return err; } master->dma_rx_slave_config.direction = DMA_DEV_TO_MEM; master->dma_rx_slave_config.dst_addr = master->rx_ping_buffer_dma; master->dma_rx_slave_config.dst_maxburst = 1; master->dma_rx_slave_config.dst_addr_width = 4; master->dma_rx_slave_config.src_addr = 0x202c000 + 0xa0; master->dma_rx_slave_config.src_maxburst = 1; master->dma_rx_slave_config.src_addr_width = 4; err = dmaengine_slave_config(master->dma_rx, &master->dma_rx_slave_config); if (err < 0) { printk("could not setup slave_rx_config\n"); tdm_dma_release(master); return err; } master->dma_tx_desc = dmaengine_prep_dma_cyclic(master->dma_tx, master->tx_ping_buffer_dma, HARDWARE_BUFFER_BYTES, HARDWARE_BUFFER_PERIOD_BYTES, DMA_MEM_TO_DEV, DMA_CTRL_ACK | DMA_PREP_INTERRUPT); if (!master->dma_tx_desc) { printk("could not setup dma_tx_desc\n"); tdm_dma_release(master); return -1; } master->dma_rx_desc = dmaengine_prep_dma_cyclic(master->dma_rx, master->rx_ping_buffer_dma, HARDWARE_BUFFER_BYTES, HARDWARE_BUFFER_PERIOD_BYTES, DMA_DEV_TO_MEM, DMA_CTRL_ACK | DMA_PREP_INTERRUPT); if (!master->dma_rx_desc) { printk("could not setup dma_rx_desc\n"); tdm_dma_release(master); return -1; } master->dma_tx_desc->callback = dma_tx_complete; master->dma_tx_desc->callback_param = master; master->dma_rx_desc->callback = dma_rx_complete; master->dma_rx_desc->callback_param = master; printk("DMA configured by success!\n"); return 0; } static void start_dma(struct imx_dma *master) { master->dma_tx_cookie = dmaengine_submit(master->dma_tx_desc); dma_async_issue_pending(master->dma_tx); master->dma_rx_cookie = dmaengine_submit(master->dma_rx_desc); dma_async_issue_pending(master->dma_rx); printk("DMA submited! dma_tx_cookie:%d\n", master->dma_tx_cookie); printk("DMA submited! dma_rx_cookie:%d\n", master->dma_rx_cookie); txcnt = 0; }

1 0

UCM SectionModifier doesn't like 'Comment'
by GitHub issues - edited 07 Aug '21

07 Aug '21

alsa-project/alsa-lib issue #167 was edited from plbossart: Adding the following patch generates a crash with alsaucm ```` alsaucm -c sof-soundwire set _verb HiFi set _enadev Headphones alsaucm: conf.c:4355: snd_config_iterator_first: Assertion `config->type == SND_CONFIG_TYPE_COMPOUND' failed. Aborted (core dumped) ```` ````diff diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf index e780ea4..fbadb65 100644 --- a/ucm2/sof-soundwire/HiFi.conf +++ b/ucm2/sof-soundwire/HiFi.conf @@ -29,3 +29,12 @@ If.hsdev { } <sof-soundwire/Hdmi.conf> + +SectionModifier."PlayMusic" { + # this works fine +} + +SectionModifier."PlayRadio" { + # this doesn't + Comment "Play Radio" +} ```` I am not sure if anyone ever used the SectionModifier, if it's a bug in alsa-lib or alsaucm. SectionModifiers are part of the current proposal in PipeWire according to the documentation for "stream endpoints". https://docs.pipewire.org/page_objects_design.html "The available UCM modifiers for each UCM device will be added as streams, plus one "default" stream for accessing the device with no modifiers." Issue URL : https://github.com/alsa-project/alsa-lib/issues/167 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

UCM SectionModifier doesn't like 'Comment'
by GitHub issues - opened 07 Aug '21

07 Aug '21

alsa-project/alsa-lib issue #167 was opened from plbossart: Adding the following patch generates a crash with alsaucm ```` alsaucm -c sof-soundwire set _verb HiFi set _enadev Headphones alsaucm: conf.c:4355: snd_config_iterator_first: Assertion `config->type == SND_CONFIG_TYPE_COMPOUND' failed. Aborted (core dumped) ```` ````diff diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf index e780ea4..fbadb65 100644 --- a/ucm2/sof-soundwire/HiFi.conf +++ b/ucm2/sof-soundwire/HiFi.conf @@ -29,3 +29,12 @@ If.hsdev { } <sof-soundwire/Hdmi.conf> + +SectionModifier."PlayMusic" { + # this works fine +} + +SectionModifier."PlayRadio" { + # this doesn't + Comment "Play Radio" +} I am not sure if anyone ever used the SectionModifier, if it's a bug in alsa-lib or alsaucm. SectionModifiers are part of the current proposal in PipeWire according to the documentation for "stream endpoints". https://docs.pipewire.org/page_objects_design.html "The available UCM modifiers for each UCM device will be added as streams, plus one "default" stream for accessing the device with no modifiers." Issue URL : https://github.com/alsa-project/alsa-lib/issues/167 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 0/4] soundwire: intel: exit clock-stop mode before system suspend
by Bard Liao 06 Aug '21

06 Aug '21

Intel validation reported an issue where the HW_RST self-clearing bit is not cleared in hardware, which as a ripple effect creates issues with the clock stop mode. This happens is a specific sequence where the Intel manager is pm_runtime suspended with the clock-stop mode enabled. During the system suspend, we currently do nothing, which can lead to potential issues on system resume and the following pm_runtime suspend, depending on the hardware state. This patch suggests a full resume if the clock-stop mode is used. This may require extra time but will make the suspend/resume flows completely symmetric. This also removes a race condition where we could not access SHIM registers if the parent was suspended as well. Resuming the link also resumes the parent by construction. BugLink: https://github.com/thesofproject/linux/issues/2606 Pierre-Louis Bossart (4): soundwire: intel: fix potential race condition during power down soundwire: intel: skip suspend/resume/wake when link was not started soundwire: intel: exit clock stop mode on system suspend soundwire: intel: simplify pm_runtime handling in suspend/resume drivers/soundwire/intel.c | 126 ++++++++++++++++++++++++++++---------- drivers/soundwire/intel.h | 1 + 2 files changed, 94 insertions(+), 33 deletions(-) -- 2.17.1

3 13

[GIT PULL] ASoC fixes for v5.14-rc4
by Mark Brown 06 Aug '21

06 Aug '21

The following changes since commit 82d28b67f780910f816fe1cfb0f676fc38c4cbb3: ASoC: ti: j721e-evm: Check for not initialized parent_clk_id (2021-07-19 12:58:42 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.14-rc4 for you to fetch changes up to e5ada3f6787a4d6234adc6f2f3ae35c6d5b71ba0: ASoC: cs42l42: Fix mono playback (2021-08-05 20:17:16 +0100) ---------------------------------------------------------------- ASoC: Fixes for v5.14 Quite a lot of fixes here, the biggest set being for the cs42l42 driver which is reasonably old but has seen a sudden uptick in activity. There's also some fixes for correctly referencing PCM buffer addresses and the removal of some driver-local bodges that had been done for the lack of prefix handling in DAPM which were broken by the core handling that as expected. ---------------------------------------------------------------- Arnd Bergmann (1): ASoC: codecs: wcd938x: fix wcd module dependency Brent Lu (1): ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard Derek Fang (1): ASoC: rt5682: Adjust headset volume button threshold Guennadi Liakhovetski (1): ASoC: SOF: Intel: hda-ipc: fix reply size checking Lucas Tanure (1): ASoC: wm_adsp: Let soc_cleanup_component_debugfs remove debugfs Marek Vasut (1): ASoC: tlv320aic32x4: Fix TAS2505/TAS2521 processing block selection Mario Limonciello (1): ASoC: amd: renoir: Run hibernation callbacks Mark Brown (3): ASoC: tlv320aic31xx: Fix jack detection after suspend ASoC: component: Remove misplaced prefix handling in pin control functions ASoC: nau8824: Fix open coded prefix handling Peter Ujfalusi (1): ASoC: topology: Select SND_DYNAMIC_MINORS Pierre-Louis Bossart (2): ASoC: SOF: Intel: hda: enforce exclusion between HDaudio and SoundWire ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies Richard Fitzgerald (10): MAINTAINERS: Add sound devicetree bindings for Wolfson Micro devices ASoC: cs42l42: Correct definition of ADC Volume control ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J ASoC: cs42l42: Fix bclk calculation for mono ASoC: cs42l42: Fix inversion of ADC Notch Switch control ASoC: cs42l42: Remove duplicate control for WNF filter frequency ASoC: cs42l42: PLL must be running when changing MCLK_SRC_SEL ASoC: cs42l42: Fix LRCLK frame start edge ASoC: cs42l42: Constrain sample rate to prevent illegal SCLK ASoC: cs42l42: Fix mono playback Takashi Iwai (5): ASoC: intel: atom: Fix reference to PCM buffer address ASoC: xilinx: Fix reference to PCM buffer address ASoC: uniphier: Fix reference to PCM buffer address ASoC: kirkwood: Fix reference to PCM buffer address ASoC: amd: Fix reference to PCM buffer address Vijendar Mukunda (1): ASoC: amd: enable stop_dma_first flag for cz_dai_7219_98357 dai link MAINTAINERS | 3 +- sound/soc/Kconfig | 1 + sound/soc/amd/acp-da7219-max98357a.c | 5 ++ sound/soc/amd/acp-pcm-dma.c | 2 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 +- sound/soc/amd/renoir/rn-pci-acp3x.c | 2 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/Makefile | 5 +- sound/soc/codecs/cs42l42.c | 104 ++++++++++++++++++--------- sound/soc/codecs/cs42l42.h | 3 + sound/soc/codecs/nau8824.c | 42 ++--------- sound/soc/codecs/rt5682.c | 1 + sound/soc/codecs/tlv320aic31xx.c | 10 +++ sound/soc/codecs/tlv320aic32x4.c | 33 +++++++-- sound/soc/codecs/wm_adsp.c | 1 - sound/soc/intel/atom/sst-mfld-platform-pcm.c | 3 +- sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- sound/soc/kirkwood/kirkwood-dma.c | 26 ++++--- sound/soc/soc-component.c | 63 +++++++--------- sound/soc/sof/intel/Kconfig | 4 +- sound/soc/sof/intel/hda-ipc.c | 4 +- sound/soc/sof/intel/hda.c | 12 ++++ sound/soc/uniphier/aio-dma.c | 2 +- sound/soc/xilinx/xlnx_formatter_pcm.c | 4 +- 25 files changed, 200 insertions(+), 137 deletions(-)

2 1

[PATCH 1/8] ASoC: cs42l42: PLL must be running when changing MCLK_SRC_SEL
by Richard Fitzgerald 06 Aug '21

06 Aug '21

Both SCLK and PLL clocks must be running to drive the glitch-free mux behind MCLK_SRC_SEL and complete the switchover. This patch moves the writing of MCLK_SRC_SEL to when the PLL is started and stopped, so that it only transitions while the PLL is running. The unconditional write MCLK_SRC_SEL=0 in cs42l42_mute_stream() is safe because if the PLL is not running MCLK_SRC_SEL is already 0. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Fixes: 43fc357199f9 ("ASoC: cs42l42: Set clock source for both ways of stream") --- sound/soc/codecs/cs42l42.c | 25 ++++++++++++++++++------- sound/soc/codecs/cs42l42.h | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index a00dc3c65549..c96549fe6ab2 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -619,6 +619,8 @@ static int cs42l42_pll_config(struct snd_soc_component *component) for (i = 0; i < ARRAY_SIZE(pll_ratio_table); i++) { if (pll_ratio_table[i].sclk == clk) { + cs42l42->pll_config = i; + /* Configure the internal sample rate */ snd_soc_component_update_bits(component, CS42L42_MCLK_CTL, CS42L42_INTERNAL_FS_MASK, @@ -627,14 +629,9 @@ static int cs42l42_pll_config(struct snd_soc_component *component) (pll_ratio_table[i].mclk_int != 24000000)) << CS42L42_INTERNAL_FS_SHIFT); - /* Set the MCLK src (PLL or SCLK) and the divide - * ratio - */ + snd_soc_component_update_bits(component, CS42L42_MCLK_SRC_SEL, - CS42L42_MCLK_SRC_SEL_MASK | CS42L42_MCLKDIV_MASK, - (pll_ratio_table[i].mclk_src_sel - << CS42L42_MCLK_SRC_SEL_SHIFT) | (pll_ratio_table[i].mclk_div << CS42L42_MCLKDIV_SHIFT)); /* Set up the LRCLK */ @@ -892,13 +889,21 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream) */ regmap_multi_reg_write(cs42l42->regmap, cs42l42_to_osc_seq, ARRAY_SIZE(cs42l42_to_osc_seq)); + + /* Must disconnect PLL before stopping it */ + snd_soc_component_update_bits(component, + CS42L42_MCLK_SRC_SEL, + CS42L42_MCLK_SRC_SEL_MASK, + 0); + usleep_range(100, 200); + snd_soc_component_update_bits(component, CS42L42_PLL_CTL1, CS42L42_PLL_START_MASK, 0); } } else { if (!cs42l42->stream_use) { /* SCLK must be running before codec unmute */ - if ((cs42l42->bclk < 11289600) && (cs42l42->sclk < 11289600)) { + if (pll_ratio_table[cs42l42->pll_config].mclk_src_sel) { snd_soc_component_update_bits(component, CS42L42_PLL_CTL1, CS42L42_PLL_START_MASK, 1); @@ -919,6 +924,12 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream) CS42L42_PLL_LOCK_TIMEOUT_US); if (ret < 0) dev_warn(component->dev, "PLL failed to lock: %d\n", ret); + + /* PLL must be running to drive glitchless switch logic */ + snd_soc_component_update_bits(component, + CS42L42_MCLK_SRC_SEL, + CS42L42_MCLK_SRC_SEL_MASK, + CS42L42_MCLK_SRC_SEL_MASK); } /* Mark SCLK as present, turn off internal oscillator */ diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h index 206b3c81d3e0..b92c17be7f58 100644 --- a/sound/soc/codecs/cs42l42.h +++ b/sound/soc/codecs/cs42l42.h @@ -775,6 +775,7 @@ struct cs42l42_private { struct gpio_desc *reset_gpio; struct completion pdn_done; struct snd_soc_jack *jack; + int pll_config; int bclk; u32 sclk; u32 srate; -- 2.11.0

2 10

[PATCH] ASoC: simple-card-utils: Avoid over-allocating DLCs
by Samuel Holland 06 Aug '21

06 Aug '21

The allocation of the DAI link components (DLCs) passed the wrong pointer to sizeof. Since simple_dai_props is much larger than snd_soc_dai_link_component, there was no out of bounds access, only wasted memory. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- sound/soc/generic/simple-card-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 677f7da93b4b..10c63b73900c 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -640,8 +640,8 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, cnf_num += li->num[i].codecs; } - dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL); - dlcs = devm_kcalloc(dev, dlc_num, sizeof(*dai_props), GFP_KERNEL); + dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL); + dlcs = devm_kcalloc(dev, dlc_num, sizeof(*dlcs), GFP_KERNEL); if (!dais || !dlcs) return -ENOMEM; -- 2.31.1

3 3