diff options
-rw-r--r-- | drivers/net/mlx4/fw.c | 13 | ||||
-rw-r--r-- | drivers/net/mlx4/fw.h | 4 | ||||
-rw-r--r-- | drivers/net/mlx4/main.c | 4 | ||||
-rw-r--r-- | include/linux/mlx4/device.h | 4 |
4 files changed, 17 insertions, 8 deletions
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c index 40d8142c23b2..8d402db9a03d 100644 --- a/drivers/net/mlx4/fw.c +++ b/drivers/net/mlx4/fw.c | |||
@@ -346,7 +346,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
346 | MLX4_GET(field, outbox, QUERY_DEV_CAP_VL_PORT_OFFSET); | 346 | MLX4_GET(field, outbox, QUERY_DEV_CAP_VL_PORT_OFFSET); |
347 | dev_cap->max_vl[i] = field >> 4; | 347 | dev_cap->max_vl[i] = field >> 4; |
348 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MTU_WIDTH_OFFSET); | 348 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MTU_WIDTH_OFFSET); |
349 | dev_cap->max_mtu[i] = field >> 4; | 349 | dev_cap->ib_mtu[i] = field >> 4; |
350 | dev_cap->max_port_width[i] = field & 0xf; | 350 | dev_cap->max_port_width[i] = field & 0xf; |
351 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_GID_OFFSET); | 351 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_GID_OFFSET); |
352 | dev_cap->max_gids[i] = 1 << (field & 0xf); | 352 | dev_cap->max_gids[i] = 1 << (field & 0xf); |
@@ -355,8 +355,10 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
355 | } | 355 | } |
356 | } else { | 356 | } else { |
357 | #define QUERY_PORT_MTU_OFFSET 0x01 | 357 | #define QUERY_PORT_MTU_OFFSET 0x01 |
358 | #define QUERY_PORT_ETH_MTU_OFFSET 0x02 | ||
358 | #define QUERY_PORT_WIDTH_OFFSET 0x06 | 359 | #define QUERY_PORT_WIDTH_OFFSET 0x06 |
359 | #define QUERY_PORT_MAX_GID_PKEY_OFFSET 0x07 | 360 | #define QUERY_PORT_MAX_GID_PKEY_OFFSET 0x07 |
361 | #define QUERY_PORT_MAC_OFFSET 0x08 | ||
360 | #define QUERY_PORT_MAX_MACVLAN_OFFSET 0x0a | 362 | #define QUERY_PORT_MAX_MACVLAN_OFFSET 0x0a |
361 | #define QUERY_PORT_MAX_VL_OFFSET 0x0b | 363 | #define QUERY_PORT_MAX_VL_OFFSET 0x0b |
362 | 364 | ||
@@ -367,7 +369,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
367 | goto out; | 369 | goto out; |
368 | 370 | ||
369 | MLX4_GET(field, outbox, QUERY_PORT_MTU_OFFSET); | 371 | MLX4_GET(field, outbox, QUERY_PORT_MTU_OFFSET); |
370 | dev_cap->max_mtu[i] = field & 0xf; | 372 | dev_cap->ib_mtu[i] = field & 0xf; |
371 | MLX4_GET(field, outbox, QUERY_PORT_WIDTH_OFFSET); | 373 | MLX4_GET(field, outbox, QUERY_PORT_WIDTH_OFFSET); |
372 | dev_cap->max_port_width[i] = field & 0xf; | 374 | dev_cap->max_port_width[i] = field & 0xf; |
373 | MLX4_GET(field, outbox, QUERY_PORT_MAX_GID_PKEY_OFFSET); | 375 | MLX4_GET(field, outbox, QUERY_PORT_MAX_GID_PKEY_OFFSET); |
@@ -378,7 +380,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
378 | MLX4_GET(field, outbox, QUERY_PORT_MAX_MACVLAN_OFFSET); | 380 | MLX4_GET(field, outbox, QUERY_PORT_MAX_MACVLAN_OFFSET); |
379 | dev_cap->log_max_macs[i] = field & 0xf; | 381 | dev_cap->log_max_macs[i] = field & 0xf; |
380 | dev_cap->log_max_vlans[i] = field >> 4; | 382 | dev_cap->log_max_vlans[i] = field >> 4; |
381 | 383 | MLX4_GET(dev_cap->eth_mtu[i], outbox, QUERY_PORT_ETH_MTU_OFFSET); | |
384 | MLX4_GET(dev_cap->def_mac[i], outbox, QUERY_PORT_MAC_OFFSET); | ||
382 | } | 385 | } |
383 | } | 386 | } |
384 | 387 | ||
@@ -412,7 +415,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
412 | mlx4_dbg(dev, "Max CQEs: %d, max WQEs: %d, max SRQ WQEs: %d\n", | 415 | mlx4_dbg(dev, "Max CQEs: %d, max WQEs: %d, max SRQ WQEs: %d\n", |
413 | dev_cap->max_cq_sz, dev_cap->max_qp_sz, dev_cap->max_srq_sz); | 416 | dev_cap->max_cq_sz, dev_cap->max_qp_sz, dev_cap->max_srq_sz); |
414 | mlx4_dbg(dev, "Local CA ACK delay: %d, max MTU: %d, port width cap: %d\n", | 417 | mlx4_dbg(dev, "Local CA ACK delay: %d, max MTU: %d, port width cap: %d\n", |
415 | dev_cap->local_ca_ack_delay, 128 << dev_cap->max_mtu[1], | 418 | dev_cap->local_ca_ack_delay, 128 << dev_cap->ib_mtu[1], |
416 | dev_cap->max_port_width[1]); | 419 | dev_cap->max_port_width[1]); |
417 | mlx4_dbg(dev, "Max SQ desc size: %d, max SQ S/G: %d\n", | 420 | mlx4_dbg(dev, "Max SQ desc size: %d, max SQ S/G: %d\n", |
418 | dev_cap->max_sq_desc_sz, dev_cap->max_sq_sg); | 421 | dev_cap->max_sq_desc_sz, dev_cap->max_sq_sg); |
@@ -824,7 +827,7 @@ int mlx4_INIT_PORT(struct mlx4_dev *dev, int port) | |||
824 | flags |= (dev->caps.port_width_cap[port] & 0xf) << INIT_PORT_PORT_WIDTH_SHIFT; | 827 | flags |= (dev->caps.port_width_cap[port] & 0xf) << INIT_PORT_PORT_WIDTH_SHIFT; |
825 | MLX4_PUT(inbox, flags, INIT_PORT_FLAGS_OFFSET); | 828 | MLX4_PUT(inbox, flags, INIT_PORT_FLAGS_OFFSET); |
826 | 829 | ||
827 | field = 128 << dev->caps.mtu_cap[port]; | 830 | field = 128 << dev->caps.ib_mtu_cap[port]; |
828 | MLX4_PUT(inbox, field, INIT_PORT_MTU_OFFSET); | 831 | MLX4_PUT(inbox, field, INIT_PORT_MTU_OFFSET); |
829 | field = dev->caps.gid_table_len[port]; | 832 | field = dev->caps.gid_table_len[port]; |
830 | MLX4_PUT(inbox, field, INIT_PORT_MAX_GID_OFFSET); | 833 | MLX4_PUT(inbox, field, INIT_PORT_MAX_GID_OFFSET); |
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h index c34e726d66e4..d0913d4d262a 100644 --- a/drivers/net/mlx4/fw.h +++ b/drivers/net/mlx4/fw.h | |||
@@ -66,11 +66,13 @@ struct mlx4_dev_cap { | |||
66 | int local_ca_ack_delay; | 66 | int local_ca_ack_delay; |
67 | int num_ports; | 67 | int num_ports; |
68 | u32 max_msg_sz; | 68 | u32 max_msg_sz; |
69 | int max_mtu[MLX4_MAX_PORTS + 1]; | 69 | int ib_mtu[MLX4_MAX_PORTS + 1]; |
70 | int max_port_width[MLX4_MAX_PORTS + 1]; | 70 | int max_port_width[MLX4_MAX_PORTS + 1]; |
71 | int max_vl[MLX4_MAX_PORTS + 1]; | 71 | int max_vl[MLX4_MAX_PORTS + 1]; |
72 | int max_gids[MLX4_MAX_PORTS + 1]; | 72 | int max_gids[MLX4_MAX_PORTS + 1]; |
73 | int max_pkeys[MLX4_MAX_PORTS + 1]; | 73 | int max_pkeys[MLX4_MAX_PORTS + 1]; |
74 | u64 def_mac[MLX4_MAX_PORTS + 1]; | ||
75 | u16 eth_mtu[MLX4_MAX_PORTS + 1]; | ||
74 | u16 stat_rate_support; | 76 | u16 stat_rate_support; |
75 | u32 flags; | 77 | u32 flags; |
76 | int reserved_uars; | 78 | int reserved_uars; |
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 560e1962212e..28f36b88de38 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c | |||
@@ -133,10 +133,12 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
133 | dev->caps.num_ports = dev_cap->num_ports; | 133 | dev->caps.num_ports = dev_cap->num_ports; |
134 | for (i = 1; i <= dev->caps.num_ports; ++i) { | 134 | for (i = 1; i <= dev->caps.num_ports; ++i) { |
135 | dev->caps.vl_cap[i] = dev_cap->max_vl[i]; | 135 | dev->caps.vl_cap[i] = dev_cap->max_vl[i]; |
136 | dev->caps.mtu_cap[i] = dev_cap->max_mtu[i]; | 136 | dev->caps.ib_mtu_cap[i] = dev_cap->ib_mtu[i]; |
137 | dev->caps.gid_table_len[i] = dev_cap->max_gids[i]; | 137 | dev->caps.gid_table_len[i] = dev_cap->max_gids[i]; |
138 | dev->caps.pkey_table_len[i] = dev_cap->max_pkeys[i]; | 138 | dev->caps.pkey_table_len[i] = dev_cap->max_pkeys[i]; |
139 | dev->caps.port_width_cap[i] = dev_cap->max_port_width[i]; | 139 | dev->caps.port_width_cap[i] = dev_cap->max_port_width[i]; |
140 | dev->caps.eth_mtu_cap[i] = dev_cap->eth_mtu[i]; | ||
141 | dev->caps.def_mac[i] = dev_cap->def_mac[i]; | ||
140 | } | 142 | } |
141 | 143 | ||
142 | dev->caps.num_uars = dev_cap->uar_size / PAGE_SIZE; | 144 | dev->caps.num_uars = dev_cap->uar_size / PAGE_SIZE; |
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 693f93cd29e1..f9e73cfc540b 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
@@ -166,7 +166,9 @@ struct mlx4_caps { | |||
166 | u64 fw_ver; | 166 | u64 fw_ver; |
167 | int num_ports; | 167 | int num_ports; |
168 | int vl_cap[MLX4_MAX_PORTS + 1]; | 168 | int vl_cap[MLX4_MAX_PORTS + 1]; |
169 | int mtu_cap[MLX4_MAX_PORTS + 1]; | 169 | int ib_mtu_cap[MLX4_MAX_PORTS + 1]; |
170 | u64 def_mac[MLX4_MAX_PORTS + 1]; | ||
171 | int eth_mtu_cap[MLX4_MAX_PORTS + 1]; | ||
170 | int gid_table_len[MLX4_MAX_PORTS + 1]; | 172 | int gid_table_len[MLX4_MAX_PORTS + 1]; |
171 | int pkey_table_len[MLX4_MAX_PORTS + 1]; | 173 | int pkey_table_len[MLX4_MAX_PORTS + 1]; |
172 | int local_ca_ack_delay; | 174 | int local_ca_ack_delay; |