From patchwork Wed Mar 9 23:00:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 86162 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3C492B73C9 for ; Thu, 10 Mar 2011 10:00:45 +1100 (EST) Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 32462B6F8B for ; Thu, 10 Mar 2011 10:00:33 +1100 (EST) Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id p29N0Edx012948; Wed, 9 Mar 2011 17:00:16 -0600 Subject: [PATCH] powerpc/pseries: Disable VPNH feature From: Benjamin Herrenschmidt To: linuxppc-dev@lists.ozlabs.org Date: Thu, 10 Mar 2011 10:00:14 +1100 Message-ID: <1299711614.22236.392.camel@pasglop> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Cc: Jesse Larrew X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This feature triggers nasty races in the scheduler between the rebuilding of the topology and the load balancing code, causing the machine to hang. Disable it for now until the races are fixed. Signed-off-by: Benjamin Herrenschmidt --- Jesse: I'm sending that to Linus now. We'll sort things out for the next release. diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index fd48123..74f1baa 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1516,6 +1516,7 @@ int start_topology_update(void) { int rc = 0; +#if 0 /* Disabled until races with load balancing are fixed */ if (firmware_has_feature(FW_FEATURE_VPHN) && get_lppaca()->shared_proc) { vphn_enabled = 1; @@ -1524,6 +1525,7 @@ int start_topology_update(void) set_topology_timer(); rc = 1; } +#endif return rc; }