powerpc/pseries: Make request_ras_irqs() available to other pseries code

At the moment only the RAS code uses event-sources interrupts (for EPOW
events and internal errors) so request_ras_irqs() (which actually requests
the event-sources interrupts) is found in ras.c and is static.

We want to be able to use event-sources interrupts in other pseries code,
so let's rename request_ras_irqs() to request_event_sources_irqs() and
move it to event_sources.c.

This will be used in an upcoming patch that adds support for IO Event
interrupts that come through as event sources.

Signed-off-by: Mark Nelson <markn@au1.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 3 insertions, 59 deletions

diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index db940d2c39a0..41a3e9a039ed 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -67,63 +67,6 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id);
 static irqreturn_t ras_error_interrupt(int irq, void *dev_id);
 
 
-static void request_ras_irqs(struct device_node *np,
-                        irq_handler_t handler,
-                        const char *name)
-{
-        int i, index, count = 0;
-        struct of_irq oirq;
-        const u32 *opicprop;
-        unsigned int opicplen;
-        unsigned int virqs[16];
-
-        /* Check for obsolete "open-pic-interrupt" property. If present, then
-         * map those interrupts using the default interrupt host and default
-         * trigger
-         */
-        opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);
-        if (opicprop) {
-                opicplen /= sizeof(u32);
-                for (i = 0; i < opicplen; i++) {
-                        if (count > 15)
-                                break;
-                        virqs[count] = irq_create_mapping(NULL, *(opicprop++));
-                        if (virqs[count] == NO_IRQ)
-                                printk(KERN_ERR "Unable to allocate interrupt "
-                                       "number for %s\n", np->full_name);
-                        else
-                                count++;
-
-                }
-        }
-        /* Else use normal interrupt tree parsing */
-        else {
-                /* First try to do a proper OF tree parsing */
-                for (index = 0; of_irq_map_one(np, index, &oirq) == 0;
-                     index++) {
-                        if (count > 15)
-                                break;
-                        virqs[count] = irq_create_of_mapping(oirq.controller,
-                                                            oirq.specifier,
-                                                            oirq.size);
-                        if (virqs[count] == NO_IRQ)
-                                printk(KERN_ERR "Unable to allocate interrupt "
-                                       "number for %s\n", np->full_name);
-                        else
-                                count++;
-                }
-        }
-
-        /* Now request them */
-        for (i = 0; i < count; i++) {
-                if (request_irq(virqs[i], handler, 0, name, NULL)) {
-                        printk(KERN_ERR "Unable to request interrupt %d for "
-                               "%s\n", virqs[i], np->full_name);
-                        return;
-                }
-        }
-}
-
 /*
  * Initialize handlers for the set of interrupts caused by hardware errors
  * and power system events.
@@ -138,14 +81,15 @@ static int __init init_ras_IRQ(void)
         /* Internal Errors */
         np = of_find_node_by_path("/event-sources/internal-errors");
         if (np != NULL) {
-                request_ras_irqs(np, ras_error_interrupt, "RAS_ERROR");
+                request_event_sources_irqs(np, ras_error_interrupt,
+                                           "RAS_ERROR");
                 of_node_put(np);
         }
 
         /* EPOW Events */
         np = of_find_node_by_path("/event-sources/epow-events");
         if (np != NULL) {
-                request_ras_irqs(np, ras_epow_interrupt, "RAS_EPOW");
+                request_event_sources_irqs(np, ras_epow_interrupt, "RAS_EPOW");
                 of_node_put(np);
         }