Skip to content

Commit 6581da7

Browse files
committed
Merge branch 'mlx5-vfio' into mlx5-next
IFC patch for "Add chunk mode support for mlx5 driver" VFIO series. Link: https://lore.kernel.org/all/20230911093856.81910-1-yishaih@nvidia.com/ Signed-off-by: Leon Romanovsky <leon@kernel.org> * mlx5-vfio: net/mlx5: Introduce ifc bits for migration in a chunk mode
2 parents 6465e26 + 5aa4c96 commit 6581da7

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

include/linux/mlx5/mlx5_ifc.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,7 +1948,9 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {
19481948
u8 reserved_at_c0[0x8];
19491949
u8 migration_multi_load[0x1];
19501950
u8 migration_tracking_state[0x1];
1951-
u8 reserved_at_ca[0x16];
1951+
u8 reserved_at_ca[0x6];
1952+
u8 migration_in_chunks[0x1];
1953+
u8 reserved_at_d1[0xf];
19521954

19531955
u8 reserved_at_e0[0xc0];
19541956

@@ -12392,7 +12394,8 @@ struct mlx5_ifc_query_vhca_migration_state_in_bits {
1239212394
u8 op_mod[0x10];
1239312395

1239412396
u8 incremental[0x1];
12395-
u8 reserved_at_41[0xf];
12397+
u8 chunk[0x1];
12398+
u8 reserved_at_42[0xe];
1239612399
u8 vhca_id[0x10];
1239712400

1239812401
u8 reserved_at_60[0x20];
@@ -12408,7 +12411,11 @@ struct mlx5_ifc_query_vhca_migration_state_out_bits {
1240812411

1240912412
u8 required_umem_size[0x20];
1241012413

12411-
u8 reserved_at_a0[0x160];
12414+
u8 reserved_at_a0[0x20];
12415+
12416+
u8 remaining_total_size[0x40];
12417+
12418+
u8 reserved_at_100[0x100];
1241212419
};
1241312420

1241412421
struct mlx5_ifc_save_vhca_state_in_bits {
@@ -12440,7 +12447,7 @@ struct mlx5_ifc_save_vhca_state_out_bits {
1244012447

1244112448
u8 actual_image_size[0x20];
1244212449

12443-
u8 reserved_at_60[0x20];
12450+
u8 next_required_umem_size[0x20];
1244412451
};
1244512452

1244612453
struct mlx5_ifc_load_vhca_state_in_bits {

0 commit comments

Comments
 (0)