Skip to contentSkip to conversation

ASoC: amd: Don't show messages about deferred probing by default

PATCH Superseded Mario Limonciello 3 participants 6 messages Jul 21, 2021 – Jul 22, 2021

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ASoC: amd: Don't show messages about deferred probing by default

Nearly every boot with a Lenovo P14s is showing acp_pdm_mach acp_pdm_mach.0: snd_soc_register_card(acp) failed: -517

This isn't useful to a user, especially as probing will run again. Downgrade the message to debug, and only show errors.

---
 sound/soc/amd/renoir/acp3x-rn.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Changes from v1->v2:
* Simplify down to one return line.

sound/soc/amd/renoir/acp3x-rn.c +9 -5
index 306134b89a82..ed73da496744 100644
@@ -54,12 +54,16 @@ static int acp_probe(struct platform_device *pdev)
 	snd_soc_card_set_drvdata(card, machine);
 	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret) {
-		dev_err(&pdev->dev,
-			"snd_soc_register_card(%s) failed: %d\n",
-			acp_card.name, ret);
-		return ret;
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev,
+				"snd_soc_register_card(%s) failed: %d\n",
+				card->name, ret);
+		else
+			dev_dbg(&pdev->dev,
+				"snd_soc_register_card(%s) probe deferred: %d\n",
+				card->name, ret);
 	}
-	return 0;
+	return ret;
 }
 
 static struct platform_driver acp_mach_driver = {
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 ASoC: amd: renoir: Run hibernation callbacks

The registers need to be re-initialized after hibernation or microphone may be non-functional.

---
 sound/soc/amd/renoir/rn-pci-acp3x.c | 2 ++
 1 file changed, 2 insertions(+)
sound/soc/amd/renoir/rn-pci-acp3x.c +2 -0
index 19438da5dfa5..7b8040e812a1 100644
@@ -382,6 +382,8 @@ static const struct dev_pm_ops rn_acp_pm = {
 	.runtime_resume =  snd_rn_acp_resume,
 	.suspend = snd_rn_acp_suspend,
 	.resume =	snd_rn_acp_resume,
+	.restore =	snd_rn_acp_resume,
+	.poweroff =	snd_rn_acp_suspend,
 };
 
 static void snd_rn_acp_remove(struct pci_dev *pci)
Signature · 1 line
2.25.1
maintainer
#2 lore raw

Re: [PATCH] ASoC: amd: renoir: Run hibernation callbacks

Quoted 2 lines · Mario Limonciello

The registers need to be re-initialized after hibernation or microphone may be non-functional.

You've sent this in reply to version 2 of an apparently unrelated patch, please don't send patches in reply to existing threads especially not unrelated ones - it really confuses the tooling.

maintainer
#3 lore raw

Re: [PATCH] ASoC: amd: renoir: Run hibernation callbacks

In reply to Mario Limonciello
Quoted 2 lines · Mario Limonciello

The registers need to be re-initialized after hibernation or microphone may be non-functional.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: amd: renoir: Run hibernation callbacks

      commit: d00f541a49406afc2c091aac121e29b3b61480a2

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

maintainer Reviewed-by on v2 1/1
#4 lore raw
In reply to Mario Limonciello
Quoted 8 lines · Mario Limonciello

Nearly every boot with a Lenovo P14s is showing acp_pdm_mach acp_pdm_mach.0: snd_soc_register_card(acp) failed: -517

This isn't useful to a user, especially as probing will run again. Downgrade the message to debug, and only show errors.

Quoted 34 lines
---
 sound/soc/amd/renoir/acp3x-rn.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Changes from v1->v2:
* Simplify down to one return line.

sound/soc/amd/renoir/acp3x-rn.c +9 -5
index 306134b89a82..ed73da496744 100644
@@ -54,12 +54,16 @@ static int acp_probe(struct platform_device *pdev)
 	snd_soc_card_set_drvdata(card, machine);
 	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret) {
-		dev_err(&pdev->dev,
-			"snd_soc_register_card(%s) failed: %d\n",
-			acp_card.name, ret);
-		return ret;
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev,
+				"snd_soc_register_card(%s) failed: %d\n",
+				card->name, ret);
+		else
+			dev_dbg(&pdev->dev,
+				"snd_soc_register_card(%s) probe deferred: %d\n",
+				card->name, ret);
 	}
-	return 0;
+	return ret;
 }
 
 static struct platform_driver acp_mach_driver = {
maintainer
#5 lore raw
In reply to Mario Limonciello
Quoted 5 lines · Mario Limonciello

Nearly every boot with a Lenovo P14s is showing acp_pdm_mach acp_pdm_mach.0: snd_soc_register_card(acp) failed: -517

This isn't useful to a user, especially as probing will run again. Downgrade the message to debug, and only show errors.

dev_err_probe()