diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2019-08-28 11:25:37 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-08-28 11:25:37 -0300 |
| commit | a0d8994b305b76fb38448b5b8961fafbe37b7abe (patch) | |
| tree | 928f1ffd287b78cc6663543474bd5fbfe9c13b86 /include/linux/mlx5 | |
| parent | RDMA/iwpm: Delete unnecessary checks before the macro call "dev_kfree_skb" (diff) | |
| parent | IB/mlx5: Add page fault handler for DC initiator WQE (diff) | |
| download | linux-dev-a0d8994b305b76fb38448b5b8961fafbe37b7abe.tar.xz linux-dev-a0d8994b305b76fb38448b5b8961fafbe37b7abe.zip | |
Merge branch 'mlx5-odp-dc' into rdma.git for-next
Michael Guralnik says:
====================
The series adds support for on-demand paging for DC transport.
As DC is a mlx-only transport, the capabilities are exposed to the user
using DEVX objects and later on through mlx5dv_query_device.
====================
Based on the mlx5-next branch from
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux for
dependencies
* branch 'mlx5-odp-dc':
IB/mlx5: Add page fault handler for DC initiator WQE
IB/mlx5: Remove check of FW capabilities in ODP page fault handling
net/mlx5: Set ODP capabilities for DC transport to max
Diffstat (limited to 'include/linux/mlx5')
| -rw-r--r-- | include/linux/mlx5/mlx5_ifc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 3a5c9965b7a2..8ec5ab9a0c08 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -948,7 +948,9 @@ struct mlx5_ifc_odp_cap_bits { struct mlx5_ifc_odp_per_transport_service_cap_bits xrc_odp_caps; - u8 reserved_at_100[0x700]; + struct mlx5_ifc_odp_per_transport_service_cap_bits dc_odp_caps; + + u8 reserved_at_120[0x6E0]; }; struct mlx5_ifc_calc_op { |