| Message ID | 1401178092-1228-2-git-send-email-jiang.liu@linux.intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, 27 May 2014, Jiang Liu wrote: > If x2apic is enabled, the MSI high address field should also be aslo > updated when setting affinity for MSI IRQ, otherwise the MSI IRQ may > target wrong APIC IDs. That should be tagged for stable, right? > Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> > --- > arch/x86/kernel/apic/io_apic.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c > index 9d0a9795a0f8..2de992501a1b 100644 > --- a/arch/x86/kernel/apic/io_apic.c > +++ b/arch/x86/kernel/apic/io_apic.c > @@ -3007,6 +3007,10 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) > > __get_cached_msi_msg(data->msi_desc, &msg); > > + msg.address_hi = MSI_ADDR_BASE_HI; > + if (x2apic_enabled()) > + msg.address_hi |= MSI_ADDR_EXT_DEST_ID(dest); > + > msg.data &= ~MSI_DATA_VECTOR_MASK; > msg.data |= MSI_DATA_VECTOR(cfg->vector); > msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK; > -- > 1.7.10.4 > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Yes, I think it should be marked for stable branches. On 2014/5/27 16:11, Thomas Gleixner wrote: > On Tue, 27 May 2014, Jiang Liu wrote: > >> If x2apic is enabled, the MSI high address field should also be aslo >> updated when setting affinity for MSI IRQ, otherwise the MSI IRQ may >> target wrong APIC IDs. > > That should be tagged for stable, right? > >> Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> >> --- >> arch/x86/kernel/apic/io_apic.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c >> index 9d0a9795a0f8..2de992501a1b 100644 >> --- a/arch/x86/kernel/apic/io_apic.c >> +++ b/arch/x86/kernel/apic/io_apic.c >> @@ -3007,6 +3007,10 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) >> >> __get_cached_msi_msg(data->msi_desc, &msg); >> >> + msg.address_hi = MSI_ADDR_BASE_HI; >> + if (x2apic_enabled()) >> + msg.address_hi |= MSI_ADDR_EXT_DEST_ID(dest); >> + >> msg.data &= ~MSI_DATA_VECTOR_MASK; >> msg.data |= MSI_DATA_VECTOR(cfg->vector); >> msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK; >> -- >> 1.7.10.4 >> >> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 9d0a9795a0f8..2de992501a1b 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3007,6 +3007,10 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) __get_cached_msi_msg(data->msi_desc, &msg); + msg.address_hi = MSI_ADDR_BASE_HI; + if (x2apic_enabled()) + msg.address_hi |= MSI_ADDR_EXT_DEST_ID(dest); + msg.data &= ~MSI_DATA_VECTOR_MASK; msg.data |= MSI_DATA_VECTOR(cfg->vector); msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
If x2apic is enabled, the MSI high address field should also be aslo updated when setting affinity for MSI IRQ, otherwise the MSI IRQ may target wrong APIC IDs. Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> --- arch/x86/kernel/apic/io_apic.c | 4 ++++ 1 file changed, 4 insertions(+)