ASoC: tegra: Add error logging for probe and callback failures
Subsystems (3)
PATCH v2 1/1 ASoC: tegra: Add error logging for probe and callback failures
Add error logging across probe and runtime error paths in Tegra audio drivers to improve debuggability. Use dev_err_probe() in all probe error paths as a defensive measure against future API changes that may return -EPROBE_DEFER. Use dev_err() for runtime callback paths. Skip redundant logging where the underlying API already reports errors.
---
Changes in v2:
- Use dev_err_probe() in all probe error paths as a defensive measure, instead of only where -EPROBE_DEFER is currently known to be returned.
- Drop redundant error logging for devm_platform_ioremap_resource() and devm_ioremap_resource() since these APIs already log errors internally.
sound/soc/tegra/tegra186_asrc.c | 7 ++--- sound/soc/tegra/tegra186_dspk.c | 15 +++------ sound/soc/tegra/tegra210_admaif.c | 18 +++++++---- sound/soc/tegra/tegra210_adx.c | 13 ++++--- sound/soc/tegra/tegra210_ahub.c | 23 +++++++------ sound/soc/tegra/tegra210_amx.c | 9 +++-- sound/soc/tegra/tegra210_dmic.c | 14 +++----- sound/soc/tegra/tegra210_i2s.c | 18 +++++----- sound/soc/tegra/tegra210_mbdrc.c | 12 ++++--- sound/soc/tegra/tegra210_mixer.c | 10 ++++-- sound/soc/tegra/tegra210_mvc.c | 7 ++--- sound/soc/tegra/tegra210_ope.c | 19 +++------- sound/soc/tegra/tegra210_peq.c | 12 ++++--- sound/soc/tegra/tegra210_sfc.c | 7 ++--- sound/soc/tegra/tegra_asoc_machine.c | 70 ++++++++++++++++++-------------- sound/soc/tegra/tegra_audio_graph_card.c | 21 ++++------ 16 files changed, 137 insertions(+), 138 deletions(-)
sound/soc/tegra/tegra186_asrc.c +3 -4
@@ -1016,10 +1016,9 @@ static int tegra186_asrc_platform_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra186_asrc_cmpnt, tegra186_asrc_dais,ARRAY_SIZE (tegra186_asrc_dais)); -if (err) { -dev_err (dev,"can't register ASRC component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register ASRC component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra186_dspk.c +6 -9
@@ -496,10 +496,9 @@ static int tegra186_dspk_platform_probe(struct platform_device *pdev)dev_set_drvdata (dev, dspk); dspk->clk_dspk =devm_clk_get (dev,"dspk" ); -if (IS_ERR (dspk->clk_dspk)) { -dev_err (dev,"can't retrieve DSPK clock\n" ); -return PTR_ERR (dspk->clk_dspk); - } +if (IS_ERR (dspk->clk_dspk)) +return dev_err_probe (dev,PTR_ERR (dspk->clk_dspk), +"can't retrieve DSPK clock\n" ); regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (regs))
@@ -516,11 +515,9 @@ static int tegra186_dspk_platform_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra186_dspk_cmpnt, tegra186_dspk_dais,ARRAY_SIZE (tegra186_dspk_dais)); -if (err) { -dev_err (dev,"can't register DSPK component, err: %d\n" , - err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register DSPK component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_admaif.c +9 -9
@@ -408,6 +408,7 @@ static int tegra_admaif_start(struct snd_soc_dai *dai, int direction) reg =CH_RX_REG (TEGRA_ADMAIF_RX_ENABLE , dai->id);break ;default : +dev_err (dai->dev,"invalid stream direction: %d\n" , direction);return -EINVAL ; }
@@ -441,6 +442,7 @@ static int tegra_admaif_stop(struct snd_soc_dai *dai, int direction) reset_reg =CH_RX_REG (TEGRA_ADMAIF_RX_SOFT_RESET , dai->id);break ;default : +dev_err (dai->dev,"invalid stream direction: %d\n" , direction);return -EINVAL ; }
@@ -489,6 +491,7 @@ static int tegra_admaif_trigger(struct snd_pcm_substream *substream, int cmd,case SNDRV_PCM_TRIGGER_SUSPEND :return tegra_admaif_stop (dai, substream->stream);default : +dev_err (dai->dev,"invalid trigger command: %d\n" , cmd);return -EINVAL ; } }
@@ -966,10 +969,9 @@ static int tegra_admaif_probe(struct platform_device *pdev)regcache_cache_only (admaif->regmap, true); err =tegra_isomgr_adma_register (&pdev->dev); -if (err) { -dev_err (&pdev->dev,"Failed to add interconnect path\n" ); -return err; - } +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to add interconnect path\n" );regmap_update_bits (admaif->regmap, admaif->soc_data->global_base +TEGRA_ADMAIF_GLOBAL_ENABLE ,1 ,1 );
@@ -1009,11 +1011,9 @@ static int tegra_admaif_probe(struct platform_device *pdev) admaif->soc_data->cmpnt, admaif->soc_data->dais, admaif->soc_data->num_ch); -if (err) { -dev_err (&pdev->dev, -"can't register ADMAIF component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (&pdev->dev, err, +"can't register ADMAIF component\n" );pm_runtime_enable (&pdev->dev);
sound/soc/tegra/tegra210_adx.c +8 -5
@@ -134,8 +134,11 @@ static int tegra210_adx_set_audio_cif(struct snd_soc_dai *dai,memset (&cif_conf,0 ,sizeof (struct tegra_cif_conf )); -if (channels <1 || channels > adx->soc_data->max_ch) +if (channels <1 || channels > adx->soc_data->max_ch) { +dev_err (dai->dev,"invalid channels: %u (max %u)\n" , + channels, adx->soc_data->max_ch);return -EINVAL ; + }switch (format) {case SNDRV_PCM_FORMAT_S8 :
@@ -149,6 +152,7 @@ static int tegra210_adx_set_audio_cif(struct snd_soc_dai *dai, audio_bits =TEGRA_ACIF_BITS_32 ;break ;default : +dev_err (dai->dev,"unsupported format: %d\n" , format);return -EINVAL ; }
@@ -717,10 +721,9 @@ static int tegra210_adx_platform_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra210_adx_cmpnt, tegra210_adx_dais,ARRAY_SIZE (tegra210_adx_dais)); -if (err) { -dev_err (dev,"can't register ADX component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register ADX component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_ahub.c +12 -11
@@ -64,8 +64,11 @@ static int tegra_ahub_put_value_enum(struct snd_kcontrol *kctl,unsigned int i, bit_pos, reg_idx =0 , reg_val =0 ;int change =0 ; -if (item[0 ] >= e->items) +if (item[0 ] >= e->items) { +dev_err (cmpnt->dev,"invalid MUX item: %u >= %u\n" , + item[0 ], e->items);return -EINVAL ; + }if (value) {/* Get the register index and value to set */
@@ -2265,10 +2268,9 @@ static int tegra_ahub_probe(struct platform_device *pdev)platform_set_drvdata (pdev, ahub); ahub->clk =devm_clk_get (&pdev->dev,"ahub" ); -if (IS_ERR (ahub->clk)) { -dev_err (&pdev->dev,"can't retrieve AHUB clock\n" ); -return PTR_ERR (ahub->clk); - } +if (IS_ERR (ahub->clk)) +return dev_err_probe (&pdev->dev,PTR_ERR (ahub->clk), +"can't retrieve AHUB clock\n" ); regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (regs))
@@ -2287,16 +2289,15 @@ static int tegra_ahub_probe(struct platform_device *pdev) ahub->soc_data->cmpnt_drv, ahub->soc_data->dai_drv, ahub->soc_data->num_dais); -if (err) { -dev_err (&pdev->dev,"can't register AHUB component, err: %d\n" , - err); -return err; - } +if (err) +return dev_err_probe (&pdev->dev, err, +"can't register AHUB component\n" );pm_runtime_enable (&pdev->dev); err =of_platform_populate (pdev->dev.of_node,NULL ,NULL , &pdev->dev);if (err) {pm_runtime_disable (&pdev->dev); -return err; +return dev_err_probe (&pdev->dev, err, +"failed to populate child nodes\n" ); }
sound/soc/tegra/tegra210_amx.c +5 -4
@@ -163,6 +163,8 @@ static int tegra210_amx_set_audio_cif(struct snd_soc_dai *dai, audio_bits =TEGRA_ACIF_BITS_32 ;break ;default : +dev_err (dai->dev,"unsupported format: %d\n" , +params_format (params));return -EINVAL ; }
@@ -767,10 +769,9 @@ static int tegra210_amx_platform_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra210_amx_cmpnt, tegra210_amx_dais,ARRAY_SIZE (tegra210_amx_dais)); -if (err) { -dev_err (dev,"can't register AMX component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register AMX component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_dmic.c +6 -8
@@ -507,10 +507,9 @@ static int tegra210_dmic_probe(struct platform_device *pdev)dev_set_drvdata (dev, dmic); dmic->clk_dmic =devm_clk_get (dev,"dmic" ); -if (IS_ERR (dmic->clk_dmic)) { -dev_err (dev,"can't retrieve DMIC clock\n" ); -return PTR_ERR (dmic->clk_dmic); - } +if (IS_ERR (dmic->clk_dmic)) +return dev_err_probe (dev,PTR_ERR (dmic->clk_dmic), +"can't retrieve DMIC clock\n" ); regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (regs))
@@ -528,10 +527,9 @@ static int tegra210_dmic_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra210_dmic_compnt, tegra210_dmic_dais,ARRAY_SIZE (tegra210_dmic_dais)); -if (err) { -dev_err (dev,"can't register DMIC component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register DMIC component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_i2s.c +10 -8
@@ -161,6 +161,7 @@ static int tegra210_i2s_init(struct snd_soc_dapm_widget *w, stream =SNDRV_PCM_STREAM_CAPTURE ; status_reg =TEGRA210_I2S_TX_STATUS + i2s->soc_data->tx_offset; }else { +dev_err (dev,"invalid I2S direction register 0x%x\n" , w->reg);return -EINVAL ; }
@@ -235,6 +236,7 @@ static int tegra210_i2s_set_fmt(struct snd_soc_dai *dai, val =I2S_CTRL_MASTER_EN ;break ;default : +dev_err (dai->dev,"invalid clock provider format 0x%x\n" , fmt);return -EINVAL ; }
@@ -270,6 +272,7 @@ static int tegra210_i2s_set_fmt(struct snd_soc_dai *dai,tegra210_i2s_set_data_offset (i2s,0 );break ;default : +dev_err (dai->dev,"invalid I2S frame format 0x%x\n" , fmt);return -EINVAL ; }
@@ -290,6 +293,7 @@ static int tegra210_i2s_set_fmt(struct snd_soc_dai *dai, val ^=I2S_CTRL_LRCK_POL_MASK ;break ;default : +dev_err (dai->dev,"invalid I2S clock inversion 0x%x\n" , fmt);return -EINVAL ; }
@@ -1070,10 +1074,9 @@ static int tegra210_i2s_probe(struct platform_device *pdev)dev_set_drvdata (dev, i2s); i2s->clk_i2s =devm_clk_get (dev,"i2s" ); -if (IS_ERR (i2s->clk_i2s)) { -dev_err (dev,"can't retrieve I2S bit clock\n" ); -return PTR_ERR (i2s->clk_i2s); - } +if (IS_ERR (i2s->clk_i2s)) +return dev_err_probe (dev,PTR_ERR (i2s->clk_i2s), +"can't retrieve I2S bit clock\n" );/* * Not an error, as this clock is needed only when some other I/O
@@ -1108,10 +1111,9 @@ static int tegra210_i2s_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, i2s->soc_data->i2s_cmpnt, tegra210_i2s_dais,ARRAY_SIZE (tegra210_i2s_dais)); -if (err) { -dev_err (dev,"can't register I2S component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register I2S component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_mbdrc.c +5 -5
@@ -987,8 +987,9 @@ int tegra210_mbdrc_regmap_init(struct platform_device *pdev)int err; child =of_get_child_by_name (dev->of_node,"dynamic-range-compressor" );if (!child) -return -ENODEV ; +return dev_err_probe (dev, -ENODEV , +"missing 'dynamic-range-compressor' DT child node\n" ); err =of_address_to_resource (child,0 , &mem);of_node_put (child);
@@ -1004,7 +1005,6 @@ int tegra210_mbdrc_regmap_init(struct platform_device *pdev) ope->mbdrc_regmap =devm_regmap_init_mmio (dev, regs, &tegra210_mbdrc_regmap_cfg); -if (IS_ERR (ope->mbdrc_regmap)) { -dev_err (dev,"regmap init failed\n" ); -return PTR_ERR (ope->mbdrc_regmap); - } +if (IS_ERR (ope->mbdrc_regmap)) +return dev_err_probe (dev,PTR_ERR (ope->mbdrc_regmap), +"MBDRC regmap init failed\n" );
sound/soc/tegra/tegra210_mixer.c +6 -4
@@ -253,6 +253,9 @@ static int tegra210_mixer_set_audio_cif(struct tegra210_mixer *mixer, audio_bits =TEGRA_ACIF_BITS_32 ;break ;default : +dev_err (regmap_get_device (mixer->regmap), +"unsupported format for MIXER CIF: %d\n" , +params_format (params));return -EINVAL ; }
@@ -651,10 +654,9 @@ static int tegra210_mixer_platform_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra210_mixer_cmpnt, tegra210_mixer_dais,ARRAY_SIZE (tegra210_mixer_dais)); -if (err) { -dev_err (dev,"can't register MIXER component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register MIXER component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_mvc.c +3 -4
@@ -741,10 +741,9 @@ static int tegra210_mvc_platform_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra210_mvc_cmpnt, tegra210_mvc_dais,ARRAY_SIZE (tegra210_mvc_dais)); -if (err) { -dev_err (dev,"can't register MVC component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register MVC component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_ope.c +7 -12
@@ -329,23 +329,18 @@ static int tegra210_ope_probe(struct platform_device *pdev) err =tegra210_peq_regmap_init (pdev); -if (err <0 ) { -dev_err (dev,"PEQ init failed\n" ); -return err; - } +if (err <0 ) +return dev_err_probe (dev, err,"PEQ init failed\n" ); err =tegra210_mbdrc_regmap_init (pdev); -if (err <0 ) { -dev_err (dev,"MBDRC init failed\n" ); -return err; - } +if (err <0 ) +return dev_err_probe (dev, err,"MBDRC init failed\n" ); err =devm_snd_soc_register_component (dev, &tegra210_ope_cmpnt, tegra210_ope_dais,ARRAY_SIZE (tegra210_ope_dais)); -if (err) { -dev_err (dev,"can't register OPE component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register OPE component\n" );pm_runtime_enable (dev);
sound/soc/tegra/tegra210_peq.c +5 -5
@@ -407,8 +407,9 @@ int tegra210_peq_regmap_init(struct platform_device *pdev)int err; child =of_get_child_by_name (dev->of_node,"equalizer" );if (!child) -return -ENODEV ; +return dev_err_probe (dev, -ENODEV , +"missing 'equalizer' DT child node\n" ); err =of_address_to_resource (child,0 , &mem);of_node_put (child);
@@ -424,7 +425,6 @@ int tegra210_peq_regmap_init(struct platform_device *pdev) ope->peq_regmap =devm_regmap_init_mmio (dev, regs, &tegra210_peq_regmap_config); -if (IS_ERR (ope->peq_regmap)) { -dev_err (dev,"regmap init failed\n" ); -return PTR_ERR (ope->peq_regmap); - } +if (IS_ERR (ope->peq_regmap)) +return dev_err_probe (dev,PTR_ERR (ope->peq_regmap), +"PEQ regmap init failed\n" );
sound/soc/tegra/tegra210_sfc.c +3 -4
@@ -3608,10 +3608,9 @@ static int tegra210_sfc_platform_probe(struct platform_device *pdev) err =devm_snd_soc_register_component (dev, &tegra210_sfc_cmpnt, tegra210_sfc_dais,ARRAY_SIZE (tegra210_sfc_dais)); -if (err) { -dev_err (dev,"can't register SFC component, err: %d\n" , err); -return err; - } +if (err) +return dev_err_probe (dev, err, +"can't register SFC component\n" );pm_runtime_enable (&pdev->dev);
sound/soc/tegra/tegra_asoc_machine.c +35 -35
123 lines not on this page · raw message
sound/soc/tegra/tegra_audio_graph_card.c +12 -9
@@ -174,20 +174,23 @@ static int tegra_audio_graph_card_probe(struct snd_soc_card *card) {struct simple_util_priv *simple =snd_soc_card_get_drvdata (card);struct tegra_audio_priv *priv =simple_to_tegra_priv (simple); +int ret; priv->clk_plla =devm_clk_get (card->dev,"pll_a" ); -if (IS_ERR (priv->clk_plla)) { -dev_err (card->dev,"Can't retrieve clk pll_a\n" ); -return PTR_ERR (priv->clk_plla); - } +if (IS_ERR (priv->clk_plla)) +return dev_err_probe (card->dev,PTR_ERR (priv->clk_plla), +"can't retrieve clk pll_a\n" ); priv->clk_plla_out0 =devm_clk_get (card->dev,"plla_out0" ); -if (IS_ERR (priv->clk_plla_out0)) { -dev_err (card->dev,"Can't retrieve clk plla_out0\n" ); -return PTR_ERR (priv->clk_plla_out0); - } +if (IS_ERR (priv->clk_plla_out0)) +return dev_err_probe (card->dev,PTR_ERR (priv->clk_plla_out0), +"can't retrieve clk plla_out0\n" ); + + ret =graph_util_card_probe (card); +if (ret <0 ) +return dev_err_probe (card->dev, ret,"graph_util_card_probe failed\n" ); -return graph_util_card_probe (card); +return ret; }static int tegra_audio_graph_probe (struct platform_device *pdev)
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 11 lines · Sheetal
Add error logging across probe and runtime error paths in Tegra audio drivers to improve debuggability. Use
dev_err_probe()in all probe error paths as a defensive measure against future API changes that may return -EPROBE_DEFER. Usedev_err()for runtime callback paths. Skip redundant logging where the underlying API already reports errors.sound/soc/tegra/tegra210_ahub.c +0
-0
sound/soc/tegra/tegra210_ahub.c static int tegra_ahub_put_value_enum(struct snd_kcontrol *kctl, · line 72
Quoted 10 lines
sound/soc/tegra/tegra210_ahub.c +4
-1@@ -64,8 +64,11 @@ static int tegra_ahub_put_value_enum(struct snd_kcontrol *kctl,unsigned int i, bit_pos, reg_idx =0 , reg_val =0 ;int change =0 ; -if (item[0 ] >= e->items) +if (item[0 ] >= e->items) { +dev_err (cmpnt->dev,"invalid MUX item: %u >= %u\n" , + item[0 ], e->items);return -EINVAL ; + }
This one can be triggered directly from userspace so it's better to be slient, otherwise people can spam the logs.
sound/soc/tegra/tegra210_mixer.c static int tegra210_mixer_set_audio_cif(struct tegra210_mixer *mixer, · line 260
Quoted 12 lines
index
6d3a2b76fd61..d9318aaaf32e100644sound/soc/tegra/tegra210_mixer.c +3
-0@@ -253,6 +253,9 @@ static int tegra210_mixer_set_audio_cif(struct tegra210_mixer *mixer, audio_bits =TEGRA_ACIF_BITS_32 ;break ;default : +dev_err (regmap_get_device (mixer->regmap), +"unsupported format for MIXER CIF: %d\n" , +params_format (params));return -EINVAL ; }
Not your bug but the driver claims to support _S8 format and this function doesn't actually implement it so we end up with another path where userspace can spam dev_err() as a result of this.
Mark Brown
maintainerQuoted 5 lines · Sheetal
Add error logging across probe and runtime error paths in Tegra audio drivers to improve debuggability. Use
dev_err_probe()in all probe error paths as a defensive measure against future API changes that may return -EPROBE_DEFER. Usedev_err()for runtime callback paths. Skip redundant logging where the underlying API already reports errors.
BTW, can I suggest splitting this up per driver or something - the change is 99% good, if it were split up then most of it could get merged even if there's one or two odd bits need some work.