Commit 40ebb561 authored by Joachim Fenkes's avatar Joachim Fenkes Committed by Roland Dreier

IB/ehca: Return physical link information in query_port()

Newer firmware versions return physical port information to the
partition, so hand that information to the consumer if it's present.
Signed-off-by: default avatarJoachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent f4ad1bcc
...@@ -151,7 +151,6 @@ int ehca_query_port(struct ib_device *ibdev, ...@@ -151,7 +151,6 @@ int ehca_query_port(struct ib_device *ibdev,
} }
memset(props, 0, sizeof(struct ib_port_attr)); memset(props, 0, sizeof(struct ib_port_attr));
props->state = rblock->state;
switch (rblock->max_mtu) { switch (rblock->max_mtu) {
case 0x1: case 0x1:
...@@ -188,11 +187,20 @@ int ehca_query_port(struct ib_device *ibdev, ...@@ -188,11 +187,20 @@ int ehca_query_port(struct ib_device *ibdev,
props->subnet_timeout = rblock->subnet_timeout; props->subnet_timeout = rblock->subnet_timeout;
props->init_type_reply = rblock->init_type_reply; props->init_type_reply = rblock->init_type_reply;
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_width = IB_WIDTH_12X;
props->active_speed = 0x1; props->active_speed = 0x1;
}
/* at the moment (logical) link state is always LINK_UP */
props->phys_state = 0x5;
query_port1: query_port1:
ehca_free_fw_ctrlblock(rblock); ehca_free_fw_ctrlblock(rblock);
......
...@@ -402,7 +402,11 @@ struct hipz_query_port { ...@@ -402,7 +402,11 @@ struct hipz_query_port {
u64 max_msg_sz; u64 max_msg_sz;
u32 max_mtu; u32 max_mtu;
u32 vl_cap; 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]; u64 guid_entries[255];
} __attribute__ ((packed)); } __attribute__ ((packed));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment