5.4-stable patches

added patches:
	mailbox-tegra-fix-superfluous-irq-error-message.patch

diff --git a/queue-5.4/mailbox-tegra-fix-superfluous-irq-error-message.patch b/queue-5.4/mailbox-tegra-fix-superfluous-irq-error-message.patch
new file mode 100644 (file)
index 0000000..8b8ecac
--- /dev/null
+++ b/queue-5.4/mailbox-tegra-fix-superfluous-irq-error-message.patch
@@ -0,0 +1,56 @@
+From c745da8d4320c49e54662c0a8f7cb6b8204f44c4 Mon Sep 17 00:00:00 2001
+From: Jon Hunter <jonathanh@nvidia.com>
+Date: Fri, 11 Oct 2019 09:34:59 +0100
+Subject: mailbox: tegra: Fix superfluous IRQ error message
+
+From: Jon Hunter <jonathanh@nvidia.com>
+
+commit c745da8d4320c49e54662c0a8f7cb6b8204f44c4 upstream.
+
+Commit 7723f4c5ecdb ("driver core: platform: Add an error message to
+platform_get_irq*()") added an error message to avoid drivers having
+to print an error message when IRQ lookup fails. However, there are
+some cases where IRQs are optional and so new optional versions of
+the platform_get_irq*() APIs have been added for these cases.
+
+The IRQs for Tegra HSP module are optional because not all instances
+of the module have the doorbell and all of the shared interrupts.
+Hence, since the above commit was applied the following error messages
+are now seen on Tegra194 ...
+
+ ERR KERN tegra-hsp c150000.hsp: IRQ doorbell not found
+ ERR KERN tegra-hsp c150000.hsp: IRQ shared0 not found
+
+The Tegra HSP driver deliberately does not fail if these are not found
+and so fix the above errors by updating the Tegra HSP driver to use
+the platform_get_irq_byname_optional() API.
+
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Acked-by: Thierry Reding <treding@nvidia.com>
+Link: https://lore.kernel.org/r/20191011083459.11551-1-jonathanh@nvidia.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mailbox/tegra-hsp.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/mailbox/tegra-hsp.c
++++ b/drivers/mailbox/tegra-hsp.c
+@@ -657,7 +657,7 @@ static int tegra_hsp_probe(struct platfo
+       hsp->num_db = (value >> HSP_nDB_SHIFT) & HSP_nINT_MASK;
+       hsp->num_si = (value >> HSP_nSI_SHIFT) & HSP_nINT_MASK;
+ 
+-      err = platform_get_irq_byname(pdev, "doorbell");
++      err = platform_get_irq_byname_optional(pdev, "doorbell");
+       if (err >= 0)
+               hsp->doorbell_irq = err;
+ 
+@@ -677,7 +677,7 @@ static int tegra_hsp_probe(struct platfo
+                       if (!name)
+                               return -ENOMEM;
+ 
+-                      err = platform_get_irq_byname(pdev, name);
++                      err = platform_get_irq_byname_optional(pdev, name);
+                       if (err >= 0) {
+                               hsp->shared_irqs[i] = err;
+                               count++;

diff --git a/queue-5.4/series b/queue-5.4/series
index fa8eb5b9e56cb1495ff552704c72ae0881163eb8..70b8c0937a5e99d8b9c718bb470690654d3e70b6 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -5,3 +5,4 @@ perf-scripts-python-exported-sql-viewer.py-fix-use-of-true-with-sqlite.patch
 sparc64-implement-ioremap_uc.patch
 lp-fix-sparc64-lpsettimeout-ioctl.patch
 time-zero-the-upper-32-bits-in-__kernel_timespec-on-32-bit.patch
+mailbox-tegra-fix-superfluous-irq-error-message.patch