aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/intr_remapping.c47
-rw-r--r--include/linux/dmar.h2
2 files changed, 0 insertions, 49 deletions
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index cb6252988546..343f7299c783 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -275,28 +275,6 @@ int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
275 return 0; 275 return 0;
276} 276}
277 277
278int clear_irte_irq(int irq, struct intel_iommu *iommu, u16 index)
279{
280 struct irq_2_iommu *irq_iommu;
281 unsigned long flags;
282
283 spin_lock_irqsave(&irq_2_ir_lock, flags);
284 irq_iommu = valid_irq_2_iommu(irq);
285 if (!irq_iommu) {
286 spin_unlock_irqrestore(&irq_2_ir_lock, flags);
287 return -1;
288 }
289
290 irq_iommu->iommu = NULL;
291 irq_iommu->irte_index = 0;
292 irq_iommu->sub_handle = 0;
293 irq_2_iommu(irq)->irte_mask = 0;
294
295 spin_unlock_irqrestore(&irq_2_ir_lock, flags);
296
297 return 0;
298}
299
300int modify_irte(int irq, struct irte *irte_modified) 278int modify_irte(int irq, struct irte *irte_modified)
301{ 279{
302 int rc; 280 int rc;
@@ -328,31 +306,6 @@ int modify_irte(int irq, struct irte *irte_modified)
328 return rc; 306 return rc;
329} 307}
330 308
331int flush_irte(int irq)
332{
333 int rc;
334 int index;
335 struct intel_iommu *iommu;
336 struct irq_2_iommu *irq_iommu;
337 unsigned long flags;
338
339 spin_lock_irqsave(&irq_2_ir_lock, flags);
340 irq_iommu = valid_irq_2_iommu(irq);
341 if (!irq_iommu) {
342 spin_unlock_irqrestore(&irq_2_ir_lock, flags);
343 return -1;
344 }
345
346 iommu = irq_iommu->iommu;
347
348 index = irq_iommu->irte_index + irq_iommu->sub_handle;
349
350 rc = qi_flush_iec(iommu, index, irq_iommu->irte_mask);
351 spin_unlock_irqrestore(&irq_2_ir_lock, flags);
352
353 return rc;
354}
355
356struct intel_iommu *map_hpet_to_ir(u8 hpet_id) 309struct intel_iommu *map_hpet_to_ir(u8 hpet_id)
357{ 310{
358 int i; 311 int i;
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index cb86aa1ca436..200439ec7c49 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -119,8 +119,6 @@ extern int alloc_irte(struct intel_iommu *iommu, int irq, u16 count);
119extern int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, 119extern int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index,
120 u16 sub_handle); 120 u16 sub_handle);
121extern int map_irq_to_irte_handle(int irq, u16 *sub_handle); 121extern int map_irq_to_irte_handle(int irq, u16 *sub_handle);
122extern int clear_irte_irq(int irq, struct intel_iommu *iommu, u16 index);
123extern int flush_irte(int irq);
124extern int free_irte(int irq); 122extern int free_irte(int irq);
125 123
126extern int irq_remapped(int irq); 124extern int irq_remapped(int irq);