drop some repoteproc patches

diff --git a/queue-5.15/remoteproc-imx_rproc-simplify-some-error-message.patch b/queue-5.15/remoteproc-imx_rproc-simplify-some-error-message.patch
deleted file mode 100644 (file)
index e11303d..0000000
--- a/queue-5.15/remoteproc-imx_rproc-simplify-some-error-message.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ed34c88c3c75a8dc56c20b609ed793c28405c6b6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 6 Aug 2022 00:02:32 +0200
-Subject: remoteproc: imx_rproc: Simplify some error message
-
-From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-
-[ Upstream commit a1c3611dcfb08e62e165ab5c00122dd13f210166 ]
-
-dev_err_probe() already prints the error code in a human readable way, so
-there is no need to duplicate it as a numerical value at the end of the
-message.
-
-While at it, remove 'ret' that is mostly useless.
-
-Fixes: 2df7062002d0 ("remoteproc: imx_proc: enable virtio/mailbox")
-Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-Link: https://lore.kernel.org/r/6b9343c2688117a340661d8ee491c2962c54a09a.1659736936.git.christophe.jaillet@wanadoo.fr
-Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/remoteproc/imx_rproc.c | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
-index e8a170ad43c1..776052ae76ae 100644
---- a/drivers/remoteproc/imx_rproc.c
-+++ b/drivers/remoteproc/imx_rproc.c
-@@ -638,7 +638,6 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
-       struct imx_rproc *priv = rproc->priv;
-       struct device *dev = priv->dev;
-       struct mbox_client *cl;
--      int ret;
- 
-       if (!of_get_property(dev->of_node, "mbox-names", NULL))
-               return 0;
-@@ -651,18 +650,15 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
-       cl->rx_callback = imx_rproc_rx_callback;
- 
-       priv->tx_ch = mbox_request_channel_byname(cl, "tx");
--      if (IS_ERR(priv->tx_ch)) {
--              ret = PTR_ERR(priv->tx_ch);
--              return dev_err_probe(cl->dev, ret,
--                                   "failed to request tx mailbox channel: %d\n", ret);
--      }
-+      if (IS_ERR(priv->tx_ch))
-+              return dev_err_probe(cl->dev, PTR_ERR(priv->tx_ch),
-+                                   "failed to request tx mailbox channel\n");
- 
-       priv->rx_ch = mbox_request_channel_byname(cl, "rx");
-       if (IS_ERR(priv->rx_ch)) {
-               mbox_free_channel(priv->tx_ch);
--              ret = PTR_ERR(priv->rx_ch);
--              return dev_err_probe(cl->dev, ret,
--                                   "failed to request rx mailbox channel: %d\n", ret);
-+              return dev_err_probe(cl->dev, PTR_ERR(priv->rx_ch),
-+                                   "failed to request rx mailbox channel\n");
-       }
- 
-       return 0;
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 7c3cceac4e4c1d237bdb8eb1e6f1522403b2b88c..adeb02eb715484263a3c687acda1145ca29b4b8b 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -293,7 +293,6 @@ clk-tegra-fix-refcount-leak-in-tegra210_clock_init.patch
 clk-tegra-fix-refcount-leak-in-tegra114_clock_init.patch
 clk-tegra20-fix-refcount-leak-in-tegra20_clock_init.patch
 sbitmap-fix-possible-io-hung-due-to-lost-wakeup.patch
-remoteproc-imx_rproc-simplify-some-error-message.patch
 hid-uclogic-make-template-placeholder-ids-generic.patch
 hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch
 hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch

diff --git a/queue-5.19/remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch b/queue-5.19/remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch
deleted file mode 100644 (file)
index 4443bcd..0000000
--- a/queue-5.19/remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dd6593236cdda4914553636ebe5a0489c29d1f58 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 15 Aug 2022 20:43:18 +0800
-Subject: remoteproc: imx_dsp_rproc: fix argument 2 of rproc_mem_entry_init
-
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-
-[ Upstream commit 729c16326b7f3f4e83e4195f620a6ca0b7dfa25a ]
-
-There are sparse warning:
-drivers/remoteproc/imx_dsp_rproc.c:602:49: sparse: sparse: incorrect type in argument 2 (different address spaces) @@     expected void *va @@     got void [noderef] __iomem *[assigned] cpu_addr @@
-drivers/remoteproc/imx_dsp_rproc.c:602:49: sparse:     expected void *va
-drivers/remoteproc/imx_dsp_rproc.c:602:49: sparse:     got void [noderef] __iomem *[assigned] cpu_addr
-drivers/remoteproc/imx_dsp_rproc.c:638:49: sparse: sparse: incorrect type in argument 2 (different address spaces) @@     expected void *va @@     got void [noderef] __iomem *[assigned] cpu_addr @@
-drivers/remoteproc/imx_dsp_rproc.c:638:49: sparse:     expected void *va
-drivers/remoteproc/imx_dsp_rproc.c:638:49: sparse:     got void [noderef] __iomem *[assigned] cpu_addr
-
-Fixes: ec0e5549f358 ("remoteproc: imx_dsp_rproc: Add remoteproc driver for DSP on i.MX")
-Reported-by: kernel test robot <lkp@intel.com>
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
-Link: https://lore.kernel.org/r/1660567398-24495-1-git-send-email-shengjiu.wang@nxp.com
-Acked-by: Mukesh Ojha <quic_mojha@quicinc.com>
-Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/remoteproc/imx_dsp_rproc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
-index ca0817f8e41e..899aa8dd12f0 100644
---- a/drivers/remoteproc/imx_dsp_rproc.c
-+++ b/drivers/remoteproc/imx_dsp_rproc.c
-@@ -599,7 +599,7 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
-               }
- 
-               /* Register memory region */
--              mem = rproc_mem_entry_init(dev, cpu_addr, (dma_addr_t)att->sa,
-+              mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)att->sa,
-                                          att->size, da, NULL, NULL, "dsp_mem");
- 
-               if (mem)
-@@ -635,7 +635,7 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
-               }
- 
-               /* Register memory region */
--              mem = rproc_mem_entry_init(dev, cpu_addr, (dma_addr_t)rmem->base,
-+              mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base,
-                                          rmem->size, da, NULL, NULL, it.node->name);
- 
-               if (mem)
--- 
-2.35.1
-

diff --git a/queue-5.19/remoteproc-imx_rproc-simplify-some-error-message.patch b/queue-5.19/remoteproc-imx_rproc-simplify-some-error-message.patch
deleted file mode 100644 (file)
index 1eb84f8..0000000
--- a/queue-5.19/remoteproc-imx_rproc-simplify-some-error-message.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From d6f39ccb0d7717063748eadb29eadce7e227dfb0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 6 Aug 2022 00:02:32 +0200
-Subject: remoteproc: imx_rproc: Simplify some error message
-
-From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-
-[ Upstream commit a1c3611dcfb08e62e165ab5c00122dd13f210166 ]
-
-dev_err_probe() already prints the error code in a human readable way, so
-there is no need to duplicate it as a numerical value at the end of the
-message.
-
-While at it, remove 'ret' that is mostly useless.
-
-Fixes: 2df7062002d0 ("remoteproc: imx_proc: enable virtio/mailbox")
-Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-Link: https://lore.kernel.org/r/6b9343c2688117a340661d8ee491c2962c54a09a.1659736936.git.christophe.jaillet@wanadoo.fr
-Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/remoteproc/imx_rproc.c | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
-index 38383e7de3c1..7cc4fd207e2d 100644
---- a/drivers/remoteproc/imx_rproc.c
-+++ b/drivers/remoteproc/imx_rproc.c
-@@ -646,7 +646,6 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
-       struct imx_rproc *priv = rproc->priv;
-       struct device *dev = priv->dev;
-       struct mbox_client *cl;
--      int ret;
- 
-       if (!of_get_property(dev->of_node, "mbox-names", NULL))
-               return 0;
-@@ -659,18 +658,15 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
-       cl->rx_callback = imx_rproc_rx_callback;
- 
-       priv->tx_ch = mbox_request_channel_byname(cl, "tx");
--      if (IS_ERR(priv->tx_ch)) {
--              ret = PTR_ERR(priv->tx_ch);
--              return dev_err_probe(cl->dev, ret,
--                                   "failed to request tx mailbox channel: %d\n", ret);
--      }
-+      if (IS_ERR(priv->tx_ch))
-+              return dev_err_probe(cl->dev, PTR_ERR(priv->tx_ch),
-+                                   "failed to request tx mailbox channel\n");
- 
-       priv->rx_ch = mbox_request_channel_byname(cl, "rx");
-       if (IS_ERR(priv->rx_ch)) {
-               mbox_free_channel(priv->tx_ch);
--              ret = PTR_ERR(priv->rx_ch);
--              return dev_err_probe(cl->dev, ret,
--                                   "failed to request rx mailbox channel: %d\n", ret);
-+              return dev_err_probe(cl->dev, PTR_ERR(priv->rx_ch),
-+                                   "failed to request rx mailbox channel\n");
-       }
- 
-       return 0;
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 89a62394e4dc1b516112ec2046f72b6dd8a5f4fa..b35ef7fad9b97d621ef8af7760cc95816b9c560d 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -407,8 +407,6 @@ clk-tegra-fix-refcount-leak-in-tegra114_clock_init.patch
 clk-tegra20-fix-refcount-leak-in-tegra20_clock_init.patch
 clk-samsung-exynosautov9-correct-register-offsets-of.patch
 sbitmap-fix-possible-io-hung-due-to-lost-wakeup.patch
-remoteproc-imx_rproc-simplify-some-error-message.patch
-remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch
 hid-uclogic-make-template-placeholder-ids-generic.patch
 hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch
 hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch

diff --git a/queue-6.0/remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch b/queue-6.0/remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch
deleted file mode 100644 (file)
index 6ac9494..0000000
--- a/queue-6.0/remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dc78c51c5ccdc9e4ff68f4795865d3ee0ffd40e1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 15 Aug 2022 20:43:18 +0800
-Subject: remoteproc: imx_dsp_rproc: fix argument 2 of rproc_mem_entry_init
-
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-
-[ Upstream commit 729c16326b7f3f4e83e4195f620a6ca0b7dfa25a ]
-
-There are sparse warning:
-drivers/remoteproc/imx_dsp_rproc.c:602:49: sparse: sparse: incorrect type in argument 2 (different address spaces) @@     expected void *va @@     got void [noderef] __iomem *[assigned] cpu_addr @@
-drivers/remoteproc/imx_dsp_rproc.c:602:49: sparse:     expected void *va
-drivers/remoteproc/imx_dsp_rproc.c:602:49: sparse:     got void [noderef] __iomem *[assigned] cpu_addr
-drivers/remoteproc/imx_dsp_rproc.c:638:49: sparse: sparse: incorrect type in argument 2 (different address spaces) @@     expected void *va @@     got void [noderef] __iomem *[assigned] cpu_addr @@
-drivers/remoteproc/imx_dsp_rproc.c:638:49: sparse:     expected void *va
-drivers/remoteproc/imx_dsp_rproc.c:638:49: sparse:     got void [noderef] __iomem *[assigned] cpu_addr
-
-Fixes: ec0e5549f358 ("remoteproc: imx_dsp_rproc: Add remoteproc driver for DSP on i.MX")
-Reported-by: kernel test robot <lkp@intel.com>
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
-Link: https://lore.kernel.org/r/1660567398-24495-1-git-send-email-shengjiu.wang@nxp.com
-Acked-by: Mukesh Ojha <quic_mojha@quicinc.com>
-Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/remoteproc/imx_dsp_rproc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
-index ca0817f8e41e..899aa8dd12f0 100644
---- a/drivers/remoteproc/imx_dsp_rproc.c
-+++ b/drivers/remoteproc/imx_dsp_rproc.c
-@@ -599,7 +599,7 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
-               }
- 
-               /* Register memory region */
--              mem = rproc_mem_entry_init(dev, cpu_addr, (dma_addr_t)att->sa,
-+              mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)att->sa,
-                                          att->size, da, NULL, NULL, "dsp_mem");
- 
-               if (mem)
-@@ -635,7 +635,7 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)
-               }
- 
-               /* Register memory region */
--              mem = rproc_mem_entry_init(dev, cpu_addr, (dma_addr_t)rmem->base,
-+              mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base,
-                                          rmem->size, da, NULL, NULL, it.node->name);
- 
-               if (mem)
--- 
-2.35.1
-

diff --git a/queue-6.0/remoteproc-imx_rproc-simplify-some-error-message.patch b/queue-6.0/remoteproc-imx_rproc-simplify-some-error-message.patch
deleted file mode 100644 (file)
index 5f63250..0000000
--- a/queue-6.0/remoteproc-imx_rproc-simplify-some-error-message.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From fb4f6133d80c5e1147a18ba9ea303c71710d60ac Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 6 Aug 2022 00:02:32 +0200
-Subject: remoteproc: imx_rproc: Simplify some error message
-
-From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-
-[ Upstream commit a1c3611dcfb08e62e165ab5c00122dd13f210166 ]
-
-dev_err_probe() already prints the error code in a human readable way, so
-there is no need to duplicate it as a numerical value at the end of the
-message.
-
-While at it, remove 'ret' that is mostly useless.
-
-Fixes: 2df7062002d0 ("remoteproc: imx_proc: enable virtio/mailbox")
-Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-Link: https://lore.kernel.org/r/6b9343c2688117a340661d8ee491c2962c54a09a.1659736936.git.christophe.jaillet@wanadoo.fr
-Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/remoteproc/imx_rproc.c | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
-index 38383e7de3c1..7cc4fd207e2d 100644
---- a/drivers/remoteproc/imx_rproc.c
-+++ b/drivers/remoteproc/imx_rproc.c
-@@ -646,7 +646,6 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
-       struct imx_rproc *priv = rproc->priv;
-       struct device *dev = priv->dev;
-       struct mbox_client *cl;
--      int ret;
- 
-       if (!of_get_property(dev->of_node, "mbox-names", NULL))
-               return 0;
-@@ -659,18 +658,15 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
-       cl->rx_callback = imx_rproc_rx_callback;
- 
-       priv->tx_ch = mbox_request_channel_byname(cl, "tx");
--      if (IS_ERR(priv->tx_ch)) {
--              ret = PTR_ERR(priv->tx_ch);
--              return dev_err_probe(cl->dev, ret,
--                                   "failed to request tx mailbox channel: %d\n", ret);
--      }
-+      if (IS_ERR(priv->tx_ch))
-+              return dev_err_probe(cl->dev, PTR_ERR(priv->tx_ch),
-+                                   "failed to request tx mailbox channel\n");
- 
-       priv->rx_ch = mbox_request_channel_byname(cl, "rx");
-       if (IS_ERR(priv->rx_ch)) {
-               mbox_free_channel(priv->tx_ch);
--              ret = PTR_ERR(priv->rx_ch);
--              return dev_err_probe(cl->dev, ret,
--                                   "failed to request rx mailbox channel: %d\n", ret);
-+              return dev_err_probe(cl->dev, PTR_ERR(priv->rx_ch),
-+                                   "failed to request rx mailbox channel\n");
-       }
- 
-       return 0;
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index fc5f492c12eae5e9d4cba16359823b5b41c098bb..1282207338d7272dfe9b14307ce4637c17f7e82b 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -479,8 +479,6 @@ clk-tegra-fix-refcount-leak-in-tegra114_clock_init.patch
 clk-tegra20-fix-refcount-leak-in-tegra20_clock_init.patch
 clk-samsung-exynosautov9-correct-register-offsets-of.patch
 sbitmap-fix-possible-io-hung-due-to-lost-wakeup.patch
-remoteproc-imx_rproc-simplify-some-error-message.patch
-remoteproc-imx_dsp_rproc-fix-argument-2-of-rproc_mem.patch
 hid-uclogic-add-missing-suffix-for-digitalizers.patch
 hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch
 hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch