Page MenuHomeFreeBSD
Files F109396152

D42232.diff
No OneTemporary
Actions

D42232.diff
View Options

diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c
--- a/sys/x86/x86/msi.c
+++ b/sys/x86/x86/msi.c
@@ -120,6 +120,7 @@
u_int msi_cpu; /* Local APIC ID. (g) */
u_int msi_count:8; /* Messages in this group. (g) */
u_int msi_maxcount:8; /* Alignment for this group. (g) */
+ u_int msi_enabled:8; /* Enabled messages in this group. (g) */
u_int *msi_irqs; /* Group's IRQ list. (g) */
u_int msi_remap_cookie;
};
@@ -204,7 +205,12 @@
{
struct msi_intsrc *msi = (struct msi_intsrc *)isrc;
- apic_enable_vector(msi->msi_cpu, msi->msi_vector);
+ msi = msi->msi_first;
+ if (msi->msi_enabled == 0) {
+ for (u_int i = 0; i < msi->msi_count; i++)
+ apic_enable_vector(msi->msi_cpu, msi->msi_vector + i);
+ }
+ msi->msi_enabled++;
}
static void
@@ -212,7 +218,12 @@
{
struct msi_intsrc *msi = (struct msi_intsrc *)isrc;
- apic_disable_vector(msi->msi_cpu, msi->msi_vector);
+ msi = msi->msi_first;
+ msi->msi_enabled--;
+ if (msi->msi_enabled == 0) {
+ for (u_int i = 0; i < msi->msi_count; i++)
+ apic_disable_vector(msi->msi_cpu, msi->msi_vector + i);
+ }
}
static int
@@ -277,11 +288,8 @@
/* Must be set before BUS_REMAP_INTR as it may call back into MSI. */
msi->msi_cpu = apic_id;
msi->msi_vector = vector;
- if (msi->msi_intsrc.is_handlers > 0)
- apic_enable_vector(msi->msi_cpu, msi->msi_vector);
- for (i = 1; i < msi->msi_count; i++) {
- sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]);
- if (sib->msi_intsrc.is_handlers > 0)
+ if (msi->msi_enabled > 0) {
+ for (i = 0; i < msi->msi_count; i++)
apic_enable_vector(apic_id, vector + i);
}
error = BUS_REMAP_INTR(device_get_parent(msi->msi_dev), msi->msi_dev,
@@ -317,15 +325,13 @@
* to prevent races where we could miss an interrupt. If BUS_REMAP_INTR
* failed then we disable and free the new, unused vector(s).
*/
- if (msi->msi_intsrc.is_handlers > 0)
- apic_disable_vector(old_id, old_vector);
- apic_free_vector(old_id, old_vector, msi->msi_irq);
- for (i = 1; i < msi->msi_count; i++) {
- sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]);
- if (sib->msi_intsrc.is_handlers > 0)
+ if (msi->msi_enabled > 0) {
+ for (i = 0; i < msi->msi_count; i++)
apic_disable_vector(old_id, old_vector + i);
- apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]);
}
+ apic_free_vector(old_id, old_vector, msi->msi_irq);
+ for (i = 1; i < msi->msi_count; i++)
+ apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]);
return (error);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 5, 12:45 PM (20 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16474538
Default Alt Text
D42232.diff (2 KB)

Event Timeline