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

Commit 30bd35ed authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

xen/pci: In xen_register_pirq bind the GSI to the IRQ after the hypercall. 



Not before .. also that code segment starts looking like the HVM one.

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent d92edd81

arch/x86/pci/xen.c

+16 −16
Original line number Diff line number Diff line
@@ -112,26 +112,10 @@ static int xen_register_pirq(u32 gsi, int gsi_override, int triggering) 
	if (!xen_pv_domain())

		return -1;



	if (triggering == ACPI_EDGE_SENSITIVE) {

		shareable = 0;

		name = "ioapic-edge";

	} else {

		shareable = 1;

		name = "ioapic-level";

	}

	pirq = xen_allocate_pirq_gsi(gsi);

	if (pirq < 0)

		goto out;



	if (gsi_override >= 0)

		irq = xen_bind_pirq_gsi_to_irq(gsi_override, pirq, shareable, name);

	else

		irq = xen_bind_pirq_gsi_to_irq(gsi, pirq, shareable, name);

	if (irq < 0)

		goto out;



	printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d (gsi=%d)\n", pirq, irq, gsi);



	map_irq.domid = DOMID_SELF;

	map_irq.type = MAP_PIRQ_TYPE_GSI;

	map_irq.index = gsi;
@@ -143,6 +127,22 @@ static int xen_register_pirq(u32 gsi, int gsi_override, int triggering) 
		return -1;

	}



	if (triggering == ACPI_EDGE_SENSITIVE) {

		shareable = 0;

		name = "ioapic-edge";

	} else {

		shareable = 1;

		name = "ioapic-level";

	}



	if (gsi_override >= 0)

		gsi = gsi_override;



	irq = xen_bind_pirq_gsi_to_irq(gsi, pirq, shareable, name);

	if (irq < 0)

		goto out;



	printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d (gsi=%d)\n", pirq, irq, gsi);

out:

	return irq;

}