mlx4_core: per-function capabilities
Subsystems (5)
PATCH v2 11/25 mlx4_core: per-function capabilities
From: Liran Liss <liranl-VPRAkNaXOzVS1MOuV/[email protected]>
The master function builds a HW profile, and manages all resources. Other functions query the master for function-specific capabilities. EQs, MSI-X vectors, and UARs are statically divided among all functions, while other resources are dynamically assigned later upon request.
Signed-off-by Liran Liss <liranl-VPRAkNaXOzVS1MOuV/[email protected]>
--- drivers/net/mlx4/cmd.c | 9 +++++ drivers/net/mlx4/fw.c | 78 +++++++++++++++++++++++++++++++++++++++++- drivers/net/mlx4/fw.h | 4 ++ drivers/net/mlx4/main.c | 70 ++++++++++++++++++++++++++++++++++++++- drivers/net/mlx4/mlx4.h | 4 ++- drivers/net/mlx4/profile.c | 26 ++++++++++++-- include/linux/mlx4/cmd.h | 1 + include/linux/mlx4/device.h | 3 ++ 8 files changed, 187 insertions(+), 8 deletions(-)
drivers/net/mlx4/cmd.c +9 -0
@@ -39,6 +39,7 @@#include <asm/io.h> #include "mlx4.h" +#include "fw.h" #define CMD_POLL_TOKEN 0xffff
@@ -532,6 +533,14 @@ static struct mlx4_cmd_info { .wrapper = NULL }, { + .opcode = MLX4_CMD_QUERY_SLAVE_CAP, + .has_inbox = false, + .has_outbox = true, + .out_is_imm = false, + .verify = NULL, + .wrapper = mlx4_QUERY_SLAVE_CAP_wrapper + }, + { .opcode = MLX4_CMD_QUERY_ADAPTER, .has_inbox = false, .has_outbox = true,
drivers/net/mlx4/fw.c +76 -2
91 lines not on this page · raw message
drivers/net/mlx4/fw.h +4 -0
@@ -160,6 +160,10 @@ struct mlx4_set_ib_param { };int mlx4_QUERY_DEV_CAP (struct mlx4_dev *dev,struct mlx4_dev_cap *dev_cap); +int mlx4_QUERY_SLAVE_CAP (struct mlx4_dev *dev,struct mlx4_caps *caps); +int mlx4_QUERY_SLAVE_CAP_wrapper (struct mlx4_dev *dev,int slave,struct mlx4_vhcr *vhcr, +struct mlx4_cmd_mailbox *inbox, +struct mlx4_cmd_mailbox *outbox);int mlx4_MAP_FA (struct mlx4_dev *dev,struct mlx4_icm *icm);int mlx4_UNMAP_FA (struct mlx4_dev *dev);int mlx4_RUN_FW (struct mlx4_dev *dev);
drivers/net/mlx4/main.c +69 -1
94 lines not on this page · raw message
drivers/net/mlx4/mlx4.h +3 -1
@@ -69,7 +69,8 @@ enum { };enum { -MLX4_NUM_PDS =1 <<15 +MLX4_NUM_PDS =1 <<15 , +MLX4_SLAVE_PD_SHIFT =17 ,/* the 7 msbs encode the slave id */ };enum {
@@ -112,6 +113,7 @@ enum mlx4_alloc_mode {enum {MLX4_MFUNC_MAX =64 , +MLX4_MFUNC_EQ_NUM =4 ,MLX4_MFUNC_MAX_EQES =8 ,MLX4_MFUNC_EQE_MASK = (MLX4_MFUNC_MAX_EQES -1 ) };
drivers/net/mlx4/profile.c +22 -4
@@ -105,9 +105,19 @@ u64 mlx4_make_profile(struct mlx4_dev *dev, profile[MLX4_RES_AUXC ].num = request->num_qp; profile[MLX4_RES_SRQ ].num = request->num_srq; profile[MLX4_RES_CQ ].num = request->num_cq; - profile[MLX4_RES_EQ ].num =min_t (unsigned, dev_cap->max_eqs, - dev_cap->reserved_eqs + -num_possible_cpus () +1 ); +if (mlx4_is_master (dev)) { + profile[MLX4_RES_EQ ].num = dev_cap->reserved_eqs + +MLX4_MFUNC_EQ_NUM * + (dev->num_slaves +1 ); +if (profile[MLX4_RES_EQ ].num > dev_cap->max_eqs) { +mlx4_warn (dev,"Not enough eqs for:%ld slave functions\n" , dev->num_slaves); +kfree (profile); +return -ENOMEM ; + } + }else + profile[MLX4_RES_EQ ].num =min_t (unsigned, dev_cap->max_eqs, + dev_cap->reserved_eqs + +num_possible_cpus () +1 ); profile[MLX4_RES_DMPT ].num = request->num_mpt; profile[MLX4_RES_CMPT ].num =MLX4_NUM_CMPTS ; profile[MLX4_RES_MTT ].num = request->num_mtt;
@@ -196,7 +206,13 @@ u64 mlx4_make_profile(struct mlx4_dev *dev, init_hca->log_num_cqs = profile[i].log_num;break ;case MLX4_RES_EQ : - dev->caps.num_eqs = profile[i].num; +if (mlx4_is_master (dev)) { + dev->caps.num_eqs = dev_cap->reserved_eqs + +min_t (unsigned, +MLX4_MFUNC_EQ_NUM , +num_possible_cpus () +1 ); + }else + dev->caps.num_eqs = profile[i].num; init_hca->eqc_base = profile[i].start; init_hca->log_num_eqs = profile[i].log_num;break ;
@@ -232,6 +248,8 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,* of the HCA profile anyway. */ dev->caps.num_pds =MLX4_NUM_PDS ; + dev->caps.slave_pd_shift =MLX4_SLAVE_PD_SHIFT ; + dev->caps.pd_base =0 ;kfree (profile);return total_size;
include/linux/mlx4/cmd.h +1 -0
@@ -128,6 +128,7 @@ enum {MLX4_CMD_ALLOC_RES =0x50 ,MLX4_CMD_FREE_RES =0x51 ,MLX4_CMD_GET_EVENT =0x52 , +MLX4_CMD_QUERY_SLAVE_CAP =0x53 ,MLX4_CMD_MCAST_ATTACH =0x54 , MLX4_CMD_GET_SLAVE_SQP = 0x55,
include/linux/mlx4/device.h +3 -0
@@ -192,6 +192,7 @@ struct mlx4_caps {int pkey_table_len[MLX4_MAX_PORTS +1 ];int local_ca_ack_delay;int num_uars; +int uar_page_size;int bf_reg_size;int bf_regs_per_page;int max_sq_sg;
@@ -226,6 +227,8 @@ struct mlx4_caps {int num_qp_per_mgm;int num_pds;int reserved_pds; +int slave_pd_shift; +int pd_base;int mtt_entry_sz;u32 max_msg_sz;u32 page_size_cap;
Signature · 12 lines
1.5.3.7 From: Liran Liss <liranl-VPRAkNaXOzVS1MOuV/[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html