1 files changed, 50 insertions, 22 deletions

diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index f10b9ec8c1f5..18fd4e71c9c1 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -208,7 +208,7 @@ static int __init opal_register_exception_handlers(void)
          * start catching/handling HMI directly in Linux.
          */
         if (!opal_check_token(OPAL_HANDLE_HMI)) {
-                pr_info("opal: Old firmware detected, OPAL handles HMIs.\n");
+                pr_info("Old firmware detected, OPAL handles HMIs.\n");
                 opal_register_exception_handler(
                                 OPAL_HYPERVISOR_MAINTENANCE_HANDLER,
                                 0, glue);
@@ -667,7 +667,13 @@ static void __init opal_dump_region_init(void)
 
         /* Register kernel log buffer */
         addr = log_buf_addr_get();
+        if (addr == NULL)
+                return;
+
         size = log_buf_len_get();
+        if (size == 0)
+                return;
+
         rc = opal_register_dump_region(OPAL_DUMP_REGION_LOG_BUF,
                                        __pa(addr), size);
         /* Don't warn if this is just an older OPAL that doesn't
@@ -695,15 +701,54 @@ static void opal_i2c_create_devs(void)
                 of_platform_device_create(np, NULL, NULL);
 }
 
+static void __init opal_irq_init(struct device_node *dn)
+{
+        const __be32 *irqs;
+        int i, irqlen;
+
+        /* Get interrupt property */
+        irqs = of_get_property(opal_node, "opal-interrupts", &irqlen);
+        opal_irq_count = irqs ? (irqlen / 4) : 0;
+        pr_debug("Found %d interrupts reserved for OPAL\n", opal_irq_count);
+        if (!opal_irq_count)
+                return;
+
+        /* Install interrupt handlers */
+        opal_irqs = kzalloc(opal_irq_count * sizeof(unsigned int), GFP_KERNEL);
+        for (i = 0; irqs && i < opal_irq_count; i++, irqs++) {
+                unsigned int irq, virq;
+                int rc;
+
+                /* Get hardware and virtual IRQ */
+                irq = be32_to_cpup(irqs);
+                virq = irq_create_mapping(NULL, irq);
+                if (virq == NO_IRQ) {
+                        pr_warn("Failed to map irq 0x%x\n", irq);
+                        continue;
+                }
+
+                /* Install interrupt handler */
+                rc = request_irq(virq, opal_interrupt, 0, "opal", NULL);
+                if (rc) {
+                        irq_dispose_mapping(virq);
+                        pr_warn("Error %d requesting irq %d (0x%x)\n",
+                                 rc, virq, irq);
+                        continue;
+                }
+
+                /* Cache IRQ */
+                opal_irqs[i] = virq;
+        }
+}
+
 static int __init opal_init(void)
 {
         struct device_node *np, *consoles;
-        const __be32 *irqs;
-        int rc, i, irqlen;
+        int rc;
 
         opal_node = of_find_node_by_path("/ibm,opal");
         if (!opal_node) {
-                pr_warn("opal: Node not found\n");
+                pr_warn("Device node not found\n");
                 return -ENODEV;
         }
 
@@ -725,24 +770,7 @@ static int __init opal_init(void)
         opal_i2c_create_devs();
 
         /* Find all OPAL interrupts and request them */
-        irqs = of_get_property(opal_node, "opal-interrupts", &irqlen);
-        pr_debug("opal: Found %d interrupts reserved for OPAL\n",
-                 irqs ? (irqlen / 4) : 0);
-        opal_irq_count = irqlen / 4;
-        opal_irqs = kzalloc(opal_irq_count * sizeof(unsigned int), GFP_KERNEL);
-        for (i = 0; irqs && i < (irqlen / 4); i++, irqs++) {
-                unsigned int hwirq = be32_to_cpup(irqs);
-                unsigned int irq = irq_create_mapping(NULL, hwirq);
-                if (irq == NO_IRQ) {
-                        pr_warning("opal: Failed to map irq 0x%x\n", hwirq);
-                        continue;
-                }
-                rc = request_irq(irq, opal_interrupt, 0, "opal", NULL);
-                if (rc)
-                        pr_warning("opal: Error %d requesting irq %d"
-                                   " (0x%x)\n", rc, irq, hwirq);
-                opal_irqs[i] = irq;
-        }
+        opal_irq_init(opal_node);
 
         /* Create "opal" kobject under /sys/firmware */
         rc = opal_sysfs_init();