6 files changed, 47 insertions, 6 deletions

diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 64c6e344399b..3e4bea3a52b1 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -190,7 +190,8 @@ extern int mp_find_ioapic(u32 gsi);
 extern int mp_find_ioapic_pin(int ioapic, u32 gsi);
 extern u32 mp_pin_to_gsi(int ioapic, int pin);
 extern int mp_map_gsi_to_irq(u32 gsi, unsigned int flags);
-extern void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
+extern void __init mp_register_ioapic(int id, u32 address, u32 gsi_base,
+                                      struct ioapic_domain_cfg *cfg);
 extern void __init pre_init_apic_IRQ0(void);
 
 extern void mp_save_irq(struct mpc_intsrc *m);
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d6635baf9e3d..f86b4bae4640 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -462,7 +462,7 @@ acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
         acpi_table_print_madt_entry(header);
 
         mp_register_ioapic(ioapic->id,
-                           ioapic->address, ioapic->global_irq_base);
+                           ioapic->address, ioapic->global_irq_base, NULL);
 
         return 0;
 }
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 51ce80004a78..563f4504f54d 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -85,6 +85,7 @@ int sis_apic_bug = -1;
 static DEFINE_RAW_SPINLOCK(ioapic_lock);
 static DEFINE_RAW_SPINLOCK(vector_lock);
 static DEFINE_MUTEX(ioapic_mutex);
+static unsigned int ioapic_dynirq_base;
 
 static struct ioapic {
         /*
@@ -2920,8 +2921,35 @@ out:
  */
 #define PIC_IRQS        (1UL << PIC_CASCADE_IR)
 
+static int mp_irqdomain_create(int ioapic)
+{
+        int hwirqs = mp_ioapic_pin_count(ioapic);
+        struct ioapic *ip = &ioapics[ioapic];
+        struct ioapic_domain_cfg *cfg = &ip->irqdomain_cfg;
+        struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(ioapic);
+
+        if (cfg->type == IOAPIC_DOMAIN_INVALID)
+                return 0;
+
+        ip->irqdomain = irq_domain_add_linear(cfg->dev, hwirqs, cfg->ops,
+                                              (void *)(long)ioapic);
+        if(!ip->irqdomain)
+                return -ENOMEM;
+
+        if (cfg->type == IOAPIC_DOMAIN_LEGACY ||
+            cfg->type == IOAPIC_DOMAIN_STRICT)
+                ioapic_dynirq_base = max(ioapic_dynirq_base,
+                                         gsi_cfg->gsi_end + 1);
+
+        if (gsi_cfg->gsi_base == 0)
+                irq_set_default_host(ip->irqdomain);
+
+        return 0;
+}
+
 void __init setup_IO_APIC(void)
 {
+        int ioapic;
 
         /*
          * calling enable_IO_APIC() is moved to setup_local_APIC for BP
@@ -2929,6 +2957,9 @@ void __init setup_IO_APIC(void)
         io_apic_irqs = nr_legacy_irqs() ? ~PIC_IRQS : ~0UL;
 
         apic_printk(APIC_VERBOSE, "ENABLING IO-APIC IRQs\n");
+        for_each_ioapic(ioapic)
+                BUG_ON(mp_irqdomain_create(ioapic));
+
         /*
          * Set up IO-APIC IRQ routing.
          */
@@ -3437,6 +3468,9 @@ unsigned int arch_dynirq_lower_bound(unsigned int from)
 {
         unsigned int min = gsi_top + nr_legacy_irqs();
 
+        if (ioapic_dynirq_base)
+                return ioapic_dynirq_base;
+
         return from < min ? min : from;
 }
 
@@ -3812,7 +3846,8 @@ static __init int bad_ioapic_register(int idx)
         return 0;
 }
 
-void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
+void __init mp_register_ioapic(int id, u32 address, u32 gsi_base,
+                               struct ioapic_domain_cfg *cfg)
 {
         int idx = 0;
         int entries;
@@ -3826,6 +3861,11 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
         ioapics[idx].mp_config.type = MP_IOAPIC;
         ioapics[idx].mp_config.flags = MPC_APIC_USABLE;
         ioapics[idx].mp_config.apicaddr = address;
+        ioapics[idx].irqdomain = NULL;
+        if (cfg)
+                ioapics[idx].irqdomain_cfg = *cfg;
+        else
+                ioapics[idx].irqdomain_cfg.type = IOAPIC_DOMAIN_INVALID;
 
         set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
 
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index b4680058db8b..d2c53feacd77 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -177,7 +177,7 @@ static void __init dtb_add_ioapic(struct device_node *dn)
                                 dn->full_name);
                 return;
         }
-        mp_register_ioapic(++ioapic_id, r.start, gsi_top);
+        mp_register_ioapic(++ioapic_id, r.start, gsi_top, NULL);
 }
 
 static void __init dtb_ioapic_setup(void)
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index b10e1132f316..ea8595e4cbd5 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -115,7 +115,7 @@ static void __init MP_bus_info(struct mpc_bus *m)
 static void __init MP_ioapic_info(struct mpc_ioapic *m)
 {
         if (m->flags & MPC_APIC_USABLE)
-                mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);
+                mp_register_ioapic(m->apicid, m->apicaddr, gsi_top, NULL);
 }
 
 static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
diff --git a/arch/x86/platform/sfi/sfi.c b/arch/x86/platform/sfi/sfi.c
index bcd1a703e3e6..8f2f789c6f04 100644
--- a/arch/x86/platform/sfi/sfi.c
+++ b/arch/x86/platform/sfi/sfi.c
@@ -82,7 +82,7 @@ static int __init sfi_parse_ioapic(struct sfi_table_header *table)
         pentry = (struct sfi_apic_table_entry *)sb->pentry;
 
         for (i = 0; i < num; i++) {
-                mp_register_ioapic(i, pentry->phys_addr, gsi_top);
+                mp_register_ioapic(i, pentry->phys_addr, gsi_top, NULL);
                 pentry++;
         }