From: tip-bot for Cliff Wickman <cpw@sgi.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
cpw@sgi.com, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/urgent] x86/UV2: Remove stale no-resources test for UV2 BAU
Date: Tue, 17 Jan 2012 09:22:33 -0800 [thread overview]
Message-ID: <tip-478c6e529e7bd7c6ef8994c55bd252c287c35893@git.kernel.org> (raw)
In-Reply-To: <20120116212050.GD5767@sgi.com>
Commit-ID: 478c6e529e7bd7c6ef8994c55bd252c287c35893
Gitweb: http://git.kernel.org/tip/478c6e529e7bd7c6ef8994c55bd252c287c35893
Author: Cliff Wickman <cpw@sgi.com>
AuthorDate: Mon, 16 Jan 2012 15:20:50 -0600
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 17 Jan 2012 09:09:56 +0100
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>
---
arch/x86/platform/uv/tlb_uv.c | 10 ----------
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 {
next prev parent reply other threads:[~2012-01-17 17:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-16 21:16 [PATCH 0/6] x86, UV2: BAU fixes for UV version 2 Cliff Wickman
2012-01-16 21:17 ` [PATCH 1/6] x86, UV2: use native UV2 broadcast mode Cliff Wickman
2012-01-17 17:20 ` [tip:x86/urgent] x86/UV2: Fix new UV2 hardware by using " tip-bot for Cliff Wickman
2012-01-16 21:18 ` [PATCH 2/6] x86, UV2: calc BAU destination timeout Cliff Wickman
2012-01-17 17:20 ` [tip:x86/urgent] x86/UV2: Fix BAU destination timeout initialization tip-bot for Cliff Wickman
2012-01-16 21:19 ` [PATCH 3/6] x86: workaround for UV2 BAU bug Cliff Wickman
2012-01-17 17:21 ` [tip:x86/urgent] x86/UV2: Work around " tip-bot for Cliff Wickman
2012-01-16 21:20 ` [PATCH 4/6] x86 UV2: remove no-resources test for UV2 BAU Cliff Wickman
2012-01-17 17:22 ` tip-bot for Cliff Wickman [this message]
2012-01-16 21:21 ` [PATCH 5/6] x86, UV2: ack BAU interrupt earlier Cliff Wickman
2012-01-17 17:23 ` [tip:x86/urgent] x86/UV2: Ack " tip-bot for Cliff Wickman
2012-01-16 21:22 ` [PATCH 6/6] x86, UV2: accounting for BAU strong nacks Cliff Wickman
2012-01-17 17:24 ` [tip:x86/urgent] x86/UV2: Add " tip-bot for Cliff Wickman
2012-01-17 9:47 ` [PATCH 0/6] x86, UV2: BAU fixes for UV version 2 Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-478c6e529e7bd7c6ef8994c55bd252c287c35893@git.kernel.org \
--to=cpw@sgi.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.