From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757227AbcIVKcn (ORCPT ); Thu, 22 Sep 2016 06:32:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51940 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756857AbcIVKcg (ORCPT ); Thu, 22 Sep 2016 06:32:36 -0400 Date: Thu, 22 Sep 2016 03:32:00 -0700 From: tip-bot for Andrew Banman Message-ID: Cc: torvalds@linux-foundation.org, mingo@kernel.org, sivanich@sgi.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, travis@sgi.com, hpa@zytor.com, abanman@sgi.com Reply-To: abanman@sgi.com, hpa@zytor.com, travis@sgi.com, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, sivanich@sgi.com, mingo@kernel.org, torvalds@linux-foundation.org In-Reply-To: <1474474161-265604-9-git-send-email-abanman@sgi.com> References: <1474474161-265604-9-git-send-email-abanman@sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/uv/BAU: Disable software timeout on UV4 hardware Git-Commit-ID: e879c1124a6c5c3367f20a254909605e7ee938c1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e879c1124a6c5c3367f20a254909605e7ee938c1 Gitweb: http://git.kernel.org/tip/e879c1124a6c5c3367f20a254909605e7ee938c1 Author: Andrew Banman AuthorDate: Wed, 21 Sep 2016 11:09:19 -0500 Committer: Ingo Molnar CommitDate: Thu, 22 Sep 2016 11:16:14 +0200 x86/platform/uv/BAU: Disable software timeout on UV4 hardware 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: Thomas Gleixner Acked-by: Mike Travis Acked-by: Dimitri Sivanich Acked-by: Thomas Gleixner Cc: Linus Torvalds Cc: Peter Zijlstra Cc: akpm@linux-foundation.org Cc: rja@sgi.com Link: http://lkml.kernel.org/r/1474474161-265604-9-git-send-email-abanman@sgi.com Signed-off-by: Ingo Molnar --- 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();