[PATCH] PCI: Change MSI to use physical delivery mode always
MSI hardcoded delivery mode to use logical delivery mode. Recently x86_64 moved to use physical mode addressing to support physflat mode. With this mode enabled noticed that my eth with MSI werent working. msi_address_init() was hardcoded to use logical mode for i386 and x86_64. So when we switch to use physical mode, things stopped working. Since anyway we dont use lowest priority delivery with MSI, its always directed to just a single CPU. Its safe and simpler to use physical mode always, even when we use logical delivery mode for IPI's or other ioapic RTE's. Signed-off-by: Ashok Raj <ashok.raj@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
48b1914873
commit
b4033c1715
@@ -10,13 +10,6 @@
|
||||
#include <mach_apic.h>
|
||||
|
||||
#define LAST_DEVICE_VECTOR 232
|
||||
#define MSI_DEST_MODE MSI_LOGICAL_MODE
|
||||
#define MSI_TARGET_CPU_SHIFT 12
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
#define MSI_TARGET_CPU logical_smp_processor_id()
|
||||
#else
|
||||
#define MSI_TARGET_CPU cpu_to_logical_apicid(first_cpu(cpu_online_map))
|
||||
#endif
|
||||
#define MSI_TARGET_CPU_SHIFT 12
|
||||
|
||||
#endif /* ASM_MSI_H */
|
||||
|
||||
@@ -45,6 +45,8 @@ extern void unlock_ipi_call_lock(void);
|
||||
#define MAX_APICID 256
|
||||
extern u8 x86_cpu_to_apicid[];
|
||||
|
||||
#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu]
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
extern void cpu_exit_clear(void);
|
||||
extern void cpu_uninit(void);
|
||||
@@ -92,6 +94,10 @@ extern int __cpu_disable(void);
|
||||
extern void __cpu_die(unsigned int cpu);
|
||||
#endif /* !__ASSEMBLY__ */
|
||||
|
||||
#else /* CONFIG_SMP */
|
||||
|
||||
#define cpu_physical_id(cpu) boot_cpu_physical_apicid
|
||||
|
||||
#define NO_PROC_ID 0xFF /* No processor magic marker */
|
||||
|
||||
#endif
|
||||
|
||||
@@ -12,9 +12,6 @@
|
||||
static inline void set_intr_gate (int nr, void *func) {}
|
||||
#define IO_APIC_VECTOR(irq) (irq)
|
||||
#define ack_APIC_irq ia64_eoi
|
||||
#define cpu_mask_to_apicid(mask) cpu_physical_id(first_cpu(mask))
|
||||
#define MSI_DEST_MODE MSI_PHYSICAL_MODE
|
||||
#define MSI_TARGET_CPU ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
|
||||
#define MSI_TARGET_CPU_SHIFT 4
|
||||
|
||||
#endif /* ASM_MSI_H */
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
#include <asm/smp.h>
|
||||
|
||||
#define LAST_DEVICE_VECTOR 232
|
||||
#define MSI_DEST_MODE MSI_LOGICAL_MODE
|
||||
#define MSI_TARGET_CPU_SHIFT 12
|
||||
#define MSI_TARGET_CPU logical_smp_processor_id()
|
||||
#define MSI_TARGET_CPU_SHIFT 12
|
||||
|
||||
#endif /* ASM_MSI_H */
|
||||
|
||||
@@ -135,5 +135,11 @@ static __inline int logical_smp_processor_id(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu]
|
||||
#else
|
||||
#define cpu_physical_id(cpu) boot_cpu_id
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user