aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Michael S. Tsirkin <mst@redhat.com> 2023-11-01 09:14:52 -0400
committerGravatar Michael S. Tsirkin <mst@redhat.com> 2023-11-01 09:14:52 -0400
commit71d47b31e9ab579a00698cf9c059fa3adc312882 (patch)
tree0b233272284fcf2d95a89a72797588bb2950dc1d
parentLinux 6.6 (diff)
parentvdpa/mlx5: Expose descriptor group mkey hw capability (diff)
downloadlinux-71d47b31e9ab579a00698cf9c059fa3adc312882.tar.gz
linux-71d47b31e9ab579a00698cf9c059fa3adc312882.tar.bz2
linux-71d47b31e9ab579a00698cf9c059fa3adc312882.zip
Merge branch 'mlx5-vhost' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git
This merges a single commit that contains changes to mlx5_ifc.h It's required to support vq descriptor mappings in mlx5/vdpa Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--include/linux/mlx5/mlx5_ifc.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index fc3db401f8a2..3388007c645f 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1231,7 +1231,13 @@ struct mlx5_ifc_virtio_emulation_cap_bits {
u8 max_emulated_devices[0x8];
u8 max_num_virtio_queues[0x18];
- u8 reserved_at_a0[0x60];
+ u8 reserved_at_a0[0x20];
+
+ u8 reserved_at_c0[0x13];
+ u8 desc_group_mkey_supported[0x1];
+ u8 reserved_at_d4[0xc];
+
+ u8 reserved_at_e0[0x20];
u8 umem_1_buffer_param_a[0x20];