lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen/pci: Use the xen_register_pirq for HVM and initial domain users

Browse Source 
.. to cut down on the code duplicity.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Konrad Rzeszutek Wilk
2011-07-06 12:42:43 -04:00
parent 30bd35edfd
commit ed89eb6396
1 changed files with 23 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
arch/x86/pci/xen.c
View File

@@ -62,60 +62,19 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
} }
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi, static int xen_register_pirq(u32 gsi, int gsi_override, int triggering,
int trigger, int polarity) bool alloc_pirq)
{ {
int rc, irq; int rc, pirq = -1, irq = -1;
struct physdev_map_pirq map_irq; struct physdev_map_pirq map_irq;
int shareable = 0; int shareable = 0;
char *name; char *name;
if (!xen_hvm_domain()) if (alloc_pirq) {
return -1; pirq = xen_allocate_pirq_gsi(gsi);
if (pirq < 0)
map_irq.domid = DOMID_SELF; goto out;
map_irq.type = MAP_PIRQ_TYPE_GSI;
map_irq.index = gsi;
map_irq.pirq = -1;
rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
if (rc) {
printk(KERN_WARNING "xen map irq failed %d\n", rc);
return -1;
} }
if (trigger == ACPI_EDGE_SENSITIVE) {
shareable = 0;
name = "ioapic-edge";
} else {
shareable = 1;
name = "ioapic-level";
}
irq = xen_bind_pirq_gsi_to_irq(gsi, map_irq.pirq, shareable, name);
printk(KERN_DEBUG "xen: --> irq=%d, pirq=%d\n", irq, map_irq.pirq);
return irq;
}
#endif
#ifdef CONFIG_XEN_DOM0
#ifdef CONFIG_ACPI
static int xen_register_pirq(u32 gsi, int gsi_override, int triggering)
{
int rc, pirq, irq = -1;
struct physdev_map_pirq map_irq;
int shareable = 0;
char *name;
if (!xen_pv_domain())
return -1;
pirq = xen_allocate_pirq_gsi(gsi);
if (pirq < 0)
goto out;
map_irq.domid = DOMID_SELF; map_irq.domid = DOMID_SELF;
map_irq.type = MAP_PIRQ_TYPE_GSI; map_irq.type = MAP_PIRQ_TYPE_GSI;
map_irq.index = gsi; map_irq.index = gsi;
@@ -138,15 +97,26 @@ static int xen_register_pirq(u32 gsi, int gsi_override, int triggering)
if (gsi_override >= 0) if (gsi_override >= 0)
gsi = gsi_override; gsi = gsi_override;
irq = xen_bind_pirq_gsi_to_irq(gsi, pirq, shareable, name); irq = xen_bind_pirq_gsi_to_irq(gsi, map_irq.pirq, shareable, name);
if (irq < 0) if (irq < 0)
goto out; goto out;
printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d (gsi=%d)\n", pirq, irq, gsi); printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d (gsi=%d)\n", map_irq.pirq, irq, gsi);
out: out:
return irq; return irq;
} }
static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi,
int trigger, int polarity)
{
if (!xen_hvm_domain())
return -1;
return xen_register_pirq(gsi, -1 /* no GSI override */,
trigger, false /* no PIRQ allocation */);
}
#ifdef CONFIG_XEN_DOM0
static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polarity) static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polarity)
{ {
int rc, irq; int rc, irq;
@@ -158,7 +128,7 @@ static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polar
printk(KERN_DEBUG "xen: registering gsi %u triggering %d polarity %d\n", printk(KERN_DEBUG "xen: registering gsi %u triggering %d polarity %d\n",
gsi, triggering, polarity); gsi, triggering, polarity);
irq = xen_register_pirq(gsi, gsi_override, triggering); irq = xen_register_pirq(gsi, gsi_override, triggering, true);
setup_gsi.gsi = gsi; setup_gsi.gsi = gsi;
setup_gsi.triggering = (triggering == ACPI_EDGE_SENSITIVE ? 0 : 1); setup_gsi.triggering = (triggering == ACPI_EDGE_SENSITIVE ? 0 : 1);
@@ -497,7 +467,8 @@ void __init xen_setup_pirqs(void)
continue; continue;
xen_register_pirq(irq, -1 /* no GSI override */, xen_register_pirq(irq, -1 /* no GSI override */,
trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE); trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE,
true /* allocate IRQ */);
} }
#endif #endif
} }