diff options
| author | Suresh Siddha | 2008-07-10 20:16:41 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-12 08:44:51 +0200 |
| commit | cf1337f0447e5be8e66daa944f0ea3bcac2b6179 (patch) | |
| tree | 6e5120ba9a75fee603a660b4324c147b9e455c79 /drivers/pci/intel-iommu.h | |
| parent | x64, x2apic/intr-remap: parse ioapic scope under vt-d structures (diff) | |
| download | kernel-qcow2-linux-cf1337f0447e5be8e66daa944f0ea3bcac2b6179.tar.gz kernel-qcow2-linux-cf1337f0447e5be8e66daa944f0ea3bcac2b6179.tar.xz kernel-qcow2-linux-cf1337f0447e5be8e66daa944f0ea3bcac2b6179.zip | |
x64, x2apic/intr-remap: move IOMMU_WAIT_OP() macro to intel-iommu.h
move IOMMU_WAIT_OP() macro to header file.
This will be used by both DMA-remapping and Intr-remapping.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: akpm@linux-foundation.org
Cc: arjan@linux.intel.com
Cc: andi@firstfloor.org
Cc: ebiederm@xmission.com
Cc: jbarnes@virtuousgeek.org
Cc: steiner@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci/intel-iommu.h')
| -rw-r--r-- | drivers/pci/intel-iommu.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/pci/intel-iommu.h b/drivers/pci/intel-iommu.h index eb167e39b464..3a650e8cba33 100644 --- a/drivers/pci/intel-iommu.h +++ b/drivers/pci/intel-iommu.h @@ -177,6 +177,21 @@ static inline void dmar_writeq(void __iomem *addr, u64 val) #define dma_frcd_source_id(c) (c & 0xffff) #define dma_frcd_page_addr(d) (d & (((u64)-1) << 12)) /* low 64 bit */ +#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) /* 10sec */ + +#define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \ +{\ + cycles_t start_time = get_cycles();\ + while (1) {\ + sts = op (iommu->reg + offset);\ + if (cond)\ + break;\ + if (DMAR_OPERATION_TIMEOUT < (get_cycles() - start_time))\ + panic("DMAR hardware is malfunctioning\n");\ + cpu_relax();\ + }\ +} + struct intel_iommu { void __iomem *reg; /* Pointer to hardware regs, virtual addr */ u64 cap; |