From patchwork Wed Feb 10 14:32:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 78428 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1AEXFJr004029 for ; Wed, 10 Feb 2010 14:35:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752481Ab0BJOfd (ORCPT ); Wed, 10 Feb 2010 09:35:33 -0500 Received: from qmta05.westchester.pa.mail.comcast.net ([76.96.62.48]:41788 "EHLO qmta05.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750914Ab0BJOfd (ORCPT ); Wed, 10 Feb 2010 09:35:33 -0500 Received: from omta16.westchester.pa.mail.comcast.net ([76.96.62.88]) by qmta05.westchester.pa.mail.comcast.net with comcast id gEE71d00U1uE5Es55EacMJ; Wed, 10 Feb 2010 14:34:36 +0000 Received: from hal.comcast.net ([75.69.247.31]) by omta16.westchester.pa.mail.comcast.net with comcast id gEdB1d00L0hNrtn3cEdBY1; Wed, 10 Feb 2010 14:37:12 +0000 Received: from hal.comcast.net (localhost.localdomain [127.0.0.1]) by hal.comcast.net (8.14.3/8.14.3) with ESMTP id o1AEWKL8011814; Wed, 10 Feb 2010 09:32:25 -0500 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id o1AEW51S011783; Wed, 10 Feb 2010 09:32:05 -0500 Date: Wed, 10 Feb 2010 09:32:05 -0500 From: Hal Rosenstock To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Subject: [PATCH] infiniband-diags/vendstat: Indicate general info for IS4 as well as IS3 Message-ID: <20100210143205.GA11779@comcast.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 10 Feb 2010 14:35:34 +0000 (UTC) diff --git a/infiniband-diags/man/vendstat.8 b/infiniband-diags/man/vendstat.8 index 76d0cfb..2a87f2b 100644 --- a/infiniband-diags/man/vendstat.8 +++ b/infiniband-diags/man/vendstat.8 @@ -1,4 +1,4 @@ -.TH VENDSTAT 8 "April 16, 2009" "OpenIB" "OpenIB Diagnostics" +.TH VENDSTAT 8 "February 10, 2010" "OpenIB" "OpenIB Diagnostics" .SH NAME vendstat \- query InfiniBand vendor specific functions @@ -20,7 +20,7 @@ Mellanox InfiniSwitch-III (IS3) and InfiniSwitch-IV (IS4). .PP .TP \fB\-N\fR -show IS3 general information. +show IS3 or IS4 general information. .TP \fB\-w\fR show IS3 port xmit wait counters. @@ -97,7 +97,7 @@ attempted to be fulfilled, and will fail if it is not possible. .SH EXAMPLES .PP -vendstat -N 6 # read IS3 general information +vendstat -N 6 # read IS3 or IS4 general information .PP vendstat -w 6 # read IS3 port xmit wait counters .PP @@ -110,4 +110,4 @@ vendstat -c 2,8 6 12 # configure IS4 port 12 counter groups for PortRcvDataSL .SH AUTHOR .TP Hal Rosenstock -.RI < halr@voltaire.com > +.RI < hal.rosenstock@gmail.com > diff --git a/infiniband-diags/src/vendstat.c b/infiniband-diags/src/vendstat.c index aeb7b66..abff83a 100644 --- a/infiniband-diags/src/vendstat.c +++ b/infiniband-diags/src/vendstat.c @@ -240,7 +240,7 @@ int main(int argc, char **argv) int i; const struct ibdiag_opt opts[] = { - {"N", 'N', 0, NULL, "show IS3 general information"}, + {"N", 'N', 0, NULL, "show IS3 or IS4 general information"}, {"w", 'w', 0, NULL, "show IS3 port xmit wait counters"}, {"i", 'i', 0, NULL, "show IS4 counter group info"}, {"c", 'c', 1, "", "configure IS4 counter groups"}, @@ -249,7 +249,7 @@ int main(int argc, char **argv) char usage_args[] = " [port]"; const char *usage_examples[] = { - "-N 6\t\t# read IS3 general information", + "-N 6\t\t# read IS3 or IS4 general information", "-w 6\t\t# read IS3 port xmit wait counters", "-i 6 12\t# read IS4 port 12 counter group info", "-c 0,1 6 12\t# configure IS4 port 12 counter groups for PortXmitDataSL", @@ -317,7 +317,7 @@ int main(int argc, char **argv) gi = (is3_general_info_t *) & buf; if (general_info) { - /* dump IS3 general info here */ + /* dump IS3 or IS4 general info here */ printf("hw_dev_rev: 0x%04x\n", ntohs(gi->hw_info.hw_revision)); printf("hw_dev_id: 0x%04x\n", ntohs(gi->hw_info.device_id)); printf("hw_uptime: 0x%08x\n", ntohl(gi->hw_info.uptime));