From: Andrew Banman <abanman@sgi.com>
To: mingo@redhat.com, akpm@linux-foundation.org
Cc: tglx@linutronix.de, hpa@zytor.com, travis@sgi.com, rja@sgi.com,
sivanich@sgi.com, x86@kernel.org, linux-kernel@vger.kernel.org,
abanman@sgi.com
Subject: [PATCH 07/10] arch/x86/platform/uv: BAU UV4 disable software timeout
Date: Tue, 20 Sep 2016 17:21:13 -0500 [thread overview]
Message-ID: <1474410076-178329-8-git-send-email-abanman@sgi.com> (raw)
In-Reply-To: <1474410076-178329-1-git-send-email-abanman@sgi.com>
Software timeouts are not currently supported on BAU for UV4. Instead, the
BAU will rely on hardware-level fairness protocols to determine broadcast
timeouts.
Do not call enable_timeouts or calculate_destination_timeout on UV4. These
functions write to pre-UV4 MMRs so they generate error messages on UV4.
Signed-off-by: Andrew Banman <abanman@sgi.com>
Acked-by: Mike Travis <travis@sgi.com>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
---
arch/x86/platform/uv/tlb_uv.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 67a31d0..bfd03db 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -2109,7 +2109,8 @@ static int __init init_per_cpu(int nuvhubs, int base_part_pnode)
void *vp;
struct uvhub_desc *uvhub_descs;
- timeout_us = calculate_destination_timeout();
+ if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())
+ timeout_us = calculate_destination_timeout();
vp = kmalloc(nuvhubs * sizeof(struct uvhub_desc), GFP_KERNEL);
uvhub_descs = (struct uvhub_desc *)vp;
@@ -2171,7 +2172,9 @@ static int __init uv_bau_init(void)
uv_base_pnode = uv_blade_to_pnode(uvhub);
}
- enable_timeouts();
+ /* software timeouts are not supported on UV4 */
+ if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())
+ enable_timeouts();
if (init_per_cpu(nuvhubs, uv_base_pnode)) {
set_bau_off();
--
1.8.5.6
next prev parent reply other threads:[~2016-09-20 22:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 22:21 Andrew Banman
2016-09-20 22:21 ` [PATCH 01/10] arch/x86/platform/uv: BAU cleanup: update printks Andrew Banman
2016-09-20 22:21 ` [PATCH 02/10] arch/x86/platform/uv: BAU cleanup: pq_init Andrew Banman
2016-09-20 22:21 ` [PATCH 03/10] arch/x86/platform/uv: BAU replace uv_physnodeaddr Andrew Banman
2016-09-20 22:21 ` [PATCH 04/10] arch/x86/platform/uv: BAU add generic function pointers Andrew Banman
2016-09-20 22:21 ` [PATCH 05/10] arch/x86/platform/uv: BAU use " Andrew Banman
2016-09-20 22:21 ` [PATCH 06/10] arch/x86/platform/uv: BAU UV4 populate uvhub_version Andrew Banman
2016-09-20 22:21 ` Andrew Banman [this message]
2016-09-20 22:21 ` [PATCH 08/10] arch/x86/platform/uv: BAU UV4 fix payload queue setup Andrew Banman
2016-09-20 22:21 ` [PATCH 09/10] arch/x86/platform/uv: BAU UV4 add version-specific functions Andrew Banman
2016-09-20 22:21 ` [PATCH 10/10] Apply Mike's UV4 fixup patches Andrew Banman
2016-09-20 22:23 ` your mail andrew banman
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=1474410076-178329-8-git-send-email-abanman@sgi.com \
--to=abanman@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rja@sgi.com \
--cc=sivanich@sgi.com \
--cc=tglx@linutronix.de \
--cc=travis@sgi.com \
--cc=x86@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).