]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 3 Sep 2023 17:03:17 +0000 (19:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 3 Sep 2023 17:03:17 +0000 (19:03 +0200)
added patches:
pinctrl-amd-don-t-show-invalid-config-param-errors.patch

queue-5.10/pinctrl-amd-don-t-show-invalid-config-param-errors.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/pinctrl-amd-don-t-show-invalid-config-param-errors.patch b/queue-5.10/pinctrl-amd-don-t-show-invalid-config-param-errors.patch
new file mode 100644 (file)
index 0000000..45634a1
--- /dev/null
@@ -0,0 +1,46 @@
+From 87b549efcb0f7934b0916d2a00607a878b6f1e0f Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Mon, 17 Jul 2023 15:16:52 -0500
+Subject: pinctrl: amd: Don't show `Invalid config param` errors
+
+From: Mario Limonciello <mario.limonciello@amd.com>
+
+commit 87b549efcb0f7934b0916d2a00607a878b6f1e0f upstream.
+
+On some systems amd_pinconf_set() is called with parameters
+0x8 (PIN_CONFIG_DRIVE_PUSH_PULL) or 0x14 (PIN_CONFIG_PERSIST_STATE)
+which are not supported by pinctrl-amd.
+
+Don't show an err message when called with an invalid parameter,
+downgrade this to debug instead.
+
+Cc: stable@vger.kernel.org # 6.1
+Fixes: 635a750d958e1 ("pinctrl: amd: Use amd_pinconf_set() for all config options")
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+Link: https://lore.kernel.org/r/20230717201652.17168-1-mario.limonciello@amd.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pinctrl/pinctrl-amd.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/pinctrl/pinctrl-amd.c
++++ b/drivers/pinctrl/pinctrl-amd.c
+@@ -653,7 +653,7 @@ static int amd_pinconf_get(struct pinctr
+               break;
+       default:
+-              dev_err(&gpio_dev->pdev->dev, "Invalid config param %04x\n",
++              dev_dbg(&gpio_dev->pdev->dev, "Invalid config param %04x\n",
+                       param);
+               return -ENOTSUPP;
+       }
+@@ -706,7 +706,7 @@ static int amd_pinconf_set(struct pinctr
+                       break;
+               default:
+-                      dev_err(&gpio_dev->pdev->dev,
++                      dev_dbg(&gpio_dev->pdev->dev,
+                               "Invalid config param %04x\n", param);
+                       ret = -ENOTSUPP;
+               }
index 0dcb7346742aab7dda68ef266eddaa9cee2a2897..ccd0d5cc5c724b8a3705c78447138f22f83d39c4 100644 (file)
@@ -19,3 +19,4 @@ firmware-stratix10-svc-fix-an-null-vs-is_err-bug-in-probe.patch
 fsi-master-ast-cf-add-module_firmware-macro.patch
 nilfs2-fix-general-protection-fault-in-nilfs_lookup_dirty_data_buffers.patch
 nilfs2-fix-warning-in-mark_buffer_dirty-due-to-discarded-buffer-reuse.patch
+pinctrl-amd-don-t-show-invalid-config-param-errors.patch