Commit 6581da70 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

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: default avatarLeon Romanovsky <leon@kernel.org>

* mlx5-vfio:
  net/mlx5: Introduce ifc bits for migration in a chunk mode
parents 6465e260 5aa4c960

include/linux/mlx5/mlx5_ifc.h

+11 −4
Original line number Diff line number Diff line
@@ -1948,7 +1948,9 @@ struct mlx5_ifc_cmd_hca_cap_2_bits { 
	u8	   reserved_at_c0[0x8];

	u8	   migration_multi_load[0x1];

	u8	   migration_tracking_state[0x1];

	u8	   reserved_at_ca[0x16];

	u8	   reserved_at_ca[0x6];

	u8	   migration_in_chunks[0x1];

	u8	   reserved_at_d1[0xf];



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



	u8         incremental[0x1];

	u8         reserved_at_41[0xf];

	u8         chunk[0x1];

	u8         reserved_at_42[0xe];

	u8         vhca_id[0x10];



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


	u8         required_umem_size[0x20];



	u8         reserved_at_a0[0x160];

	u8         reserved_at_a0[0x20];



	u8         remaining_total_size[0x40];



	u8         reserved_at_100[0x100];

};



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


	u8         actual_image_size[0x20];



	u8         reserved_at_60[0x20];

	u8         next_required_umem_size[0x20];

};



struct mlx5_ifc_load_vhca_state_in_bits {