From patchwork Tue Oct 13 17:34:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 53467 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 n9DHlwSf021239 for ; Tue, 13 Oct 2009 17:47:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751511AbZJMRhB (ORCPT ); Tue, 13 Oct 2009 13:37:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760069AbZJMRhB (ORCPT ); Tue, 13 Oct 2009 13:37:01 -0400 Received: from qmta12.westchester.pa.mail.comcast.net ([76.96.59.227]:43970 "EHLO QMTA12.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751511AbZJMRhA (ORCPT ); Tue, 13 Oct 2009 13:37:00 -0400 Received: from OMTA17.westchester.pa.mail.comcast.net ([76.96.62.89]) by QMTA12.westchester.pa.mail.comcast.net with comcast id sF0s1c00d1vXlb85CHcQ8Q; Tue, 13 Oct 2009 17:36:24 +0000 Received: from hal.comcast.net ([75.69.247.31]) by OMTA17.westchester.pa.mail.comcast.net with comcast id sHjJ1c00E0hNrtn3dHjJnP; Tue, 13 Oct 2009 17:43:19 +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 n9DHbVDO004710; Tue, 13 Oct 2009 13:37:36 -0400 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id n9DHYsta030490; Tue, 13 Oct 2009 13:34:54 -0400 Date: Tue, 13 Oct 2009 13:34:54 -0400 From: Hal Rosenstock To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Subject: [PATCHv2] opensm: Add infrastructure support for PortInfo IsMulticastPkeyTrapSuppressionSupported Message-ID: <20091013173454.GA30487@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 diff --git a/opensm/include/iba/ib_types.h b/opensm/include/iba/ib_types.h index aa566f7..7a54d9e 100644 --- a/opensm/include/iba/ib_types.h +++ b/opensm/include/iba/ib_types.h @@ -4431,7 +4431,7 @@ typedef struct _ib_port_info { ib_net16_t p_key_violations; ib_net16_t q_key_violations; uint8_t guid_cap; - uint8_t subnet_timeout; /* cli_rereg(1b), resrv(2b), timeout(5b) */ + uint8_t subnet_timeout; /* cli_rereg(1b), mcast_pkey_trap_suppr(1b), resrv(1b), timeout(5b) */ uint8_t resp_time_value; uint8_t error_threshold; /* local phy errors(4b), overrun errors(4b) */ ib_net16_t max_credit_hint; @@ -5281,7 +5281,7 @@ ib_port_info_set_timeout(IN ib_port_info_t * const p_pi, { CL_ASSERT(timeout <= 0x1F); p_pi->subnet_timeout = - (uint8_t) ((p_pi->subnet_timeout & 0x80) | (timeout & 0x1F)); + (uint8_t) ((p_pi->subnet_timeout & 0xE0) | (timeout & 0x1F)); } /* @@ -5316,7 +5316,7 @@ ib_port_info_set_client_rereg(IN ib_port_info_t * const p_pi, CL_ASSERT(client_rereg <= 0x1); p_pi->subnet_timeout = (uint8_t) ((p_pi-> - subnet_timeout & 0x1F) | ((client_rereg << 7) & 0x80)); + subnet_timeout & 0x5F) | ((client_rereg << 7) & 0x80)); } /* @@ -5335,6 +5335,42 @@ ib_port_info_set_client_rereg(IN ib_port_info_t * const p_pi, * SEE ALSO *********/ +/****f* IBA Base: Types/ib_port_info_set_mcast_pkey_trap_suppress +* NAME +* ib_port_info_set_mcast_pkey_trap_suppress +* +* DESCRIPTION +* Sets the encoded multicast pkey trap suppresion enabled bit value +* in the PortInfo attribute. +* +* SYNOPSIS +*/ +static inline void OSM_API +ib_port_info_set_mcast_pkey_trap_suppress(IN ib_port_info_t * const p_pi, + IN const uint8_t trap_suppress) +{ + CL_ASSERT(trap_suppress <= 0x1); + p_pi->subnet_timeout = + (uint8_t) ((p_pi->subnet_timeout & 0xBF) | (trap_suppress << 6)); +} + +/* +* PARAMETERS +* p_pi +* [in] Pointer to a PortInfo attribute. +* +* trap_suppress +* [in] Multicast pkey trap suppresion enabled value to set +* (either 1 or 0). +* +* RETURN VALUES +* None. +* +* NOTES +* +* SEE ALSO +*********/ + /****f* IBA Base: Types/ib_port_info_get_timeout * NAME * ib_port_info_get_timeout @@ -5391,6 +5427,35 @@ ib_port_info_get_client_rereg(IN ib_port_info_t const *p_pi) * SEE ALSO *********/ +/****f* IBA Base: Types/ib_port_info_get_mcast_pkey_trap_suppress +* NAME +* ib_port_info_get_mcast_pkey_trap_suppress +* +* DESCRIPTION +* Gets the encoded multicast pkey trap suppresion enabled bit value +* in the PortInfo attribute. +* +* SYNOPSIS +*/ +static inline uint8_t OSM_API +ib_port_info_get_mcast_pkey_trap_suppress(IN ib_port_info_t const *p_pi) +{ + return ((p_pi->subnet_timeout & 0x40) >> 6); +} + +/* +* PARAMETERS +* p_pi +* [in] Pointer to a PortInfo attribute. +* +* RETURN VALUES +* Multicast PKey trap suppression enabled value (either 1 or 0). +* +* NOTES +* +* SEE ALSO +*********/ + /****f* IBA Base: Types/ib_port_info_set_hoq_lifetime * NAME * ib_port_info_set_hoq_lifetime diff --git a/opensm/opensm/osm_helper.c b/opensm/opensm/osm_helper.c index 2b1e5ef..40dea10 100644 --- a/opensm/opensm/osm_helper.c +++ b/opensm/opensm/osm_helper.c @@ -823,6 +823,7 @@ void osm_dump_port_info(IN osm_log_t * p_log, IN ib_net64_t node_guid, "\t\t\t\tq_key_violations........0x%X\n" "\t\t\t\tguid_cap................0x%X\n" "\t\t\t\tclient_reregister.......0x%X\n" + "\t\t\t\tmcast_pkey_trap_suppr...0x%X\n" "\t\t\t\tsubnet_timeout..........0x%X\n" "\t\t\t\tresp_time_value.........0x%X\n" "\t\t\t\terror_threshold.........0x%X\n" @@ -849,6 +850,7 @@ void osm_dump_port_info(IN osm_log_t * p_log, IN ib_net64_t node_guid, cl_ntoh16(p_pi->p_key_violations), cl_ntoh16(p_pi->q_key_violations), p_pi->guid_cap, ib_port_info_get_client_rereg(p_pi), + ib_port_info_get_mcast_pkey_trap_suppress(p_pi), ib_port_info_get_timeout(p_pi), p_pi->resp_time_value, p_pi->error_threshold, cl_ntoh16(p_pi->max_credit_hint), cl_ntoh32(p_pi->link_rt_latency));