Linux 4.19.51

[thirdparty/kernel/stable-queue.git] / releases / 4.19.51 / mailbox-stm32-ipcc-check-invalid-irq.patch

diff --git a/releases/4.19.51/mailbox-stm32-ipcc-check-invalid-irq.patch b/releases/4.19.51/mailbox-stm32-ipcc-check-invalid-irq.patch
new file mode 100644 (file)
index 0000000..7667add
--- /dev/null
+++ b/releases/4.19.51/mailbox-stm32-ipcc-check-invalid-irq.patch
@@ -0,0 +1,65 @@
+From 3523cdbc64dcd41053bbf0ec1be1b431b81e0f34 Mon Sep 17 00:00:00 2001
+From: Fabien Dessenne <fabien.dessenne@st.com>
+Date: Wed, 24 Apr 2019 17:51:05 +0200
+Subject: mailbox: stm32-ipcc: check invalid irq
+
+[ Upstream commit 68a1c8485cf83734d4da9d81cd3b5d2ae7c0339b ]
+
+On failure of_irq_get() returns a negative value or zero, which is
+not handled as an error in the existing implementation.
+Instead of using this API, use platform_get_irq() that returns
+exclusively a negative value on failure.
+Also, do not output an error log in case of defer probe error.
+
+Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
+Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/mailbox/stm32-ipcc.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
+index 533b0da5235d..ca1f993c0de3 100644
+--- a/drivers/mailbox/stm32-ipcc.c
++++ b/drivers/mailbox/stm32-ipcc.c
+@@ -8,9 +8,9 @@
+ #include <linux/bitfield.h>
+ #include <linux/clk.h>
+ #include <linux/interrupt.h>
++#include <linux/io.h>
+ #include <linux/mailbox_controller.h>
+ #include <linux/module.h>
+-#include <linux/of_irq.h>
+ #include <linux/platform_device.h>
+ #include <linux/pm_wakeirq.h>
+ 
+@@ -240,9 +240,11 @@ static int stm32_ipcc_probe(struct platform_device *pdev)
+ 
+       /* irq */
+       for (i = 0; i < IPCC_IRQ_NUM; i++) {
+-              ipcc->irqs[i] = of_irq_get_byname(dev->of_node, irq_name[i]);
++              ipcc->irqs[i] = platform_get_irq_byname(pdev, irq_name[i]);
+               if (ipcc->irqs[i] < 0) {
+-                      dev_err(dev, "no IRQ specified %s\n", irq_name[i]);
++                      if (ipcc->irqs[i] != -EPROBE_DEFER)
++                              dev_err(dev, "no IRQ specified %s\n",
++                                      irq_name[i]);
+                       ret = ipcc->irqs[i];
+                       goto err_clk;
+               }
+@@ -263,9 +265,10 @@ static int stm32_ipcc_probe(struct platform_device *pdev)
+ 
+       /* wakeup */
+       if (of_property_read_bool(np, "wakeup-source")) {
+-              ipcc->wkp = of_irq_get_byname(dev->of_node, "wakeup");
++              ipcc->wkp = platform_get_irq_byname(pdev, "wakeup");
+               if (ipcc->wkp < 0) {
+-                      dev_err(dev, "could not get wakeup IRQ\n");
++                      if (ipcc->wkp != -EPROBE_DEFER)
++                              dev_err(dev, "could not get wakeup IRQ\n");
+                       ret = ipcc->wkp;
+                       goto err_clk;
+               }
+-- 
+2.20.1
+