diff options
author | Feng Wu <feng.wu@intel.com> | 2015-06-09 01:20:32 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-12 05:33:52 -0400 |
commit | 2705a3d2a690c3dd9f58c7d788bc0f432acdeceb (patch) | |
tree | 6ea683b8edb784fb9c0788dee4e3ac3b5e2e60aa | |
parent | 8541186faf3b59623c86022cc5f21ce9bd1332c5 (diff) |
iommu, x86: Save the mode (posted or remapped) of an IRTE
Add a new field to struct irq_2_iommu, which captures whether the
associated IRTE is in posted mode or remapped mode. We update this
field when the IRTE is written into the table.
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Feng Wu <feng.wu@intel.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Joerg Roedel <joro@8bytes.org>
Cc: jiang.liu@linux.intel.com
Cc: iommu@lists.linux-foundation.org
Cc: dwmw2@infradead.org
Link: http://lkml.kernel.org/r/1433827237-3382-6-git-send-email-feng.wu@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index a643eecf9d29..68bce0a52b9b 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c | |||
@@ -18,6 +18,11 @@ | |||
18 | 18 | ||
19 | #include "irq_remapping.h" | 19 | #include "irq_remapping.h" |
20 | 20 | ||
21 | enum irq_mode { | ||
22 | IRQ_REMAPPING, | ||
23 | IRQ_POSTING, | ||
24 | }; | ||
25 | |||
21 | struct ioapic_scope { | 26 | struct ioapic_scope { |
22 | struct intel_iommu *iommu; | 27 | struct intel_iommu *iommu; |
23 | unsigned int id; | 28 | unsigned int id; |
@@ -37,6 +42,7 @@ struct irq_2_iommu { | |||
37 | u16 irte_index; | 42 | u16 irte_index; |
38 | u16 sub_handle; | 43 | u16 sub_handle; |
39 | u8 irte_mask; | 44 | u8 irte_mask; |
45 | enum irq_mode mode; | ||
40 | }; | 46 | }; |
41 | 47 | ||
42 | struct intel_ir_data { | 48 | struct intel_ir_data { |
@@ -104,6 +110,7 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, | |||
104 | irq_iommu->irte_index = index; | 110 | irq_iommu->irte_index = index; |
105 | irq_iommu->sub_handle = 0; | 111 | irq_iommu->sub_handle = 0; |
106 | irq_iommu->irte_mask = mask; | 112 | irq_iommu->irte_mask = mask; |
113 | irq_iommu->mode = IRQ_REMAPPING; | ||
107 | } | 114 | } |
108 | raw_spin_unlock_irqrestore(&irq_2_ir_lock, flags); | 115 | raw_spin_unlock_irqrestore(&irq_2_ir_lock, flags); |
109 | 116 | ||
@@ -144,6 +151,9 @@ static int modify_irte(struct irq_2_iommu *irq_iommu, | |||
144 | __iommu_flush_cache(iommu, irte, sizeof(*irte)); | 151 | __iommu_flush_cache(iommu, irte, sizeof(*irte)); |
145 | 152 | ||
146 | rc = qi_flush_iec(iommu, index, 0); | 153 | rc = qi_flush_iec(iommu, index, 0); |
154 | |||
155 | /* Update iommu mode according to the IRTE mode */ | ||
156 | irq_iommu->mode = irte->pst ? IRQ_POSTING : IRQ_REMAPPING; | ||
147 | raw_spin_unlock_irqrestore(&irq_2_ir_lock, flags); | 157 | raw_spin_unlock_irqrestore(&irq_2_ir_lock, flags); |
148 | 158 | ||
149 | return rc; | 159 | return rc; |