diff options
| author | Jason Gunthorpe | 2019-07-08 18:48:55 +0200 |
|---|---|---|
| committer | Jason Gunthorpe | 2019-07-08 18:48:55 +0200 |
| commit | 20893d9da7af01f9202fa78782a178004eab420d (patch) | |
| tree | 7554c9427a88af61d59ffb6a2b6b7f9f66c0c716 /include/linux/mlx5 | |
| parent | RDMA/rvt: Do not use a kernel header in the ABI (diff) | |
| parent | IB/mlx5: Implement VHCA tunnel mechanism in DEVX (diff) | |
| download | kernel-qcow2-linux-20893d9da7af01f9202fa78782a178004eab420d.tar.gz kernel-qcow2-linux-20893d9da7af01f9202fa78782a178004eab420d.tar.xz kernel-qcow2-linux-20893d9da7af01f9202fa78782a178004eab420d.zip | |
Merge branch 'vhca-tunnel' into rdma.git for-next
Max Gurtovoy says:
====================
Those two patches introduce VHCA tunnel mechanism to DEVX interface
needed for Bluefield SOC. See extensive commit messages for more
information.
====================
Based on the mlx5-next branch from
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux for
dependencies
* branch 'vcha-tunnel':
IB/mlx5: Implement VHCA tunnel mechanism in DEVX
net/mlx5: Introduce VHCA tunnel device capability
Diffstat (limited to 'include/linux/mlx5')
| -rw-r--r-- | include/linux/mlx5/mlx5_ifc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 06881b79167e..ba60bd17a92a 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -1390,7 +1390,9 @@ struct mlx5_ifc_cmd_hca_cap_bits { u8 reserved_at_6c8[0x28]; u8 sf_base_id[0x10]; - u8 reserved_at_700[0x100]; + u8 reserved_at_700[0x80]; + u8 vhca_tunnel_commands[0x40]; + u8 reserved_at_7c0[0x40]; }; enum mlx5_flow_destination_type { @@ -9694,7 +9696,7 @@ struct mlx5_ifc_general_obj_in_cmd_hdr_bits { u8 opcode[0x10]; u8 uid[0x10]; - u8 reserved_at_20[0x10]; + u8 vhca_tunnel_id[0x10]; u8 obj_type[0x10]; u8 obj_id[0x20]; |