diff options
author | Jan Beulich <jbeulich@suse.com> | 2013-03-25 14:28:31 +0100 |
---|---|---|
committer | Jan Beulich <jbeulich@suse.com> | 2013-03-25 14:28:31 +0100 |
commit | fae0372140befb88d890a30704a8ec058c902af8 (patch) | |
tree | eae6ad998551ddd302104d765a75375b7319747f /xen/include/asm-x86/io_apic.h | |
parent | 85bae8b3406b234f3074617771072623525a3576 (diff) | |
download | xen-fae0372140befb88d890a30704a8ec058c902af8.tar.gz xen-fae0372140befb88d890a30704a8ec058c902af8.tar.bz2 xen-fae0372140befb88d890a30704a8ec058c902af8.zip |
IOMMU: properly check whether interrupt remapping is enabled
... rather than the IOMMU as a whole.
That in turn required to make sure iommu_intremap gets properly
cleared when the respective initialization fails (or isn't being
done at all).
Along with making sure interrupt remapping doesn't get inconsistently
enabled on some IOMMUs and not on others in the VT-d code, this in turn
allowed quite a bit of cleanup on the VT-d side (if desired, that
cleanup could of course be broken out into a separate patch).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
Diffstat (limited to 'xen/include/asm-x86/io_apic.h')
-rw-r--r-- | xen/include/asm-x86/io_apic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index 0cbd04039b..6d90628055 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -129,7 +129,7 @@ struct IO_APIC_route_entry { extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; /* Only need to remap ioapic RTE (reg: 10~3Fh) */ -#define ioapic_reg_remapped(reg) (iommu_enabled && ((reg) >= 0x10)) +#define ioapic_reg_remapped(reg) (iommu_intremap && ((reg) >= 0x10)) static inline unsigned int __io_apic_read(unsigned int apic, unsigned int reg) { |