5.15 patch

diff --git a/queue-5.15/reset-tegra-bpmp-revert-handle-errors-in-bpmp-response.patch b/queue-5.15/reset-tegra-bpmp-revert-handle-errors-in-bpmp-response.patch
new file mode 100644 (file)
index 0000000..68f8132
--- /dev/null
+++ b/queue-5.15/reset-tegra-bpmp-revert-handle-errors-in-bpmp-response.patch
@@ -0,0 +1,50 @@
+From 69125b4b9440be015783312e1b8753ec96febde0 Mon Sep 17 00:00:00 2001
+From: Jon Hunter <jonathanh@nvidia.com>
+Date: Fri, 12 Nov 2021 11:27:12 +0000
+Subject: reset: tegra-bpmp: Revert Handle errors in BPMP response
+
+From: Jon Hunter <jonathanh@nvidia.com>
+
+commit 69125b4b9440be015783312e1b8753ec96febde0 upstream.
+
+Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP
+response") fixed an issue in the Tegra BPMP error handling but has
+exposed an issue in the Tegra194 HDA driver and now resetting the
+Tegra194 HDA controller is failing. For now revert the commit
+c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")
+while a fix for the Tegra HDA driver is created.
+
+Fixes: c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Link: https://lore.kernel.org/r/20211112112712.21587-1-jonathanh@nvidia.com
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/reset/tegra/reset-bpmp.c |    9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+--- a/drivers/reset/tegra/reset-bpmp.c
++++ b/drivers/reset/tegra/reset-bpmp.c
+@@ -20,7 +20,6 @@ static int tegra_bpmp_reset_common(struc
+       struct tegra_bpmp *bpmp = to_tegra_bpmp(rstc);
+       struct mrq_reset_request request;
+       struct tegra_bpmp_message msg;
+-      int err;
+ 
+       memset(&request, 0, sizeof(request));
+       request.cmd = command;
+@@ -31,13 +30,7 @@ static int tegra_bpmp_reset_common(struc
+       msg.tx.data = &request;
+       msg.tx.size = sizeof(request);
+ 
+-      err = tegra_bpmp_transfer(bpmp, &msg);
+-      if (err)
+-              return err;
+-      if (msg.rx.ret)
+-              return -EINVAL;
+-
+-      return 0;
++      return tegra_bpmp_transfer(bpmp, &msg);
+ }
+ 
+ static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,

diff --git a/queue-5.15/series b/queue-5.15/series
new file mode 100644 (file)
index 0000000..11ee256
--- /dev/null
+++ b/queue-5.15/series
@@ -0,0 +1 @@
+reset-tegra-bpmp-revert-handle-errors-in-bpmp-response.patch