From patchwork Mon Feb 4 09:36:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Netes X-Patchwork-Id: 2089941 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4D035DFE82 for ; Mon, 4 Feb 2013 09:36:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752350Ab3BDJgt (ORCPT ); Mon, 4 Feb 2013 04:36:49 -0500 Received: from mail-ve0-f172.google.com ([209.85.128.172]:64543 "EHLO mail-ve0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752229Ab3BDJgt (ORCPT ); Mon, 4 Feb 2013 04:36:49 -0500 Received: by mail-ve0-f172.google.com with SMTP id cz11so2964937veb.31 for ; Mon, 04 Feb 2013 01:36:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:date:from:to:subject:message-id:mime-version :content-type:content-disposition:user-agent:x-gm-message-state; bh=xw/zCJgUhqM5GGPkw+baTyiB7Lo1lS0VAdzdh447yj4=; b=TCUlIVamdwqwNMYPyEPndyQgDKqMpl8TjC+GIQbiqBv2BnYwJec4OUqgbw7LRyX/z+ dbDnhSOP0KOOyZmjaKOlV8GHa43jrp46k+WgqVJfZ6frNfYW4b6sDrxD2M5pf7xv3l2B 217xljge4L+SRFAWLqC7KZw3Zy6ON9FqmJm1JjMl2/oZscn5E26WQaQrXh7wfF0/44Lb XzJq1hr81Z95ZhgE4DdI86f/zrJJ1cyGkiD9zM1dylATWbfLotc+21JGiWOh0i6bfvYS il6bda35FcAHh5pdpSs/ZWJHr9d2AR6V/XNJ0aq9iS9QKmyaK7xpMu8Vpy0A8aBy2j32 Nlyw== X-Received: by 10.58.234.234 with SMTP id uh10mr17442516vec.37.1359970608322; Mon, 04 Feb 2013 01:36:48 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPS id i17sm16662893vdt.5.2013.02.04.01.36.46 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Feb 2013 01:36:47 -0800 (PST) Date: Mon, 4 Feb 2013 11:36:44 +0200 From: Alex Netes To: linux-rdma@vger.kernel.org, Hal Rosenstock Subject: [PATCH] opensm/osm_torus.c: torus routing should fail with VLCap 1 on switch external ports Message-ID: <20130204093644.GB13151@calypso.mtl.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmDG3tkirYBwuIRO5S5bMblFkk7Y6R6R5lMfx0K5lTtzJJ/6aW30/ckGt/PCBYJfvNwvY7O Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Hal Rosenstock Signed-off-by: Alex Netes Acked-by: Jim Schutt --- opensm/osm_torus.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/opensm/osm_torus.c b/opensm/osm_torus.c index e63cb40..757a32a 100644 --- a/opensm/osm_torus.c +++ b/opensm/osm_torus.c @@ -7021,11 +7021,13 @@ bool verify_setup(struct torus *t, struct fabric *f) "ERR 4E20: missing required torus size specification!\n"); goto out; } - if (t->osm->subn.min_sw_data_vls < 2) - OSM_LOG(&t->osm->log, OSM_LOG_INFO, - "Warning: Too few data VLs to support torus routing " + if (t->osm->subn.min_sw_data_vls < 2) { + OSM_LOG(&t->osm->log, OSM_LOG_ERROR, + "ERR 4E48: Too few data VLs to support torus routing " "without credit loops (have switchport %d need 2)\n", (int)t->osm->subn.min_sw_data_vls); + goto out; + } if (t->osm->subn.min_sw_data_vls < 4) OSM_LOG(&t->osm->log, OSM_LOG_INFO, "Warning: Too few data VLs to support torus routing "