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

[alsa-devel] [RFC PATCH 0/3] ALSA: compress: Add support for FLAC
by Vinod Koul 19 Nov '19

19 Nov '19

The current design of sending codec parameters assumes that decoders will have parsers so they can parse the encoded stream for parameters and configure the decoder. But this assumption may not be universally true and we know some DSPs which do not contain the parsers so additional parameters are required to be passed. So add these parameters starting with FLAC decoder. The size of snd_codec_options is still 120 bytes after this change (due to this being a union) I think we should also bump the (minor) version if this proposal is acceptable so the userspace can check and populate flac specific structure. Along, with the core header change, patches are added to support FLAC in Qualcomm drivers. This was tested on 96boards db845c Srinivas Kandagatla (1): ASoC: qcom: q6asm: add support to flac config Vinod Koul (2): ALSA: compress: add flac decoder params ASoC: qcom: q6asm-dai: add support to flac decoder include/uapi/sound/compress_params.h | 10 +++++ sound/soc/qcom/qdsp6/q6asm-dai.c | 35 +++++++++++++++++- sound/soc/qcom/qdsp6/q6asm.c | 55 ++++++++++++++++++++++++++++ sound/soc/qcom/qdsp6/q6asm.h | 15 ++++++++ 4 files changed, 114 insertions(+), 1 deletion(-) -- 2.23.0

4 10

[alsa-devel] [PATCH 0/2] ASoC: pcm3168a: Poor man's RST gpio handling
by Peter Ujfalusi 18 Nov '19

18 Nov '19

Hi, when the codec RST input is connected to a GPIO it needs to be pulled high in order to take the pcm3168a out from reset and to make it respond to register accesses via i2c. I have a board where one GPIO line is connected to two pcm3168a codec so runtime handling of the RST gpio is not possible (one codec would place the other codec to reset as well). The only possible solution is to request the gpio with GPIOD_FLAGS_BIT_NONEXCLUSIVE flag, ask it to be high initially and never touch it again. If the optinal GPIO is not described then issue the reset as the driver did. Regards, Peter --- Peter Ujfalusi (2): bindings: sound: pcm3168a: Document optional RST gpio ASoC: pcm3168a: Add support for optional RST gpio handling .../devicetree/bindings/sound/ti,pcm3168a.txt | 7 ++++ sound/soc/codecs/pcm3168a.c | 38 +++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

3 8

[alsa-devel] Applied "ASoC: SOF: Intel: Fix build break" to the asoc tree
by Mark Brown 18 Nov '19

18 Nov '19

The patch ASoC: SOF: Intel: Fix build break has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 >From 302ee055af0201e61be7670f957c1622d6ce176e Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Mon, 18 Nov 2019 15:52:47 +0000 Subject: [PATCH] ASoC: SOF: Intel: Fix build break Commit 130d3e9077 (Fix CFL and CML FW nocodec binary names.) broke the build in some configurations as it depends on changes in the development branch, revert it. Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sof/sof-pci-dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 2ef927371b23..d66412a77873 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -113,7 +113,7 @@ static const struct sof_dev_desc cnl_desc = { #if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE) static const struct sof_dev_desc cfl_desc = { - .machines = snd_soc_acpi_intel_cfl_machines, + .machines = snd_soc_acpi_intel_cnl_machines, .resindex_lpe_base = 0, .resindex_pcicfg_base = -1, .resindex_imr_base = -1, @@ -122,7 +122,7 @@ static const struct sof_dev_desc cfl_desc = { .chip_info = &cnl_chip_info, .default_fw_path = "intel/sof", .default_tplg_path = "intel/sof-tplg", - .nocodec_fw_filename = "sof-cfl.ri", + .nocodec_fw_filename = "sof-cnl.ri", .nocodec_tplg_filename = "sof-cnl-nocodec.tplg", .ops = &sof_cnl_ops, .arch_ops = &sof_xtensa_arch_ops @@ -133,7 +133,7 @@ static const struct sof_dev_desc cfl_desc = { IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) static const struct sof_dev_desc cml_desc = { - .machines = snd_soc_acpi_intel_cml_machines, + .machines = snd_soc_acpi_intel_cnl_machines, .resindex_lpe_base = 0, .resindex_pcicfg_base = -1, .resindex_imr_base = -1, @@ -142,7 +142,7 @@ static const struct sof_dev_desc cml_desc = { .chip_info = &cnl_chip_info, .default_fw_path = "intel/sof", .default_tplg_path = "intel/sof-tplg", - .nocodec_fw_filename = "sof-cml.ri", + .nocodec_fw_filename = "sof-cnl.ri", .nocodec_tplg_filename = "sof-cnl-nocodec.tplg", .ops = &sof_cnl_ops, .arch_ops = &sof_xtensa_arch_ops -- 2.20.1

1 0

[alsa-devel] [PATCH 0/3] ASoC: Intel/SOF: split CFL, CNL, CML firmware names
by Pierre-Louis Bossart 18 Nov '19

18 Nov '19

The manifests used for the three machines can be different, so let's move to use different firmware names. When the files can be shared between platforms, we will use a symlink in /lib/firmware. This change may break early platforms who relies on custom kernels/firmware, but this will be the format supported moving forward for all SOF firmware releases. One platform - one name. Liam Girdwood (1): ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names. Pierre-Louis Bossart (2): ASoC: Intel: acpi-match: split CNL tables in three ASoC: SOF: Intel: hda: use fallback for firmware name include/sound/soc-acpi-intel-match.h | 2 + sound/soc/intel/common/Makefile | 3 +- .../intel/common/soc-acpi-intel-cfl-match.c | 18 ++++++ .../intel/common/soc-acpi-intel-cml-match.c | 56 +++++++++++++++++++ .../intel/common/soc-acpi-intel-cnl-match.c | 38 ------------- sound/soc/sof/intel/hda.c | 11 +++- sound/soc/sof/sof-pci-dev.c | 8 +-- 7 files changed, 91 insertions(+), 45 deletions(-) create mode 100644 sound/soc/intel/common/soc-acpi-intel-cfl-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-cml-match.c -- 2.20.1

2 7

[alsa-devel] [PATCH] ASoC: tlv320aic31xx: configure output common-mode voltage
by Lucas Stach 18 Nov '19

18 Nov '19

The tlv320aic31xx devices allow to adjust the output common-mode voltage for best analog performance. The datasheet states that the common mode voltage should be set to be <= AVDD/2. This changes allows to configure the output common-mode voltage via a DT property. If the property is absent the voltage is automatically chosen as the highest voltage below/equal to AVDD/2. Signed-off-by: Lucas Stach <l.stach(a)pengutronix.de> --- .../bindings/sound/tlv320aic31xx.txt | 5 +++ sound/soc/codecs/tlv320aic31xx.c | 45 +++++++++++++++++++ sound/soc/codecs/tlv320aic31xx.h | 8 ++++ 3 files changed, 58 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt index 5b3c33bb99e5..e372303697dc 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt @@ -29,6 +29,11 @@ Optional properties: 3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD If this node is not mentioned or if the value is unknown, then micbias is set to 2.0V. +- ai31xx-ocmv - output common-mode voltage setting + 0 - 1.35V, + 1 - 1.5V, + 2 - 1.65V, + 3 - 1.8V Deprecated properties: diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index df627a08def9..f6f19fdc72f5 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -171,6 +171,7 @@ struct aic31xx_priv { int rate_div_line; bool master_dapm_route_applied; int irq; + u8 ocmv; /* output common-mode voltage */ }; struct aic31xx_rate_divs { @@ -1312,6 +1313,11 @@ static int aic31xx_codec_probe(struct snd_soc_component *component) if (ret) return ret; + /* set output common-mode voltage */ + snd_soc_component_update_bits(component, AIC31XX_HPDRIVER, + AIC31XX_HPD_OCMV_MASK, + aic31xx->ocmv << AIC31XX_HPD_OCMV_SHIFT); + return 0; } @@ -1501,6 +1507,43 @@ static irqreturn_t aic31xx_irq(int irq, void *data) return IRQ_NONE; } +static void aic31xx_configure_ocmv(struct aic31xx_priv *priv) +{ + struct device *dev = priv->dev; + int dvdd, avdd; + u32 value; + + if (dev->fwnode && + fwnode_property_read_u32(dev->fwnode, "ai31xx-ocmv", &value)) { + /* OCMV setting is forced by DT */ + if (value <= 3) { + priv->ocmv = value; + return; + } + } + + avdd = regulator_get_voltage(priv->supplies[3].consumer); + dvdd = regulator_get_voltage(priv->supplies[5].consumer); + + if (avdd > 3600000 || dvdd > 1950000) { + dev_warn(dev, + "Too high supply voltage(s) AVDD: %d, DVDD: %d\n", + avdd, dvdd); + } else if (avdd == 3600000 && dvdd == 1950000) { + priv->ocmv = AIC31XX_HPD_OCMV_1_8V; + } else if (avdd >= 3300000 && dvdd >= 1800000) { + priv->ocmv = AIC31XX_HPD_OCMV_1_65V; + } else if (avdd >= 3000000 && dvdd >= 1650000) { + priv->ocmv = AIC31XX_HPD_OCMV_1_5V; + } else if (avdd >= 2700000 && dvdd >= 1525000) { + priv->ocmv = AIC31XX_HPD_OCMV_1_35V; + } else { + dev_warn(dev, + "Invalid supply voltage(s) AVDD: %d, DVDD: %d\n", + avdd, dvdd); + } +} + static int aic31xx_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1570,6 +1613,8 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, return ret; } + aic31xx_configure_ocmv(aic31xx); + if (aic31xx->irq > 0) { regmap_update_bits(aic31xx->regmap, AIC31XX_GPIO1, AIC31XX_GPIO1_FUNC_MASK, diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index cb024955c978..83a8c7604cc3 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -232,6 +232,14 @@ struct aic31xx_pdata { #define AIC31XX_HSD_HP 0x01 #define AIC31XX_HSD_HS 0x03 +/* AIC31XX_HPDRIVER */ +#define AIC31XX_HPD_OCMV_MASK GENMASK(4, 3) +#define AIC31XX_HPD_OCMV_SHIFT 3 +#define AIC31XX_HPD_OCMV_1_35V 0x0 +#define AIC31XX_HPD_OCMV_1_5V 0x1 +#define AIC31XX_HPD_OCMV_1_65V 0x2 +#define AIC31XX_HPD_OCMV_1_8V 0x3 + /* AIC31XX_MICBIAS */ #define AIC31XX_MICBIAS_MASK GENMASK(1, 0) #define AIC31XX_MICBIAS_SHIFT 0 -- 2.20.1

2 1

[alsa-devel] [PATCH v2] ASoC: wm_adsp: Expose mixer control API
by David Rhodes 18 Nov '19

18 Nov '19

Changes since v1: Updated commit message Handle controls without subname Call snd_ctl_notify() in wm_adsp_write_ctl()

3 4

[alsa-devel] [PATCH v7 1/6] ASoC: amd:Create multiple I2S platform device endpoint
by Ravulapati Vishnu vardhan rao 18 Nov '19

18 Nov '19

Creates Platform Device endpoints for multiple I2S instances: SP and BT endpoints device. Pass PCI resources like MMIO, irq to the platform devices. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x.h | 5 ++ sound/soc/amd/raven/pci-acp3x.c | 102 ++++++++++++++++++++++++++++------------ 2 files changed, 76 insertions(+), 31 deletions(-) diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..2f15fe1 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,10 +7,15 @@ #include "chip_offset_byte.h" +#define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 #define ACP3x_REG_START 0x1240000 #define ACP3x_REG_END 0x1250200 +#define ACP3x_I2STDM_REG_START 0x1242400 +#define ACP3x_I2STDM_REG_END 0x1242410 +#define ACP3x_BT_TDM_REG_START 0x1242800 +#define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index facec24..174adbc 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -16,17 +16,17 @@ struct acp3x_dev_data { void __iomem *acp3x_base; bool acp3x_audio_mode; struct resource *res; - struct platform_device *pdev; + struct platform_device *pdev[ACP3x_DEVS]; }; static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { - int ret; - u32 addr, val; struct acp3x_dev_data *adata; - struct platform_device_info pdevinfo; + struct platform_device_info pdevinfo[ACP3x_DEVS]; unsigned int irqflags; + int ret, val, i; + u32 addr; if (pci_enable_device(pci)) { dev_err(&pci->dev, "pci_enable_device failed\n"); @@ -40,10 +40,10 @@ static int snd_acp3x_probe(struct pci_dev *pci, } adata = devm_kzalloc(&pci->dev, sizeof(struct acp3x_dev_data), - GFP_KERNEL); + GFP_KERNEL); if (!adata) { ret = -ENOMEM; - goto release_regions; + goto adata_free; } /* check for msi interrupt support */ @@ -56,7 +56,8 @@ static int snd_acp3x_probe(struct pci_dev *pci, irqflags = 0; addr = pci_resource_start(pci, 0); - adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0)); + adata->acp3x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); if (!adata->acp3x_base) { ret = -ENOMEM; goto release_regions; @@ -68,11 +69,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev, - sizeof(struct resource) * 2, + sizeof(struct resource) * 4, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto unmap_mmio; + goto release_regions; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -80,28 +81,52 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->res[0].start = addr; adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START); - adata->res[1].name = "acp3x_i2s_irq"; - adata->res[1].flags = IORESOURCE_IRQ; - adata->res[1].start = pci->irq; - adata->res[1].end = pci->irq; + adata->res[1].name = "acp3x_i2s_sp"; + adata->res[1].flags = IORESOURCE_MEM; + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; + + adata->res[2].name = "acp3x_i2s_bt"; + adata->res[2].flags = IORESOURCE_MEM; + adata->res[2].start = addr + ACP3x_BT_TDM_REG_START; + adata->res[2].end = addr + ACP3x_BT_TDM_REG_END; + + adata->res[3].name = "acp3x_i2s_irq"; + adata->res[3].flags = IORESOURCE_IRQ; + adata->res[3].start = pci->irq; + adata->res[3].end = adata->res[3].start; adata->acp3x_audio_mode = ACP3x_I2S_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); - pdevinfo.name = "acp3x_rv_i2s"; - pdevinfo.id = 0; - pdevinfo.parent = &pci->dev; - pdevinfo.num_res = 2; - pdevinfo.res = adata->res; - pdevinfo.data = &irqflags; - pdevinfo.size_data = sizeof(irqflags); - - adata->pdev = platform_device_register_full(&pdevinfo); - if (IS_ERR(adata->pdev)) { - dev_err(&pci->dev, "cannot register %s device\n", - pdevinfo.name); - ret = PTR_ERR(adata->pdev); - goto unmap_mmio; + pdevinfo[0].name = "acp3x_rv_i2s_dma"; + pdevinfo[0].id = 0; + pdevinfo[0].parent = &pci->dev; + pdevinfo[0].num_res = 4; + pdevinfo[0].res = &adata->res[0]; + pdevinfo[0].data = &irqflags; + pdevinfo[0].size_data = sizeof(irqflags); + + pdevinfo[1].name = "acp3x_i2s_playcap"; + pdevinfo[1].id = 0; + pdevinfo[1].parent = &pci->dev; + pdevinfo[1].num_res = 1; + pdevinfo[1].res = &adata->res[1]; + + pdevinfo[2].name = "acp3x_i2s_playcap"; + pdevinfo[2].id = 1; + pdevinfo[2].parent = &pci->dev; + pdevinfo[2].num_res = 1; + pdevinfo[2].res = &adata->res[2]; + for (i = 0; i < ACP3x_DEVS ; i++) { + adata->pdev[i] = + platform_device_register_full(&pdevinfo[i]); + if (IS_ERR(adata->pdev[i])) { + dev_err(&pci->dev, "cannot register %s device\n", + pdevinfo[i].name); + ret = PTR_ERR(adata->pdev[i]); + goto unmap_mmio; + } } break; default: @@ -112,10 +137,22 @@ static int snd_acp3x_probe(struct pci_dev *pci, return 0; unmap_mmio: + if (val == I2S_MODE) + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + devm_kfree(&pci->dev, adata->res); + devm_kfree(&pci->dev, adata); pci_disable_msi(pci); - iounmap(adata->acp3x_base); + pci_release_regions(pci); + pci_disable_device(pci); release_regions: + devm_kfree(&pci->dev, adata); + pci_disable_msi(pci); pci_release_regions(pci); + pci_disable_device(pci); +adata_free: + pci_release_regions(pci); + pci_disable_device(pci); disable_pci: pci_disable_device(pci); @@ -125,10 +162,12 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci); + int i; - platform_device_unregister(adata->pdev); - iounmap(adata->acp3x_base); - + if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + } pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -151,6 +190,7 @@ static struct pci_driver acp3x_driver = { module_pci_driver(acp3x_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_DESCRIPTION("AMD ACP3x PCI driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

3 2

[alsa-devel] [asoc:for-5.4 438/441] sound/soc/sof/sof-pci-dev.c:136:15: error: 'snd_soc_acpi_intel_cml_machines' undeclared here (not in a function); did you mean 'snd_soc_acpi_intel_cnl_machines'?
by kbuild test robot 18 Nov '19

18 Nov '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4 head: fe23be2d85b05f561431d75acddec726ea807d2a commit: 130d3e90777fe974e4b8fa100cec8faf19cac998 [438/441] ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names. config: i386-randconfig-c002-20191117 (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: git checkout 130d3e90777fe974e4b8fa100cec8faf19cac998 # save the attached .config to linux build tree make ARCH=i386 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): >> sound/soc/sof/sof-pci-dev.c:136:15: error: 'snd_soc_acpi_intel_cml_machines' undeclared here (not in a function); did you mean 'snd_soc_acpi_intel_cnl_machines'? .machines = snd_soc_acpi_intel_cml_machines, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ snd_soc_acpi_intel_cnl_machines vim +136 sound/soc/sof/sof-pci-dev.c 131 132 #if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) || \ 133 IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) 134 135 static const struct sof_dev_desc cml_desc = { > 136 .machines = snd_soc_acpi_intel_cml_machines, 137 .resindex_lpe_base = 0, 138 .resindex_pcicfg_base = -1, 139 .resindex_imr_base = -1, 140 .irqindex_host_ipc = -1, 141 .resindex_dma_base = -1, 142 .chip_info = &cnl_chip_info, 143 .default_fw_path = "intel/sof", 144 .default_tplg_path = "intel/sof-tplg", 145 .nocodec_fw_filename = "sof-cml.ri", 146 .nocodec_tplg_filename = "sof-cnl-nocodec.tplg", 147 .ops = &sof_cnl_ops, 148 .arch_ops = &sof_xtensa_arch_ops 149 }; 150 #endif 151 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org Intel Corporation

3 2

[alsa-devel] [PATCH v3 00/19] ASoC: soc-core cleanup - step 4
by Kuninori Morimoto 18 Nov '19

18 Nov '19

Hi Mark These are v3 of soc-core cleanup step4. These are based on mark/for-5.5 branch. These had been tested on Intel CI, and had no issue. And are reviewed by Pierre-Louis, Ranjani. Kuninori Morimoto (19): ASoC: soc-core: move soc_init_dai_link() ASoC: soc-core: tidyup soc_init_dai_link() ASoC: soc-core: typo fix at soc_dai_link_sanity_check() ASoC: soc-core: remove duplicated soc_is_dai_link_bound() ASoC: soc-core: call soc_bind_dai_link() under snd_soc_add_dai_link() ASoC: soc-core: add soc_unbind_dai_link() ASoC: soc-core: move snd_soc_lookup_component() ASoC: soc-core: tidyup snd_soc_lookup_component() ASoC: soc-core: add snd_soc_del_component_unlocked() ASoC: soc-core: remove snd_soc_component_add/del() ASoC: soc-core: use snd_soc_lookup_component() at snd_soc_unregister_component() ASoC: soc-core: move snd_soc_register_dai() ASoC: soc-core: move snd_soc_unregister_dais() ASoC: soc-core: add snd_soc_unregister_dai() ASoC: soc-core: have legacy_dai_naming at snd_soc_register_dai() ASoC: soc-core: don't call snd_soc_dapm_new_dai_widgets() at snd_soc_register_dai() ASoC: soc-core: call snd_soc_register_dai() from snd_soc_register_dais() ASoC: soc-core: remove topology specific operation ASoC: soc.h: dobj is used only when SND_SOC_TOPOLOGY include/sound/soc.h | 15 +- sound/soc/soc-core.c | 526 ++++++++++++++++++++--------------------------- sound/soc/soc-topology.c | 17 +- 3 files changed, 255 insertions(+), 303 deletions(-) -- 2.7.4

6 59

[alsa-devel] [PATCH] ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk()
by Takashi Iwai 18 Nov '19

18 Nov '19

The commit 60849562a5db ("ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk()") added NULL checks in create_yamaha_midi_quirk(), but there was an overlook. The code allows one of either injd or outjd is NULL, but the second if check made returning -ENODEV if any of them is NULL. Fix it in a proper form. Fixes: 60849562a5db ("ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk()") Reported-by: Pavel Machek <pavel(a)denx.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0bbe1201a6ac..349e1e52996d 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -248,8 +248,8 @@ static int create_yamaha_midi_quirk(struct snd_usb_audio *chip, NULL, USB_MS_MIDI_OUT_JACK); if (!injd && !outjd) return -ENODEV; - if (!(injd && snd_usb_validate_midi_desc(injd)) || - !(outjd && snd_usb_validate_midi_desc(outjd))) + if ((injd && !snd_usb_validate_midi_desc(injd)) || + (outjd && !snd_usb_validate_midi_desc(outjd))) return -ENODEV; if (injd && (injd->bLength < 5 || (injd->bJackType != USB_MS_EMBEDDED && -- 2.16.4

2 1