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

[RESEND v13 00/10] Add support for audio on SC7280 based targets
by Srinivasa Rao Mandadapu 19 Feb '22

19 Feb '22

This patch set is to add support for Audio over wcd codec, digital mics, through digital codecs and without ADSP. Changes Since V12: -- Fix arguments type mismatch. Changes Since V11: -- Fix kernel robot issue on arguments type mismatch. Changes Since V10: -- Split bulk clock voting to individual clock voting as per use case in cdc-dma driver. -- Add missing codec dma clocks. -- Update rxtx lpm buffer size. Changes Since V9: -- Change individual clock voting to bulk clock voting of lpass-sc7280 platform driver. -- Remove redundant clocks in lpass variant structure. -- Add mclk for MI2S based headset path. -- Remove unused lpass variant structure members in lpass header. Changes Since V8: -- Fix errors in sc7280 lpass cpu dt-bindings. -- Move to quicinc domain email id's. Changes Since V7: -- Fix indentation errors. -- Bisect patches to avoid interdependency. Changes Since V6: -- Split cdc dma regmap config macros. -- Add write dma reg fields for i2s path. -- Add helper function to distinguish rxtx and va dma ports. -- Optimizing clock and reg name in cpu dt-bindings. -- Update buffer management for cdc dma path. -- Remove Kconfig fields of machine driver. Changes Since V5: -- Include MI2S primary node to snd_soc_dai_driver in lpass-sc7280 platform driver. -- Move dependency patch list to corresponding patch. -- Add support for missing cdc-dma ports. -- Change if/else conditional statements to switch cases. -- Add missing error handlings. -- Typo errors fix. Changes Since V4: -- Remove unused variable in lpass-sc7280 platform driver. Changes Since V3: -- Remove redundant power domain controls. As power domains can be configured from dtsi. Changes Since V2: -- Split lpass sc7280 cpu driver patch and create regmap config patch. -- Create patches based on latest kernel tip. -- Add helper function to get dma control and lpaif handle. -- Remove unused variables. Changes Since V1: -- Typo errors fix -- CPU driver readable/writable apis optimization. -- Add Missing config patch -- Add Common api for repeated dmactl initialization. Srinivasa Rao Mandadapu (10): ASoC: qcom: SC7280: Update config for building codec dma drivers ASoC: qcom: Move lpass_pcm_data structure to lpass header ASoC: qcom: lpass: Add dma fields for codec dma lpass interface ASoC: qcom: Add helper function to get dma control and lpaif handle ASoC: qcom: Add register definition for codec rddma and wrdma ASoC: qcom: Add regmap config support for codec dma driver ASoC: qcom: Add support for codec dma driver ASoC: qcom: Add lpass CPU driver for codec dma control ASoC: dt-bindings: Add SC7280 lpass cpu bindings ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 75 ++- sound/soc/qcom/Kconfig | 11 + sound/soc/qcom/Makefile | 4 + sound/soc/qcom/lpass-cdc-dma.c | 304 ++++++++++ sound/soc/qcom/lpass-cpu.c | 244 +++++++- sound/soc/qcom/lpass-lpaif-reg.h | 127 ++++- sound/soc/qcom/lpass-platform.c | 617 ++++++++++++++++++--- sound/soc/qcom/lpass-sc7280.c | 447 +++++++++++++++ sound/soc/qcom/lpass.h | 145 +++++ 9 files changed, 1887 insertions(+), 87 deletions(-) create mode 100644 sound/soc/qcom/lpass-cdc-dma.c create mode 100644 sound/soc/qcom/lpass-sc7280.c -- 2.7.4

5 28

[PATCH v14 00/10] Add support for audio on SC7280 based targets
by Srinivasa Rao Mandadapu 19 Feb '22

19 Feb '22

This patch set is to add support for Audio over wcd codec, digital mics, through digital codecs and without ADSP. Changes Since V13: -- Change bulk cdc clock voting to individual clock voting. -- Remove redundant code, conditional check and prints. -- Fix typo errors. Changes Since V12: -- Fix arguments type mismatch. Changes Since V11: -- Fix kernel robot issue on arguments type mismatch. Changes Since V10: -- Split bulk clock voting to individual clock voting as per use case in cdc-dma driver. -- Add missing codec dma clocks. -- Update rxtx lpm buffer size. Changes Since V9: -- Change individual clock voting to bulk clock voting of lpass-sc7280 platform driver. -- Remove redundant clocks in lpass variant structure. -- Add mclk for MI2S based headset path. -- Remove unused lpass variant structure members in lpass header. Changes Since V8: -- Fix errors in sc7280 lpass cpu dt-bindings. -- Move to quicinc domain email id's. Changes Since V7: -- Fix indentation errors. -- Bisect patches to avoid interdependency. Changes Since V6: -- Split cdc dma regmap config macros. -- Add write dma reg fields for i2s path. -- Add helper function to distinguish rxtx and va dma ports. -- Optimizing clock and reg name in cpu dt-bindings. -- Update buffer management for cdc dma path. -- Remove Kconfig fields of machine driver. Changes Since V5: -- Include MI2S primary node to snd_soc_dai_driver in lpass-sc7280 platform driver. -- Move dependency patch list to corresponding patch. -- Add support for missing cdc-dma ports. -- Change if/else conditional statements to switch cases. -- Add missing error handlings. -- Typo errors fix. Changes Since V4: -- Remove unused variable in lpass-sc7280 platform driver. Changes Since V3: -- Remove redundant power domain controls. As power domains can be configured from dtsi. Changes Since V2: -- Split lpass sc7280 cpu driver patch and create regmap config patch. -- Create patches based on latest kernel tip. -- Add helper function to get dma control and lpaif handle. -- Remove unused variables. Changes Since V1: -- Typo errors fix -- CPU driver readable/writable apis optimization. -- Add Missing config patch -- Add Common api for repeated dmactl initialization. Srinivasa Rao Mandadapu (10): ASoC: qcom: SC7280: Update config for building codec dma drivers ASoC: qcom: Move lpass_pcm_data structure to lpass header ASoC: qcom: lpass: Add dma fields for codec dma lpass interface ASoC: qcom: Add helper function to get dma control and lpaif handle ASoC: qcom: Add register definition for codec rddma and wrdma ASoC: qcom: Add regmap config support for codec dma driver ASoC: qcom: Add support for codec dma driver ASoC: qcom: Add lpass CPU driver for codec dma control ASoC: dt-bindings: Add SC7280 lpass cpu bindings ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 75 ++- sound/soc/qcom/Kconfig | 11 + sound/soc/qcom/Makefile | 4 + sound/soc/qcom/lpass-cdc-dma.c | 305 +++++++++++ sound/soc/qcom/lpass-cpu.c | 252 ++++++++- sound/soc/qcom/lpass-lpaif-reg.h | 127 ++++- sound/soc/qcom/lpass-platform.c | 601 ++++++++++++++++++--- sound/soc/qcom/lpass-sc7280.c | 447 +++++++++++++++ sound/soc/qcom/lpass.h | 143 +++++ 9 files changed, 1881 insertions(+), 84 deletions(-) create mode 100644 sound/soc/qcom/lpass-cdc-dma.c create mode 100644 sound/soc/qcom/lpass-sc7280.c -- 2.7.4

2 11

[PATCH 0/1] sound: add quirk for Huawei D15
by Mauro Carvalho Chehab 19 Feb '22

19 Feb '22

Hi Pierre-Louis, Based on my tests, Huawei D15 (Intel) uses SSP0 on es8336. Add a quirk for it. Please notice that, currently, only the internal speaker is working. The topology for the internal microphone and for the headphones is wrong. Enabling/disabling the other two quirks (GPIO and/or DMIC) doesn't cause any audible results, nor change the devices listed on pavucontrol (tested with pipewire-pulse). Mauro Carvalho Chehab (1): ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021 sound/soc/intel/boards/sof_es8336.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.33.1

3 4

[bug report] ASoC: codec: wcd938x: Add switch control for selecting CTIA/OMTP Headset
by Dan Carpenter 18 Feb '22

18 Feb '22

Hello Srinivasa Rao Mandadapu, This is a semi-automatic email about new static checker warnings. The patch 013cc2aea0f6: "ASoC: codec: wcd938x: Add switch control for selecting CTIA/OMTP Headset" from Feb 12, 2022, leads to the following Smatch complaint: sound/soc/codecs/wcd938x.c:4210 wcd938x_swap_gnd_mic() error: we previously assumed 'component' could be null (see line 4209) sound/soc/codecs/wcd938x.c 4203 static bool wcd938x_swap_gnd_mic(struct snd_soc_component *component, bool active) 4204 { 4205 int value; 4206 4207 struct wcd938x_priv *wcd938x; 4208 4209 if (!component) { ^^^^^^^^^ Check for NULL. 4210 dev_err(component->dev, "%s component is NULL\n", __func__); ^^^^^^^^^^^^^^ NULL Dereference. But can it really be NULL? 4211 return false; 4212 } 4213 regards, dan carpenter

1 0

Re: [PATCH 5/5] spi: make remove callback a void function
by Hans Verkuil 18 Feb '22

18 Feb '22

On 23/01/2022 18:52, Uwe Kleine-König wrote: > The value returned by an spi 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> > --- > drivers/bus/moxtet.c | 4 +--- > drivers/char/tpm/st33zp24/spi.c | 4 +--- > drivers/char/tpm/tpm_tis_spi_main.c | 3 +-- > drivers/clk/clk-lmk04832.c | 4 +--- > drivers/gpio/gpio-74x164.c | 4 +--- > drivers/gpio/gpio-max3191x.c | 4 +--- > drivers/gpio/gpio-max7301.c | 4 +--- > drivers/gpio/gpio-mc33880.c | 4 +--- > drivers/gpio/gpio-pisosr.c | 4 +--- > drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +-- > drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +--- > drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +--- > drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +-- > drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +--- > drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +-- > drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +-- > drivers/gpu/drm/tiny/hx8357d.c | 4 +--- > drivers/gpu/drm/tiny/ili9163.c | 4 +--- > drivers/gpu/drm/tiny/ili9225.c | 4 +--- > drivers/gpu/drm/tiny/ili9341.c | 4 +--- > drivers/gpu/drm/tiny/ili9486.c | 4 +--- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +--- > drivers/gpu/drm/tiny/repaper.c | 4 +--- > drivers/gpu/drm/tiny/st7586.c | 4 +--- > drivers/gpu/drm/tiny/st7735r.c | 4 +--- > drivers/hwmon/adcxx.c | 4 +--- > drivers/hwmon/adt7310.c | 3 +-- > drivers/hwmon/max1111.c | 3 +-- > drivers/hwmon/max31722.c | 4 +--- > drivers/iio/accel/bma400_spi.c | 4 +--- > drivers/iio/accel/bmc150-accel-spi.c | 4 +--- > drivers/iio/accel/bmi088-accel-spi.c | 4 +--- > drivers/iio/accel/kxsd9-spi.c | 4 +--- > drivers/iio/accel/mma7455_spi.c | 4 +--- > drivers/iio/accel/sca3000.c | 4 +--- > drivers/iio/adc/ad7266.c | 4 +--- > drivers/iio/adc/ltc2496.c | 4 +--- > drivers/iio/adc/mcp320x.c | 4 +--- > drivers/iio/adc/mcp3911.c | 4 +--- > drivers/iio/adc/ti-adc12138.c | 4 +--- > drivers/iio/adc/ti-ads7950.c | 4 +--- > drivers/iio/adc/ti-ads8688.c | 4 +--- > drivers/iio/adc/ti-tlc4541.c | 4 +--- > drivers/iio/amplifiers/ad8366.c | 4 +--- > drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +--- > drivers/iio/dac/ad5360.c | 4 +--- > drivers/iio/dac/ad5380.c | 4 +--- > drivers/iio/dac/ad5446.c | 4 +--- > drivers/iio/dac/ad5449.c | 4 +--- > drivers/iio/dac/ad5504.c | 4 +--- > drivers/iio/dac/ad5592r.c | 4 +--- > drivers/iio/dac/ad5624r_spi.c | 4 +--- > drivers/iio/dac/ad5686-spi.c | 4 +--- > drivers/iio/dac/ad5761.c | 4 +--- > drivers/iio/dac/ad5764.c | 4 +--- > drivers/iio/dac/ad5791.c | 4 +--- > drivers/iio/dac/ad8801.c | 4 +--- > drivers/iio/dac/ltc1660.c | 4 +--- > drivers/iio/dac/ltc2632.c | 4 +--- > drivers/iio/dac/mcp4922.c | 4 +--- > drivers/iio/dac/ti-dac082s085.c | 4 +--- > drivers/iio/dac/ti-dac7311.c | 3 +-- > drivers/iio/frequency/adf4350.c | 4 +--- > drivers/iio/gyro/bmg160_spi.c | 4 +--- > drivers/iio/gyro/fxas21002c_spi.c | 4 +--- > drivers/iio/health/afe4403.c | 4 +--- > drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +--- > drivers/iio/magnetometer/hmc5843_spi.c | 4 +--- > drivers/iio/potentiometer/max5487.c | 4 +--- > drivers/iio/pressure/ms5611_spi.c | 4 +--- > drivers/iio/pressure/zpa2326_spi.c | 4 +--- > drivers/input/keyboard/applespi.c | 4 +--- > drivers/input/misc/adxl34x-spi.c | 4 +--- > drivers/input/touchscreen/ads7846.c | 4 +--- > drivers/input/touchscreen/cyttsp4_spi.c | 4 +--- > drivers/input/touchscreen/tsc2005.c | 4 +--- > drivers/leds/leds-cr0014114.c | 4 +--- > drivers/leds/leds-dac124s085.c | 4 +--- > drivers/leds/leds-el15203000.c | 4 +--- > drivers/leds/leds-spi-byte.c | 4 +--- > drivers/media/spi/cxd2880-spi.c | 4 +--- > drivers/media/spi/gs1662.c | 4 +--- > drivers/media/tuners/msi001.c | 3 +-- A bit late, but for drivers/media: Acked-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> Thanks! Hans

1 0

Multiple codecs of the same type on the same card
by Ricard Wanderlof 18 Feb '22

18 Feb '22

When adding codecs to a card, all the controls of each individual codec are visible as controls for the complete card. But how does one handle the case of multiple codecs of the same type, for instance two identical codecs being used in TDM mode to create a multi channel card? Is there some method for resolving the fact that the control names naturally conflict? Or is this expected to be resolved in the machine driver? Currently I've been using simple-card, but perhaps this type of configuration is too advanced to be resolved for that, and a specialized machine driver is needed? /Ricard -- Ricard Wolf Wanderlof ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

1 1

[PATCH] ASoC: codecs: Add power domains support in digital macro codecs
by Srinivasa Rao Mandadapu 17 Feb '22

17 Feb '22

Add support for enabling required power domains in digital macro codecs. macro and dcodec power domains are being requested as clocks by HLOS in ADSP based architectures and ADSP internally handling as powerdomains. In ADSP bypass case need to handle them as power domains explicitly. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Co-developed-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> Signed-off-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> --- sound/soc/codecs/Kconfig | 4 ++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/lpass-macro-common.c | 72 +++++++++++++++++++++++++++++++++++ sound/soc/codecs/lpass-macro-common.h | 18 +++++++++ sound/soc/codecs/lpass-rx-macro.c | 13 ++++++- sound/soc/codecs/lpass-tx-macro.c | 10 +++++ sound/soc/codecs/lpass-va-macro.c | 11 +++++- sound/soc/qcom/Kconfig | 1 + 8 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 sound/soc/codecs/lpass-macro-common.c create mode 100644 sound/soc/codecs/lpass-macro-common.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c2627f7..d3a850f 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -244,6 +244,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_WCD9335 imply SND_SOC_WCD934X imply SND_SOC_WCD938X_SDW + imply SND_SOC_LPASS_MACRO_COMMON imply SND_SOC_LPASS_RX_MACRO imply SND_SOC_LPASS_TX_MACRO imply SND_SOC_WL1273 @@ -2008,6 +2009,9 @@ config SND_SOC_TPA6130A2 tristate "Texas Instruments TPA6130A2 headphone amplifier" depends on I2C +config SND_SOC_LPASS_MACRO_COMMON + tristate + config SND_SOC_LPASS_WSA_MACRO depends on COMMON_CLK select REGMAP_MMIO diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index b4e11c3..c3c6059 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -112,6 +112,7 @@ snd-soc-l3-objs := l3.o snd-soc-lm4857-objs := lm4857.o snd-soc-lm49453-objs := lm49453.o snd-soc-lochnagar-sc-objs := lochnagar-sc.o +snd-soc-lpass-macro-common-objs := lpass-macro-common.o snd-soc-lpass-rx-macro-objs := lpass-rx-macro.o snd-soc-lpass-tx-macro-objs := lpass-tx-macro.o snd-soc-lpass-wsa-macro-objs := lpass-wsa-macro.o @@ -676,6 +677,7 @@ obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o obj-$(CONFIG_SND_SOC_SIMPLE_AMPLIFIER) += snd-soc-simple-amplifier.o obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o +obj-$(CONFIG_SND_SOC_LPASS_MACRO_COMMON) += snd-soc-lpass-macro-common.o obj-$(CONFIG_SND_SOC_LPASS_WSA_MACRO) += snd-soc-lpass-wsa-macro.o obj-$(CONFIG_SND_SOC_LPASS_VA_MACRO) += snd-soc-lpass-va-macro.o obj-$(CONFIG_SND_SOC_LPASS_RX_MACRO) += snd-soc-lpass-rx-macro.o diff --git a/sound/soc/codecs/lpass-macro-common.c b/sound/soc/codecs/lpass-macro-common.c new file mode 100644 index 0000000..b8e50e6 --- /dev/null +++ b/sound/soc/codecs/lpass-macro-common.c @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0-only +// Copyright (c) 2022, The Linux Foundation. All rights reserved. + +#include <linux/export.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/pm_domain.h> +#include <linux/pm_runtime.h> + +#include "lpass-macro-common.h" + +int lpass_macro_pds_init(struct platform_device *pdev, struct lpass_macro **pds) +{ + struct device *dev = &pdev->dev; + struct lpass_macro *l_pds; + int ret; + + const struct property *prop = of_find_property(dev->of_node, "power-domains", NULL); + + if (!prop) + return 0; + + l_pds = devm_kzalloc(dev, sizeof(*l_pds), GFP_KERNEL); + if (!l_pds) + return -ENOMEM; + + l_pds->macro_pd = dev_pm_domain_attach_by_name(dev, "macro"); + if (IS_ERR_OR_NULL(l_pds->macro_pd)) { + ret = PTR_ERR(l_pds->macro_pd) ? : -ENODATA; + return ret; + } + ret = pm_runtime_get_sync(l_pds->macro_pd); + if (ret < 0) { + dev_err(dev, "%s failed for macro_pd, ret %d\n", __func__, ret); + dev_pm_domain_detach(l_pds->macro_pd, false); + pm_runtime_put_noidle(l_pds->macro_pd); + return ret; + } + + l_pds->dcodec_pd = dev_pm_domain_attach_by_name(dev, "dcodec"); + if (IS_ERR_OR_NULL(l_pds->dcodec_pd)) { + ret = PTR_ERR(l_pds->dcodec_pd) ? : -ENODATA; + dev_pm_domain_detach(l_pds->macro_pd, false); + return ret; + } + + ret = pm_runtime_get_sync(l_pds->dcodec_pd); + if (ret < 0) { + dev_err(dev, "%s failed for dcodec_pd, ret %d\n", __func__, ret); + + dev_pm_domain_detach(l_pds->dcodec_pd, false); + pm_runtime_put_noidle(l_pds->dcodec_pd); + return ret; + } + *pds = l_pds; + return ret; +} +EXPORT_SYMBOL_GPL(lpass_macro_pds_init); + +void lpass_macro_pds_exit(struct platform_device *pdev, struct lpass_macro *pds) +{ + pm_runtime_put(pds->macro_pd); + pm_runtime_put(pds->dcodec_pd); + dev_pm_domain_detach(pds->macro_pd, false); + dev_pm_domain_detach(pds->dcodec_pd, false); +} +EXPORT_SYMBOL_GPL(lpass_macro_pds_exit); + +MODULE_DESCRIPTION("QTI SC7280 LPI GPIO pin control driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h new file mode 100644 index 0000000..c343f0e --- /dev/null +++ b/sound/soc/codecs/lpass-macro-common.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2022, The Linux Foundation. All rights reserved. + */ + +#ifndef __LPASS_MACRO_COMMON_H__ +#define __LPASS_MACRO_COMMON_H__ + + +struct lpass_macro { + struct device *macro_pd; + struct device *dcodec_pd; +}; + +int lpass_macro_pds_init(struct platform_device *pdev, struct lpass_macro **pds); +void lpass_macro_pds_exit(struct platform_device *pdev, struct lpass_macro *pds); + +#endif /* __LPASS_MACRO_COMMON_H__ */ diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 29d214f..db32090 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -14,6 +14,8 @@ #include <linux/of_clk.h> #include <linux/clk-provider.h> +#include "lpass-macro-common.h" + #define CDC_RX_TOP_TOP_CFG0 (0x0000) #define CDC_RX_TOP_SWR_CTRL (0x0008) #define CDC_RX_TOP_DEBUG (0x000C) @@ -606,7 +608,7 @@ struct rx_macro { int is_softclip_on; int is_aux_hpf_on; int softclip_clk_users; - + struct lpass_macro *pds; struct regmap *regmap; struct clk_bulk_data clks[RX_NUM_CLKS_MAX]; struct clk_hw hw; @@ -3537,6 +3539,12 @@ static int rx_macro_probe(struct platform_device *pdev) return ret; } + ret = lpass_macro_pds_init(pdev, &rx->pds); + if (ret < 0) { + dev_err(dev, "Enabling power domains failed in %s\n", __func__); + return ret; + } + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); @@ -3575,6 +3583,9 @@ static int rx_macro_remove(struct platform_device *pdev) of_clk_del_provider(pdev->dev.of_node); clk_bulk_disable_unprepare(RX_NUM_CLKS_MAX, rx->clks); + + lpass_macro_pds_exit(pdev, rx->pds); + return 0; } diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 9c96ab1..4d1e5ab 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -13,6 +13,8 @@ #include <linux/of_clk.h> #include <linux/clk-provider.h> +#include "lpass-macro-common.h" + #define CDC_TX_CLK_RST_CTRL_MCLK_CONTROL (0x0000) #define CDC_TX_MCLK_EN_MASK BIT(0) #define CDC_TX_MCLK_ENABLE BIT(0) @@ -266,6 +268,7 @@ struct tx_macro { u16 dmic_clk_div; bool bcs_enable; int dec_mode[NUM_DECIMATORS]; + struct lpass_macro *pds; bool bcs_clk_en; }; #define to_tx_macro(_hw) container_of(_hw, struct tx_macro, hw) @@ -1802,6 +1805,11 @@ static int tx_macro_probe(struct platform_device *pdev) return ret; } + ret = lpass_macro_pds_init(pdev, &tx->pds); + if (ret < 0) { + dev_err(dev, "Enabling power domains failed in %s\n", __func__); + return ret; + } base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); @@ -1859,6 +1867,8 @@ static int tx_macro_remove(struct platform_device *pdev) clk_bulk_disable_unprepare(TX_NUM_CLKS_MAX, tx->clks); + lpass_macro_pds_exit(pdev, tx->pds); + return 0; } diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index 11147e3..b29b9a1 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -15,6 +15,8 @@ #include <sound/soc-dapm.h> #include <sound/tlv.h> +#include "lpass-macro-common.h" + /* VA macro registers */ #define CDC_VA_CLK_RST_CTRL_MCLK_CONTROL (0x0000) #define CDC_VA_MCLK_CONTROL_EN BIT(0) @@ -195,6 +197,7 @@ struct va_macro { struct regmap *regmap; struct clk_bulk_data clks[VA_NUM_CLKS_MAX]; struct clk_hw hw; + struct lpass_macro *pds; s32 dmic_0_1_clk_cnt; s32 dmic_2_3_clk_cnt; @@ -1413,7 +1416,11 @@ static int va_macro_probe(struct platform_device *pdev) dev_err(dev, "Error getting VA Clocks (%d)\n", ret); return ret; } - + ret = lpass_macro_pds_init(pdev, &va->pds); + if (ret < 0) { + dev_err(dev, "Enabling power domains failed %s\n", __func__); + return ret; + } ret = of_property_read_u32(dev->of_node, "qcom,dmic-sample-rate", &sample_rate); if (ret) { @@ -1468,6 +1475,8 @@ static int va_macro_remove(struct platform_device *pdev) clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks); + lpass_macro_pds_exit(pdev, va->pds); + return 0; } diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 52db003..6ffd51a 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -194,6 +194,7 @@ config SND_SOC_SC7280 select SND_SOC_LPASS_SC7280 select SND_SOC_MAX98357A select SND_SOC_WCD938X + select SND_SOC_LPASS_MACRO_COMMON select SND_SOC_LPASS_RX_MACRO select SND_SOC_LPASS_TX_MACRO help -- 2.7.4

2 3

[PATCH] ASoC: SOF: Replace zero-length array with flexible-array member
by Stephen Kitt 17 Feb '22

17 Feb '22

There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use "flexible array members"[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy(). [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-… Link: https://github.com/KSPP/linux/issues/78 Link: https://github.com/KSPP/linux/issues/180 Suggested-by: Gustavo A. R. Silva <gustavoars(a)kernel.org> Signed-off-by: Stephen Kitt <steve(a)sk2.org> --- include/sound/sof/topology.h | 2 +- sound/soc/sof/topology.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index d12736e14b69..adee6afd1490 100644 --- a/include/sound/sof/topology.h +++ b/include/sound/sof/topology.h @@ -237,7 +237,7 @@ struct sof_ipc_comp_process { /* reserved for future use */ uint32_t reserved[7]; - uint8_t data[0]; + uint8_t data[]; } __packed; /* frees components, buffers and pipelines diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index e72dcae5e7ee..1d119d1dd69d 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2164,7 +2164,7 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, */ if (ipc_data_size) { for (i = 0; i < widget->num_kcontrols; i++) { - memcpy(&process->data + offset, + memcpy(&process->data[offset], wdata[i].pdata->data, wdata[i].pdata->size); offset += wdata[i].pdata->size; base-commit: f71077a4d84bbe8c7b91b7db7c4ef815755ac5e3 -- 2.27.0

4 3

ucm2: sof-essx8336: initial support
by GitHub pull_request - opened 17 Feb '22

17 Feb '22

alsa-project/alsa-ucm-conf pull request #139 was opened from plbossart: Loosely based on the sof-hda-dsp model for DMIC conditional handling. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/139 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/139.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2] ASoC: SOF: core: unregister clients and machine drivers in .shutdown
by Kai Vehmanen 17 Feb '22

17 Feb '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> On a platform shutdown, the expectation for most drivers is that userspace tasks will release all resources. When those sequences do not complete, it can be the case that PCM devices exposed by ALSA cards are used *after* the DSP shutdown completes, leading to a platform hang. When the clients and machine drivers provide an _unregister callback, let's invoke it in the shutdown sequence. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/soc/sof/core.c | 9 +++++++++ 1 file changed, 9 insertions(+) V1->V2: - correct patch title to have "ASoC: SOF: " prefix (reported by Amadeusz) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index d99ecbb4282d..2a35d8ddf43e 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -463,10 +463,19 @@ EXPORT_SYMBOL(snd_sof_device_remove); int snd_sof_device_shutdown(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev); + struct snd_sof_pdata *pdata = sdev->pdata; if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) cancel_work_sync(&sdev->probe_work); + /* + * make sure clients and machine driver(s) are unregistered to force + * all userspace devices to be closed prior to the DSP shutdown sequence + */ + sof_unregister_clients(sdev); + + snd_sof_machine_unregister(sdev, pdata); + if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) return snd_sof_shutdown(sdev); base-commit: f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea -- 2.35.1

3 2