Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/pci: Use the INT_SRC_OVR IRQ (instead of GSI) to preset the ACPI SCI IRQ.
xen/mmu: Fix for linker errors when CONFIG_SMP is not defined.
+28
-2
+24
-2
arch/x86/pci/xen.c
+24
-2
arch/x86/pci/xen.c
···
333
333
struct physdev_map_pirq map_irq;
334
334
int shareable = 0;
335
335
char *name;
336
+
bool gsi_override = false;
336
337
337
338
if (!xen_pv_domain())
338
339
return -1;
···
350
349
if (pirq < 0)
351
350
goto out;
352
351
353
-
irq = xen_bind_pirq_gsi_to_irq(gsi, pirq, shareable, name);
352
+
/* Before we bind the GSI to a Linux IRQ, check whether
353
+
* we need to override it with bus_irq (IRQ) value. Usually for
354
+
* IRQs below IRQ_LEGACY_IRQ this holds IRQ == GSI, as so:
355
+
* ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level)
356
+
* but there are oddballs where the IRQ != GSI:
357
+
* ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level)
358
+
* which ends up being: gsi_to_irq[9] == 20
359
+
* (which is what acpi_gsi_to_irq ends up calling when starting the
360
+
* the ACPI interpreter and keels over since IRQ 9 has not been
361
+
* setup as we had setup IRQ 20 for it).
362
+
*/
363
+
if (gsi == acpi_sci_override_gsi) {
364
+
/* Check whether the GSI != IRQ */
365
+
acpi_gsi_to_irq(gsi, &irq);
366
+
if (irq != gsi)
367
+
/* Bugger, we MUST have that IRQ. */
368
+
gsi_override = true;
369
+
}
370
+
if (gsi_override)
371
+
irq = xen_bind_pirq_gsi_to_irq(irq, pirq, shareable, name);
372
+
else
373
+
irq = xen_bind_pirq_gsi_to_irq(gsi, pirq, shareable, name);
354
374
if (irq < 0)
355
375
goto out;
356
376
357
-
printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d\n", pirq, irq);
377
+
printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d (gsi=%d)\n", pirq, irq, gsi);
358
378
359
379
map_irq.domid = DOMID_SELF;
360
380
map_irq.type = MAP_PIRQ_TYPE_GSI;