[MTHCA,TOOLS] - mthca report PSID in ca_attr .

- vstat report PSID field

git-svn-id: svn://openib.tc.cornell.edu/gen1@332 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mthca/kernel/hca_verbs.c b/trunk/hw/mthca/kernel/hca_verbs.c
index e47a49d93a9b046d20b375cc784a46ab17a3f108..366232f28250418e48e6c06379017af6ff382632 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_verbs.c
+++ b/trunk/hw/mthca/kernel/hca_verbs.c
@@ -170,8 +170,8 @@ mlnx_query_ca (
        num_pkeys = 0;\r
        required_size = PTR_ALIGN(sizeof(ib_ca_attr_t)) +\r
                PTR_ALIGN(sizeof(uint32_t) * num_page_sizes) +\r
-               PTR_ALIGN(sizeof(ib_port_attr_t) * num_ports);\r
-\r
+               PTR_ALIGN(sizeof(ib_port_attr_t) * num_ports)+\r
+               PTR_ALIGN(MTHCA_BOARD_ID_LEN);\r
        // get port properties\r
        for (port_num = 0; port_num <= end_port(ib_dev) - start_port(ib_dev); ++port_num) {\r
                // request\r
@@ -223,7 +223,11 @@ mlnx_query_ca (
                size = PTR_ALIGN(sizeof(uint16_t) * hca_ports[port_num].pkey_tbl_len);\r
                last_p += size;\r
        }\r
-\r
+       \r
+       //copy vendor specific data\r
+       cl_memcpy(last_p, props.board_id, MTHCA_BOARD_ID_LEN);\r
+       last_p += PTR_ALIGN(MTHCA_BOARD_ID_LEN);\r
+       \r
        // Separate the loops to ensure that table pointers are always setup\r
        for (port_num = 0; port_num < num_ports; port_num++) {\r
 \r

diff --git a/trunk/hw/mthca/kernel/ib_verbs.h b/trunk/hw/mthca/kernel/ib_verbs.h
index ef4df0234c7fc8a4a2359e691ecdae853d10a8b1..0ba30ccfd87a0926eb0b351404f60c59b769bbc8 100644 (file)
--- a/trunk/hw/mthca/kernel/ib_verbs.h
+++ b/trunk/hw/mthca/kernel/ib_verbs.h
@@ -84,6 +84,7 @@ struct ib_device_attr {
        u64                     page_size_cap;
        u32                     vendor_id;
        u32                     vendor_part_id;
+       u8                      board_id[16];
        u32                     hw_ver;
        int                     max_qp;
        int                     max_qp_wr;

diff --git a/trunk/hw/mthca/kernel/mthca_provider.c b/trunk/hw/mthca/kernel/mthca_provider.c
index 2d2046269cf23808e1ea900eb8b2cae19c613fc6..01c9fe40a59ef67399d9ccf41d2e7519f97d0f68 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_provider.c
+++ b/trunk/hw/mthca/kernel/mthca_provider.c
@@ -97,7 +97,7 @@
        props->vendor_part_id      = cl_ntoh16(*(__be16 *) (out_mad->data + 30));
        props->hw_ver              = cl_ntoh32(*(__be32 *) (out_mad->data + 32));
        memcpy(&props->sys_image_guid, out_mad->data +  4, 8);
-
+       memcpy(&props->board_id, mdev->board_id, MTHCA_BOARD_ID_LEN);
        props->max_mr_size         = ~0ull;
        props->page_size_cap       = mdev->limits.page_size_cap;
        props->max_qp              = mdev->limits.num_qps - mdev->limits.reserved_qps;

diff --git a/trunk/inc/mthca/mthca_vc.h b/trunk/inc/mthca/mthca_vc.h
index 9a75758226799cf23d1d568d7e9dfc8e45a8faaf..91d95e320f17559dc4f37962a3b770a36deaee2b 100644 (file)
--- a/trunk/inc/mthca/mthca_vc.h
+++ b/trunk/inc/mthca/mthca_vc.h
@@ -27,7 +27,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * $Id: hca_verbs.c 148 2005-07-12 07:48:46Z sleybo $
+ * $Id: mthca_vc.c 148 2005-07-12 07:48:46Z sleybo $
  */
 
 #ifndef MTHCA_VC_H
@@ -49,4 +49,14 @@ struct _map_crspace {
 #define FW_OPEN_IF             0xe7
 #define FW_CLOSE_IF            0x7e
 
+
+/* Defines for get data for vendor specific */
+#define MTHCA_BOARD_ID_LEN  64
+
+inline char* mthca_get_board_id(ib_ca_attr_t *ca_attr)
+{
+    return (char*)(ca_attr)+(ca_attr->size - MTHCA_BOARD_ID_LEN);
+}
+
+
 #endif

diff --git a/trunk/tools/vstat/user/vstat_main.c b/trunk/tools/vstat/user/vstat_main.c
index f6f780efa9fed4386f13ec8bb229ce062f5ac2e2..1d0eaf8c09bd1e7f9790c711b74e8b8a023b0529 100644 (file)
--- a/trunk/tools/vstat/user/vstat_main.c
+++ b/trunk/tools/vstat/user/vstat_main.c
@@ -42,6 +42,7 @@
 #ifndef WIN32\r
 #include <complib/cl_device.h>\r
 #endif\r
+#include <mthca/mthca_vc.h>\r
 \r
 \r
 #define VEND_ID_MELLNOX        0x02c9\r
@@ -93,16 +94,16 @@ void printPortGID(ib_net64_t subnetPrefix, ib_net64_t portGuid){
 void printPortLinkState(int portState){ //TODO: check that these are all the options and that they are correct\r
        switch(portState){\r
                case 1:\r
-                       printf("\t\tport_state=PORT_DOWN\n");\r
+                       printf("\t\tport_state=PORT_DOWN (%d)\n",portState);\r
                        break;\r
                case 2:\r
-                       printf("\t\tport_state=PORT_INITIALIZE\n");\r
+                       printf("\t\tport_state=PORT_INITIALIZE (%d)\n",portState);\r
                        break;\r
                case 4:\r
-                       printf("\t\tport_state=PORT_ACTIVE\n");\r
+                       printf("\t\tport_state=PORT_ACTIVE (%d)\n",portState);\r
                        break;\r
                default:\r
-                       printf("\t\tport_state=UNKNOWN\n"); \r
+                       printf("\t\tport_state=UNKNOWN (%d)\n",portState); \r
        }\r
 }\r
 \r
@@ -111,22 +112,22 @@ void printPortLinkState(int portState){ //TODO: check that these are all the opt
 void printPortMTU(int mtu){ //TODO: check that these are all the options and that they are correct\r
        switch(mtu){\r
                case 1:\r
-                       printf("\t\tmax_mtu=256\n");\r
+                       printf("\t\tmax_mtu=256 (%d)\n",mtu);\r
                        break;\r
                case 2:\r
-                       printf("\t\tmax_mtu=512\n");\r
+                       printf("\t\tmax_mtu=512 (%d)\n",mtu);\r
                        break;\r
                case 3:\r
-                       printf("\t\tmax_mtu=1024\n");\r
+                       printf("\t\tmax_mtu=1024 (%d)\n",mtu);\r
                        break;\r
                case 4:\r
-                       printf("\t\tmax_mtu=2048\n");\r
+                       printf("\t\tmax_mtu=2048 (%d)\n",mtu);\r
                        break;\r
                case 5:\r
-                       printf("\t\tmax_mtu=4096\n");\r
+                       printf("\t\tmax_mtu=4096 (%d)\n",mtu);\r
                        break;\r
                default:\r
-                       printf("\t\tmax_mtu=UNKNOWN\n"); \r
+                       printf("\t\tmax_mtu=UNKNOWN (%d)\n",mtu); \r
        }\r
 }\r
 \r
@@ -169,10 +170,11 @@ void vstat_print_ca_attr(int idx,  ib_ca_attr_t* ca_attr, BOOLEAN fullPrint){
                (uint16_t )(ca_attr->fw_ver>>32),\r
                (uint16_t)(ca_attr->fw_ver>>16),\r
                (uint16_t )(ca_attr->fw_ver));\r
+               printf("\tPSID=%s\n",mthca_get_board_id(ca_attr));\r
        }else{\r
                printf("\tfw_ver=0x%I64x\n",ca_attr->fw_ver);\r
        }\r
-       printf("\tPSID=NA\n");\r
+\r
        if(fullPrint){\r
                printf("\tnum_phys_ports = %d\n",ca_attr->num_ports);\r
                printf("\tmax_num_qp = 0x%x             (Maximum Number of QPs supported)\n", ca_attr->max_qps);\r