2 files changed, 19 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c
index 15806d140461..5bd7b591987e 100644
--- a/drivers/infiniband/hw/ehca/ehca_hca.c
+++ b/drivers/infiniband/hw/ehca/ehca_hca.c
@@ -151,7 +151,6 @@ int ehca_query_port(struct ib_device *ibdev,
         }
 
         memset(props, 0, sizeof(struct ib_port_attr));
-        props->state = rblock->state;
 
         switch (rblock->max_mtu) {
         case 0x1:
@@ -188,11 +187,20 @@ int ehca_query_port(struct ib_device *ibdev,
         props->subnet_timeout  = rblock->subnet_timeout;
         props->init_type_reply = rblock->init_type_reply;
 
-        props->active_width    = IB_WIDTH_12X;
-        props->active_speed    = 0x1;
-
-        /* at the moment (logical) link state is always LINK_UP */
-        props->phys_state      = 0x5;
+        if (rblock->state && rblock->phys_width) {
+                props->phys_state      = rblock->phys_pstate;
+                props->state           = rblock->phys_state;
+                props->active_width    = rblock->phys_width;
+                props->active_speed    = rblock->phys_speed;
+        } else {
+                /* old firmware releases don't report physical
+                 * port info, so use default values
+                 */
+                props->phys_state      = 5;
+                props->state           = rblock->state;
+                props->active_width    = IB_WIDTH_12X;
+                props->active_speed    = 0x1;
+        }
 
 query_port1:
         ehca_free_fw_ctrlblock(rblock);
diff --git a/drivers/infiniband/hw/ehca/hipz_hw.h b/drivers/infiniband/hw/ehca/hipz_hw.h
index d9739e554515..485b8400359e 100644
--- a/drivers/infiniband/hw/ehca/hipz_hw.h
+++ b/drivers/infiniband/hw/ehca/hipz_hw.h
@@ -402,7 +402,11 @@ struct hipz_query_port {
         u64 max_msg_sz;
         u32 max_mtu;
         u32 vl_cap;
-        u8  reserved2[1900];
+        u32 phys_pstate;
+        u32 phys_state;
+        u32 phys_speed;
+        u32 phys_width;
+        u8  reserved2[1884];
         u64 guid_entries[255];
 } __attribute__ ((packed));