From a3c9b9fd1ccb70480a92ee2c4462804b67700a58 Mon Sep 17 00:00:00 2001 From: leonidk Date: Thu, 19 Jun 2008 17:52:36 +0000 Subject: [PATCH] [HW, TOOLS] return system_image_guid git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1289 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- hw/mlx4/kernel/hca/data.c | 2 ++ hw/mthca/kernel/hca_data.c | 2 ++ tools/vstat/user/vstat_main.c | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/mlx4/kernel/hca/data.c b/hw/mlx4/kernel/hca/data.c index ae97df32..46e8d170 100644 --- a/hw/mlx4/kernel/hca/data.c +++ b/hw/mlx4/kernel/hca/data.c @@ -245,6 +245,7 @@ from_hca_cap( ca_attr_p->max_srq = hca_info_p->max_srq; ca_attr_p->max_srq_wrs = hca_info_p->max_srq_wr; ca_attr_p->max_srq_sges = hca_info_p->max_srq_sge; + ca_attr_p->system_image_guid = hca_info_p->sys_image_guid; ca_attr_p->local_ack_delay = hca_info_p->local_ca_ack_delay; ca_attr_p->bad_pkey_ctr_support = hca_info_p->device_cap_flags & IB_DEVICE_BAD_PKEY_CNTR; @@ -255,6 +256,7 @@ from_hca_cap( ca_attr_p->change_primary_port = hca_info_p->device_cap_flags & IB_DEVICE_CHANGE_PHY_PORT; ca_attr_p->modify_wr_depth = hca_info_p->device_cap_flags & IB_DEVICE_RESIZE_MAX_WR; ca_attr_p->modify_srq_depth = hca_info_p->device_cap_flags & IB_DEVICE_SRQ_RESIZE; + ca_attr_p->system_image_guid_support = hca_info_p->device_cap_flags & IB_DEVICE_SYS_IMAGE_GUID; ca_attr_p->hw_agents = FALSE; // in the context of IBAL then agent is implemented on the host ca_attr_p->num_page_sizes = 1; diff --git a/hw/mthca/kernel/hca_data.c b/hw/mthca/kernel/hca_data.c index 4e0d528b..aa98771d 100644 --- a/hw/mthca/kernel/hca_data.c +++ b/hw/mthca/kernel/hca_data.c @@ -282,6 +282,7 @@ mlnx_conv_hca_cap( ca_attr_p->max_srq = hca_info_p->max_srq; ca_attr_p->max_srq_wrs = hca_info_p->max_srq_wr; ca_attr_p->max_srq_sges = hca_info_p->max_srq_sge; + ca_attr_p->system_image_guid = hca_info_p->sys_image_guid; ca_attr_p->local_ack_delay = hca_info_p->local_ca_ack_delay; ca_attr_p->bad_pkey_ctr_support = hca_info_p->device_cap_flags & IB_DEVICE_BAD_PKEY_CNTR; @@ -292,6 +293,7 @@ mlnx_conv_hca_cap( ca_attr_p->change_primary_port = hca_info_p->device_cap_flags & IB_DEVICE_CHANGE_PHY_PORT; ca_attr_p->modify_wr_depth = hca_info_p->device_cap_flags & IB_DEVICE_RESIZE_MAX_WR; ca_attr_p->modify_srq_depth = hca_info_p->device_cap_flags & IB_DEVICE_SRQ_RESIZE; + ca_attr_p->system_image_guid_support = hca_info_p->device_cap_flags & IB_DEVICE_SYS_IMAGE_GUID; ca_attr_p->hw_agents = FALSE; // in the context of IBAL then agent is implemented on the host ca_attr_p->num_page_sizes = 1; diff --git a/tools/vstat/user/vstat_main.c b/tools/vstat/user/vstat_main.c index a901450a..86acd263 100644 --- a/tools/vstat/user/vstat_main.c +++ b/tools/vstat/user/vstat_main.c @@ -82,8 +82,8 @@ void print64bit(ib_net64_t u64, BOOLEAN hexFormat){ } } -void printGUID(ib_net64_t guid){ - printf("\tnode_guid="); +void printGUID(char *title, ib_net64_t guid){ + printf(title); print64bit(guid, TRUE); printf("\n"); } @@ -340,8 +340,9 @@ void vstat_print_ca_attr(int idx, ib_ca_attr_t* ca_attr, ib_port_info_t* vstat_ }else{ printf("\tfw_ver=0x%I64x\n",ca_attr->fw_ver); } - printGUID(ca_attr->ca_guid); + printGUID("\tnode_guid=", ca_attr->ca_guid); if(fullPrint){ + printGUID("\tsys_image_guid=", ca_attr->system_image_guid); printf("\tnum_phys_ports = %d\n",ca_attr->num_ports); printf("\tmax_num_qp = 0x%x (Maximum Number of QPs supported)\n", ca_attr->max_qps); printf("\tmax_qp_ous_wr = 0x%x (Maximum Number of outstanding WR on any WQ)\n", ca_attr->max_wrs); -- 2.17.1