Skip to content

Commit

Permalink
Merge branch 'mlx5-vfio' of https://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/git/mellanox/linux into v6.7/vfio/next

Signed-off-by: Alex Williamson <[email protected]>
  • Loading branch information
awilliam committed Sep 28, 2023
2 parents b6cd170 + 5aa4c96 commit a1e16a3
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions include/linux/mlx5/mlx5_ifc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down Expand Up @@ -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];
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit a1e16a3

Please sign in to comment.