Page MenuHomeFreeBSD
Files F165156072

D17991.id50426.diff
No OneTemporary
Actions

D17991.id50426.diff
View Options

Index: sys/x86/include/intr_machdep.h
===================================================================
--- sys/x86/include/intr_machdep.h
+++ sys/x86/include/intr_machdep.h
@@ -51,15 +51,11 @@
* IRQ values returned by ACPI methods such as _CRS can be used
* directly by the ACPI bus driver.
*
- * MSI interrupts allocate a block of interrupts starting at either
- * the end of the I/O APIC range or 256, whichever is higher. When
- * running under the Xen Hypervisor, an additional range of IRQ values
- * are available for binding to event channel events. We use 256 as
- * the minimum IRQ value for MSI interrupts to attempt to leave 255
- * unused since 255 is used in PCI to indicate an invalid INTx IRQ.
+ * MSI interrupts allocate a block of interrupts starting at the end
+ * of the I/O APIC range. When running under the Xen Hypervisor, an
+ * additional range of IRQ values are available for binding to event
+ * channel events.
*/
-#define MINIMUM_MSI_INT 256
-
extern u_int first_msi_irq;
extern u_int num_io_irqs;
extern u_int num_msi_irqs;
Index: sys/x86/x86/msi.c
===================================================================
--- sys/x86/x86/msi.c
+++ sys/x86/x86/msi.c
@@ -338,7 +338,7 @@
if (num_msi_irqs == 0)
return;
- first_msi_irq = max(MINIMUM_MSI_INT, num_io_irqs);
+ first_msi_irq = num_io_irqs;
if (first_msi_irq + num_msi_irqs < first_msi_irq)
panic("num_msi_irq too high");
num_io_irqs = first_msi_irq + num_msi_irqs;
Index: sys/x86/xen/pvcpu_enum.c
===================================================================
--- sys/x86/xen/pvcpu_enum.c
+++ sys/x86/xen/pvcpu_enum.c
@@ -199,7 +199,7 @@
* this is legacy code so just keep using the previous
* behaviour and assume a maximum of 256 interrupts.
*/
- num_io_irqs = max(MINIMUM_MSI_INT - 1, num_io_irqs);
+ num_io_irqs = max(255, num_io_irqs);
acpi_SetDefaultIntrModel(ACPI_INTR_APIC);
}
Index: sys/x86/xen/xen_msi.c
===================================================================
--- sys/x86/xen/xen_msi.c
+++ sys/x86/xen/xen_msi.c
@@ -56,7 +56,7 @@
{
MPASS(num_io_irqs > 0);
- first_msi_irq = min(MINIMUM_MSI_INT, num_io_irqs);
+ first_msi_irq = num_io_irqs;
if (first_msi_irq + num_msi_irqs < first_msi_irq)
panic("num_msi_irq too high");
num_io_irqs = first_msi_irq + num_msi_irqs;

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 7, 11:09 AM (51 m, 30 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36167522
Default Alt Text
D17991.id50426.diff (2 KB)

Event Timeline