Drop reset-tegra-bpmp-handle-errors-in-bpmp-response.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch b/queue-4.19/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
deleted file mode 100644 (file)
index a82ef16..0000000
--- a/queue-4.19/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 29de6b25aa34db9dc47aa37742a1d04e277fd36f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 15 Sep 2021 11:55:14 +0300
-Subject: reset: tegra-bpmp: Handle errors in BPMP response
-
-From: Mikko Perttunen <mperttunen@nvidia.com>
-
-[ Upstream commit c045ceb5a145d2a9a4bf33cbc55185ddf99f60ab ]
-
-The return value from tegra_bpmp_transfer indicates the success or
-failure of the IPC transaction with BPMP. If the transaction
-succeeded, we also need to check the actual command's result code.
-Add code to do this.
-
-Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
-Link: https://lore.kernel.org/r/20210915085517.1669675-2-mperttunen@nvidia.com
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c
-index 5daf2ee1a396b..f9790b60f9964 100644
---- a/drivers/reset/tegra/reset-bpmp.c
-+++ b/drivers/reset/tegra/reset-bpmp.c
-@@ -23,6 +23,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       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;
-@@ -33,7 +34,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       msg.tx.data = &request;
-       msg.tx.size = sizeof(request);
- 
--      return tegra_bpmp_transfer(bpmp, &msg);
-+      err = tegra_bpmp_transfer(bpmp, &msg);
-+      if (err)
-+              return err;
-+      if (msg.rx.ret)
-+              return -EINVAL;
-+
-+      return 0;
- }
- 
- static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
--- 
-2.33.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index f968500fc134a0c3522cc5606b78fc4e0326b410..9e7627825032673a396675da2c9bcf2614f9f6ab 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -28,7 +28,6 @@ scsi-qla2xxx-fix-unmap-of-already-freed-sgl.patch
 cavium-fix-return-values-of-the-probe-function.patch
 sfc-don-t-use-netif_info-before-net_device-setup.patch
 hyperv-vmbus-include-linux-bitops.h.patch
-reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
 mmc-winbond-don-t-build-on-m68k.patch
 drm-panel-orientation-quirks-add-quirk-for-aya-neo-2.patch
 bpf-prevent-increasing-bpf_jit_limit-above-max.patch

diff --git a/queue-5.10/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch b/queue-5.10/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
deleted file mode 100644 (file)
index 0bf4c10..0000000
--- a/queue-5.10/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c69a43097a24911f61670941846f886211c8776a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 15 Sep 2021 11:55:14 +0300
-Subject: reset: tegra-bpmp: Handle errors in BPMP response
-
-From: Mikko Perttunen <mperttunen@nvidia.com>
-
-[ Upstream commit c045ceb5a145d2a9a4bf33cbc55185ddf99f60ab ]
-
-The return value from tegra_bpmp_transfer indicates the success or
-failure of the IPC transaction with BPMP. If the transaction
-succeeded, we also need to check the actual command's result code.
-Add code to do this.
-
-Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
-Link: https://lore.kernel.org/r/20210915085517.1669675-2-mperttunen@nvidia.com
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c
-index 24d3395964cc4..4c5bba52b1059 100644
---- a/drivers/reset/tegra/reset-bpmp.c
-+++ b/drivers/reset/tegra/reset-bpmp.c
-@@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       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;
-@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       msg.tx.data = &request;
-       msg.tx.size = sizeof(request);
- 
--      return tegra_bpmp_transfer(bpmp, &msg);
-+      err = tegra_bpmp_transfer(bpmp, &msg);
-+      if (err)
-+              return err;
-+      if (msg.rx.ret)
-+              return -EINVAL;
-+
-+      return 0;
- }
- 
- static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 3e8f68bbf98914af7ddd92e8b57fd09732c044ac..f13d08d49e00f87902ca7f3e3c87974a35ce6d4d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -58,7 +58,6 @@ sfc-export-fibre-specific-supported-link-modes.patch
 sfc-don-t-use-netif_info-before-net_device-setup.patch
 hyperv-vmbus-include-linux-bitops.h.patch
 arm-dts-sun7i-a20-olinuxino-lime2-fix-ethernet-phy-m.patch
-reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
 reset-socfpga-add-empty-driver-allowing-consumers-to.patch
 mmc-winbond-don-t-build-on-m68k.patch
 drm-panel-orientation-quirks-add-quirk-for-aya-neo-2.patch

diff --git a/queue-5.14/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch b/queue-5.14/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
deleted file mode 100644 (file)
index 5cde2d3..0000000
--- a/queue-5.14/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 56b49d170845d0454d6c313082d9c05d5a362fa2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 15 Sep 2021 11:55:14 +0300
-Subject: reset: tegra-bpmp: Handle errors in BPMP response
-
-From: Mikko Perttunen <mperttunen@nvidia.com>
-
-[ Upstream commit c045ceb5a145d2a9a4bf33cbc55185ddf99f60ab ]
-
-The return value from tegra_bpmp_transfer indicates the success or
-failure of the IPC transaction with BPMP. If the transaction
-succeeded, we also need to check the actual command's result code.
-Add code to do this.
-
-Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
-Link: https://lore.kernel.org/r/20210915085517.1669675-2-mperttunen@nvidia.com
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c
-index 24d3395964cc4..4c5bba52b1059 100644
---- a/drivers/reset/tegra/reset-bpmp.c
-+++ b/drivers/reset/tegra/reset-bpmp.c
-@@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       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;
-@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       msg.tx.data = &request;
-       msg.tx.size = sizeof(request);
- 
--      return tegra_bpmp_transfer(bpmp, &msg);
-+      err = tegra_bpmp_transfer(bpmp, &msg);
-+      if (err)
-+              return err;
-+      if (msg.rx.ret)
-+              return -EINVAL;
-+
-+      return 0;
- }
- 
- static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
--- 
-2.33.0
-

diff --git a/queue-5.14/series b/queue-5.14/series
index 099858002d220407e785dcc704fa66189d8f8820..46fd7d75cbfa3ec232b96ebb1b79c2fb3a53d37a 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -69,7 +69,6 @@ sfc-export-fibre-specific-supported-link-modes.patch
 sfc-don-t-use-netif_info-before-net_device-setup.patch
 hyperv-vmbus-include-linux-bitops.h.patch
 arm-dts-sun7i-a20-olinuxino-lime2-fix-ethernet-phy-m.patch
-reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
 reset-socfpga-add-empty-driver-allowing-consumers-to.patch
 mmc-winbond-don-t-build-on-m68k.patch
 spi-altera-change-to-dynamic-allocation-of-spi-id.patch

diff --git a/queue-5.4/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch b/queue-5.4/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
deleted file mode 100644 (file)
index f117204..0000000
--- a/queue-5.4/reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 98bd616e275cc6d5513f032870e5eef8ac7cf482 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 15 Sep 2021 11:55:14 +0300
-Subject: reset: tegra-bpmp: Handle errors in BPMP response
-
-From: Mikko Perttunen <mperttunen@nvidia.com>
-
-[ Upstream commit c045ceb5a145d2a9a4bf33cbc55185ddf99f60ab ]
-
-The return value from tegra_bpmp_transfer indicates the success or
-failure of the IPC transaction with BPMP. If the transaction
-succeeded, we also need to check the actual command's result code.
-Add code to do this.
-
-Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
-Link: https://lore.kernel.org/r/20210915085517.1669675-2-mperttunen@nvidia.com
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c
-index 24d3395964cc4..4c5bba52b1059 100644
---- a/drivers/reset/tegra/reset-bpmp.c
-+++ b/drivers/reset/tegra/reset-bpmp.c
-@@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       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;
-@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
-       msg.tx.data = &request;
-       msg.tx.size = sizeof(request);
- 
--      return tegra_bpmp_transfer(bpmp, &msg);
-+      err = tegra_bpmp_transfer(bpmp, &msg);
-+      if (err)
-+              return err;
-+      if (msg.rx.ret)
-+              return -EINVAL;
-+
-+      return 0;
- }
- 
- static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
--- 
-2.33.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 5e0771555a93c72b5f28445e40f69690dd044485..eb8c2027d9dc0089d3e7c5852a430d2d171ad0c6 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -40,7 +40,6 @@ cavium-fix-return-values-of-the-probe-function.patch
 sfc-don-t-use-netif_info-before-net_device-setup.patch
 hyperv-vmbus-include-linux-bitops.h.patch
 arm-dts-sun7i-a20-olinuxino-lime2-fix-ethernet-phy-m.patch
-reset-tegra-bpmp-handle-errors-in-bpmp-response.patch
 reset-socfpga-add-empty-driver-allowing-consumers-to.patch
 mmc-winbond-don-t-build-on-m68k.patch
 drm-panel-orientation-quirks-add-quirk-for-aya-neo-2.patch