net/mlx5_core: Update device capabilities handling

Rearrange struct mlx5_caps so it has a "gen" field to represent the current
capabilities configured for the device. Max capabilities can also be queried
from the device. Also update capabilities struct to contain more fields as per
the latest revision if firmware specification.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 40 insertions, 12 deletions

diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 334947151dfc..dce01fd854a8 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -71,6 +71,11 @@ enum {
 };
 
 enum {
+        MLX5_MIN_PKEY_TABLE_SIZE = 128,
+        MLX5_MAX_LOG_PKEY_TABLE  = 5,
+};
+
+enum {
         MLX5_PERM_LOCAL_READ    = 1 << 2,
         MLX5_PERM_LOCAL_WRITE   = 1 << 3,
         MLX5_PERM_REMOTE_READ   = 1 << 4,
@@ -184,10 +189,10 @@ enum {
         MLX5_DEV_CAP_FLAG_CQ_MODER      = 1LL << 29,
         MLX5_DEV_CAP_FLAG_RESIZE_CQ     = 1LL << 30,
         MLX5_DEV_CAP_FLAG_RESIZE_SRQ    = 1LL << 32,
+        MLX5_DEV_CAP_FLAG_DCT           = 1LL << 37,
         MLX5_DEV_CAP_FLAG_REMOTE_FENCE  = 1LL << 38,
         MLX5_DEV_CAP_FLAG_TLP_HINTS     = 1LL << 39,
         MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40,
-        MLX5_DEV_CAP_FLAG_DCT           = 1LL << 41,
         MLX5_DEV_CAP_FLAG_CMDIF_CSUM    = 3LL << 46,
 };
 
@@ -243,10 +248,14 @@ enum {
 };
 
 enum {
-        MLX5_CAP_OFF_DCT                = 41,
         MLX5_CAP_OFF_CMDIF_CSUM         = 46,
 };
 
+enum {
+        HCA_CAP_OPMOD_GET_MAX   = 0,
+        HCA_CAP_OPMOD_GET_CUR   = 1,
+};
+
 struct mlx5_inbox_hdr {
         __be16          opcode;
         u8              rsvd[4];
@@ -303,9 +312,10 @@ struct mlx5_hca_cap {
         u8      log_max_ra_req_qp;
         u8      rsvd10;
         u8      log_max_ra_res_qp;
-        u8      rsvd11[4];
+        u8      pad_cap;
+        u8      rsvd11[3];
         __be16  max_qp_count;
-        __be16  rsvd12;
+        __be16  pkey_table_size;
         u8      rsvd13;
         u8      local_ca_ack_delay;
         u8      rsvd14;
@@ -335,11 +345,7 @@ struct mlx5_hca_cap {
         u8      log_max_xrcd;
         u8      rsvd25[42];
         __be16  log_uar_page_sz;
-        u8      rsvd26[28];
-        u8      log_max_atomic_size_qp;
-        u8      rsvd27[2];
-        u8      log_max_atomic_size_dc;
-        u8      rsvd28[76];
+        u8      rsvd26[108];
 };
 
 
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index b88e9b46d957..45a2add747e0 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -335,23 +335,30 @@ struct mlx5_port_caps {
         int     pkey_table_len;
 };
 
-struct mlx5_caps {
+struct mlx5_general_caps {
         u8      log_max_eq;
         u8      log_max_cq;
         u8      log_max_qp;
         u8      log_max_mkey;
         u8      log_max_pd;
         u8      log_max_srq;
+        u8      log_max_strq;
+        u8      log_max_mrw_sz;
+        u8      log_max_bsf_list_size;
+        u8      log_max_klm_list_size;
         u32     max_cqes;
         int     max_wqes;
+        u32     max_eqes;
+        u32     max_indirection;
         int     max_sq_desc_sz;
         int     max_rq_desc_sz;
+        int     max_dc_sq_desc_sz;
         u64     flags;
         u16     stat_rate_support;
         int     log_max_msg;
         int     num_ports;
-        int     max_ra_res_qp;
-        int     max_ra_req_qp;
+        u8      log_max_ra_res_qp;
+        u8      log_max_ra_req_qp;
         int     max_srq_wqes;
         int     bf_reg_size;
         int     bf_regs_per_page;
@@ -363,6 +370,19 @@ struct mlx5_caps {
         u8      log_max_mcg;
         u32     max_qp_mcg;
         int     min_page_sz;
+        int     pd_cap;
+        u32     max_qp_counters;
+        u32     pkey_table_size;
+        u8      log_max_ra_req_dc;
+        u8      log_max_ra_res_dc;
+        u32     uar_sz;
+        u8      min_log_pg_sz;
+        u8      log_max_xrcd;
+        u16     log_uar_page_sz;
+};
+
+struct mlx5_caps {
+        struct mlx5_general_caps gen;
 };
 
 struct mlx5_cmd_mailbox {
@@ -695,6 +715,8 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev);
 void mlx5_cmd_use_events(struct mlx5_core_dev *dev);
 void mlx5_cmd_use_polling(struct mlx5_core_dev *dev);
 int mlx5_cmd_status_to_err(struct mlx5_outbox_hdr *hdr);
+int mlx5_core_get_caps(struct mlx5_core_dev *dev, struct mlx5_caps *caps,
+                       u16 opmod);
 int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
                   int out_size);
 int mlx5_cmd_exec_cb(struct mlx5_core_dev *dev, void *in, int in_size,