Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77dff1c7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: xen: Sanitise sparse_irq handling 



There seems to be more cleanups possible, but that's left to the xen
experts :)

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
parent ad9f4334

drivers/xen/events.c

+11 −12
Original line number Original line Diff line number Diff line
@@ -338,30 +338,29 @@ static void unmask_evtchn(int port) 




static int find_unbound_irq(void)

static int find_unbound_irq(void)

{

{

	int irq;

	struct irq_data *data;

	struct irq_desc *desc;

	int irq, res;





	for (irq = 0; irq < nr_irqs; irq++) {

	for (irq = 0; irq < nr_irqs; irq++) {

		desc = irq_to_desc(irq);

		data = irq_get_irq_data(irq);

		/* only 0->15 have init'd desc; handle irq > 16 */

		/* only 0->15 have init'd desc; handle irq > 16 */

		if (desc == NULL)

		if (!data)

			break;

			break;

		if (desc->chip == &no_irq_chip)

		if (data->chip == &no_irq_chip)

			break;

			break;

		if (desc->chip != &xen_dynamic_chip)

		if (data->chip != &xen_dynamic_chip)

			continue;

			continue;

		if (irq_info[irq].type == IRQT_UNBOUND)

		if (irq_info[irq].type == IRQT_UNBOUND)

			break;

			return irq;

	}

	}





	if (irq == nr_irqs)

	if (irq == nr_irqs)

		panic("No available IRQ to bind to: increase nr_irqs!\n");

		panic("No available IRQ to bind to: increase nr_irqs!\n");





	desc = irq_to_desc_alloc_node(irq, 0);

	res = irq_alloc_desc_at(irq, 0);

	if (WARN_ON(desc == NULL))

		return -1;





	dynamic_irq_init_keep_chip_data(irq);

	if (WARN_ON(res != irq))

		return -1;





	return irq;

	return irq;

}

}
@@ -495,7 +494,7 @@ static void unbind_from_irq(unsigned int irq) 
	if (irq_info[irq].type != IRQT_UNBOUND) {

	if (irq_info[irq].type != IRQT_UNBOUND) {

		irq_info[irq] = mk_unbound_info();

		irq_info[irq] = mk_unbound_info();





		dynamic_irq_cleanup(irq);

		irq_free_desc(irq);

	}

	}





	spin_unlock(&irq_mapping_update_lock);

	spin_unlock(&irq_mapping_update_lock);