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

[alsa-devel] [asoc:for-5.5 32/32] sound/soc/codecs/tas2770.c:211:14: sparse: sparse: restricted snd_pcm_format_t degrades to integer
by kbuild test robot 01 Oct '19

01 Oct '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5 head: 1a476abc723e644248dba975b71122fcf878703b commit: 1a476abc723e644248dba975b71122fcf878703b [32/32] tas2770: add tas2770 smart PA kernel driver reproduce: # apt-get install sparse # sparse version: v0.6.1-rc1-37-gd466a02-dirty git checkout 1a476abc723e644248dba975b71122fcf878703b make ARCH=x86_64 allmodconfig make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> sparse warnings: (new ones prefixed by >>) >> sound/soc/codecs/tas2770.c:211:14: sparse: sparse: restricted snd_pcm_format_t degrades to integer sound/soc/codecs/tas2770.c:218:14: sparse: sparse: restricted snd_pcm_format_t degrades to integer sound/soc/codecs/tas2770.c:225:14: sparse: sparse: restricted snd_pcm_format_t degrades to integer >> sound/soc/codecs/tas2770.c:361:58: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected int bitwidth @@ got restricted snd_pcm_formint bitwidth @@ >> sound/soc/codecs/tas2770.c:361:58: sparse: expected int bitwidth >> sound/soc/codecs/tas2770.c:361:58: sparse: got restricted snd_pcm_format_t vim +211 sound/soc/codecs/tas2770.c 204 205 static int tas2770_set_bitwidth(struct tas2770_priv *tas2770, int bitwidth) 206 { 207 int ret; 208 struct snd_soc_component *component = tas2770->component; 209 210 switch (bitwidth) { > 211 case SNDRV_PCM_FORMAT_S16_LE: 212 ret = snd_soc_component_update_bits(component, 213 TAS2770_TDM_CFG_REG2, 214 TAS2770_TDM_CFG_REG2_RXW_MASK, 215 TAS2770_TDM_CFG_REG2_RXW_16BITS); 216 tas2770->v_sense_slot = tas2770->i_sense_slot + 2; 217 break; 218 case SNDRV_PCM_FORMAT_S24_LE: 219 ret = snd_soc_component_update_bits(component, 220 TAS2770_TDM_CFG_REG2, 221 TAS2770_TDM_CFG_REG2_RXW_MASK, 222 TAS2770_TDM_CFG_REG2_RXW_24BITS); 223 tas2770->v_sense_slot = tas2770->i_sense_slot + 4; 224 break; 225 case SNDRV_PCM_FORMAT_S32_LE: 226 ret = snd_soc_component_update_bits(component, 227 TAS2770_TDM_CFG_REG2, 228 TAS2770_TDM_CFG_REG2_RXW_MASK, 229 TAS2770_TDM_CFG_REG2_RXW_32BITS); 230 tas2770->v_sense_slot = tas2770->i_sense_slot + 4; 231 break; 232 233 default: 234 return -EINVAL; 235 } 236 237 tas2770->channel_size = bitwidth; 238 239 ret = snd_soc_component_update_bits(component, 240 TAS2770_TDM_CFG_REG5, 241 TAS2770_TDM_CFG_REG5_VSNS_MASK | 242 TAS2770_TDM_CFG_REG5_50_MASK, 243 TAS2770_TDM_CFG_REG5_VSNS_ENABLE | 244 tas2770->v_sense_slot); 245 if (ret) 246 goto end; 247 ret = snd_soc_component_update_bits(component, 248 TAS2770_TDM_CFG_REG6, 249 TAS2770_TDM_CFG_REG6_ISNS_MASK | 250 TAS2770_TDM_CFG_REG6_50_MASK, 251 TAS2770_TDM_CFG_REG6_ISNS_ENABLE | 252 tas2770->i_sense_slot); 253 254 end: 255 return ret; 256 } 257 258 static int tas2770_set_samplerate(struct tas2770_priv *tas2770, int samplerate) 259 { 260 int ret; 261 struct snd_soc_component *component = tas2770->component; 262 263 switch (samplerate) { 264 case 48000: 265 ret = snd_soc_component_update_bits(component, 266 TAS2770_TDM_CFG_REG0, 267 TAS2770_TDM_CFG_REG0_SMP_MASK, 268 TAS2770_TDM_CFG_REG0_SMP_48KHZ); 269 if (ret) 270 goto end; 271 ret = snd_soc_component_update_bits(component, 272 TAS2770_TDM_CFG_REG0, 273 TAS2770_TDM_CFG_REG0_31_MASK, 274 TAS2770_TDM_CFG_REG0_31_44_1_48KHZ); 275 if (ret) 276 goto end; 277 break; 278 case 44100: 279 ret = snd_soc_component_update_bits(component, 280 TAS2770_TDM_CFG_REG0, 281 TAS2770_TDM_CFG_REG0_SMP_MASK, 282 TAS2770_TDM_CFG_REG0_SMP_44_1KHZ); 283 if (ret) 284 goto end; 285 ret = snd_soc_component_update_bits(component, 286 TAS2770_TDM_CFG_REG0, 287 TAS2770_TDM_CFG_REG0_31_MASK, 288 TAS2770_TDM_CFG_REG0_31_44_1_48KHZ); 289 if (ret) 290 goto end; 291 break; 292 case 96000: 293 ret = snd_soc_component_update_bits(component, 294 TAS2770_TDM_CFG_REG0, 295 TAS2770_TDM_CFG_REG0_SMP_MASK, 296 TAS2770_TDM_CFG_REG0_SMP_48KHZ); 297 if (ret) 298 goto end; 299 ret = snd_soc_component_update_bits(component, 300 TAS2770_TDM_CFG_REG0, 301 TAS2770_TDM_CFG_REG0_31_MASK, 302 TAS2770_TDM_CFG_REG0_31_88_2_96KHZ); 303 break; 304 case 88200: 305 ret = snd_soc_component_update_bits(component, 306 TAS2770_TDM_CFG_REG0, 307 TAS2770_TDM_CFG_REG0_SMP_MASK, 308 TAS2770_TDM_CFG_REG0_SMP_44_1KHZ); 309 if (ret) 310 goto end; 311 ret = snd_soc_component_update_bits(component, 312 TAS2770_TDM_CFG_REG0, 313 TAS2770_TDM_CFG_REG0_31_MASK, 314 TAS2770_TDM_CFG_REG0_31_88_2_96KHZ); 315 break; 316 case 19200: 317 ret = snd_soc_component_update_bits(component, 318 TAS2770_TDM_CFG_REG0, 319 TAS2770_TDM_CFG_REG0_SMP_MASK, 320 TAS2770_TDM_CFG_REG0_SMP_48KHZ); 321 if (ret) 322 goto end; 323 ret = snd_soc_component_update_bits(component, 324 TAS2770_TDM_CFG_REG0, 325 TAS2770_TDM_CFG_REG0_31_MASK, 326 TAS2770_TDM_CFG_REG0_31_176_4_192KHZ); 327 if (ret) 328 goto end; 329 break; 330 case 17640: 331 ret = snd_soc_component_update_bits(component, 332 TAS2770_TDM_CFG_REG0, 333 TAS2770_TDM_CFG_REG0_SMP_MASK, 334 TAS2770_TDM_CFG_REG0_SMP_44_1KHZ); 335 if (ret) 336 goto end; 337 ret = snd_soc_component_update_bits(component, 338 TAS2770_TDM_CFG_REG0, 339 TAS2770_TDM_CFG_REG0_31_MASK, 340 TAS2770_TDM_CFG_REG0_31_176_4_192KHZ); 341 break; 342 default: 343 ret = -EINVAL; 344 } 345 346 end: 347 if (!ret) 348 tas2770->sampling_rate = samplerate; 349 return ret; 350 } 351 352 static int tas2770_hw_params(struct snd_pcm_substream *substream, 353 struct snd_pcm_hw_params *params, 354 struct snd_soc_dai *dai) 355 { 356 struct snd_soc_component *component = dai->component; 357 struct tas2770_priv *tas2770 = 358 snd_soc_component_get_drvdata(component); 359 int ret; 360 > 361 ret = tas2770_set_bitwidth(tas2770, params_format(params)); 362 if (ret < 0) 363 goto end; 364 365 366 ret = tas2770_set_samplerate(tas2770, params_rate(params)); 367 368 end: 369 return ret; 370 } 371 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:for-5.5 29/32] sound/core/pcm_dmaengine.c:429:50: sparse: sparse: restricted snd_pcm_format_t degrades to integer
by kbuild test robot 01 Oct '19

01 Oct '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5 head: 1a476abc723e644248dba975b71122fcf878703b commit: e957204e732bc2916a241dc61dd7dd14e9a98350 [29/32] ASoC: pcm_dmaengine: Extract snd_dmaengine_pcm_refine_runtime_hwparams reproduce: # apt-get install sparse # sparse version: v0.6.1-rc1-37-gd466a02-dirty git checkout e957204e732bc2916a241dc61dd7dd14e9a98350 make ARCH=x86_64 allmodconfig make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> sparse warnings: (new ones prefixed by >>) >> sound/core/pcm_dmaengine.c:429:50: sparse: sparse: restricted snd_pcm_format_t degrades to integer sound/core/pcm_dmaengine.c:429:55: sparse: sparse: restricted snd_pcm_format_t degrades to integer sound/core/pcm_dmaengine.c:429:79: sparse: sparse: restricted snd_pcm_format_t degrades to integer vim +429 sound/core/pcm_dmaengine.c 371 372 /** 373 * snd_dmaengine_pcm_refine_runtime_hwparams - Refine runtime hw params 374 * @substream: PCM substream 375 * @dma_data: DAI DMA data 376 * @hw: PCM hw params 377 * @chan: DMA channel to use for data transfers 378 * 379 * Returns 0 on success, a negative error code otherwise. 380 * 381 * This function will query DMA capability, then refine the pcm hardware 382 * parameters. 383 */ 384 int snd_dmaengine_pcm_refine_runtime_hwparams( 385 struct snd_pcm_substream *substream, 386 struct snd_dmaengine_dai_dma_data *dma_data, 387 struct snd_pcm_hardware *hw, 388 struct dma_chan *chan) 389 { 390 struct dma_slave_caps dma_caps; 391 u32 addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | 392 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | 393 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); 394 snd_pcm_format_t i; 395 int ret = 0; 396 397 if (!hw || !chan || !dma_data) 398 return -EINVAL; 399 400 ret = dma_get_slave_caps(chan, &dma_caps); 401 if (ret == 0) { 402 if (dma_caps.cmd_pause && dma_caps.cmd_resume) 403 hw->info |= SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME; 404 if (dma_caps.residue_granularity <= DMA_RESIDUE_GRANULARITY_SEGMENT) 405 hw->info |= SNDRV_PCM_INFO_BATCH; 406 407 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 408 addr_widths = dma_caps.dst_addr_widths; 409 else 410 addr_widths = dma_caps.src_addr_widths; 411 } 412 413 /* 414 * If SND_DMAENGINE_PCM_DAI_FLAG_PACK is set keep 415 * hw.formats set to 0, meaning no restrictions are in place. 416 * In this case it's the responsibility of the DAI driver to 417 * provide the supported format information. 418 */ 419 if (!(dma_data->flags & SND_DMAENGINE_PCM_DAI_FLAG_PACK)) 420 /* 421 * Prepare formats mask for valid/allowed sample types. If the 422 * dma does not have support for the given physical word size, 423 * it needs to be masked out so user space can not use the 424 * format which produces corrupted audio. 425 * In case the dma driver does not implement the slave_caps the 426 * default assumption is that it supports 1, 2 and 4 bytes 427 * widths. 428 */ > 429 for (i = SNDRV_PCM_FORMAT_FIRST; i <= SNDRV_PCM_FORMAT_LAST; i++) { 430 int bits = snd_pcm_format_physical_width(i); 431 432 /* 433 * Enable only samples with DMA supported physical 434 * widths 435 */ 436 switch (bits) { 437 case 8: 438 case 16: 439 case 24: 440 case 32: 441 case 64: 442 if (addr_widths & (1 << (bits / 8))) 443 hw->formats |= pcm_format_to_bits(i); 444 break; 445 default: 446 /* Unsupported types */ 447 break; 448 } 449 } 450 451 return ret; 452 } 453 EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_refine_runtime_hwparams); 454 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:for-5.5 2/32] sound/soc/fsl/fsl_mqs.c:182:38: sparse: sparse: Using plain integer as NULL pointer
by kbuild test robot 01 Oct '19

01 Oct '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5 head: 1a476abc723e644248dba975b71122fcf878703b commit: 9e28f6532c611c0c3fa759d2101aba9f0d41e860 [2/32] ASoC: fsl_mqs: Add MQS component driver reproduce: # apt-get install sparse # sparse version: v0.6.1-rc1-37-gd466a02-dirty git checkout 9e28f6532c611c0c3fa759d2101aba9f0d41e860 make ARCH=x86_64 allmodconfig make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> sparse warnings: (new ones prefixed by >>) >> sound/soc/fsl/fsl_mqs.c:182:38: sparse: sparse: Using plain integer as NULL pointer vim +182 sound/soc/fsl/fsl_mqs.c 178 179 static int fsl_mqs_probe(struct platform_device *pdev) 180 { 181 struct device_node *np = pdev->dev.of_node; > 182 struct device_node *gpr_np = 0; 183 struct fsl_mqs *mqs_priv; 184 void __iomem *regs; 185 int ret = 0; 186 187 mqs_priv = devm_kzalloc(&pdev->dev, sizeof(*mqs_priv), GFP_KERNEL); 188 if (!mqs_priv) 189 return -ENOMEM; 190 191 /* On i.MX6sx the MQS control register is in GPR domain 192 * But in i.MX8QM/i.MX8QXP the control register is moved 193 * to its own domain. 194 */ 195 if (of_device_is_compatible(np, "fsl,imx8qm-mqs")) 196 mqs_priv->use_gpr = false; 197 else 198 mqs_priv->use_gpr = true; 199 200 if (mqs_priv->use_gpr) { 201 gpr_np = of_parse_phandle(np, "gpr", 0); 202 if (IS_ERR(gpr_np)) { 203 dev_err(&pdev->dev, "failed to get gpr node by phandle\n"); 204 ret = PTR_ERR(gpr_np); 205 goto out; 206 } 207 208 mqs_priv->regmap = syscon_node_to_regmap(gpr_np); 209 if (IS_ERR(mqs_priv->regmap)) { 210 dev_err(&pdev->dev, "failed to get gpr regmap\n"); 211 ret = PTR_ERR(mqs_priv->regmap); 212 goto out; 213 } 214 } else { 215 regs = devm_platform_ioremap_resource(pdev, 0); 216 if (IS_ERR(regs)) 217 return PTR_ERR(regs); 218 219 mqs_priv->regmap = devm_regmap_init_mmio_clk(&pdev->dev, 220 "core", 221 regs, 222 &fsl_mqs_regmap_config); 223 if (IS_ERR(mqs_priv->regmap)) { 224 dev_err(&pdev->dev, "failed to init regmap: %ld\n", 225 PTR_ERR(mqs_priv->regmap)); 226 return PTR_ERR(mqs_priv->regmap); 227 } 228 229 mqs_priv->ipg = devm_clk_get(&pdev->dev, "core"); 230 if (IS_ERR(mqs_priv->ipg)) { 231 dev_err(&pdev->dev, "failed to get the clock: %ld\n", 232 PTR_ERR(mqs_priv->ipg)); 233 goto out; 234 } 235 } 236 237 mqs_priv->mclk = devm_clk_get(&pdev->dev, "mclk"); 238 if (IS_ERR(mqs_priv->mclk)) { 239 dev_err(&pdev->dev, "failed to get the clock: %ld\n", 240 PTR_ERR(mqs_priv->mclk)); 241 goto out; 242 } 243 244 dev_set_drvdata(&pdev->dev, mqs_priv); 245 pm_runtime_enable(&pdev->dev); 246 247 return devm_snd_soc_register_component(&pdev->dev, &soc_codec_fsl_mqs, 248 &fsl_mqs_dai, 1); 249 out: 250 if (!IS_ERR(gpr_np)) 251 of_node_put(gpr_np); 252 253 return ret; 254 } 255 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: madera: Add support for using MCLK3
by Charles Keepax 01 Oct '19

01 Oct '19

Some Madera CODECs have a third MCLK pin allow this to be sourced for the FLLs and system clocks. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/madera.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/madera.h b/sound/soc/codecs/madera.h index 1f3e8e230cf25..6d8938a3fb647 100644 --- a/sound/soc/codecs/madera.h +++ b/sound/soc/codecs/madera.h @@ -27,6 +27,7 @@ #define MADERA_FLL_SRC_NONE -1 #define MADERA_FLL_SRC_MCLK1 0 #define MADERA_FLL_SRC_MCLK2 1 +#define MADERA_FLL_SRC_MCLK3 2 #define MADERA_FLL_SRC_SLIMCLK 3 #define MADERA_FLL_SRC_FLL1 4 #define MADERA_FLL_SRC_FLL2 5 @@ -51,6 +52,7 @@ #define MADERA_CLK_SRC_MCLK1 0x0 #define MADERA_CLK_SRC_MCLK2 0x1 +#define MADERA_CLK_SRC_MCLK3 0x2 #define MADERA_CLK_SRC_FLL1 0x4 #define MADERA_CLK_SRC_FLL2 0x5 #define MADERA_CLK_SRC_FLL3 0x6 -- 2.11.0

2 1

[alsa-devel] [PATCH] ASoC: wm_adsp: Fix theoretical NULL pointer for alg_region
by Charles Keepax 01 Oct '19

01 Oct '19

From: Li Xu <li.xu(a)cirrus.com> Fix potential NULL pointer dereference for alg_region in wm_adsp_buffer_parse_legacy. In practice this can never happen as loading the firmware should have failed at the wm_adsp2_setup_algs stage, however probably better for the code to be robust against future changes and this is more helpful for static analysis. Signed-off-by: Li Xu <li.xu(a)cirrus.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index ae28d9907c30f..85396d920e0a9 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -3697,11 +3697,16 @@ static int wm_adsp_buffer_parse_legacy(struct wm_adsp *dsp) u32 xmalg, addr, magic; int i, ret; + alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id); + if (!alg_region) { + adsp_err(dsp, "No algorithm region found\n"); + return -EINVAL; + } + buf = wm_adsp_buffer_alloc(dsp); if (!buf) return -ENOMEM; - alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id); xmalg = dsp->ops->sys_config_size / sizeof(__be32); addr = alg_region->base + xmalg + ALG_XM_FIELD(magic); -- 2.11.0

2 1

[alsa-devel] [PATCH 00/13] ASoC: SOF: fixes and improvements
by Pierre-Louis Bossart 01 Oct '19

01 Oct '19

No new features in this patchset but fixes and improvements identified during validation/product hardening/SoundWire development. I realize we are at the end of the merge window so will let Takashi/Mark decide if this series can be provided as fixes for v5.4 or queued for later. Kai Vehmanen (2): ASoC: SOF: pcm: fix resource leak in hw_free ASoC: SOF: Intel: hda: fix warnings during FW load Keyon Jie (1): ASoC: SOF: topology: fix parse fail issue for byte/bool tuple types Liam Girdwood (3): ASoC: SOF: ipc: retain DSP context after FW exception. ASoC: SOF: Intel: initialise and verify FW crash dump data. ASoC: SOF: Intel: Add context data to any IPC timeout. Marcin Rajwa (2): ASoC: SOF: ipc: introduce no_stream_position in sof_ipc_stream_params struct ASoC: SOF: Intel: hda: fix reset of host_period_bytes Pan Xiuli (1): ASoC: SOF: pcm: harden PCM STOP sequence Pierre-Louis Bossart (2): ASoC: SOF: loader: fix kernel oops on firmware boot failure ASoC: SOF: trace: move to opt-in with Kconfig and module parameter Ranjani Sridharan (2): ASoC: SOF: core: check for mandatory fw_ready op during SOF probe ASoC: SOF: Intel: hda: Disable DMI L1 entry during capture include/sound/sof/stream.h | 4 +-- sound/soc/sof/Kconfig | 16 ++++++++++++ sound/soc/sof/core.c | 28 +++++++++++++++----- sound/soc/sof/debug.c | 16 ++++++++++++ sound/soc/sof/intel/Kconfig | 10 +++++++ sound/soc/sof/intel/bdw.c | 29 +++++++++++++++++++- sound/soc/sof/intel/byt.c | 29 +++++++++++++++++++- sound/soc/sof/intel/hda-ctrl.c | 12 +++------ sound/soc/sof/intel/hda-loader.c | 1 + sound/soc/sof/intel/hda-pcm.c | 15 ++++++++--- sound/soc/sof/intel/hda-stream.c | 45 +++++++++++++++++++++++++++----- sound/soc/sof/intel/hda.c | 7 +++++ sound/soc/sof/intel/hda.h | 5 +++- sound/soc/sof/ipc.c | 10 +------ sound/soc/sof/loader.c | 4 +-- sound/soc/sof/pcm.c | 35 +++++++++++++++++-------- sound/soc/sof/sof-priv.h | 17 ++++++++---- sound/soc/sof/topology.c | 4 ++- sound/soc/sof/trace.c | 17 +++++++++++- 19 files changed, 245 insertions(+), 59 deletions(-) -- 2.20.1

2 26

[alsa-devel] [PATCH 0/4] ASoC: Intel: boards: improvements for RT5651/82-based platforms
by Pierre-Louis Bossart 01 Oct '19

01 Oct '19

RT5651/RT5682 boards are used for SOF validation. This patchset corrects problems identified during module load/reload tests and an error for DMIC support in some configurations. These fixes are not critical and can be queued for v5.5 Bard Liao (1): ASoC: intel: sof_rt5682: use separate route map for dmic Jaska Uimonen (3): ASoC: intel: bytcr_rt5651: add null check to support_button_press ASoC: rt5682: add NULL handler to set_jack function ASoC: intel: sof_rt5682: add remove function to disable jack sound/soc/codecs/rt5651.c | 3 ++ sound/soc/codecs/rt5682.c | 12 +++++-- sound/soc/intel/boards/sof_rt5682.c | 51 ++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 6 deletions(-) -- 2.20.1

2 8

[alsa-devel] [PATCH] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency
by Arnd Bergmann 01 Oct '19

01 Oct '19

CONFIG_SND_SOC_SOF_IMX depends on CONFIG_SND_SOC_SOF, but is in turn referenced by the sof-of-dev driver. This creates a reverse dependency that manifests in a link error when CONFIG_SND_SOC_SOF_OF is built-in but CONFIG_SND_SOC_SOF_IMX=m: sound/soc/sof/sof-of-dev.o:(.data+0x118): undefined reference to `sof_imx8_ops' Make the latter a 'bool' symbol and change the Makefile so the imx8 driver is compiled the same way as the driver using it. A nicer way would be to reverse the layering and move all the imx specific bits of sof-of-dev.c into the imx driver itself, which can then call into the common code. Doing this would need more testing and can be done if we add another driver like the first one. Fixes: f4df4e4042b0 ("ASoC: SOF: imx8: Fix COMPILE_TEST error") Fixes: 202acc565a1f ("ASoC: SOF: imx: Add i.MX8 HW support") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/sof/imx/Kconfig | 2 +- sound/soc/sof/imx/Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig index 5acae75f5750..a3891654a1fc 100644 --- a/sound/soc/sof/imx/Kconfig +++ b/sound/soc/sof/imx/Kconfig @@ -12,7 +12,7 @@ config SND_SOC_SOF_IMX_TOPLEVEL if SND_SOC_SOF_IMX_TOPLEVEL config SND_SOC_SOF_IMX8 - tristate "SOF support for i.MX8" + bool "SOF support for i.MX8" depends on IMX_SCU depends on IMX_DSP help diff --git a/sound/soc/sof/imx/Makefile b/sound/soc/sof/imx/Makefile index 6ef908e8c807..9e8f35df0ff2 100644 --- a/sound/soc/sof/imx/Makefile +++ b/sound/soc/sof/imx/Makefile @@ -1,4 +1,6 @@ # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) snd-sof-imx8-objs := imx8.o -obj-$(CONFIG_SND_SOC_SOF_IMX8) += snd-sof-imx8.o +ifdef CONFIG_SND_SOC_SOF_IMX8 +obj-$(CONFIG_SND_SOC_SOF_OF) += snd-sof-imx8.o +endif -- 2.20.0

3 5

[alsa-devel] [PATCH] ASoC: max98373: check for device node before parsing
by Sathyanarayana Nujella 01 Oct '19

01 Oct '19

Below Oops is caused in a system which uses ACPI instead of device node: of_get_named_gpiod_flags: can't parse 'maxim,reset-gpio' property of node '(null)[0]' BUG: kernel NULL pointer dereference, address: 0000000000000010 This patch avoids NULL pointer deferencing by adding a check before parsing and initializes to make reset-gpio pin as invalid. Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> Signed-off-by: Jairaj Arava <jairaj.arava(a)intel.com> --- sound/soc/codecs/max98373.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index e609abcf3220..eb709d528259 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -901,16 +901,20 @@ static void max98373_slot_config(struct i2c_client *i2c, max98373->i_slot = value & 0xF; else max98373->i_slot = 1; - - max98373->reset_gpio = of_get_named_gpio(dev->of_node, + if (dev->of_node) { + max98373->reset_gpio = of_get_named_gpio(dev->of_node, "maxim,reset-gpio", 0); - if (!gpio_is_valid(max98373->reset_gpio)) { - dev_err(dev, "Looking up %s property in node %s failed %d\n", - "maxim,reset-gpio", dev->of_node->full_name, - max98373->reset_gpio); + if (!gpio_is_valid(max98373->reset_gpio)) { + dev_err(dev, "Looking up %s property in node %s failed %d\n", + "maxim,reset-gpio", dev->of_node->full_name, + max98373->reset_gpio); + } else { + dev_dbg(dev, "maxim,reset-gpio=%d", + max98373->reset_gpio); + } } else { - dev_dbg(dev, "maxim,reset-gpio=%d", - max98373->reset_gpio); + /* this makes reset_gpio as invalid */ + max98373->reset_gpio = -1; } if (!device_property_read_u32(dev, "maxim,spkfb-slot-no", &value)) -- 2.7.4

2 1

[alsa-devel] [PATCH v2] ASoC: Intel: cht_bsw_rt5645: Add quirk for boards using pmc_plt_clk_0
by Sam McNally 01 Oct '19

01 Oct '19

As of commit 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL"), the cht_bsw_rt5645 driver needs to enable the clock it's using for the codec's mclk. It does this from commit 7735bce05a9c ("ASoC: Intel: boards: use devm_clk_get() unconditionally"), enabling pmc_plt_clk_3. However, Strago family Chromebooks use pmc_plt_clk_0 for the codec mclk, resulting in white noise with some digital microphones. Add a DMI-based quirk for Strago family Chromebooks to use pmc_plt_clk_0 instead - mirroring the changes made to cht_bsw_max98090_ti in commit a182ecd3809c ("ASoC: intel: cht_bsw_max98090_ti: Add quirk for boards using pmc_plt_clk_0") and making use of the existing dmi_check_system() call and related infrastructure added in commit 22af29114eb4 ("ASoC: Intel: cht-bsw-rt5645: add quirks for SSP0/AIF1/AIF2 routing"). Signed-off-by: Sam McNally <sammc(a)chromium.org> --- Changes in v2: - Added to the description references to more related commits (similar cht_bsw_max98090_ti clock quirks inspiring this change and and the cht_bsw_rt5645 quirks setup) sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 8879c3be29d5..c68a5b85a4a0 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -48,6 +48,7 @@ struct cht_mc_private { #define CHT_RT5645_SSP2_AIF2 BIT(16) /* default is using AIF1 */ #define CHT_RT5645_SSP0_AIF1 BIT(17) #define CHT_RT5645_SSP0_AIF2 BIT(18) +#define CHT_RT5645_PMC_PLT_CLK_0 BIT(19) static unsigned long cht_rt5645_quirk = 0; @@ -59,6 +60,8 @@ static void log_quirks(struct device *dev) dev_info(dev, "quirk SSP0_AIF1 enabled"); if (cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2) dev_info(dev, "quirk SSP0_AIF2 enabled"); + if (cht_rt5645_quirk & CHT_RT5645_PMC_PLT_CLK_0) + dev_info(dev, "quirk PMC_PLT_CLK_0 enabled"); } static int platform_clock_control(struct snd_soc_dapm_widget *w, @@ -226,15 +229,21 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream, return 0; } -/* uncomment when we have a real quirk static int cht_rt5645_quirk_cb(const struct dmi_system_id *id) { cht_rt5645_quirk = (unsigned long)id->driver_data; return 1; } -*/ static const struct dmi_system_id cht_rt5645_quirk_table[] = { + { + /* Strago family Chromebooks */ + .callback = cht_rt5645_quirk_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"), + }, + .driver_data = (void *)CHT_RT5645_PMC_PLT_CLK_0, + }, { }, }; @@ -526,6 +535,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) int dai_index = 0; int ret_val = 0; int i; + const char *mclk_name; drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL); if (!drv) @@ -662,11 +672,15 @@ static int snd_cht_mc_probe(struct platform_device *pdev) if (ret_val) return ret_val; - drv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3"); + if (cht_rt5645_quirk & CHT_RT5645_PMC_PLT_CLK_0) + mclk_name = "pmc_plt_clk_0"; + else + mclk_name = "pmc_plt_clk_3"; + + drv->mclk = devm_clk_get(&pdev->dev, mclk_name); if (IS_ERR(drv->mclk)) { - dev_err(&pdev->dev, - "Failed to get MCLK from pmc_plt_clk_3: %ld\n", - PTR_ERR(drv->mclk)); + dev_err(&pdev->dev, "Failed to get MCLK from %s: %ld\n", + mclk_name, PTR_ERR(drv->mclk)); return PTR_ERR(drv->mclk); } -- 2.23.0.237.gc6a4ce50a0-goog

3 2