summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCliff Wickman <cpw@sgi.com>2012-01-16 15:20:50 -0600
committerIngo Molnar <mingo@elte.hu>2012-01-17 09:09:56 +0100
commit478c6e529e7bd7c6ef8994c55bd252c287c35893 (patch)
tree17d2e4cc052c3c6fd0f4005d06ac53be7d5d8219
parentc5d35d399e685acccc85a675e8765c26b2a9813a (diff)
downloadop-kernel-dev-478c6e529e7bd7c6ef8994c55bd252c287c35893.zip
op-kernel-dev-478c6e529e7bd7c6ef8994c55bd252c287c35893.tar.gz
x86/UV2: Remove stale no-resources test for UV2 BAU
This patch removes an unnecessary test for a no-destination-resources-available condition that looks like a destination timeout in UV1, but is separately distinguishable in UV2. Signed-off-by: Cliff Wickman <cpw@sgi.com> Link: http://lkml.kernel.org/r/20120116212050.GD5767@sgi.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/platform/uv/tlb_uv.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 9010ca7..affea50 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -642,16 +642,6 @@ static int uv2_wait_completion(struct bau_desc *bau_desc,
} else if (descriptor_stat == UV2H_DESC_DEST_TIMEOUT) {
stat->s_dtimeout++;
ttm = get_cycles();
- /*
- * Our retries may be blocked by all destination
- * swack resources being consumed, and a timeout
- * pending. In that case hardware returns the
- * ERROR that looks like a destination timeout.
- */
- if (cycles_2_us(ttm - bcp->send_message) < timeout_us) {
- bcp->conseccompletes = 0;
- return FLUSH_RETRY_PLUGGED;
- }
bcp->conseccompletes = 0;
return FLUSH_RETRY_TIMEOUT;
} else {
OpenPOWER on IntegriCloud