genirq: Another round of tree wide cleanups

Index: tip/arch/arm/mach-iop13xx/include/mach/irqs.h
===================================================================
@@ -191,6 +191,4 @@ static inline u32 read_intpnd_3(void)
 #define NR_IOP13XX_IRQS	(IRQ_IOP13XX_HPI + 1)
 #endif
 
-#define NR_IRQS		NR_IOP13XX_IRQS
-
 #endif /* _IOP13XX_IRQ_H_ */

Index: tip/arch/arm/mach-iop13xx/include/mach/time.h
===================================================================
@@ -1,5 +1,8 @@
 #ifndef _IOP13XX_TIME_H_
 #define _IOP13XX_TIME_H_
+
+#include <mach/irqs.h>
+
 #define IRQ_IOP_TIMER0 IRQ_IOP13XX_TIMER0
 
 #define IOP_TMR_EN	    0x02

Index: tip/arch/arm/mach-iop13xx/iq81340mc.c
===================================================================
@@ -93,4 +93,5 @@ MACHINE_START(IQ81340MC, "Intel IQ81340M
 	.init_time	= iq81340mc_timer_init,
 	.init_machine   = iq81340mc_init,
 	.restart	= iop13xx_restart,
+	.nr_irqs	= NR_IOP13XX_IRQS,
 MACHINE_END

Index: tip/arch/arm/mach-iop13xx/iq81340sc.c
===================================================================
@@ -95,4 +95,5 @@ MACHINE_START(IQ81340SC, "Intel IQ81340S
 	.init_time	= iq81340sc_timer_init,
 	.init_machine   = iq81340sc_init,
 	.restart	= iop13xx_restart,
+	.nr_irqs	= NR_IOP13XX_IRQS,
 MACHINE_END

77 lines not on this page · raw message

Index: tip/arch/arm/mach-iop13xx/setup.c
===================================================================
@@ -27,6 +27,7 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/hardware/iop_adma.h>
+#include <mach/irqs.h>
 
 #define IOP13XX_UART_XTAL 33334000
 #define IOP13XX_SETUP_DEBUG 0

Index: tip/arch/arm/mach-iop13xx/tpmi.c
===================================================================
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
+#include <mach/irqs.h>
 
 /* assumes CONTROLLER_ONLY# is never asserted in the ESSR register */
 #define IOP13XX_TPMI_MMR(dev) 	IOP13XX_REG_ADDR32_PHYS(0x48000 + (dev << 12))

Index: tip/arch/mips/pci/msi-xlp.c
===================================================================
@@ -206,14 +206,8 @@ static struct irq_chip xlp_msix_chip = {
 	.irq_unmask	= unmask_msi_irq,
 };
 
-void destroy_irq(unsigned int irq)
-{
-	    /* nothing to do yet */
-}
-
 void arch_teardown_msi_irq(unsigned int irq)
 {
-	destroy_irq(irq);
 }
 
 /*

@@ -298,10 +292,8 @@ static int xlp_setup_msi(uint64_t lnkbas
 
 	xirq = xirq + msivec;		/* msi mapped to global irq space */
 	ret = irq_set_msi_desc(xirq, desc);
-	if (ret < 0) {
-		destroy_irq(xirq);
+	if (ret < 0)
 		return ret;
-	}
 
 	write_msi_msg(xirq, &msg);
 	return 0;

Index: tip/arch/mips/pci/pci-xlr.c
===================================================================
@@ -214,14 +214,8 @@ static int get_irq_vector(const struct p
 }
 
 #ifdef CONFIG_PCI_MSI
-void destroy_irq(unsigned int irq)
-{
-	    /* nothing to do yet */
-}
-
 void arch_teardown_msi_irq(unsigned int irq)
 {
-	destroy_irq(irq);
 }
 
 int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)

@@ -263,10 +257,8 @@ int arch_setup_msi_irq(struct pci_dev *d
 		MSI_DATA_DELIVERY_FIXED;
 
 	ret = irq_set_msi_desc(irq, desc);
-	if (ret < 0) {
-		destroy_irq(irq);
+	if (ret < 0)
 		return ret;
-	}
 
 	write_msi_msg(irq, &msg);
 	return 0;

Index: tip/include/linux/irq.h
===================================================================
@@ -637,6 +637,21 @@ static inline int irq_reserve_irq(unsign
 	return irq_reserve_irqs(irq, 1);
 }
 
+#ifdef CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
+unsigned int irq_alloc_hwirqs(int cnt, int node);
+static inline unsigned int irq_alloc_hwirq(int node)
+{
+	return irq_alloc_hwirqs(1, node);
+}
+void irq_free_hwirqs(unsigned int from, int cnt);
+static inline void irq_free_hwirq(unsigned int irq)
+{
+	return irq_free_hwirqs(irq, 1);
+}
+int arch_setup_hwirq(unsigned int irq, int node);
+void arch_teardown_hwirq(unsigned int irq);
+#endif
+
 #ifndef irq_reg_writel
 # define irq_reg_writel(val, addr)	writel(val, addr)
 #endif

57 lines not on this page · raw message

index 33cff9a3058b..aa7577e80bc8 100644
@@ -17,14 +17,33 @@
 
 #include <linux/hardirq.h>
 
-/* The hypervisor interface provides 32 IRQs. */
+/* The hypervisor interface provides 32 IPI events per core. */
+#define NR_IPI_EVENTS 32
+
+#if CHIP_HAS_IPI()
+/* 
+ * The number of supported IRQs. This can be set to a larger value
+ * (at most NR_CPUS*NR_IPI_EVENTS) that may be needed with more
+ * peripheral devices.
+ */
+#define NR_IRQS 256
+#else
 #define NR_IRQS 32
+#endif
 
-/* IRQ numbers used for linux IPIs. */
-#define IRQ_RESCHEDULE 0
+/* The IRQ number used for linux IPI reschedule. */
+extern int irq_reschedule;
+/* The IPI event used for irq_reschedule. */
+extern int irq_reschedule_event;
 
 #define irq_canonicalize(irq)   (irq)
 
+/* An IRQ number is bound to a core and an IPI event number. */
+struct irq_map {
+	int cpu;
+	int event;
+};
+
 void ack_bad_irq(unsigned int irq);
 
 /*

@@ -74,6 +93,29 @@ enum {
  */
 void tile_irq_activate(unsigned int irq, int tile_irq_type);
 
+/*
+ * Create an IRQ that is valid only on a single core. The core is
+ * specified by callers with the exception that this function will
+ * choose a core if cpu=-1.
+ */
+int create_irq_on(int cpu);
+
+/* 
+ * Create an IRQ that is valid only on a single core. The core is
+ * chosen from non-dataplanes by this function.
+ */
+static inline int create_irq_on_any(void)
+{
+	return create_irq_on(-1);
+}
+
+/* Create an IRQ that is valid on all cores. */
+int create_irq(void);
+
+/* Map an IRQ number to (cpu, event). For globally-valid IRQs, cpu=-1. */
+int tile_irq_get_cpu(int irq);
+int tile_irq_get_event(int irq);
+
 void setup_irq_regs(void);
 
 #endif /* _ASM_TILE_IRQ_H */

390 lines not on this page · raw message

185 lines not on this page · raw message

index 01e8ab29f43a..fbba5c0000b6 100644
@@ -185,7 +185,7 @@ void flush_icache_range(unsigned long start, unsigned long end)
 }
 
 
-/* Called when smp_send_reschedule() triggers IRQ_RESCHEDULE. */
+/* Called when smp_send_reschedule() triggers irq_reschedule. */
 static irqreturn_t handle_reschedule_ipi(int irq, void *token)
 {
 	__get_cpu_var(irq_stat).irq_resched_count++;

@@ -218,11 +218,17 @@ void __init ipi_init(void)
 		offset = PFN_PHYS(pte_pfn(pte));
 		ipi_mappings[cpu] = ioremap_prot(offset, PAGE_SIZE, pte);
 	}
+
+	irq_reschedule = create_irq();
+	irq_reschedule_event = tile_irq_get_event(irq_reschedule);
+#else
+	irq_reschedule = 0;
+	irq_reschedule_event = irq_reschedule;
 #endif
 
-	/* Bind handle_reschedule_ipi() to IRQ_RESCHEDULE. */
-	tile_irq_activate(IRQ_RESCHEDULE, TILE_IRQ_PERCPU);
-	BUG_ON(setup_irq(IRQ_RESCHEDULE, &resched_action));
+	/* Bind handle_reschedule_ipi() to irq_reschedule. */
+	tile_irq_activate(irq_reschedule, TILE_IRQ_PERCPU);
+	BUG_ON(setup_irq(irq_reschedule, &resched_action));
 }
 
 #if CHIP_HAS_IPI()

@@ -237,7 +243,7 @@ void smp_send_reschedule(int cpu)
 	 * directed at the PCI shim.  For now, just do a raw store,
 	 * casting away the __iomem attribute.
 	 */
-	((unsigned long __force *)ipi_mappings[cpu])[IRQ_RESCHEDULE] = 0;
+	((unsigned long __force *)ipi_mappings[cpu])[irq_reschedule_event] = 0;
 }
 
 #else

@@ -250,7 +256,7 @@ void smp_send_reschedule(int cpu)
 
 	coord.y = cpu_y(cpu);
 	coord.x = cpu_x(cpu);
-	hv_trigger_ipi(coord, IRQ_RESCHEDULE);
+	hv_trigger_ipi(coord, irq_reschedule);
 }
 
 #endif /* CHIP_HAS_IPI() */

index 7e1c91d41a87..d98f3becc7e1 100644
@@ -1233,7 +1233,8 @@ static int tile_net_setup_interrupts(struct net_device *dev)
 		struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
 		if (info->mpipe[instance].has_iqueue) {
 			gxio_mpipe_request_notif_ring_interrupt(&md->context,
-				cpu_x(cpu), cpu_y(cpu), KERNEL_PL, irq,
+				cpu_x(cpu), cpu_y(cpu), KERNEL_PL,
+				tile_irq_get_event(irq),
 				info->mpipe[instance].iqueue.ring);
 		}
 	}

index af8cdaa1dcb9..602d18543eb0 100644
@@ -81,7 +81,7 @@ static int hvc_tile_get_chars(uint32_t vt, char *buf, int count)
 static int hvc_tile_notifier_add_irq(struct hvc_struct *hp, int irq)
 {
 	int rc;
-	int cpu = raw_smp_processor_id();  /* Choose an arbitrary cpu */
+	int cpu = tile_irq_get_cpu(irq);
 	HV_Coord coord = { .x = cpu_x(cpu), .y = cpu_y(cpu) };
 
 	rc = notifier_add_irq(hp, irq);

@@ -93,7 +93,7 @@ static int hvc_tile_notifier_add_irq(struct hvc_struct *hp, int irq)
 	 * If the hypervisor returns an error, we still return 0, so that
 	 * we can fall back to polling.
 	 */
-	if (hv_console_set_ipi(KERNEL_PL, irq, coord) < 0)
+	if (hv_console_set_ipi(KERNEL_PL, tile_irq_get_event(irq), coord) < 0)
 		notifier_del_irq(hp, irq);
 
 	return 0;

@@ -133,7 +133,7 @@ static int hvc_tile_probe(struct platform_device *pdev)
 	int tile_hvc_irq;
 
 	/* Create our IRQ and register it. */
-	tile_hvc_irq = create_irq();
+	tile_hvc_irq = create_irq_on_any();
 	if (tile_hvc_irq < 0)
 		return -ENXIO;
 

index f92d7e6bd876..434ba89522fe 100644
@@ -339,8 +339,7 @@ static int tilegx_startup(struct uart_port *port)
 {
 	struct tile_uart_port *tile_uart;
 	gxio_uart_context_t *context;
-	int ret = 0;
-	int cpu = raw_smp_processor_id();  /* pick an arbitrary cpu */
+	int cpu, ret = 0;
 
 	tile_uart = container_of(port, struct tile_uart_port, uart);
 	if (mutex_lock_interruptible(&tile_uart->mutex))

@@ -359,7 +358,7 @@ static int tilegx_startup(struct uart_port *port)
 		}
 
 		/* Create our IRQs. */
-		port->irq = create_irq();
+		port->irq = create_irq_on_any();
 		if (port->irq < 0)
 			goto err_uart_dest;
 		tile_irq_activate(port->irq, TILE_IRQ_PERCPU);

@@ -371,9 +370,11 @@ static int tilegx_startup(struct uart_port *port)
 			goto err_dest_irq;
 
 		/* Request that the hardware start sending us interrupts. */
+		cpu = tile_irq_get_cpu(port->irq);
 		tile_uart->irq_cpu = cpu;
 		ret = gxio_uart_cfg_interrupt(context, cpu_x(cpu), cpu_y(cpu),
-					      KERNEL_PL, port->irq);
+					      KERNEL_PL,
+					      tile_irq_get_event(port->irq));
 		if (ret)
 			goto err_free_irq;
 

index f3713d32c9a1..4798576b5ddb 100644
@@ -103,8 +103,7 @@ static int ehci_hcd_tilegx_drv_probe(struct platform_device *pdev)
 	struct ehci_hcd *ehci;
 	struct tilegx_usb_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	pte_t pte = { 0 };
-	int my_cpu = smp_processor_id();
-	int ret;
+	int my_cpu, ret;
 
 	if (usb_disabled())
 		return -ENODEV;

@@ -142,18 +141,20 @@ static int ehci_hcd_tilegx_drv_probe(struct platform_device *pdev)
 	ehci->hcs_params = readl(&ehci->caps->hcs_params);
 
 	/* Create our IRQs and register them. */
-	pdata->irq = create_irq();
+	pdata->irq = create_irq_on_any();
 	if (pdata->irq < 0) {
 		ret = -ENXIO;
 		goto err_no_irq;
 	}
 
+	my_cpu = tile_irq_get_cpu(pdata->irq);
 	tile_irq_activate(pdata->irq, TILE_IRQ_PERCPU);
 
 	/* Configure interrupts. */
 	ret = gxio_usb_host_cfg_interrupt(&pdata->usb_ctx,
 					  cpu_x(my_cpu), cpu_y(my_cpu),
-					  KERNEL_PL, pdata->irq);
+					  KERNEL_PL,
+					  tile_irq_get_event(pdata->irq));
 	if (ret) {
 		ret = -ENXIO;
 		goto err_have_irq;

index 0b183e0b0a8a..b8a100be2d44 100644
@@ -97,8 +97,7 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev)
 	struct usb_hcd *hcd;
 	struct tilegx_usb_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	pte_t pte = { 0 };
-	int my_cpu = smp_processor_id();
-	int ret;
+	int my_cpu, ret;
 
 	if (usb_disabled())
 		return -ENODEV;

@@ -129,18 +128,20 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev)
 	tilegx_start_ohc();
 
 	/* Create our IRQs and register them. */
-	pdata->irq = create_irq();
+	pdata->irq = create_irq_on_any();
 	if (pdata->irq < 0) {
 		ret = -ENXIO;
 		goto err_no_irq;
 	}
 
+	my_cpu = tile_irq_get_cpu(pdata->irq);
 	tile_irq_activate(pdata->irq, TILE_IRQ_PERCPU);
 
 	/* Configure interrupts. */
 	ret = gxio_usb_host_cfg_interrupt(&pdata->usb_ctx,
 					  cpu_x(my_cpu), cpu_y(my_cpu),
-					  KERNEL_PL, pdata->irq);
+					  KERNEL_PL,
+					  tile_irq_get_event(pdata->irq));
 	if (ret) {
 		ret = -ENXIO;
 		goto err_have_irq;

Index: tip/arch/x86/kernel/apic/io_apic.c
===================================================================
@@ -3010,6 +3010,39 @@ void destroy_irqs(unsigned int irq, unsi
 		destroy_irq(irq + i);
 }
 
+int arch_setup_hwirq(unsigned int irq, int node)
+{
+	struct irq_cfg *cfg;
+	unsigned long flags;
+	int ret;
+
+	cfg = alloc_irq_cfg(irq, node);
+	if (!cfg)
+		return -ENOMEM;
+
+	raw_spin_lock_irqsave(&vector_lock, flags);
+	ret = __assign_irq_vector(irq, cfg, apic->target_cpus());
+	raw_spin_unlock_irqrestore(&vector_lock, flags);
+
+	if (!ret)
+		irq_set_chip_data(irq, cfg);
+	else
+		free_irq_cfg(irq, cfg);
+	return ret;
+}
+
+void arch_teardown_hwirq(unsigned int irq)
+{
+	struct irq_cfg *cfg = irq_get_chip_data(irq);
+	unsigned long flags;
+
+	free_remapped_irq(irq);
+	raw_spin_lock_irqsave(&vector_lock, flags);
+	__clear_irq_vector(irq, cfg);
+	raw_spin_unlock_irqrestore(&vector_lock, flags);
+	free_irq_cfg(irq, cfg);
+}
+
 /*
  * MSI message composition
  */

Index: tip/drivers/iommu/irq_remapping.c
===================================================================
@@ -51,7 +51,7 @@ static void irq_remapping_disable_io_api
 
 static int do_setup_msi_irqs(struct pci_dev *dev, int nvec)
 {
-	int node, ret, sub_handle, nvec_pow2, index = 0;
+	int ret, sub_handle, nvec_pow2, index = 0;
 	unsigned int irq;
 	struct msi_desc *msidesc;
 

@@ -61,8 +61,7 @@ static int do_setup_msi_irqs(struct pci_
 	WARN_ON(msidesc->msi_attrib.multiple);
 	WARN_ON(msidesc->nvec_used);
 
-	node = dev_to_node(&dev->dev);
-	irq = __create_irqs(get_nr_irqs_gsi(), nvec, node);
+	irq = irq_alloc_hwirqs(nvec, dev_to_node(&dev->dev));
 	if (irq == 0)
 		return -ENOSPC;
 

@@ -89,7 +88,7 @@ static int do_setup_msi_irqs(struct pci_
 	return 0;
 
 error:
-	destroy_irqs(irq, nvec);
+	irq_free_hwirqs(irq, nvec);
 
 	/*
 	 * Restore altered MSI descriptor fields and prevent just destroyed

@@ -109,12 +108,11 @@ static int do_setup_msix_irqs(struct pci
 	unsigned int irq;
 
 	node		= dev_to_node(&dev->dev);
-	irq		= get_nr_irqs_gsi();
 	sub_handle	= 0;
 
 	list_for_each_entry(msidesc, &dev->msi_list, list) {
 
-		irq = create_irq_nr(irq, node);
+		irq = irq_alloc_hwirq(node);
 		if (irq == 0)
 			return -1;
 

@@ -137,7 +135,7 @@ static int do_setup_msix_irqs(struct pci
 	return 0;
 
 error:
-	destroy_irq(irq);
+	irq_free_hwirq(irq);
 	return ret;
 }
 

Index: tip/arch/x86/kernel/hpet.c
===================================================================
@@ -479,7 +479,7 @@ static int hpet_msi_next_event(unsigned
 static int hpet_setup_msi_irq(unsigned int irq)
 {
 	if (x86_msi.setup_hpet_msi(irq, hpet_blockid)) {
-		destroy_irq(irq);
+		irq_free_hwirq(irq);
 		return -EINVAL;
 	}
 	return 0;

@@ -487,9 +487,8 @@ static int hpet_setup_msi_irq(unsigned i
 
 static int hpet_assign_irq(struct hpet_dev *dev)
 {
-	unsigned int irq;
+	unsigned int irq = irq_alloc_hwirq(-1);
 
-	irq = create_irq_nr(0, -1);
 	if (!irq)
 		return -EINVAL;
 

Index: tip/arch/x86/platform/uv/uv_irq.c
===================================================================
@@ -238,11 +238,9 @@ uv_set_irq_affinity(struct irq_data *dat
 int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,
 		 unsigned long mmr_offset, int limit)
 {
-	int irq, ret;
+	int ret, irq = irq_alloc_hwirq(uv_blade_to_memory_nid(mmr_blade));
 
-	irq = create_irq_nr(NR_IRQS_LEGACY, uv_blade_to_memory_nid(mmr_blade));
-
-	if (irq <= 0)
+	if (!irq)
 		return -EBUSY;
 
 	ret = arch_enable_uv_irq(irq_name, irq, cpu, mmr_blade, mmr_offset,

@@ -250,7 +248,7 @@ int uv_setup_irq(char *irq_name, int cpu
 	if (ret == irq)
 		uv_set_irq_2_mmr_info(irq, mmr_offset, mmr_blade);
 	else
-		destroy_irq(irq);
+		irq_free_hwirq(irq);
 
 	return ret;
 }

@@ -285,6 +283,6 @@ void uv_teardown_irq(unsigned int irq)
 			n = n->rb_right;
 	}
 	spin_unlock_irqrestore(&uv_irq_lock, irqflags);
-	destroy_irq(irq);
+	irq_free_hwirq(irq);
 }
 EXPORT_SYMBOL_GPL(uv_teardown_irq);

Index: tip/drivers/pci/htirq.c
===================================================================
@@ -87,12 +87,9 @@ void unmask_ht_irq(struct irq_data *data
 int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
 {
 	struct ht_irq_cfg *cfg;
+	int max_irq, pos, irq;
 	unsigned long flags;
 	u32 data;
-	int max_irq;
-	int pos;
-	int irq;
-	int node;
 
 	pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ);
 	if (!pos)

@@ -120,10 +117,8 @@ int __ht_create_irq(struct pci_dev *dev,
 	cfg->msg.address_lo = 0xffffffff;
 	cfg->msg.address_hi = 0xffffffff;
 
-	node = dev_to_node(&dev->dev);
-	irq = create_irq_nr(0, node);
-
-	if (irq <= 0) {
+	irq = irq_alloc_hwirq(dev_to_node(&dev->dev));
+	if (!irq) {
 		kfree(cfg);
 		return -EBUSY;
 	}

@@ -166,7 +161,7 @@ void ht_destroy_irq(unsigned int irq)
 	cfg = irq_get_handler_data(irq);
 	irq_set_chip(irq, NULL);
 	irq_set_handler_data(irq, NULL);
-	destroy_irq(irq);
+	irq_free_hwirq(irq);
 
 	kfree(cfg);
 }

Index: tip/arch/x86/kernel/apic/io_apic.c
===================================================================
@@ -3169,8 +3169,8 @@ int setup_msi_irq(struct pci_dev *dev, s
 
 int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
-	unsigned int irq, irq_want;
 	struct msi_desc *msidesc;
+	unsigned int irq;
 	int node, ret;
 
 	/* Multiple MSI vectors only supported with interrupt remapping */

@@ -3178,28 +3178,25 @@ int native_setup_msi_irqs(struct pci_dev
 		return 1;
 
 	node = dev_to_node(&dev->dev);
-	irq_want = nr_irqs_gsi;
+
 	list_for_each_entry(msidesc, &dev->msi_list, list) {
-		irq = create_irq_nr(irq_want, node);
-		if (irq == 0)
+		irq = irq_alloc_hwirq(node);
+		if (!irq)
 			return -ENOSPC;
 
-		irq_want = irq + 1;
-
 		ret = setup_msi_irq(dev, msidesc, irq, 0);
-		if (ret < 0)
-			goto error;
+		if (ret < 0) {
+			irq_free_hwirq(irq);
+			return ret;
+		}
+
 	}
 	return 0;
-
-error:
-	destroy_irq(irq);
-	return ret;
 }
 
 void native_teardown_msi_irq(unsigned int irq)
 {
-	destroy_irq(irq);
+	irq_free_hwirq(irq);
 }
 
 #ifdef CONFIG_DMAR_TABLE

Index: tip/arch/x86/include/asm/io_apic.h
===================================================================
@@ -168,8 +168,6 @@ extern int save_ioapic_entries(void);
 extern void mask_ioapic_entries(void);
 extern int restore_ioapic_entries(void);
 
-extern int get_nr_irqs_gsi(void);
-
 extern void setup_ioapic_ids_from_mpc(void);
 extern void setup_ioapic_ids_from_mpc_nocheck(void);
 

Index: tip/arch/x86/kernel/apic/io_apic.c
===================================================================
@@ -3450,11 +3450,6 @@ static void __init probe_nr_irqs_gsi(voi
 	printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
 }
 
-int get_nr_irqs_gsi(void)
-{
-	return nr_irqs_gsi;
-}
-
 unsigned int arch_dynirq_lower_bound(unsigned int from)
 {
 	return from < nr_irqs_gsi ? nr_irqs_gsi : from;

Index: tip/drivers/xen/events/events_base.c
===================================================================
@@ -390,22 +390,7 @@ static void xen_irq_init(unsigned irq)
 
 static int __must_check xen_allocate_irqs_dynamic(int nvec)
 {
-	int first = 0;
-	int i, irq;
-
-#ifdef CONFIG_X86_IO_APIC
-	/*
-	 * For an HVM guest or domain 0 which see "real" (emulated or
-	 * actual respectively) GSIs we allocate dynamic IRQs
-	 * e.g. those corresponding to event channels or MSIs
-	 * etc. from the range above those "real" GSIs to avoid
-	 * collisions.
-	 */
-	if (xen_initial_domain() || xen_hvm_domain())
-		first = get_nr_irqs_gsi();
-#endif
-
-	irq = irq_alloc_descs_from(first, nvec, -1);
+	int i, irq = irq_alloc_descs(-1, 0, nvec, -1);
 
 	if (irq >= 0) {
 		for (i = 0; i < nvec; i++)

Index: tip/drivers/iommu/dmar.c
===================================================================
@@ -1551,7 +1551,7 @@ int dmar_set_interrupt(struct intel_iomm
 		return 0;
 
 	irq = create_irq();
-	if (!irq) {
+	if (irq <= 0) {
 		pr_err("IOMMU: no free vectors\n");
 		return -EINVAL;
 	}

Index: tip/arch/ia64/include/asm/irq_remapping.h
===================================================================
@@ -1,4 +1,6 @@
 #ifndef __IA64_INTR_REMAPPING_H
 #define __IA64_INTR_REMAPPING_H
 #define irq_remapping_enabled 0
+#define dmar_alloc_hwirq	create_irq
+#define dmar_free_hwirq		destroy_irq
 #endif

Index: tip/arch/x86/include/asm/irq_remapping.h
===================================================================
@@ -58,6 +58,9 @@ extern bool setup_remapped_irq(int irq,
 
 void irq_remap_modify_chip_defaults(struct irq_chip *chip);
 
+#define dmar_alloc_hwirq()	irq_alloc_hwirq(-1)
+#define dmar_free_hwirq		irq_free_hwirq
+
 #else  /* CONFIG_IRQ_REMAP */
 
 static inline void setup_irq_remapping_ops(void) { }

Index: tip/drivers/iommu/dmar.c
===================================================================
@@ -994,7 +994,7 @@ static void free_iommu(struct intel_iomm
 	if (iommu->irq) {
 		free_irq(iommu->irq, iommu);
 		irq_set_handler_data(iommu->irq, NULL);
-		destroy_irq(iommu->irq);
+		dmar_free_hwirq(iommu->irq);
 	}
 
 	if (iommu->qi) {

@@ -1550,7 +1550,7 @@ int dmar_set_interrupt(struct intel_iomm
 	if (iommu->irq)
 		return 0;
 
-	irq = create_irq();
+	irq = dmar_alloc_hwirq();
 	if (irq <= 0) {
 		pr_err("IOMMU: no free vectors\n");
 		return -EINVAL;

@@ -1563,7 +1563,7 @@ int dmar_set_interrupt(struct intel_iomm
 	if (ret) {
 		irq_set_handler_data(irq, NULL);
 		iommu->irq = 0;
-		destroy_irq(irq);
+		dmar_free_hwirq(irq);
 		return ret;
 	}
 

Index: tip/arch/ia64/include/asm/hw_irq.h
===================================================================
@@ -132,7 +132,6 @@ extern int reserve_irq_vector (int vecto
 extern void __setup_vector_irq(int cpu);
 extern void ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect);
 extern void ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action);
-extern int check_irq_used (int irq);
 extern void destroy_and_reserve_irq (unsigned int irq);
 
 #if defined(CONFIG_SMP) && (defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG))

Index: tip/arch/ia64/kernel/irq_ia64.c
===================================================================
@@ -93,14 +93,6 @@ static int irq_status[NR_IRQS] = {
 	[0 ... NR_IRQS -1] = IRQ_UNUSED
 };
 
-int check_irq_used(int irq)
-{
-	if (irq_status[irq] == IRQ_USED)
-		return 1;
-
-	return -1;
-}
-
 static inline int find_unassigned_irq(void)
 {
 	int irq;

Index: tip/arch/x86/kernel/apic/io_apic.c
===================================================================
@@ -281,18 +281,6 @@ static struct irq_cfg *alloc_irq_and_cfg
 	return cfg;
 }
 
-static int alloc_irqs_from(unsigned int from, unsigned int count, int node)
-{
-	return irq_alloc_descs_from(from, count, node);
-}
-
-static void free_irq_at(unsigned int at, struct irq_cfg *cfg)
-{
-	free_irq_cfg(at, cfg);
-	irq_free_desc(at);
-}
-
-
 struct io_apic {
 	unsigned int index;
 	unsigned int unused[3];

@@ -2916,100 +2904,8 @@ static int __init ioapic_init_ops(void)
 device_initcall(ioapic_init_ops);
 
 /*
- * Dynamic irq allocate and deallocation
+ * Dynamic irq allocate and deallocation. Should be replaced by irq domains!
  */
-unsigned int __create_irqs(unsigned int from, unsigned int count, int node)
-{
-	struct irq_cfg **cfg;
-	unsigned long flags;
-	int irq, i;
-
-	if (from < nr_irqs_gsi)
-		from = nr_irqs_gsi;
-
-	cfg = kzalloc_node(count * sizeof(cfg[0]), GFP_KERNEL, node);
-	if (!cfg)
-		return 0;
-
-	irq = alloc_irqs_from(from, count, node);
-	if (irq < 0)
-		goto out_cfgs;
-
-	for (i = 0; i < count; i++) {
-		cfg[i] = alloc_irq_cfg(irq + i, node);
-		if (!cfg[i])
-			goto out_irqs;
-	}
-
-	raw_spin_lock_irqsave(&vector_lock, flags);
-	for (i = 0; i < count; i++)
-		if (__assign_irq_vector(irq + i, cfg[i], apic->target_cpus()))
-			goto out_vecs;
-	raw_spin_unlock_irqrestore(&vector_lock, flags);
-
-	for (i = 0; i < count; i++) {
-		irq_set_chip_data(irq + i, cfg[i]);
-		irq_clear_status_flags(irq + i, IRQ_NOREQUEST);
-	}
-
-	kfree(cfg);
-	return irq;
-
-out_vecs:
-	for (i--; i >= 0; i--)
-		__clear_irq_vector(irq + i, cfg[i]);
-	raw_spin_unlock_irqrestore(&vector_lock, flags);
-out_irqs:
-	for (i = 0; i < count; i++)
-		free_irq_at(irq + i, cfg[i]);
-out_cfgs:
-	kfree(cfg);
-	return 0;
-}
-
-unsigned int create_irq_nr(unsigned int from, int node)
-{
-	return __create_irqs(from, 1, node);
-}
-
-int create_irq(void)
-{
-	int node = cpu_to_node(0);
-	unsigned int irq_want;
-	int irq;
-
-	irq_want = nr_irqs_gsi;
-	irq = create_irq_nr(irq_want, node);
-
-	if (irq == 0)
-		irq = -1;
-
-	return irq;
-}
-
-void destroy_irq(unsigned int irq)
-{
-	struct irq_cfg *cfg = irq_get_chip_data(irq);
-	unsigned long flags;
-
-	irq_set_status_flags(irq, IRQ_NOREQUEST|IRQ_NOPROBE);
-
-	free_remapped_irq(irq);
-
-	raw_spin_lock_irqsave(&vector_lock, flags);
-	__clear_irq_vector(irq, cfg);
-	raw_spin_unlock_irqrestore(&vector_lock, flags);
-	free_irq_at(irq, cfg);
-}
-
-void destroy_irqs(unsigned int irq, unsigned int count)
-{
-	unsigned int i;
-
-	for (i = 0; i < count; i++)
-		destroy_irq(irq + i);
-}
-
 int arch_setup_hwirq(unsigned int irq, int node)
 {
 	struct irq_cfg *cfg;

Index: tip/include/linux/irq.h
===================================================================
@@ -526,12 +526,8 @@ static inline void irq_set_percpu_devid_
 }
 
 /* Handle dynamic irq creation and destruction */
-extern unsigned int create_irq_nr(unsigned int irq_want, int node);
-extern unsigned int __create_irqs(unsigned int from, unsigned int count,
-				  int node);
 extern int create_irq(void);
 extern void destroy_irq(unsigned int irq);
-extern void destroy_irqs(unsigned int irq, unsigned int count);
 
 /*
  * Dynamic irq helper functions. Obsolete. Use irq_alloc_desc* and

Index: tip/arch/tile/include/asm/irq.h
===================================================================
@@ -76,4 +76,7 @@ void tile_irq_activate(unsigned int irq,
 
 void setup_irq_regs(void);
 
+unsigned int irq_alloc_hwirq(int node);
+void irq_free_hwirq(unsigned int irq);
+
 #endif /* _ASM_TILE_IRQ_H */

Index: tip/arch/tile/kernel/irq.c
===================================================================
@@ -312,4 +312,16 @@ void destroy_irq(unsigned int irq)
 	spin_unlock_irqrestore(&available_irqs_lock, flags);
 }
 EXPORT_SYMBOL(destroy_irq);
+
+unsigned int irq_alloc_hwirq(int node)
+{
+	int ret = create_irq();
+	return ret < 0 ? 0 : ret;
+}
+
+void irq_free_hwirq(unsigned int irq)
+{
+	destroy_irq();
+}
+
 #endif

Index: tip/drivers/usb/host/ehci-tilegx.c
===================================================================
@@ -142,8 +142,8 @@ static int ehci_hcd_tilegx_drv_probe(str
 	ehci->hcs_params = readl(&ehci->caps->hcs_params);
 
 	/* Create our IRQs and register them. */
-	pdata->irq = create_irq();
-	if (pdata->irq < 0) {
+	pdata->irq = irq_alloc_hwirq(-1);
+	if (!pdata->irq) {
 		ret = -ENXIO;
 		goto err_no_irq;
 	}

@@ -175,7 +175,7 @@ static int ehci_hcd_tilegx_drv_probe(str
 	}
 
 err_have_irq:
-	destroy_irq(pdata->irq);
+	irq_free_hwirq(pdata->irq);
 err_no_irq:
 	tilegx_stop_ehc();
 	usb_put_hcd(hcd);

@@ -193,7 +193,7 @@ static int ehci_hcd_tilegx_drv_remove(st
 	usb_put_hcd(hcd);
 	tilegx_stop_ehc();
 	gxio_usb_host_destroy(&pdata->usb_ctx);
-	destroy_irq(pdata->irq);
+	irq_free_hwirq(pdata->irq);
 
 	return 0;
 }

Index: tip/drivers/usb/host/ohci-tilegx.c
===================================================================
@@ -129,8 +129,8 @@ static int ohci_hcd_tilegx_drv_probe(str
 	tilegx_start_ohc();
 
 	/* Create our IRQs and register them. */
-	pdata->irq = create_irq();
-	if (pdata->irq < 0) {
+	pdata->irq = irq_alloc_hwirq(-1);
+	if (!pdata->irq) {
 		ret = -ENXIO;
 		goto err_no_irq;
 	}

@@ -164,7 +164,7 @@ static int ohci_hcd_tilegx_drv_probe(str
 	}
 
 err_have_irq:
-	destroy_irq(pdata->irq);
+	irq_free_hwirq(pdata->irq);
 err_no_irq:
 	tilegx_stop_ohc();
 	usb_put_hcd(hcd);

@@ -182,7 +182,7 @@ static int ohci_hcd_tilegx_drv_remove(st
 	usb_put_hcd(hcd);
 	tilegx_stop_ohc();
 	gxio_usb_host_destroy(&pdata->usb_ctx);
-	destroy_irq(pdata->irq);
+	irq_free_hwirq(pdata->irq);
 
 	return 0;
 }

Index: tip/drivers/net/ethernet/tile/tilegx.c
===================================================================
@@ -1208,8 +1208,8 @@ static int tile_net_setup_interrupts(str
 
 	irq = md->ingress_irq;
 	if (irq < 0) {
-		irq = create_irq();
-		if (irq < 0) {
+		irq = irq_alloc_hwirq(-1);
+		if (!irq) {
 			netdev_err(dev,
 				   "create_irq failed: mpipe[%d] %d\n",
 				   instance, irq);

@@ -1223,7 +1223,7 @@ static int tile_net_setup_interrupts(str
 		if (rc != 0) {
 			netdev_err(dev, "request_irq failed: mpipe[%d] %d\n",
 				   instance, rc);
-			destroy_irq(irq);
+			irq_free_hwirq(irq);
 			return rc;
 		}
 		md->ingress_irq = irq;

Index: tip/drivers/tty/serial/tilegx.c
===================================================================
@@ -359,8 +359,8 @@ static int tilegx_startup(struct uart_po
 		}
 
 		/* Create our IRQs. */
-		port->irq = create_irq();
-		if (port->irq < 0)
+		port->irq = irq_alloc_hwirq(-1);
+		if (!port->irq)
 			goto err_uart_dest;
 		tile_irq_activate(port->irq, TILE_IRQ_PERCPU);
 

@@ -395,7 +395,7 @@ static int tilegx_startup(struct uart_po
 err_free_irq:
 	free_irq(port->irq, port);
 err_dest_irq:
-	destroy_irq(port->irq);
+	irq_free_hwirq(port->irq);
 err_uart_dest:
 	gxio_uart_destroy(context);
 	ret = -ENXIO;

@@ -435,7 +435,7 @@ static void tilegx_shutdown(struct uart_
 
 	if (port->irq > 0) {
 		free_irq(port->irq, port);
-		destroy_irq(port->irq);
+		irq_free_hwirq(port->irq);
 		port->irq = 0;
 	}
 

Index: tip/drivers/tty/hvc/hvc_tile.c
===================================================================
@@ -133,14 +133,14 @@ static int hvc_tile_probe(struct platfor
 	int tile_hvc_irq;
 
 	/* Create our IRQ and register it. */
-	tile_hvc_irq = create_irq();
-	if (tile_hvc_irq < 0)
+	tile_hvc_irq = irq_alloc_hwirq(-1);
+	if (!tile_hvc_irq)
 		return -ENXIO;
 
 	tile_irq_activate(tile_hvc_irq, TILE_IRQ_PERCPU);
 	hp = hvc_alloc(0, tile_hvc_irq, &hvc_tile_get_put_ops, 128);
 	if (IS_ERR(hp)) {
-		destroy_irq(tile_hvc_irq);
+		irq_free_hwirq(tile_hvc_irq);
 		return PTR_ERR(hp);
 	}
 	dev_set_drvdata(&pdev->dev, hp);

@@ -155,7 +155,7 @@ static int hvc_tile_remove(struct platfo
 
 	rc = hvc_remove(hp);
 	if (rc == 0)
-		destroy_irq(hp->data);
+		irq_free_hwirq(hp->data);
 
 	return rc;
 }

Index: tip/arch/tile/kernel/pci_gx.c
===================================================================
@@ -350,10 +350,9 @@ static int tile_init_irqs(struct pci_con
 		int cpu;
 
 		/* Ask the kernel to allocate an IRQ. */
-		irq = create_irq();
-		if (irq < 0) {
+		irq = irq_alloc_hwirq(-1);
+		if (!irq) {
 			pr_err("PCI: no free irq vectors, failed for %d\n", i);
-
 			goto free_irqs;
 		}
 		controller->irq_intx_table[i] = irq;

@@ -382,7 +381,7 @@ static int tile_init_irqs(struct pci_con
 
 free_irqs:
 	for (j = 0; j < i; j++)
-		destroy_irq(controller->irq_intx_table[j]);
+		irq_free_hwirq(controller->irq_intx_table[j]);
 
 	return -1;
 }

@@ -1500,9 +1499,9 @@ int arch_setup_msi_irq(struct pci_dev *p
 	int irq;
 	int ret;
 
-	irq = create_irq();
-	if (irq < 0)
-		return irq;
+	irq = irq_alloc_hwirq(-1);
+	if (!irq)
+		return -ENOSPC;
 
 	/*
 	 * Since we use a 64-bit Mem-Map to accept the MSI write, we fail

@@ -1601,11 +1600,11 @@ hv_msi_config_failure:
 	/* Free mem-map */
 msi_mem_map_alloc_failure:
 is_64_failure:
-	destroy_irq(irq);
+	irq_free_hwirq(irq);
 	return ret;
 }
 
 void arch_teardown_msi_irq(unsigned int irq)
 {
-	destroy_irq(irq);
+	irq_free_hwirq(irq);
 }