From patchwork Fri Nov 20 19:15:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 61721 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAKJWmv7031252 for ; Fri, 20 Nov 2009 19:32:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753760AbZKTTcn (ORCPT ); Fri, 20 Nov 2009 14:32:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754929AbZKTTcm (ORCPT ); Fri, 20 Nov 2009 14:32:42 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:54461 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753760AbZKTTck (ORCPT ); Fri, 20 Nov 2009 14:32:40 -0500 X-WSS-ID: 0KTF9HP-08-QV2-02 X-M-MSG: Received: from sentry.sandia.gov (mm03snlnto.sandia.gov [132.175.109.20]) by sentry-three.sandia.gov (Tumbleweed MailGate 3.6.1) with ESMTP id 205398FECB6; Fri, 20 Nov 2009 12:15:24 -0700 (MST) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Fri, 20 Nov 2009 12:15:14 -0700 X-Server-Uuid: 6BFC7783-7E22-49B4-B610-66D6BE496C0E Received: from localhost.localdomain (sale659.sandia.gov [134.253.4.20]) by mailgate.sandia.gov (8.14.1/8.14.1) with ESMTP id nAKJF9tN028412; Fri, 20 Nov 2009 12:15:13 -0700 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, eitan@mellanox.co.il, jaschut@sandia.gov Subject: [PATCH 06/11] opensm: Enable torus-2QoS routing engine. Date: Fri, 20 Nov 2009 12:15:04 -0700 Message-ID: <1258744509-11148-6-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.5.6.GIT In-Reply-To: <1258744509-11148-1-git-send-email-jaschut@sandia.gov> References: <1258744509-11148-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.7.378829, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2009.11.20.190049 X-PerlMx-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, TO_NO_NAME 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20091120191514; ID=1; SEV=2.3.1; DFV=B2009112016; IFV=NA; AIF=B2009112016; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230382E34423036454143322E303038453A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2009112016_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 671835484EG2204796-01-01 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/include/opensm/osm_opensm.h b/opensm/include/opensm/osm_opensm.h index ef9d4e1..90c6c0f 100644 --- a/opensm/include/opensm/osm_opensm.h +++ b/opensm/include/opensm/osm_opensm.h @@ -105,6 +105,7 @@ typedef enum _osm_routing_engine_type { OSM_ROUTING_ENGINE_TYPE_FTREE, OSM_ROUTING_ENGINE_TYPE_LASH, OSM_ROUTING_ENGINE_TYPE_DOR, + OSM_ROUTING_ENGINE_TYPE_TORUS_2QOS, OSM_ROUTING_ENGINE_TYPE_UNKNOWN } osm_routing_engine_type_t; /***********/ diff --git a/opensm/opensm/osm_opensm.c b/opensm/opensm/osm_opensm.c index 9cd254e..7052d49 100644 --- a/opensm/opensm/osm_opensm.c +++ b/opensm/opensm/osm_opensm.c @@ -70,6 +70,7 @@ extern int osm_ucast_file_setup(struct osm_routing_engine *, osm_opensm_t *); extern int osm_ucast_ftree_setup(struct osm_routing_engine *, osm_opensm_t *); extern int osm_ucast_lash_setup(struct osm_routing_engine *, osm_opensm_t *); extern int osm_ucast_dor_setup(struct osm_routing_engine *, osm_opensm_t *); +extern int osm_ucast_torus2QoS_setup(struct osm_routing_engine *, osm_opensm_t *); const static struct routing_engine_module routing_modules[] = { {"minhop", osm_ucast_minhop_setup}, @@ -78,6 +79,7 @@ const static struct routing_engine_module routing_modules[] = { {"ftree", osm_ucast_ftree_setup}, {"lash", osm_ucast_lash_setup}, {"dor", osm_ucast_dor_setup}, + {"torus-2QoS", osm_ucast_torus2QoS_setup}, {NULL, NULL} }; @@ -98,6 +100,8 @@ const char *osm_routing_engine_type_str(IN osm_routing_engine_type_t type) return "lash"; case OSM_ROUTING_ENGINE_TYPE_DOR: return "dor"; + case OSM_ROUTING_ENGINE_TYPE_TORUS_2QOS: + return "torus-2QoS"; default: break; } @@ -124,6 +128,8 @@ osm_routing_engine_type_t osm_routing_engine_type(IN const char *str) return OSM_ROUTING_ENGINE_TYPE_LASH; else if (!strcasecmp(str, "dor")) return OSM_ROUTING_ENGINE_TYPE_DOR; + else if (!strcasecmp(str, "torus-2QoS")) + return OSM_ROUTING_ENGINE_TYPE_TORUS_2QOS; else return OSM_ROUTING_ENGINE_TYPE_UNKNOWN; }