diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 09:31:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 09:31:21 -0800 |
| commit | 60042600c57be5737cd9d6869e7144f7fe786274 (patch) | |
| tree | 8b789dd736a98e3671be6e7c405c4800625fb30d /include | |
| parent | Fix iwlan DMA mapping direction (diff) | |
| parent | intel-iommu: fix endless "Unknown DMAR structure type" loop (diff) | |
| download | linux-dev-60042600c57be5737cd9d6869e7144f7fe786274.tar.xz linux-dev-60042600c57be5737cd9d6869e7144f7fe786274.zip | |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: fix endless "Unknown DMAR structure type" loop
VT-d: handle Invalidation Queue Error to avoid system hang
intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/intel-iommu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index c4f6c101dbcd..d2e3cbfba14f 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -194,6 +194,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val) /* FSTS_REG */ #define DMA_FSTS_PPF ((u32)2) #define DMA_FSTS_PFO ((u32)1) +#define DMA_FSTS_IQE (1 << 4) #define dma_fsts_fault_record_index(s) (((s) >> 8) & 0xff) /* FRCD_REG, 32 bits access */ @@ -328,7 +329,7 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type, int non_present_entry_flush); -extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu); +extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu); extern void *intel_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t); extern void intel_free_coherent(struct device *, size_t, void *, dma_addr_t); |