Merge branch 'linus' into x86/cleanups

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / mpic_msi.c

diff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c
index de3e5e8bc3241e297ed321b240fb95edaa4350e2..1d44eee80fa1275c5527967a4edf3a57f5f53f7f 100644 (file)
--- a/arch/powerpc/sysdev/mpic_msi.c
+++ b/arch/powerpc/sysdev/mpic_msi.c
@@ -15,59 +15,17 @@
 #include <asm/prom.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
+#include <asm/msi_bitmap.h>
 
 #include <sysdev/mpic.h>
 
-static void __mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)
-{
-       pr_debug("mpic: reserving hwirq 0x%lx\n", hwirq);
-       bitmap_allocate_region(mpic->hwirq_bitmap, hwirq, 0);
-}
-
 void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)
 {
-       unsigned long flags;
-
        /* The mpic calls this even when there is no allocator setup */
-       if (!mpic->hwirq_bitmap)
+       if (!mpic->msi_bitmap.bitmap)
                return;
 
-       spin_lock_irqsave(&mpic->bitmap_lock, flags);
-       __mpic_msi_reserve_hwirq(mpic, hwirq);
-       spin_unlock_irqrestore(&mpic->bitmap_lock, flags);
-}
-
-irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num)
-{
-       unsigned long flags;
-       int offset, order = get_count_order(num);
-
-       spin_lock_irqsave(&mpic->bitmap_lock, flags);
-       /*
-        * This is fast, but stricter than we need. We might want to add
-        * a fallback routine which does a linear search with no alignment.
-        */
-       offset = bitmap_find_free_region(mpic->hwirq_bitmap, mpic->irq_count,
-                                        order);
-       spin_unlock_irqrestore(&mpic->bitmap_lock, flags);
-
-       pr_debug("mpic: allocated 0x%x (2^%d) at offset 0x%x\n",
-                num, order, offset);
-
-       return offset;
-}
-
-void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num)
-{
-       unsigned long flags;
-       int order = get_count_order(num);
-
-       pr_debug("mpic: freeing 0x%x (2^%d) at offset 0x%x\n",
-                num, order, offset);
-
-       spin_lock_irqsave(&mpic->bitmap_lock, flags);
-       bitmap_release_region(mpic->hwirq_bitmap, offset, order);
-       spin_unlock_irqrestore(&mpic->bitmap_lock, flags);
+       msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, hwirq);
 }
 
 #ifdef CONFIG_MPIC_U3_HT_IRQS
@@ -83,13 +41,13 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
 
        /* Reserve source numbers we know are reserved in the HW */
        for (i = 0;   i < 8;   i++)
-               __mpic_msi_reserve_hwirq(mpic, i);
+               msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, i);
 
        for (i = 42;  i < 46;  i++)
-               __mpic_msi_reserve_hwirq(mpic, i);
+               msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, i);
 
        for (i = 100; i < 105; i++)
-               __mpic_msi_reserve_hwirq(mpic, i);
+               msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, i);
 
        np = NULL;
        while ((np = of_find_all_nodes(np))) {
@@ -99,7 +57,7 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
                while (of_irq_map_one(np, index++, &oirq) == 0) {
                        ops->xlate(mpic->irqhost, NULL, oirq.specifier,
                                                oirq.size, &hwirq, &flags);
-                       __mpic_msi_reserve_hwirq(mpic, hwirq);
+                       msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, hwirq);
                }
        }
 
@@ -112,70 +70,25 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
 }
 #endif
 
-static int mpic_msi_reserve_dt_hwirqs(struct mpic *mpic)
-{
-       int i, len;
-       const u32 *p;
-
-       p = of_get_property(mpic->irqhost->of_node,
-                           "msi-available-ranges", &len);
-       if (!p) {
-               pr_debug("mpic: no msi-available-ranges property found on %s\n",
-                         mpic->irqhost->of_node->full_name);
-               return -ENODEV;
-       }
-
-       if (len % 8 != 0) {
-               printk(KERN_WARNING "mpic: Malformed msi-available-ranges "
-                      "property on %s\n", mpic->irqhost->of_node->full_name);
-               return -EINVAL;
-       }
-
-       bitmap_allocate_region(mpic->hwirq_bitmap, 0,
-                              get_count_order(mpic->irq_count));
-
-       /* Format is: (<u32 start> <u32 count>)+ */
-       len /= sizeof(u32);
-       for (i = 0; i < len / 2; i++, p += 2)
-               mpic_msi_free_hwirqs(mpic, *p, *(p + 1));
-
-       return 0;
-}
-
 int mpic_msi_init_allocator(struct mpic *mpic)
 {
-       int rc, size;
-
-       BUG_ON(mpic->hwirq_bitmap);
-       spin_lock_init(&mpic->bitmap_lock);
+       int rc;
 
-       size = BITS_TO_LONGS(mpic->irq_count) * sizeof(long);
-       pr_debug("mpic: allocator bitmap size is 0x%x bytes\n", size);
+       rc = msi_bitmap_alloc(&mpic->msi_bitmap, mpic->irq_count,
+                             mpic->irqhost->of_node);
+       if (rc)
+               return rc;
 
-       mpic->hwirq_bitmap = alloc_maybe_bootmem(size, GFP_KERNEL);
-
-       if (!mpic->hwirq_bitmap) {
-               pr_debug("mpic: ENOMEM allocating allocator bitmap!\n");
-               return -ENOMEM;
-       }
-
-       memset(mpic->hwirq_bitmap, 0, size);
-
-       rc = mpic_msi_reserve_dt_hwirqs(mpic);
-       if (rc) {
+       rc = msi_bitmap_reserve_dt_hwirqs(&mpic->msi_bitmap);
+       if (rc > 0) {
                if (mpic->flags & MPIC_U3_HT_IRQS)
                        rc = mpic_msi_reserve_u3_hwirqs(mpic);
 
-               if (rc)
-                       goto out_free;
+               if (rc) {
+                       msi_bitmap_free(&mpic->msi_bitmap);
+                       return rc;
+               }
        }
 
        return 0;
-
- out_free:
-       if (mem_init_done)
-               kfree(mpic->hwirq_bitmap);
-
-       mpic->hwirq_bitmap = NULL;
-       return rc;
 }