Fixes for 4.14

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

diff --git a/queue-4.14/powerpc-powernv-opal-dump-use-irq_handled-instead-of.patch b/queue-4.14/powerpc-powernv-opal-dump-use-irq_handled-instead-of.patch
new file mode 100644 (file)
index 0000000..93f7055
--- /dev/null
+++ b/queue-4.14/powerpc-powernv-opal-dump-use-irq_handled-instead-of.patch
@@ -0,0 +1,63 @@
+From 18abfb69b5d9779c6cda594c0878f7e6973bc51b Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 20 Feb 2017 18:52:11 +0530
+Subject: powerpc/powernv/opal-dump : Use IRQ_HANDLED instead of numbers in
+ interrupt handler
+
+From: Mukesh Ojha <mukesh02@linux.vnet.ibm.com>
+
+[ Upstream commit b29336c0e1785a28bc40a9fd47c2321671e9792e ]
+
+Fixes: 8034f715f ("powernv/opal-dump: Convert to irq domain")
+
+Converts all the return explicit number to a more proper IRQ_HANDLED,
+which looks proper incase of interrupt handler returning case.
+
+Here, It also removes error message like "nobody cared" which was
+getting unveiled while returning -1 or 0 from handler.
+
+Signed-off-by: Mukesh Ojha <mukesh02@linux.vnet.ibm.com>
+Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/powerpc/platforms/powernv/opal-dump.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c
+index e21e2c0af69d2..1a8b6e276a112 100644
+--- a/arch/powerpc/platforms/powernv/opal-dump.c
++++ b/arch/powerpc/platforms/powernv/opal-dump.c
+@@ -385,13 +385,12 @@ static irqreturn_t process_dump(int irq, void *data)
+ {
+       int rc;
+       uint32_t dump_id, dump_size, dump_type;
+-      struct dump_obj *dump;
+       char name[22];
+       struct kobject *kobj;
+ 
+       rc = dump_read_info(&dump_id, &dump_size, &dump_type);
+       if (rc != OPAL_SUCCESS)
+-              return rc;
++              return IRQ_HANDLED;
+ 
+       sprintf(name, "0x%x-0x%x", dump_type, dump_id);
+ 
+@@ -403,12 +402,10 @@ static irqreturn_t process_dump(int irq, void *data)
+       if (kobj) {
+               /* Drop reference added by kset_find_obj() */
+               kobject_put(kobj);
+-              return 0;
++              return IRQ_HANDLED;
+       }
+ 
+-      dump = create_dump_obj(dump_id, dump_size, dump_type);
+-      if (!dump)
+-              return -1;
++      create_dump_obj(dump_id, dump_size, dump_type);
+ 
+       return IRQ_HANDLED;
+ }
+-- 
+2.27.0
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 6ef9348e82576ed6f08239af5c0552ed4e5d24c7..19540c024f72c3b2d8971c28eadbec6fe95752c6 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -189,3 +189,4 @@ usb-cdc-acm-add-quirk-to-blacklist-etas-es58x-devices.patch
 usb-cdc-wdm-make-wdm_flush-interruptible-and-add-wdm_fsync.patch
 eeprom-at25-set-minimum-read-write-access-stride-to-1.patch
 usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch
+powerpc-powernv-opal-dump-use-irq_handled-instead-of.patch