diff mbox

opensm/osm_torus.c: Improve some misconfiguration error messages

Message ID 50B7B36E.1030400@dev.mellanox.co.il (mailing list archive)
State Accepted
Delegated to: Alex Netes
Headers show

Commit Message

Hal Rosenstock Nov. 29, 2012, 7:11 p.m. UTC
Signed-off-by: Jim Schutt <jaschut@sandia.gov>
Signed-off-by: Hal Rosenstock <hal@mellanox.com>
---
 opensm/osm_torus.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

Comments

Alex Netes Jan. 30, 2013, 5:54 p.m. UTC | #1
Hi Hal,

On 14:11 Thu 29 Nov     , Hal Rosenstock wrote:
> 
> Signed-off-by: Jim Schutt <jaschut@sandia.gov>
> Signed-off-by: Hal Rosenstock <hal@mellanox.com>
> ---

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/opensm/osm_torus.c b/opensm/osm_torus.c
index 43343c7..4d1bec7 100644
--- a/opensm/osm_torus.c
+++ b/opensm/osm_torus.c
@@ -7025,8 +7025,9 @@  out:
 	return;
 }
 
-#define LINK_ERR_STR " direction link required!\n"
-#define SEED_ERR_STR " direction links with different seed switches!\n"
+#define LINK_ERR_STR " direction link required for topology seed configuration since radix == 4! See torus-2QoS.conf(5).\n"
+#define LINK_ERR2_STR " direction link required for topology seed configuration! See torus-2QoS.conf(5).\n"
+#define SEED_ERR_STR " direction links for topology seed do not share a common switch! See torus-2QoS.conf(5).\n"
 
 static
 bool verify_setup(struct torus *t, struct fabric *f)
@@ -7154,7 +7155,7 @@  again:
 		if (o->xp_link.end[0].port >= 0 &&
 		    o->xm_link.end[0].port >= 0) {
 			OSM_LOG(&t->osm->log, OSM_LOG_ERROR,
-				"ERR 4E2B: Positive or negative x" LINK_ERR_STR);
+				"ERR 4E2B: Positive or negative x" LINK_ERR2_STR);
 			goto out;
 		}
 		if (o->xp_link.end[0].port < 0 &&
@@ -7177,7 +7178,7 @@  again:
 		if (o->zp_link.end[0].port >= 0 &&
 		    o->zm_link.end[0].port >= 0) {
 			OSM_LOG(&t->osm->log, OSM_LOG_ERROR,
-				"ERR 4E2C: Positive or negative z" LINK_ERR_STR);
+				"ERR 4E2C: Positive or negative z" LINK_ERR2_STR);
 			goto out;
 		}
 		if ((o->xp_link.end[0].port < 0 &&
@@ -7220,7 +7221,7 @@  again:
 		if (o->yp_link.end[0].port >= 0 &&
 		    o->ym_link.end[0].port >= 0) {
 			OSM_LOG(&t->osm->log, OSM_LOG_ERROR,
-				"ERR 4E2E: Positive or negative y" LINK_ERR_STR);
+				"ERR 4E2E: Positive or negative y" LINK_ERR2_STR);
 			goto out;
 		}
 		if ((o->xp_link.end[0].port < 0 &&
@@ -7269,7 +7270,9 @@  again:
 	if (need_seed)
 		OSM_LOG(&t->osm->log, OSM_LOG_ERROR,
 			"ERR 4E30: Every configured torus seed has at "
-			"least one switch missing in fabric!\n");
+			"least one switch missing in fabric! See "
+			"torus-2QoS.conf(5) and TORUS TOPOLOGY DISCOVERY "
+			"in torus-2QoS(8)\n");
 	else
 		success = true;
 out: