]> Pileus Git - ~andy/linux/commitdiff
x86/UV2: Remove stale no-resources test for UV2 BAU
authorCliff Wickman <cpw@sgi.com>
Mon, 16 Jan 2012 21:20:50 +0000 (15:20 -0600)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Jan 2012 08:09:56 +0000 (09:09 +0100)
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>
arch/x86/platform/uv/tlb_uv.c

index 9010ca715c03f758b1834095255e399e79a14c2e..affea509c174dbbbf264ccc1bd3b61f4a230e71e 100644 (file)
@@ -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 {