diff options
author | Jack Morgenstein <jackm@dev.mellanox.co.il> | 2014-03-12 06:00:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-12 15:57:12 -0400 |
commit | 6ee51a4e866bbb0921180b457ed16cd172859346 (patch) | |
tree | c207c933969c0a492cc9806dec1e0c77dc0f4cf0 /include/linux/mlx4 | |
parent | 36f6fdb74997c3f456f1c6a9803c009c49a30053 (diff) |
mlx4: Adjust QP1 multiplexing for RoCE/SRIOV
This requires the following modifications:
1. Fix build_mlx4_header to properly fill in the ETH fields
2. Adjust mux and demux QP1 flow to support RoCE.
This commit still assumes only one GID per slave for RoCE.
The commit enabling multiple GIDs is a subsequent commit, and
is done separately because of its complexity.
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mlx4')
-rw-r--r-- | include/linux/mlx4/device.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 5edd2c68274d..fbe6cda00ba7 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
@@ -48,6 +48,8 @@ | |||
48 | #define MSIX_LEGACY_SZ 4 | 48 | #define MSIX_LEGACY_SZ 4 |
49 | #define MIN_MSIX_P_PORT 5 | 49 | #define MIN_MSIX_P_PORT 5 |
50 | 50 | ||
51 | #define MLX4_ROCE_MAX_GIDS 128 | ||
52 | |||
51 | enum { | 53 | enum { |
52 | MLX4_FLAG_MSI_X = 1 << 0, | 54 | MLX4_FLAG_MSI_X = 1 << 0, |
53 | MLX4_FLAG_OLD_PORT_CMDS = 1 << 1, | 55 | MLX4_FLAG_OLD_PORT_CMDS = 1 << 1, |
@@ -1182,6 +1184,8 @@ int set_and_calc_slave_port_state(struct mlx4_dev *dev, int slave, u8 port, int | |||
1182 | 1184 | ||
1183 | void mlx4_put_slave_node_guid(struct mlx4_dev *dev, int slave, __be64 guid); | 1185 | void mlx4_put_slave_node_guid(struct mlx4_dev *dev, int slave, __be64 guid); |
1184 | __be64 mlx4_get_slave_node_guid(struct mlx4_dev *dev, int slave); | 1186 | __be64 mlx4_get_slave_node_guid(struct mlx4_dev *dev, int slave); |
1187 | int mlx4_get_slave_from_roce_gid(struct mlx4_dev *dev, int port, u8 *gid, int *slave_id); | ||
1188 | int mlx4_get_roce_gid_from_slave(struct mlx4_dev *dev, int port, int slave_id, u8 *gid); | ||
1185 | 1189 | ||
1186 | int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn, | 1190 | int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn, |
1187 | u32 max_range_qpn); | 1191 | u32 max_range_qpn); |