From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934430AbcIUQJx (ORCPT ); Wed, 21 Sep 2016 12:09:53 -0400 Received: from relay2.sgi.com ([192.48.180.65]:54564 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934301AbcIUQJw (ORCPT ); Wed, 21 Sep 2016 12:09:52 -0400 From: Andrew Banman To: mingo@redhat.com Cc: akpm@linux-foundation.org, 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 08/10] arch/x86/platform/uv: BAU UV4 disable software timeout Date: Wed, 21 Sep 2016 11:09:19 -0500 Message-Id: <1474474161-265604-9-git-send-email-abanman@sgi.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1474474161-265604-1-git-send-email-abanman@sgi.com> References: <1474410720-82890-1-git-send-email-abanman@sgi.com> <1474474161-265604-1-git-send-email-abanman@sgi.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Mike Travis Acked-by: Dimitri Sivanich Acked-by: Thomas Gleixner --- 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 ddbeb16..72a5de7 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