From patchwork Sat Jul 23 11:02:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 1002102 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6NB2oXH025403 for ; Sat, 23 Jul 2011 11:02:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752177Ab1GWLCs (ORCPT ); Sat, 23 Jul 2011 07:02:48 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:36633 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751991Ab1GWLCr (ORCPT ); Sat, 23 Jul 2011 07:02:47 -0400 Received: by wyg8 with SMTP id 8so1942320wyg.19 for ; Sat, 23 Jul 2011 04:02:46 -0700 (PDT) Received: by 10.227.42.131 with SMTP id s3mr2142905wbe.104.1311418966223; Sat, 23 Jul 2011 04:02:46 -0700 (PDT) Received: from [192.168.1.100] (c-71-192-10-85.hsd1.ma.comcast.net [71.192.10.85]) by mx.google.com with ESMTPS id o19sm2631354wbh.43.2011.07.23.04.02.43 (version=SSLv3 cipher=OTHER); Sat, 23 Jul 2011 04:02:45 -0700 (PDT) Message-ID: <4E2AAA51.5000902@dev.mellanox.co.il> Date: Sat, 23 Jul 2011 07:02:41 -0400 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.18) Gecko/20110616 Thunderbird/3.1.11 MIME-Version: 1.0 To: Ira Weiny CC: "linux-rdma@vger.kernel.org" Subject: [PATCHv3 1/2] libibmad: Support for Mellanox vendor specific ExtendedPortInfo SM class MAD 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.6 (demeter1.kernel.org [140.211.167.41]); Sat, 23 Jul 2011 11:02:51 +0000 (UTC) for FDR10 operation Signed-off-by: Hal Rosenstock --- Changes since v2: Added enum for FDR10 Changes since v1: Rebased -- 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 --git a/include/infiniband/mad.h b/include/infiniband/mad.h index b1258bd..09c8d4a 100644 --- a/include/infiniband/mad.h +++ b/include/infiniband/mad.h @@ -141,7 +141,9 @@ enum SMI_ATTR_ID { IB_ATTR_VENDORMADSTBL = 0x1d, IB_ATTR_SMINFO = 0x20, - IB_ATTR_LAST + IB_ATTR_LAST, + + IB_ATTR_MLNX_EXT_PORT_INFO = 0xff90, }; enum SA_ATTR_ID { @@ -1023,6 +1025,15 @@ enum MAD_FIELDS { IB_PC_VL_XMIT_TIME_CONG14, IB_PC_VL_XMIT_TIME_CONG_LAST_F, + /* + * Mellanox ExtendedPortInfo fields + */ + IB_MLNX_EXT_PORT_STATE_CHG_ENABLE_F, + IB_MLNX_EXT_PORT_LINK_SPEED_SUPPORTED_F, + IB_MLNX_EXT_PORT_LINK_SPEED_ENABLED_F, + IB_MLNX_EXT_PORT_LINK_SPEED_ACTIVE_F, + IB_MLNX_EXT_PORT_LAST_F, + IB_FIELD_LAST_ /* must be last */ }; @@ -1119,6 +1130,10 @@ enum MAD_NODE_TYPE { IB_NODE_MAX = NODE_RNIC }; +enum MLNX_EXT_PORT_INFO_LINK_SPEEDS { + FDR10 = 1 +}; + /******************************************************************************/ /* portid.c */ @@ -1361,7 +1376,8 @@ MAD_EXPORT ib_mad_dump_fn mad_dump_perfcounters_port_vl_xmit_flow_ctl_update_errors, mad_dump_perfcounters_port_vl_xmit_wait_counters, mad_dump_perfcounters_sw_port_vl_congestion, mad_dump_perfcounters_rcv_con_ctrl, mad_dump_perfcounters_sl_rcv_fecn, mad_dump_perfcounters_sl_rcv_becn, - mad_dump_perfcounters_xmit_con_ctrl, mad_dump_perfcounters_vl_xmit_time_cong; + mad_dump_perfcounters_xmit_con_ctrl, mad_dump_perfcounters_vl_xmit_time_cong, + mad_dump_mlnx_ext_port_info; MAD_EXPORT void mad_dump_fields(char *buf, int bufsz, void *val, int valsz, int start, int end); diff --git a/src/dump.c b/src/dump.c index 52b2010..29fb742 100644 --- a/src/dump.c +++ b/src/dump.c @@ -957,6 +957,12 @@ void mad_dump_perfcounters_vl_xmit_time_cong(char *buf, int bufsz, void *val, in IB_PC_VL_XMIT_TIME_CONG_LAST_F); } +void mad_dump_mlnx_ext_port_info(char *buf, int bufsz, void *val, int valsz) +{ + _dump_fields(buf, bufsz, val, IB_MLNX_EXT_PORT_STATE_CHG_ENABLE_F, + IB_MLNX_EXT_PORT_LAST_F); +} + void xdump(FILE * file, char *msg, void *p, int size) { #define HEX(x) ((x) < 10 ? '0' + (x) : 'a' + ((x) -10)) diff --git a/src/fields.c b/src/fields.c index 23947dc..04c60c7 100644 --- a/src/fields.c +++ b/src/fields.c @@ -772,6 +772,15 @@ static const ib_field_t ib_mad_f[] = { {480, 32, "PortVLXmitTimeCong14", mad_dump_uint}, {0, 0}, /* IB_PC_VL_XMIT_TIME_CONG_LAST_F */ + /* + * Mellanox ExtendedPortInfo fields + */ + {BITSOFFS(24, 8), "StateChangeEnable", mad_dump_hex}, + {BITSOFFS(56, 8), "LinkSpeedSupported", mad_dump_hex}, + {BITSOFFS(88, 8), "LinkSpeedEnabled", mad_dump_hex}, + {BITSOFFS(120, 8), "LinkSpeedActive", mad_dump_hex}, + {0, 0}, /* IB_MLNX_EXT_PORT_LAST_F */ + {0, 0} /* IB_FIELD_LAST_ */ }; diff --git a/src/libibmad.map b/src/libibmad.map index f0b42a5..508c18b 100644 --- a/src/libibmad.map +++ b/src/libibmad.map @@ -18,6 +18,7 @@ IBMAD_1.3 { mad_dump_linkwidth; mad_dump_linkwidthen; mad_dump_linkwidthsup; + mad_dump_mlnx_ext_port_info; mad_dump_mtu; mad_dump_node_type; mad_dump_nodedesc;