July 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR
by Judy Hsiao 06 Jul '22

06 Jul '22

Add the error code '-EBUSY' when fail to read I2S_CLR in rockchip_snd_rxctrl() and rockchip_snd_txctrl() Fixes: 44f362c2cc6d ("ASoC: rockchip: i2s: switch BCLK to GPIO") Signed-off-by: Judy Hsiao <judyhsiao(a)chromium.org> --- sound/soc/rockchip/rockchip_i2s.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index f783994cc16a..fd36c0bacc43 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -171,6 +171,7 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) retry--; if (!retry) { dev_warn(i2s->dev, "fail to clear\n"); + ret = -EBUSY; break; } } @@ -232,6 +233,7 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) retry--; if (!retry) { dev_warn(i2s->dev, "fail to clear\n"); + ret = -EBUSY; break; } } -- 2.37.0.rc0.161.g10f37bed90-goog

4 3

[PATCH v2 0/6] Add support of two Audio PLL source
by Shengjiu Wang 06 Jul '22

06 Jul '22

i.MX8MQ/MN/MM/MP platforms typically have 2 AUDIO PLLs being configured to handle 8kHz and 11kHz series audio rates. The patches implement the functionality to select at runtime the appropriate AUDIO PLL for root clock, if there is no two PLL registered, then no action taken. change in v2: - simply the logic for calling reparent function Shengjiu Wang (6): ASoC: fsl_utils: Add function to handle PLL clock source ASoC: fsl_spdif: Add support for PLL switch at runtime. ASoC: fsl_micfil: Add support for PLL switch at runtime ASoC: fsl_sai: Add support for PLL switch at runtime ASoC: dt-bindings: fsl_spdif: Add two PLL clock source ASoC: dt-bindings: fsl-sai: Add two PLL clock source .../devicetree/bindings/sound/fsl,spdif.yaml | 4 ++ .../devicetree/bindings/sound/fsl-sai.txt | 3 + sound/soc/fsl/Kconfig | 3 + sound/soc/fsl/fsl_micfil.c | 31 +++++++++ sound/soc/fsl/fsl_sai.c | 38 ++++++++++ sound/soc/fsl/fsl_sai.h | 2 + sound/soc/fsl/fsl_spdif.c | 48 +++++++++++-- sound/soc/fsl/fsl_utils.c | 69 +++++++++++++++++++ sound/soc/fsl/fsl_utils.h | 7 ++ 9 files changed, 200 insertions(+), 5 deletions(-) -- 2.17.1

3 9

[PATCH V2 0/5] I2S driver changes for Jadeite platform
by Vijendar Mukunda 06 Jul '22

06 Jul '22

Jadeite(JD) platform is Stoney APU varaint which uses I2S MICSP instance and ES8336 Codec. This patch series creates I2S platform devices for JD platform, adds I2S MICSP instance support and Machine driver support This patch set depends on: --checkpatch warnings patch --https://patchwork.kernel.org/project/alsa-devel/patch/20220627125834.481731-1-Vijendar.Mukunda@amd.com/ changes since v1: - removed hw_params() callback in machine driver and moved sysclk programming logic to startup() callback. - Modified ACPI & I2C flag depedency checks in Kconfig file Vijendar Mukunda (5): drm/amdgpu: add dmi check for jadeite platform drm/amdgpu: create I2S platform devices for Jadeite platform ASoC: amd: add I2S MICSP instance support ASoC: amd: add Machine driver for Jadeite platform ASoC: amd: enable machine driver build for Jadeite platform drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 329 ++++++++++++++++-------- sound/soc/amd/Kconfig | 13 + sound/soc/amd/Makefile | 2 + sound/soc/amd/acp-es8336.c | 324 +++++++++++++++++++++++ sound/soc/amd/acp-pcm-dma.c | 50 +++- sound/soc/amd/acp.h | 13 + 6 files changed, 620 insertions(+), 111 deletions(-) create mode 100644 sound/soc/amd/acp-es8336.c -- 2.25.1

3 8

[PATCH 1/2] ASoC: SOF: sof-client-probes: fix error codes in sof_probes_compr_copy()
by Dan Carpenter 06 Jul '22

06 Jul '22

This function tries to return the number of bytes that it was able to copy to the user. However, because there are multiple calls to copy_to_user() in a row that means the bytes are not necessarily consecutive so it's not useful. Just return -EFAULT instead. Fixes: 3dc0d7091778 ("ASoC: SOF: Convert the generic probe support to SOF client") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/sof/sof-client-probes.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c index 1f1ea93a7fbf..679bc7d371fc 100644 --- a/sound/soc/sof/sof-client-probes.c +++ b/sound/soc/sof/sof-client-probes.c @@ -385,7 +385,6 @@ static int sof_probes_compr_copy(struct snd_soc_component *component, struct snd_compr_runtime *rtd = cstream->runtime; unsigned int offset, n; void *ptr; - int ret; if (count > rtd->buffer_size) count = rtd->buffer_size; @@ -395,14 +394,15 @@ static int sof_probes_compr_copy(struct snd_soc_component *component, n = rtd->buffer_size - offset; if (count < n) { - ret = copy_to_user(buf, ptr, count); + if (copy_to_user(buf, ptr, count)) + return -EFAULT; } else { - ret = copy_to_user(buf, ptr, n); - ret += copy_to_user(buf + n, rtd->dma_area, count - n); + if (copy_to_user(buf, ptr, n)) + return -EFAULT; + if (copy_to_user(buf + n, rtd->dma_area, count - n)) + return -EFAULT; } - if (ret) - return count - ret; return count; } -- 2.35.1

3 10

[PATCH v1] add tas2780
by Raphael-Xu 06 Jul '22

06 Jul '22

add tas2780.yaml Signed-off-by: Raphael-Xu <13691752556(a)139.com> --- .../devicetree/bindings/sound/tas2780.yaml | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas2780.yaml diff --git a/Documentation/devicetree/bindings/sound/tas2780.yaml b/Documentation/devicetree/bindings/sound/tas2780.yaml new file mode 100644 index 000000000000..5a0de0995066 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas2780.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2020-2022 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/sound/tas2780.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Texas Instruments TAS2780 Smart PA + +maintainers: + - Raphael Xu <raphael-xu(a)ti.com> + +description: | + The TAS2780 is a mono, digital input Class-D audio amplifier optimized for + efficiently driving high peak power into small loudspeakers. + Integrated speaker voltage and current sense provides for + real time monitoring of loudspeaker behavior. + +properties: + compatible: + enum: + - ti,tas2780 + + reg: + maxItems: 1 + description: | + I2C address of the device can be between 0x38 to 0x45. + + reset-gpios: + maxItems: 1 + description: GPIO used to reset the device. + + interrupts: + maxItems: 1 + + ti,imon-slot-no: + $ref: /schemas/types.yaml#/definitions/uint32 + description: TDM TX current sense time slot. + + ti,vmon-slot-no: + $ref: /schemas/types.yaml#/definitions/uint32 + description: TDM TX voltage sense time slot. + + '#sound-dai-cells': + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + codec: codec@38 { + compatible = "ti,tas2780"; + reg = <0x38>; + #sound-dai-cells = <1>; + interrupt-parent = <&gpio1>; + interrupts = <14>; + reset-gpios = <&gpio1 15 0>; + shutdown-gpios = <&gpio1 15 0>; + ti,imon-slot-no = <0>; + ti,vmon-slot-no = <2>; + }; + }; + +... -- 2.35.1

1 0

[PATCH v2 0/2] ASoC: Intel: Skylake: Fixes for skl_get_ssp_clks()
by Peter Ujfalusi 06 Jul '22

06 Jul '22

Hi, Changes since v1: - drop reference to a might never happening patch from the commit message of patch 2. Cover letter: while looking at long standing sparse reports regarding to arrays of flexible structures (arrays of flexible arrays of flexible structures, really). I came across these which did not looked right. The skl_get_ssp_clks() as some issues and can work under only strict single condition. Regards, Peter --- Peter Ujfalusi (2): ASoC: Intel: Skylake: Correct the ssp rate discovery in skl_get_ssp_clks() ASoC: Intel: Skylake: Correct the handling of fmt_config flexible array sound/soc/intel/skylake/skl-nhlt.c | 40 ++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 13 deletions(-) -- 2.37.0

3 4

[PATCH] ASoC: SOF: ipc-msg-injector: fix copy in sof_msg_inject_ipc4_dfs_write()
by Dan Carpenter 06 Jul '22

06 Jul '22

The bug here is that when we copy the payload the value of *ppos should be zero but it is sizeof(ipc4_msg->header_u64) instead. That means that the buffer will be copied to the wrong location within the ipc4_msg->data_ptr buffer. Really, in this context, it is simpler and more appropriate to use copy_from_user() instead of simple_write_to_buffer() so I have re-written the function. Fixes: 066c67624d8c ("ASoC: SOF: ipc-msg-injector: Add support for IPC4 messages") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- >From static analysis. Not tested. I believe this function is mostly used to write random junk to the device and see what breaks. So probably it works fine as-is. sound/soc/sof/sof-client-ipc-msg-injector.c | 27 ++++++++------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/sound/soc/sof/sof-client-ipc-msg-injector.c b/sound/soc/sof/sof-client-ipc-msg-injector.c index 6bdfa527b7f7..e8ab173e95b5 100644 --- a/sound/soc/sof/sof-client-ipc-msg-injector.c +++ b/sound/soc/sof/sof-client-ipc-msg-injector.c @@ -181,7 +181,7 @@ static ssize_t sof_msg_inject_ipc4_dfs_write(struct file *file, struct sof_client_dev *cdev = file->private_data; struct sof_msg_inject_priv *priv = cdev->data; struct sof_ipc4_msg *ipc4_msg = priv->tx_buffer; - ssize_t size; + size_t data_size; int ret; if (*ppos) @@ -191,25 +191,18 @@ static ssize_t sof_msg_inject_ipc4_dfs_write(struct file *file, return -EINVAL; /* copy the header first */ - size = simple_write_to_buffer(&ipc4_msg->header_u64, - sizeof(ipc4_msg->header_u64), - ppos, buffer, count); - if (size < 0) - return size; - if (size != sizeof(ipc4_msg->header_u64)) + if (copy_from_user(&ipc4_msg->header_u64, buffer, + sizeof(ipc4_msg->header_u64))) return -EFAULT; - count -= size; + data_size = count - sizeof(ipc4_msg->header_u64); + if (data_size > priv->max_msg_size) + return -EINVAL; /* Copy the payload */ - size = simple_write_to_buffer(ipc4_msg->data_ptr, - priv->max_msg_size, ppos, buffer, - count); - if (size < 0) - return size; - if (size != count) + if (copy_from_user(ipc4_msg->data_ptr, buffer, data_size)) return -EFAULT; - ipc4_msg->data_size = count; + ipc4_msg->data_size = data_size; /* Initialize the reply storage */ ipc4_msg = priv->rx_buffer; @@ -221,9 +214,9 @@ static ssize_t sof_msg_inject_ipc4_dfs_write(struct file *file, /* return the error code if test failed */ if (ret < 0) - size = ret; + count = ret; - return size; + return count; }; static int sof_msg_inject_dfs_release(struct inode *inode, struct file *file) -- 2.35.1

2 2

Re: [PATCH 6/6] i2c: Make remove callback return void
by Vladimir Oltean 06 Jul '22

06 Jul '22

On Tue, Jun 28, 2022 at 04:03:12PM +0200, Uwe Kleine-König wrote: > From: Uwe Kleine-König <uwe(a)kleine-koenig.org> > > The value returned by an i2c driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> > --- Assuming you remove the spurious kasan change: Reviewed-by: Vladimir Oltean <olteanv(a)gmail.com>

2 1

[PATCH] ASoC: SOF: debug: delete sof_dfsentry_write()
by Dan Carpenter 06 Jul '22

06 Jul '22

The sof_dfsentry_write() function used to have a purpose but now it is a no-op. It allocates a zeroed buffer, copies at least one byte of data to it, and then frees it without doing anything. Just delete the function. Fixes: 6e9548cdb30e ("ASoC: SOF: Convert the generic IPC flood test into SOF client") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- >From review. Not tested. sound/soc/sof/debug.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c index c5d797e97c02..00abc2000bfb 100644 --- a/sound/soc/sof/debug.c +++ b/sound/soc/sof/debug.c @@ -19,24 +19,6 @@ #include "sof-priv.h" #include "ops.h" -static ssize_t sof_dfsentry_write(struct file *file, const char __user *buffer, - size_t count, loff_t *ppos) -{ - size_t size; - char *string; - int ret; - - string = kzalloc(count+1, GFP_KERNEL); - if (!string) - return -ENOMEM; - - size = simple_write_to_buffer(string, count, ppos, buffer, count); - ret = size; - - kfree(string); - return ret; -} - static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos) { @@ -126,7 +108,6 @@ static const struct file_operations sof_dfs_fops = { .open = simple_open, .read = sof_dfsentry_read, .llseek = default_llseek, - .write = sof_dfsentry_write, }; /* create FS entry for debug files that can expose DSP memories, registers */ -- 2.35.1

2 1

[PATCH 0/3] soundwire: revisit peripheral driver bind/unbind
by Pierre-Louis Bossart 06 Jul '22

06 Jul '22

This patchset fixes the driver bind/unbind cases which are not well-supported today. I initially reported a race condition in March 2022 [1] and the more tests I ran the more timing assumptions crept to the surface. With this patchset, I've been able to bind the drivers in any order, and when all dependencies were available the card is created/registered. Likewise I was able to remove codec drivers while the bus was still running. The initial suggestion to use device_lock()/unlock() led to system hangs in suspend-resume that I was unable to root-cause after weeks of tests, hence this patchset relies on a SoundWire-specific lock doesn't interfere with other core device locking. I think it's a pretty important set of changes that would ideally be merged in this kernel cycle, so that we can finally add the inclusive 'manager/peripheral' language change in the next kernel cycle. Feedback and comments welcome. [1] https://lore.kernel.org/alsa-devel/d0559e97-c4a0-b817-428c-d3e305390270@lin… Pierre-Louis Bossart (3): soundwire: revisit driver bind/unbind and callbacks soundwire: peripheral: remove useless ops pointer soundwire: intel: use pm_runtime_resume() on component probe drivers/soundwire/bus.c | 75 ++++++++++++++++++++--------------- drivers/soundwire/bus_type.c | 30 +++++++++++--- drivers/soundwire/intel.c | 18 +++++++++ drivers/soundwire/slave.c | 3 +- drivers/soundwire/stream.c | 53 ++++++++++++++++--------- include/linux/soundwire/sdw.h | 8 +--- 6 files changed, 124 insertions(+), 63 deletions(-) -- 2.34.1

2 4