Merge tag 'vfio-v6.9-rc1' of https://github.com/awilliam/linux-vfio

[sfrench/cifs-2.6.git] / include / linux / mlx5 / mlx5_ifc.h

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 0e513e372bf044d3ea1ba88ebf344dab8a0e1435..c940b329a475fbe37ede4e5b8c9a34826df9b060 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1103,7 +1103,7 @@ struct mlx5_ifc_roce_cap_bits {
        u8         sw_r_roce_src_udp_port[0x1];
        u8         fl_rc_qp_when_roce_disabled[0x1];
        u8         fl_rc_qp_when_roce_enabled[0x1];
-       u8         reserved_at_7[0x1];
+       u8         roce_cc_general[0x1];
        u8         qp_ooo_transmit_default[0x1];
        u8         reserved_at_9[0x15];
        u8         qp_ts_format[0x2];
@@ -10253,7 +10253,9 @@ struct mlx5_ifc_mcam_access_reg_bits {
        u8         mcqi[0x1];
        u8         mcqs[0x1];
 
-       u8         regs_95_to_87[0x9];
+       u8         regs_95_to_90[0x6];
+       u8         mpir[0x1];
+       u8         regs_88_to_87[0x2];
        u8         mpegc[0x1];
        u8         mtutc[0x1];
        u8         regs_84_to_68[0x11];
@@ -10261,7 +10263,9 @@ struct mlx5_ifc_mcam_access_reg_bits {
 
        u8         regs_63_to_46[0x12];
        u8         mrtc[0x1];
-       u8         regs_44_to_32[0xd];
+       u8         regs_44_to_41[0x4];
+       u8         mfrl[0x1];
+       u8         regs_39_to_32[0x8];
 
        u8         regs_31_to_10[0x16];
        u8         mtmp[0x1];
@@ -10661,6 +10665,7 @@ enum {
        MLX5_INITIAL_SEG_NIC_INTERFACE_FULL_DRIVER  = 0x0,
        MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED     = 0x1,
        MLX5_INITIAL_SEG_NIC_INTERFACE_NO_DRAM_NIC  = 0x2,
+       MLX5_INITIAL_SEG_NIC_INTERFACE_SW_RESET     = 0x7,
 };
 
 enum {
@@ -12710,6 +12715,14 @@ enum mlx5_msees_oper_status {
        MLX5_MSEES_OPER_STATUS_FAIL_FREE_RUNNING        = 0x5,
 };
 
+enum mlx5_msees_failure_reason {
+       MLX5_MSEES_FAILURE_REASON_UNDEFINED_ERROR               = 0x0,
+       MLX5_MSEES_FAILURE_REASON_PORT_DOWN                     = 0x1,
+       MLX5_MSEES_FAILURE_REASON_TOO_HIGH_FREQUENCY_DIFF       = 0x2,
+       MLX5_MSEES_FAILURE_REASON_NET_SYNCHRONIZER_DEVICE_ERROR = 0x3,
+       MLX5_MSEES_FAILURE_REASON_LACK_OF_RESOURCES             = 0x4,
+};
+
 struct mlx5_ifc_msees_reg_bits {
        u8         reserved_at_0[0x8];
        u8         local_port[0x8];