From 38867d6fcc42ab4951ed8554d7f188b5fe2f95ba Mon Sep 17 00:00:00 2001 From: mark gross Date: Mon, 12 May 2008 13:41:57 -0700 Subject: [PATCH] --- yaml --- r: 96511 b: refs/heads/master c: a7eb08c2a14f28cb652ea6ad1a8e2b8efc55fb9a h: refs/heads/master i: 96509: e14ac1fc93f0cb491f7858912f7059386ecfa221 96507: 52216d54a9c24a18f71e5a691160453d07df53b3 96503: 19c1bb15d787166314b7206a3e5125f81c30051a 96495: af56147d29254b87b658590e8dfd20a4a0d109b7 96479: 9109b2a3e086bf0d125ffedf9bdb8a1a389a5906 96447: 058af91f661bb852012c8322b3d0933308b09347 96383: 1fe475226050a2aa9ba39e24fd23f53726a6b26c 96255: 3cbcae632b73198afa813322443f68cd8c533843 v: v3 --- [refs] | 2 +- trunk/drivers/pci/intel-iommu.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6cfb098c7285..d7bbb2662b10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34a65055e5e7304b3d6ad0f7542bf66308eae50a +refs/heads/master: a7eb08c2a14f28cb652ea6ad1a8e2b8efc55fb9a diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c index 1fd8bb765702..66c0fd21894b 100644 --- a/trunk/drivers/pci/intel-iommu.c +++ b/trunk/drivers/pci/intel-iommu.c @@ -49,7 +49,7 @@ #define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 -#define DMAR_OPERATION_TIMEOUT (HZ*60) /* 1m */ +#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) /* 10sec */ #define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1) @@ -490,12 +490,12 @@ static int iommu_alloc_root_entry(struct intel_iommu *iommu) #define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \ {\ - unsigned long start_time = jiffies;\ + cycles_t start_time = get_cycles();\ while (1) {\ sts = op (iommu->reg + offset);\ if (cond)\ break;\ - if (time_after(jiffies, start_time + DMAR_OPERATION_TIMEOUT))\ + if (DMAR_OPERATION_TIMEOUT < (get_cycles() - start_time))\ panic("DMAR hardware is malfunctioning\n");\ cpu_relax();\ }\