[PATCH v1 for-next 01/16] RDMA/ocrdma: Avoid posting DPP requests for RDMA READ

[PATCH v1 for-next 01/16] RDMA/ocrdma: Avoid posting DPP requests for RDMA READ

[Selvin Xavier]

From: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>

Rollback the patch which allows dpp posting of RDMA READ since this path is
not yet stable in FW

Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 3bbf201..bce4adf 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2206,7 +2206,8 @@ int ocrdma_mbx_create_qp(struct ocrdma_qp *qp, struct ib_qp_init_attr *attrs,
 				OCRDMA_CREATE_QP_REQ_RQ_CQID_MASK;
 	qp->rq_cq = cq;
 
-	if (pd->dpp_enabled && pd->num_dpp_qp) {
+	if (pd->dpp_enabled && attrs->cap.max_inline_data && pd->num_dpp_qp &&
+	    (attrs->cap.max_inline_data <= dev->attr.max_inline_data)) {
 		ocrdma_set_create_qp_dpp_cmd(cmd, pd, qp, enable_dpp_cq,
 					     dpp_cq_id);
 	}
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 02/16] RDMA/ocrdma: Query and initalize the PFC SL

[Selvin Xavier]

This patch implements routine to query the PFC priority from the adapter port.

Following are the changes implemented:

 * A new FW command is implemented to query the operational/admin
   DCBX configuration from the FW and obtain active priority(service level).
 * Adds support for the async event reported by FW when the PFC priority
   changes. Service level is re-initialized during modify_qp or
   create_ah, based on this event.
 * Maintain SL value in ocrdma_dev structure and refer that as and
   when needed.

Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma.h      |   21 ++++
 drivers/infiniband/hw/ocrdma/ocrdma_ah.c   |    2 +
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c   |  172 ++++++++++++++++++++++++++++
 drivers/infiniband/hw/ocrdma/ocrdma_hw.h   |    2 +
 drivers/infiniband/hw/ocrdma/ocrdma_main.c |    1 +
 drivers/infiniband/hw/ocrdma/ocrdma_sli.h  |   81 +++++++++++++-
 6 files changed, 278 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index 19011db..5cd65c2 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -236,6 +236,9 @@ struct ocrdma_dev {
 	struct rcu_head rcu;
 	int id;
 	u64 stag_arr[OCRDMA_MAX_STAG];
+	u8 sl; /* service level */
+	bool pfc_state;
+	atomic_t update_sl;
 	u16 pvid;
 	u32 asic_id;
 
@@ -518,4 +521,22 @@ static inline u8 ocrdma_get_asic_type(struct ocrdma_dev *dev)
 				OCRDMA_SLI_ASIC_GEN_NUM_SHIFT;
 }
 
+static inline u8 ocrdma_get_pfc_prio(u8 *pfc, u8 prio)
+{
+	return *(pfc + prio);
+}
+
+static inline u8 ocrdma_get_app_prio(u8 *app_prio, u8 prio)
+{
+	return *(app_prio + prio);
+}
+
+static inline u8 ocrdma_is_enabled_and_synced(u32 state)
+{	/* May also be used to interpret TC-state, QCN-state
+	 * Appl-state and Logical-link-state in future.
+	 */
+	return (state & OCRDMA_STATE_FLAG_ENABLED) &&
+		(state & OCRDMA_STATE_FLAG_SYNC);
+}
+
 #endif
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
index d4cc01f..a023234 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
@@ -100,6 +100,8 @@ struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr)
 	if (!(attr->ah_flags & IB_AH_GRH))
 		return ERR_PTR(-EINVAL);
 
+	if (atomic_cmpxchg(&dev->update_sl, 1, 0))
+		ocrdma_init_service_level(dev);
 	ah = kzalloc(sizeof(*ah), GFP_ATOMIC);
 	if (!ah)
 		return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index bce4adf..e6463cb 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -771,6 +771,10 @@ static void ocrdma_process_grp5_aync(struct ocrdma_dev *dev,
 					OCRDMA_AE_PVID_MCQE_TAG_MASK) >>
 					OCRDMA_AE_PVID_MCQE_TAG_SHIFT);
 		break;
+
+	case OCRDMA_ASYNC_EVENT_COS_VALUE:
+		atomic_set(&dev->update_sl, 1);
+		break;
 	default:
 		/* Not interested evts. */
 		break;
@@ -2265,6 +2269,8 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
 
 	if ((ah_attr->ah_flags & IB_AH_GRH) == 0)
 		return -EINVAL;
+	if (atomic_cmpxchg(&qp->dev->update_sl, 1, 0))
+		ocrdma_init_service_level(qp->dev);
 	cmd->params.tclass_sq_psn |=
 	    (ah_attr->grh.traffic_class << OCRDMA_QP_PARAMS_TCLASS_SHIFT);
 	cmd->params.rnt_rc_sl_fl |=
@@ -2298,6 +2304,10 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
 		cmd->params.vlan_dmac_b4_to_b5 |=
 		    vlan_id << OCRDMA_QP_PARAMS_VLAN_SHIFT;
 		cmd->flags |= OCRDMA_QP_PARA_VLAN_EN_VALID;
+		/* override the sl with default priority if 0 */
+		cmd->params.rnt_rc_sl_fl |=
+			(ah_attr->sl ? ah_attr->sl :
+				qp->dev->sl) << OCRDMA_QP_PARAMS_SL_SHIFT;
 	}
 	return 0;
 }
@@ -2605,6 +2615,168 @@ int ocrdma_mbx_destroy_srq(struct ocrdma_dev *dev, struct ocrdma_srq *srq)
 	return status;
 }
 
+static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
+				      struct ocrdma_dcbx_cfg *dcbxcfg)
+{
+	int status = 0;
+	dma_addr_t pa;
+	struct ocrdma_mqe cmd;
+
+	struct ocrdma_get_dcbx_cfg_req *req = NULL;
+	struct ocrdma_get_dcbx_cfg_rsp *rsp = NULL;
+	struct pci_dev *pdev = dev->nic_info.pdev;
+	struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
+
+	memset(&cmd, 0, sizeof(struct ocrdma_mqe));
+	cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
+					sizeof(struct ocrdma_get_dcbx_cfg_req));
+	req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
+	if (!req) {
+		status = -ENOMEM;
+		goto mem_err;
+	}
+
+	cmd.hdr.spcl_sge_cnt_emb |= (1 << OCRDMA_MQE_HDR_SGE_CNT_SHIFT) &
+					OCRDMA_MQE_HDR_SGE_CNT_MASK;
+	mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
+	mqe_sge->pa_hi = (u32) upper_32_bits(pa);
+	mqe_sge->len = cmd.hdr.pyld_len;
+
+	memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
+	ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
+			OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
+	req->param_type = ptype;
+
+	status = ocrdma_mbx_cmd(dev, &cmd);
+	if (status)
+		goto mbx_err;
+
+	rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
+	ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
+	memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
+
+mbx_err:
+	dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
+mem_err:
+	return status;
+}
+
+#define OCRDMA_MAX_SERVICE_LEVEL_INDEX	0x08
+#define OCRDMA_DEFAULT_SERVICE_LEVEL	0x05
+
+static int ocrdma_parse_dcbxcfg_rsp(struct ocrdma_dev *dev, int ptype,
+				    struct ocrdma_dcbx_cfg *dcbxcfg,
+				    u8 *srvc_lvl)
+{
+	int status = -EINVAL, indx, slindx;
+	int ventry_cnt;
+	struct ocrdma_app_parameter *app_param;
+	u8 valid, proto_sel;
+	u8 app_prio, pfc_prio;
+	u16 proto;
+
+	if (!(dcbxcfg->tcv_aev_opv_st & OCRDMA_DCBX_STATE_MASK)) {
+		pr_info("%s ocrdma%d DCBX is disabled\n",
+			dev_name(&dev->nic_info.pdev->dev), dev->id);
+		goto out;
+	}
+
+	if (!ocrdma_is_enabled_and_synced(dcbxcfg->pfc_state)) {
+		pr_info("%s ocrdma%d priority flow control(%s) is %s%s\n",
+			dev_name(&dev->nic_info.pdev->dev), dev->id,
+			(ptype > 0 ? "operational" : "admin"),
+			(dcbxcfg->pfc_state & OCRDMA_STATE_FLAG_ENABLED) ?
+			"enabled" : "disabled",
+			(dcbxcfg->pfc_state & OCRDMA_STATE_FLAG_SYNC) ?
+			"" : ", not sync'ed");
+		goto out;
+	} else {
+		pr_info("%s ocrdma%d priority flow control is enabled and sync'ed\n",
+			dev_name(&dev->nic_info.pdev->dev), dev->id);
+	}
+
+	ventry_cnt = (dcbxcfg->tcv_aev_opv_st >>
+				OCRDMA_DCBX_APP_ENTRY_SHIFT)
+				& OCRDMA_DCBX_STATE_MASK;
+
+	for (indx = 0; indx < ventry_cnt; indx++) {
+		app_param = &dcbxcfg->app_param[indx];
+		valid = (app_param->valid_proto_app >>
+				OCRDMA_APP_PARAM_VALID_SHIFT)
+				& OCRDMA_APP_PARAM_VALID_MASK;
+		proto_sel = (app_param->valid_proto_app
+				>>  OCRDMA_APP_PARAM_PROTO_SEL_SHIFT)
+				& OCRDMA_APP_PARAM_PROTO_SEL_MASK;
+		proto = app_param->valid_proto_app &
+				OCRDMA_APP_PARAM_APP_PROTO_MASK;
+
+		if (
+			valid && proto == OCRDMA_APP_PROTO_ROCE &&
+			proto_sel == OCRDMA_PROTO_SELECT_L2) {
+			for (slindx = 0; slindx <
+				OCRDMA_MAX_SERVICE_LEVEL_INDEX; slindx++) {
+				app_prio = ocrdma_get_app_prio(
+						(u8 *)app_param->app_prio,
+						slindx);
+				pfc_prio = ocrdma_get_pfc_prio(
+						(u8 *)dcbxcfg->pfc_prio,
+						slindx);
+
+				if (app_prio && pfc_prio) {
+					*srvc_lvl = slindx;
+					status = 0;
+					goto out;
+				}
+			}
+			if (slindx == OCRDMA_MAX_SERVICE_LEVEL_INDEX) {
+				pr_info("%s ocrdma%d application priority not set for 0x%x protocol\n",
+					dev_name(&dev->nic_info.pdev->dev),
+					dev->id, proto);
+			}
+		}
+	}
+
+out:
+	return status;
+}
+
+void ocrdma_init_service_level(struct ocrdma_dev *dev)
+{
+	int status = 0, indx;
+	struct ocrdma_dcbx_cfg dcbxcfg;
+	u8 srvc_lvl = OCRDMA_DEFAULT_SERVICE_LEVEL;
+	int ptype = OCRDMA_PARAMETER_TYPE_OPER;
+
+	for (indx = 0; indx < 2; indx++) {
+		status = ocrdma_mbx_get_dcbx_config(dev, ptype, &dcbxcfg);
+		if (status) {
+			pr_err("%s(): status=%d\n", __func__, status);
+			ptype = OCRDMA_PARAMETER_TYPE_ADMIN;
+			continue;
+		}
+
+		status = ocrdma_parse_dcbxcfg_rsp(dev, ptype,
+						  &dcbxcfg, &srvc_lvl);
+		if (status) {
+			ptype = OCRDMA_PARAMETER_TYPE_ADMIN;
+			continue;
+		}
+
+		break;
+	}
+
+	if (status)
+		pr_info("%s ocrdma%d service level default\n",
+			dev_name(&dev->nic_info.pdev->dev), dev->id);
+	else
+		pr_info("%s ocrdma%d service level %d\n",
+			dev_name(&dev->nic_info.pdev->dev), dev->id,
+			srvc_lvl);
+
+	dev->pfc_state = ocrdma_is_enabled_and_synced(dcbxcfg.pfc_state);
+	dev->sl = srvc_lvl;
+}
+
 int ocrdma_alloc_av(struct ocrdma_dev *dev, struct ocrdma_ah *ah)
 {
 	int i;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
index e513f72..6eed8f1 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
@@ -135,4 +135,6 @@ int ocrdma_get_irq(struct ocrdma_dev *dev, struct ocrdma_eq *eq);
 
 int ocrdma_mbx_rdma_stats(struct ocrdma_dev *, bool reset);
 char *port_speed_string(struct ocrdma_dev *dev);
+void ocrdma_init_service_level(struct ocrdma_dev *);
+
 #endif				/* __OCRDMA_HW_H__ */
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 7c504e0..9368d52 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -399,6 +399,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
 	if (status)
 		goto alloc_err;
 
+	ocrdma_init_service_level(dev);
 	status = ocrdma_register_device(dev);
 	if (status)
 		goto alloc_err;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
index 96c9ee6..4defae8 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
@@ -422,7 +422,12 @@ struct ocrdma_ae_qp_mcqe {
 
 #define OCRDMA_ASYNC_RDMA_EVE_CODE 0x14
 #define OCRDMA_ASYNC_GRP5_EVE_CODE 0x5
-#define OCRDMA_ASYNC_EVENT_PVID_STATE 0x3
+
+enum ocrdma_async_grp5_events {
+	OCRDMA_ASYNC_EVENT_QOS_VALUE	= 0x01,
+	OCRDMA_ASYNC_EVENT_COS_VALUE	= 0x02,
+	OCRDMA_ASYNC_EVENT_PVID_STATE	= 0x03
+};
 
 enum OCRDMA_ASYNC_EVENT_TYPE {
 	OCRDMA_CQ_ERROR			= 0x00,
@@ -1949,5 +1954,79 @@ struct ocrdma_get_ctrl_attribs_rsp {
 	struct mgmt_controller_attrib ctrl_attribs;
 };
 
+#define OCRDMA_SUBSYS_DCBX 0x10
+
+enum OCRDMA_DCBX_OPCODE {
+	OCRDMA_CMD_GET_DCBX_CONFIG = 0x01
+};
+
+enum OCRDMA_DCBX_PARAM_TYPE {
+	OCRDMA_PARAMETER_TYPE_ADMIN	= 0x00,
+	OCRDMA_PARAMETER_TYPE_OPER	= 0x01,
+	OCRDMA_PARAMETER_TYPE_PEER	= 0x02
+};
+
+enum OCRDMA_DCBX_APP_PROTO {
+	OCRDMA_APP_PROTO_ROCE	= 0x8915
+};
+
+enum OCRDMA_DCBX_PROTO {
+	OCRDMA_PROTO_SELECT_L2	= 0x00,
+	OCRDMA_PROTO_SELECT_L4	= 0x01
+};
+
+enum OCRDMA_DCBX_APP_PARAM {
+	OCRDMA_APP_PARAM_APP_PROTO_MASK = 0xFFFF,
+	OCRDMA_APP_PARAM_PROTO_SEL_MASK = 0xFF,
+	OCRDMA_APP_PARAM_PROTO_SEL_SHIFT = 0x10,
+	OCRDMA_APP_PARAM_VALID_MASK	= 0xFF,
+	OCRDMA_APP_PARAM_VALID_SHIFT	= 0x18
+};
+
+enum OCRDMA_DCBX_STATE_FLAGS {
+	OCRDMA_STATE_FLAG_ENABLED	= 0x01,
+	OCRDMA_STATE_FLAG_ADDVERTISED	= 0x02,
+	OCRDMA_STATE_FLAG_WILLING	= 0x04,
+	OCRDMA_STATE_FLAG_SYNC		= 0x08,
+	OCRDMA_STATE_FLAG_UNSUPPORTED	= 0x40000000,
+	OCRDMA_STATE_FLAG_NEG_FAILD	= 0x80000000
+};
+
+enum OCRDMA_TCV_AEV_OPV_ST {
+	OCRDMA_DCBX_TC_SUPPORT_MASK	= 0xFF,
+	OCRDMA_DCBX_TC_SUPPORT_SHIFT	= 0x18,
+	OCRDMA_DCBX_APP_ENTRY_SHIFT	= 0x10,
+	OCRDMA_DCBX_OP_PARAM_SHIFT	= 0x08,
+	OCRDMA_DCBX_STATE_MASK		= 0xFF
+};
+
+struct ocrdma_app_parameter {
+	u32 valid_proto_app;
+	u32 oui;
+	u32 app_prio[2];
+};
+
+struct ocrdma_dcbx_cfg {
+	u32 tcv_aev_opv_st;
+	u32 tc_state;
+	u32 pfc_state;
+	u32 qcn_state;
+	u32 appl_state;
+	u32 ll_state;
+	u32 tc_bw[2];
+	u32 tc_prio[8];
+	u32 pfc_prio[2];
+	struct ocrdma_app_parameter app_param[15];
+};
+
+struct ocrdma_get_dcbx_cfg_req {
+	struct ocrdma_mbx_hdr hdr;
+	u32 param_type;
+} __packed;
+
+struct ocrdma_get_dcbx_cfg_rsp {
+	struct ocrdma_mbx_rsp hdr;
+	struct ocrdma_dcbx_cfg cfg;
+} __packed;
 
 #endif				/* __OCRDMA_SLI_H__ */
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 for-next 02/16] RDMA/ocrdma: Query and initalize the PFC SL

[Or Gerlitz]

On 10/06/2014 17:02, Selvin Xavier wrote:
> This patch implements routine to query the PFC priority from the adapter port.
>
> Following are the changes implemented:
>
>   * A new FW command is implemented to query the operational/admin
>     DCBX configuration from the FW and obtain active priority(service level).
>   * Adds support for the async event reported by FW when the PFC priority changes.

+benet maintainers,

Any reason for all code relating to the above not to land in your 
Ethernet driver? the same FW serves  for plain Ethernet and RoCE, isn't 
that?


> Service level is re-initialized during modify_qp or
>     create_ah, based on this event.
>   * Maintain SL value in ocrdma_dev structure and refer that as and
>     when needed.
>
> Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
> Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
> ---
>   drivers/infiniband/hw/ocrdma/ocrdma.h      |   21 ++++
>   drivers/infiniband/hw/ocrdma/ocrdma_ah.c   |    2 +
>   drivers/infiniband/hw/ocrdma/ocrdma_hw.c   |  172 ++++++++++++++++++++++++++++
>   drivers/infiniband/hw/ocrdma/ocrdma_hw.h   |    2 +
>   drivers/infiniband/hw/ocrdma/ocrdma_main.c |    1 +
>   drivers/infiniband/hw/ocrdma/ocrdma_sli.h  |   81 +++++++++++++-
>   6 files changed, 278 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
> index 19011db..5cd65c2 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma.h
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
> @@ -236,6 +236,9 @@ struct ocrdma_dev {
>   	struct rcu_head rcu;
>   	int id;
>   	u64 stag_arr[OCRDMA_MAX_STAG];
> +	u8 sl; /* service level */
> +	bool pfc_state;
> +	atomic_t update_sl;
>   	u16 pvid;
>   	u32 asic_id;
>   
> @@ -518,4 +521,22 @@ static inline u8 ocrdma_get_asic_type(struct ocrdma_dev *dev)
>   				OCRDMA_SLI_ASIC_GEN_NUM_SHIFT;
>   }
>   
> +static inline u8 ocrdma_get_pfc_prio(u8 *pfc, u8 prio)
> +{
> +	return *(pfc + prio);
> +}
> +
> +static inline u8 ocrdma_get_app_prio(u8 *app_prio, u8 prio)
> +{
> +	return *(app_prio + prio);
> +}
> +
> +static inline u8 ocrdma_is_enabled_and_synced(u32 state)
> +{	/* May also be used to interpret TC-state, QCN-state
> +	 * Appl-state and Logical-link-state in future.
> +	 */
> +	return (state & OCRDMA_STATE_FLAG_ENABLED) &&
> +		(state & OCRDMA_STATE_FLAG_SYNC);
> +}
> +
>   #endif
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
> index d4cc01f..a023234 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
> @@ -100,6 +100,8 @@ struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr)
>   	if (!(attr->ah_flags & IB_AH_GRH))
>   		return ERR_PTR(-EINVAL);
>   
> +	if (atomic_cmpxchg(&dev->update_sl, 1, 0))
> +		ocrdma_init_service_level(dev);
>   	ah = kzalloc(sizeof(*ah), GFP_ATOMIC);
>   	if (!ah)
>   		return ERR_PTR(-ENOMEM);
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index bce4adf..e6463cb 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -771,6 +771,10 @@ static void ocrdma_process_grp5_aync(struct ocrdma_dev *dev,
>   					OCRDMA_AE_PVID_MCQE_TAG_MASK) >>
>   					OCRDMA_AE_PVID_MCQE_TAG_SHIFT);
>   		break;
> +
> +	case OCRDMA_ASYNC_EVENT_COS_VALUE:
> +		atomic_set(&dev->update_sl, 1);
> +		break;
>   	default:
>   		/* Not interested evts. */
>   		break;
> @@ -2265,6 +2269,8 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
>   
>   	if ((ah_attr->ah_flags & IB_AH_GRH) == 0)
>   		return -EINVAL;
> +	if (atomic_cmpxchg(&qp->dev->update_sl, 1, 0))
> +		ocrdma_init_service_level(qp->dev);
>   	cmd->params.tclass_sq_psn |=
>   	    (ah_attr->grh.traffic_class << OCRDMA_QP_PARAMS_TCLASS_SHIFT);
>   	cmd->params.rnt_rc_sl_fl |=
> @@ -2298,6 +2304,10 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
>   		cmd->params.vlan_dmac_b4_to_b5 |=
>   		    vlan_id << OCRDMA_QP_PARAMS_VLAN_SHIFT;
>   		cmd->flags |= OCRDMA_QP_PARA_VLAN_EN_VALID;
> +		/* override the sl with default priority if 0 */
> +		cmd->params.rnt_rc_sl_fl |=
> +			(ah_attr->sl ? ah_attr->sl :
> +				qp->dev->sl) << OCRDMA_QP_PARAMS_SL_SHIFT;
>   	}
>   	return 0;
>   }
> @@ -2605,6 +2615,168 @@ int ocrdma_mbx_destroy_srq(struct ocrdma_dev *dev, struct ocrdma_srq *srq)
>   	return status;
>   }
>   
> +static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> +				      struct ocrdma_dcbx_cfg *dcbxcfg)
> +{
> +	int status = 0;
> +	dma_addr_t pa;
> +	struct ocrdma_mqe cmd;
> +
> +	struct ocrdma_get_dcbx_cfg_req *req = NULL;
> +	struct ocrdma_get_dcbx_cfg_rsp *rsp = NULL;
> +	struct pci_dev *pdev = dev->nic_info.pdev;
> +	struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
> +
> +	memset(&cmd, 0, sizeof(struct ocrdma_mqe));
> +	cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
> +					sizeof(struct ocrdma_get_dcbx_cfg_req));
> +	req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
> +	if (!req) {
> +		status = -ENOMEM;
> +		goto mem_err;
> +	}
> +
> +	cmd.hdr.spcl_sge_cnt_emb |= (1 << OCRDMA_MQE_HDR_SGE_CNT_SHIFT) &
> +					OCRDMA_MQE_HDR_SGE_CNT_MASK;
> +	mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
> +	mqe_sge->pa_hi = (u32) upper_32_bits(pa);
> +	mqe_sge->len = cmd.hdr.pyld_len;
> +
> +	memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
> +	ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
> +			OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
> +	req->param_type = ptype;
> +
> +	status = ocrdma_mbx_cmd(dev, &cmd);
> +	if (status)
> +		goto mbx_err;
> +
> +	rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
> +	ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
> +	memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
> +
> +mbx_err:
> +	dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
> +mem_err:
> +	return status;
> +}
> +
> +#define OCRDMA_MAX_SERVICE_LEVEL_INDEX	0x08
> +#define OCRDMA_DEFAULT_SERVICE_LEVEL	0x05
> +
> +static int ocrdma_parse_dcbxcfg_rsp(struct ocrdma_dev *dev, int ptype,
> +				    struct ocrdma_dcbx_cfg *dcbxcfg,
> +				    u8 *srvc_lvl)
> +{
> +	int status = -EINVAL, indx, slindx;
> +	int ventry_cnt;
> +	struct ocrdma_app_parameter *app_param;
> +	u8 valid, proto_sel;
> +	u8 app_prio, pfc_prio;
> +	u16 proto;
> +
> +	if (!(dcbxcfg->tcv_aev_opv_st & OCRDMA_DCBX_STATE_MASK)) {
> +		pr_info("%s ocrdma%d DCBX is disabled\n",
> +			dev_name(&dev->nic_info.pdev->dev), dev->id);
> +		goto out;
> +	}
> +
> +	if (!ocrdma_is_enabled_and_synced(dcbxcfg->pfc_state)) {
> +		pr_info("%s ocrdma%d priority flow control(%s) is %s%s\n",
> +			dev_name(&dev->nic_info.pdev->dev), dev->id,
> +			(ptype > 0 ? "operational" : "admin"),
> +			(dcbxcfg->pfc_state & OCRDMA_STATE_FLAG_ENABLED) ?
> +			"enabled" : "disabled",
> +			(dcbxcfg->pfc_state & OCRDMA_STATE_FLAG_SYNC) ?
> +			"" : ", not sync'ed");
> +		goto out;
> +	} else {
> +		pr_info("%s ocrdma%d priority flow control is enabled and sync'ed\n",
> +			dev_name(&dev->nic_info.pdev->dev), dev->id);
> +	}
> +
> +	ventry_cnt = (dcbxcfg->tcv_aev_opv_st >>
> +				OCRDMA_DCBX_APP_ENTRY_SHIFT)
> +				& OCRDMA_DCBX_STATE_MASK;
> +
> +	for (indx = 0; indx < ventry_cnt; indx++) {
> +		app_param = &dcbxcfg->app_param[indx];
> +		valid = (app_param->valid_proto_app >>
> +				OCRDMA_APP_PARAM_VALID_SHIFT)
> +				& OCRDMA_APP_PARAM_VALID_MASK;
> +		proto_sel = (app_param->valid_proto_app
> +				>>  OCRDMA_APP_PARAM_PROTO_SEL_SHIFT)
> +				& OCRDMA_APP_PARAM_PROTO_SEL_MASK;
> +		proto = app_param->valid_proto_app &
> +				OCRDMA_APP_PARAM_APP_PROTO_MASK;
> +
> +		if (
> +			valid && proto == OCRDMA_APP_PROTO_ROCE &&
> +			proto_sel == OCRDMA_PROTO_SELECT_L2) {
> +			for (slindx = 0; slindx <
> +				OCRDMA_MAX_SERVICE_LEVEL_INDEX; slindx++) {
> +				app_prio = ocrdma_get_app_prio(
> +						(u8 *)app_param->app_prio,
> +						slindx);
> +				pfc_prio = ocrdma_get_pfc_prio(
> +						(u8 *)dcbxcfg->pfc_prio,
> +						slindx);
> +
> +				if (app_prio && pfc_prio) {
> +					*srvc_lvl = slindx;
> +					status = 0;
> +					goto out;
> +				}
> +			}
> +			if (slindx == OCRDMA_MAX_SERVICE_LEVEL_INDEX) {
> +				pr_info("%s ocrdma%d application priority not set for 0x%x protocol\n",
> +					dev_name(&dev->nic_info.pdev->dev),
> +					dev->id, proto);
> +			}
> +		}
> +	}
> +
> +out:
> +	return status;
> +}
> +
> +void ocrdma_init_service_level(struct ocrdma_dev *dev)
> +{
> +	int status = 0, indx;
> +	struct ocrdma_dcbx_cfg dcbxcfg;
> +	u8 srvc_lvl = OCRDMA_DEFAULT_SERVICE_LEVEL;
> +	int ptype = OCRDMA_PARAMETER_TYPE_OPER;
> +
> +	for (indx = 0; indx < 2; indx++) {
> +		status = ocrdma_mbx_get_dcbx_config(dev, ptype, &dcbxcfg);
> +		if (status) {
> +			pr_err("%s(): status=%d\n", __func__, status);
> +			ptype = OCRDMA_PARAMETER_TYPE_ADMIN;
> +			continue;
> +		}
> +
> +		status = ocrdma_parse_dcbxcfg_rsp(dev, ptype,
> +						  &dcbxcfg, &srvc_lvl);
> +		if (status) {
> +			ptype = OCRDMA_PARAMETER_TYPE_ADMIN;
> +			continue;
> +		}
> +
> +		break;
> +	}
> +
> +	if (status)
> +		pr_info("%s ocrdma%d service level default\n",
> +			dev_name(&dev->nic_info.pdev->dev), dev->id);
> +	else
> +		pr_info("%s ocrdma%d service level %d\n",
> +			dev_name(&dev->nic_info.pdev->dev), dev->id,
> +			srvc_lvl);
> +
> +	dev->pfc_state = ocrdma_is_enabled_and_synced(dcbxcfg.pfc_state);
> +	dev->sl = srvc_lvl;
> +}
> +
>   int ocrdma_alloc_av(struct ocrdma_dev *dev, struct ocrdma_ah *ah)
>   {
>   	int i;
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
> index e513f72..6eed8f1 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
> @@ -135,4 +135,6 @@ int ocrdma_get_irq(struct ocrdma_dev *dev, struct ocrdma_eq *eq);
>   
>   int ocrdma_mbx_rdma_stats(struct ocrdma_dev *, bool reset);
>   char *port_speed_string(struct ocrdma_dev *dev);
> +void ocrdma_init_service_level(struct ocrdma_dev *);
> +
>   #endif				/* __OCRDMA_HW_H__ */
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index 7c504e0..9368d52 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -399,6 +399,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
>   	if (status)
>   		goto alloc_err;
>   
> +	ocrdma_init_service_level(dev);
>   	status = ocrdma_register_device(dev);
>   	if (status)
>   		goto alloc_err;
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
> index 96c9ee6..4defae8 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
> @@ -422,7 +422,12 @@ struct ocrdma_ae_qp_mcqe {
>   
>   #define OCRDMA_ASYNC_RDMA_EVE_CODE 0x14
>   #define OCRDMA_ASYNC_GRP5_EVE_CODE 0x5
> -#define OCRDMA_ASYNC_EVENT_PVID_STATE 0x3
> +
> +enum ocrdma_async_grp5_events {
> +	OCRDMA_ASYNC_EVENT_QOS_VALUE	= 0x01,
> +	OCRDMA_ASYNC_EVENT_COS_VALUE	= 0x02,
> +	OCRDMA_ASYNC_EVENT_PVID_STATE	= 0x03
> +};
>   
>   enum OCRDMA_ASYNC_EVENT_TYPE {
>   	OCRDMA_CQ_ERROR			= 0x00,
> @@ -1949,5 +1954,79 @@ struct ocrdma_get_ctrl_attribs_rsp {
>   	struct mgmt_controller_attrib ctrl_attribs;
>   };
>   
> +#define OCRDMA_SUBSYS_DCBX 0x10
> +
> +enum OCRDMA_DCBX_OPCODE {
> +	OCRDMA_CMD_GET_DCBX_CONFIG = 0x01
> +};
> +
> +enum OCRDMA_DCBX_PARAM_TYPE {
> +	OCRDMA_PARAMETER_TYPE_ADMIN	= 0x00,
> +	OCRDMA_PARAMETER_TYPE_OPER	= 0x01,
> +	OCRDMA_PARAMETER_TYPE_PEER	= 0x02
> +};
> +
> +enum OCRDMA_DCBX_APP_PROTO {
> +	OCRDMA_APP_PROTO_ROCE	= 0x8915
> +};
> +
> +enum OCRDMA_DCBX_PROTO {
> +	OCRDMA_PROTO_SELECT_L2	= 0x00,
> +	OCRDMA_PROTO_SELECT_L4	= 0x01
> +};
> +
> +enum OCRDMA_DCBX_APP_PARAM {
> +	OCRDMA_APP_PARAM_APP_PROTO_MASK = 0xFFFF,
> +	OCRDMA_APP_PARAM_PROTO_SEL_MASK = 0xFF,
> +	OCRDMA_APP_PARAM_PROTO_SEL_SHIFT = 0x10,
> +	OCRDMA_APP_PARAM_VALID_MASK	= 0xFF,
> +	OCRDMA_APP_PARAM_VALID_SHIFT	= 0x18
> +};
> +
> +enum OCRDMA_DCBX_STATE_FLAGS {
> +	OCRDMA_STATE_FLAG_ENABLED	= 0x01,
> +	OCRDMA_STATE_FLAG_ADDVERTISED	= 0x02,
> +	OCRDMA_STATE_FLAG_WILLING	= 0x04,
> +	OCRDMA_STATE_FLAG_SYNC		= 0x08,
> +	OCRDMA_STATE_FLAG_UNSUPPORTED	= 0x40000000,
> +	OCRDMA_STATE_FLAG_NEG_FAILD	= 0x80000000
> +};
> +
> +enum OCRDMA_TCV_AEV_OPV_ST {
> +	OCRDMA_DCBX_TC_SUPPORT_MASK	= 0xFF,
> +	OCRDMA_DCBX_TC_SUPPORT_SHIFT	= 0x18,
> +	OCRDMA_DCBX_APP_ENTRY_SHIFT	= 0x10,
> +	OCRDMA_DCBX_OP_PARAM_SHIFT	= 0x08,
> +	OCRDMA_DCBX_STATE_MASK		= 0xFF
> +};
> +
> +struct ocrdma_app_parameter {
> +	u32 valid_proto_app;
> +	u32 oui;
> +	u32 app_prio[2];
> +};
> +
> +struct ocrdma_dcbx_cfg {
> +	u32 tcv_aev_opv_st;
> +	u32 tc_state;
> +	u32 pfc_state;
> +	u32 qcn_state;
> +	u32 appl_state;
> +	u32 ll_state;
> +	u32 tc_bw[2];
> +	u32 tc_prio[8];
> +	u32 pfc_prio[2];
> +	struct ocrdma_app_parameter app_param[15];
> +};
> +
> +struct ocrdma_get_dcbx_cfg_req {
> +	struct ocrdma_mbx_hdr hdr;
> +	u32 param_type;
> +} __packed;
> +
> +struct ocrdma_get_dcbx_cfg_rsp {
> +	struct ocrdma_mbx_rsp hdr;
> +	struct ocrdma_dcbx_cfg cfg;
> +} __packed;
>   
>   #endif				/* __OCRDMA_SLI_H__ */

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH v1 for-next 02/16] RDMA/ocrdma: Query and initalize the PFC SL

[Selvin Xavier]

> -----Original Message-----
> From: Or Gerlitz [mailto:ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org]
> Sent: Wednesday, June 11, 2014 3:11 PM
> To: Selvin Xavier; linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Subramanian Seetharaman
> Cc: roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org; Devesh Sharma; Sathya Perla; Ajit Khaparde
> Subject: Re: [PATCH v1 for-next 02/16] RDMA/ocrdma: Query and initalize
> the PFC SL
> 
> On 10/06/2014 17:02, Selvin Xavier wrote:
> > This patch implements routine to query the PFC priority from the adapter
> port.
> >
> > Following are the changes implemented:
> >
> >   * A new FW command is implemented to query the operational/admin
> >     DCBX configuration from the FW and obtain active priority(service level).
> >   * Adds support for the async event reported by FW when the PFC priority
> changes.
> 
> +benet maintainers,
> 
> Any reason for all code relating to the above not to land in your Ethernet
> driver? the same FW serves  for plain Ethernet and RoCE, isn't that?
> 
Yes, the same FW serves Ethernet and RoCE.

This patch does not provide mechanism for users to get/set PFC priority for RoCE as of now.
FW does DCBx negotiation and accepts settings provided by the switch. 
So RoCE Driver is required to query PFC settings from FW and use it while setting up QPs.
This is implemented in this patch.
Support for DCBX parameter reporting to the kernel and implementing DCBX hooks may be
added in the benet driver in the future.

> 
> > Service level is re-initialized during modify_qp or
> >     create_ah, based on this event.
> >   * Maintain SL value in ocrdma_dev structure and refer that as and
> >     when needed.
> >
> > Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
> > Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
> > ---
> >   drivers/infiniband/hw/ocrdma/ocrdma.h      |   21 ++++
> >   drivers/infiniband/hw/ocrdma/ocrdma_ah.c   |    2 +
> >   drivers/infiniband/hw/ocrdma/ocrdma_hw.c   |  172
> ++++++++++++++++++++++++++++
> >   drivers/infiniband/hw/ocrdma/ocrdma_hw.h   |    2 +
> >   drivers/infiniband/hw/ocrdma/ocrdma_main.c |    1 +
> >   drivers/infiniband/hw/ocrdma/ocrdma_sli.h  |   81 +++++++++++++-
> >   6 files changed, 278 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h
> > b/drivers/infiniband/hw/ocrdma/ocrdma.h
> > index 19011db..5cd65c2 100644
> > --- a/drivers/infiniband/hw/ocrdma/ocrdma.h
> > +++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
> > @@ -236,6 +236,9 @@ struct ocrdma_dev {
> >   	struct rcu_head rcu;
> >   	int id;
> >   	u64 stag_arr[OCRDMA_MAX_STAG];
> > +	u8 sl; /* service level */
> > +	bool pfc_state;
> > +	atomic_t update_sl;
> >   	u16 pvid;
> >   	u32 asic_id;
> >
> > @@ -518,4 +521,22 @@ static inline u8 ocrdma_get_asic_type(struct
> ocrdma_dev *dev)
> >   				OCRDMA_SLI_ASIC_GEN_NUM_SHIFT;
> >   }
> >
> > +static inline u8 ocrdma_get_pfc_prio(u8 *pfc, u8 prio) {
> > +	return *(pfc + prio);
> > +}
> > +
> > +static inline u8 ocrdma_get_app_prio(u8 *app_prio, u8 prio) {
> > +	return *(app_prio + prio);
> > +}
> > +
> > +static inline u8 ocrdma_is_enabled_and_synced(u32 state)
> > +{	/* May also be used to interpret TC-state, QCN-state
> > +	 * Appl-state and Logical-link-state in future.
> > +	 */
> > +	return (state & OCRDMA_STATE_FLAG_ENABLED) &&
> > +		(state & OCRDMA_STATE_FLAG_SYNC);
> > +}
> > +
> >   #endif
> > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
> > b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
> > index d4cc01f..a023234 100644
> > --- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
> > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
> > @@ -100,6 +100,8 @@ struct ib_ah *ocrdma_create_ah(struct ib_pd
> *ibpd, struct ib_ah_attr *attr)
> >   	if (!(attr->ah_flags & IB_AH_GRH))
> >   		return ERR_PTR(-EINVAL);
> >
> > +	if (atomic_cmpxchg(&dev->update_sl, 1, 0))
> > +		ocrdma_init_service_level(dev);
> >   	ah = kzalloc(sizeof(*ah), GFP_ATOMIC);
> >   	if (!ah)
> >   		return ERR_PTR(-ENOMEM);
> > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > index bce4adf..e6463cb 100644
> > --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > @@ -771,6 +771,10 @@ static void ocrdma_process_grp5_aync(struct
> ocrdma_dev *dev,
> >
> 	OCRDMA_AE_PVID_MCQE_TAG_MASK) >>
> >
> 	OCRDMA_AE_PVID_MCQE_TAG_SHIFT);
> >   		break;
> > +
> > +	case OCRDMA_ASYNC_EVENT_COS_VALUE:
> > +		atomic_set(&dev->update_sl, 1);
> > +		break;
> >   	default:
> >   		/* Not interested evts. */
> >   		break;
> > @@ -2265,6 +2269,8 @@ static int ocrdma_set_av_params(struct
> ocrdma_qp
> > *qp,
> >
> >   	if ((ah_attr->ah_flags & IB_AH_GRH) == 0)
> >   		return -EINVAL;
> > +	if (atomic_cmpxchg(&qp->dev->update_sl, 1, 0))
> > +		ocrdma_init_service_level(qp->dev);
> >   	cmd->params.tclass_sq_psn |=
> >   	    (ah_attr->grh.traffic_class <<
> OCRDMA_QP_PARAMS_TCLASS_SHIFT);
> >   	cmd->params.rnt_rc_sl_fl |=
> > @@ -2298,6 +2304,10 @@ static int ocrdma_set_av_params(struct
> ocrdma_qp *qp,
> >   		cmd->params.vlan_dmac_b4_to_b5 |=
> >   		    vlan_id << OCRDMA_QP_PARAMS_VLAN_SHIFT;
> >   		cmd->flags |= OCRDMA_QP_PARA_VLAN_EN_VALID;
> > +		/* override the sl with default priority if 0 */
> > +		cmd->params.rnt_rc_sl_fl |=
> > +			(ah_attr->sl ? ah_attr->sl :
> > +				qp->dev->sl) <<
> OCRDMA_QP_PARAMS_SL_SHIFT;
> >   	}
> >   	return 0;
> >   }
> > @@ -2605,6 +2615,168 @@ int ocrdma_mbx_destroy_srq(struct
> ocrdma_dev *dev, struct ocrdma_srq *srq)
> >   	return status;
> >   }
> >
> > +static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32
> ptype,
> > +				      struct ocrdma_dcbx_cfg *dcbxcfg) {
> > +	int status = 0;
> > +	dma_addr_t pa;
> > +	struct ocrdma_mqe cmd;
> > +
> > +	struct ocrdma_get_dcbx_cfg_req *req = NULL;
> > +	struct ocrdma_get_dcbx_cfg_rsp *rsp = NULL;
> > +	struct pci_dev *pdev = dev->nic_info.pdev;
> > +	struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
> > +
> > +	memset(&cmd, 0, sizeof(struct ocrdma_mqe));
> > +	cmd.hdr.pyld_len = max_t (u32, sizeof(struct
> ocrdma_get_dcbx_cfg_rsp),
> > +					sizeof(struct
> ocrdma_get_dcbx_cfg_req));
> > +	req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa,
> GFP_KERNEL);
> > +	if (!req) {
> > +		status = -ENOMEM;
> > +		goto mem_err;
> > +	}
> > +
> > +	cmd.hdr.spcl_sge_cnt_emb |= (1 <<
> OCRDMA_MQE_HDR_SGE_CNT_SHIFT) &
> > +
> 	OCRDMA_MQE_HDR_SGE_CNT_MASK;
> > +	mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
> > +	mqe_sge->pa_hi = (u32) upper_32_bits(pa);
> > +	mqe_sge->len = cmd.hdr.pyld_len;
> > +
> > +	memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
> > +	ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
> > +			OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
> > +	req->param_type = ptype;
> > +
> > +	status = ocrdma_mbx_cmd(dev, &cmd);
> > +	if (status)
> > +		goto mbx_err;
> > +
> > +	rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
> > +	ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
> > +	memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
> > +
> > +mbx_err:
> > +	dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
> > +mem_err:
> > +	return status;
> > +}
> > +
> > +#define OCRDMA_MAX_SERVICE_LEVEL_INDEX	0x08
> > +#define OCRDMA_DEFAULT_SERVICE_LEVEL	0x05
> > +
> > +static int ocrdma_parse_dcbxcfg_rsp(struct ocrdma_dev *dev, int ptype,
> > +				    struct ocrdma_dcbx_cfg *dcbxcfg,
> > +				    u8 *srvc_lvl)
> > +{
> > +	int status = -EINVAL, indx, slindx;
> > +	int ventry_cnt;
> > +	struct ocrdma_app_parameter *app_param;
> > +	u8 valid, proto_sel;
> > +	u8 app_prio, pfc_prio;
> > +	u16 proto;
> > +
> > +	if (!(dcbxcfg->tcv_aev_opv_st & OCRDMA_DCBX_STATE_MASK)) {
> > +		pr_info("%s ocrdma%d DCBX is disabled\n",
> > +			dev_name(&dev->nic_info.pdev->dev), dev->id);
> > +		goto out;
> > +	}
> > +
> > +	if (!ocrdma_is_enabled_and_synced(dcbxcfg->pfc_state)) {
> > +		pr_info("%s ocrdma%d priority flow control(%s) is %s%s\n",
> > +			dev_name(&dev->nic_info.pdev->dev), dev->id,
> > +			(ptype > 0 ? "operational" : "admin"),
> > +			(dcbxcfg->pfc_state &
> OCRDMA_STATE_FLAG_ENABLED) ?
> > +			"enabled" : "disabled",
> > +			(dcbxcfg->pfc_state & OCRDMA_STATE_FLAG_SYNC)
> ?
> > +			"" : ", not sync'ed");
> > +		goto out;
> > +	} else {
> > +		pr_info("%s ocrdma%d priority flow control is enabled and
> sync'ed\n",
> > +			dev_name(&dev->nic_info.pdev->dev), dev->id);
> > +	}
> > +
> > +	ventry_cnt = (dcbxcfg->tcv_aev_opv_st >>
> > +				OCRDMA_DCBX_APP_ENTRY_SHIFT)
> > +				& OCRDMA_DCBX_STATE_MASK;
> > +
> > +	for (indx = 0; indx < ventry_cnt; indx++) {
> > +		app_param = &dcbxcfg->app_param[indx];
> > +		valid = (app_param->valid_proto_app >>
> > +				OCRDMA_APP_PARAM_VALID_SHIFT)
> > +				& OCRDMA_APP_PARAM_VALID_MASK;
> > +		proto_sel = (app_param->valid_proto_app
> > +				>>
> OCRDMA_APP_PARAM_PROTO_SEL_SHIFT)
> > +				&
> OCRDMA_APP_PARAM_PROTO_SEL_MASK;
> > +		proto = app_param->valid_proto_app &
> > +				OCRDMA_APP_PARAM_APP_PROTO_MASK;
> > +
> > +		if (
> > +			valid && proto == OCRDMA_APP_PROTO_ROCE &&
> > +			proto_sel == OCRDMA_PROTO_SELECT_L2) {
> > +			for (slindx = 0; slindx <
> > +				OCRDMA_MAX_SERVICE_LEVEL_INDEX;
> slindx++) {
> > +				app_prio = ocrdma_get_app_prio(
> > +						(u8 *)app_param->app_prio,
> > +						slindx);
> > +				pfc_prio = ocrdma_get_pfc_prio(
> > +						(u8 *)dcbxcfg->pfc_prio,
> > +						slindx);
> > +
> > +				if (app_prio && pfc_prio) {
> > +					*srvc_lvl = slindx;
> > +					status = 0;
> > +					goto out;
> > +				}
> > +			}
> > +			if (slindx == OCRDMA_MAX_SERVICE_LEVEL_INDEX)
> {
> > +				pr_info("%s ocrdma%d application priority
> not set for 0x%x protocol\n",
> > +					dev_name(&dev->nic_info.pdev-
> >dev),
> > +					dev->id, proto);
> > +			}
> > +		}
> > +	}
> > +
> > +out:
> > +	return status;
> > +}
> > +
> > +void ocrdma_init_service_level(struct ocrdma_dev *dev) {
> > +	int status = 0, indx;
> > +	struct ocrdma_dcbx_cfg dcbxcfg;
> > +	u8 srvc_lvl = OCRDMA_DEFAULT_SERVICE_LEVEL;
> > +	int ptype = OCRDMA_PARAMETER_TYPE_OPER;
> > +
> > +	for (indx = 0; indx < 2; indx++) {
> > +		status = ocrdma_mbx_get_dcbx_config(dev, ptype,
> &dcbxcfg);
> > +		if (status) {
> > +			pr_err("%s(): status=%d\n", __func__, status);
> > +			ptype = OCRDMA_PARAMETER_TYPE_ADMIN;
> > +			continue;
> > +		}
> > +
> > +		status = ocrdma_parse_dcbxcfg_rsp(dev, ptype,
> > +						  &dcbxcfg, &srvc_lvl);
> > +		if (status) {
> > +			ptype = OCRDMA_PARAMETER_TYPE_ADMIN;
> > +			continue;
> > +		}
> > +
> > +		break;
> > +	}
> > +
> > +	if (status)
> > +		pr_info("%s ocrdma%d service level default\n",
> > +			dev_name(&dev->nic_info.pdev->dev), dev->id);
> > +	else
> > +		pr_info("%s ocrdma%d service level %d\n",
> > +			dev_name(&dev->nic_info.pdev->dev), dev->id,
> > +			srvc_lvl);
> > +
> > +	dev->pfc_state =
> ocrdma_is_enabled_and_synced(dcbxcfg.pfc_state);
> > +	dev->sl = srvc_lvl;
> > +}
> > +
> >   int ocrdma_alloc_av(struct ocrdma_dev *dev, struct ocrdma_ah *ah)
> >   {
> >   	int i;
> > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
> > b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
> > index e513f72..6eed8f1 100644
> > --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
> > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
> > @@ -135,4 +135,6 @@ int ocrdma_get_irq(struct ocrdma_dev *dev, struct
> > ocrdma_eq *eq);
> >
> >   int ocrdma_mbx_rdma_stats(struct ocrdma_dev *, bool reset);
> >   char *port_speed_string(struct ocrdma_dev *dev);
> > +void ocrdma_init_service_level(struct ocrdma_dev *);
> > +
> >   #endif				/* __OCRDMA_HW_H__ */
> > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> > b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> > index 7c504e0..9368d52 100644
> > --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> > @@ -399,6 +399,7 @@ static struct ocrdma_dev *ocrdma_add(struct
> be_dev_info *dev_info)
> >   	if (status)
> >   		goto alloc_err;
> >
> > +	ocrdma_init_service_level(dev);
> >   	status = ocrdma_register_device(dev);
> >   	if (status)
> >   		goto alloc_err;
> > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
> > b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
> > index 96c9ee6..4defae8 100644
> > --- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
> > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
> > @@ -422,7 +422,12 @@ struct ocrdma_ae_qp_mcqe {
> >
> >   #define OCRDMA_ASYNC_RDMA_EVE_CODE 0x14
> >   #define OCRDMA_ASYNC_GRP5_EVE_CODE 0x5 -#define
> > OCRDMA_ASYNC_EVENT_PVID_STATE 0x3
> > +
> > +enum ocrdma_async_grp5_events {
> > +	OCRDMA_ASYNC_EVENT_QOS_VALUE	= 0x01,
> > +	OCRDMA_ASYNC_EVENT_COS_VALUE	= 0x02,
> > +	OCRDMA_ASYNC_EVENT_PVID_STATE	= 0x03
> > +};
> >
> >   enum OCRDMA_ASYNC_EVENT_TYPE {
> >   	OCRDMA_CQ_ERROR			= 0x00,
> > @@ -1949,5 +1954,79 @@ struct ocrdma_get_ctrl_attribs_rsp {
> >   	struct mgmt_controller_attrib ctrl_attribs;
> >   };
> >
> > +#define OCRDMA_SUBSYS_DCBX 0x10
> > +
> > +enum OCRDMA_DCBX_OPCODE {
> > +	OCRDMA_CMD_GET_DCBX_CONFIG = 0x01
> > +};
> > +
> > +enum OCRDMA_DCBX_PARAM_TYPE {
> > +	OCRDMA_PARAMETER_TYPE_ADMIN	= 0x00,
> > +	OCRDMA_PARAMETER_TYPE_OPER	= 0x01,
> > +	OCRDMA_PARAMETER_TYPE_PEER	= 0x02
> > +};
> > +
> > +enum OCRDMA_DCBX_APP_PROTO {
> > +	OCRDMA_APP_PROTO_ROCE	= 0x8915
> > +};
> > +
> > +enum OCRDMA_DCBX_PROTO {
> > +	OCRDMA_PROTO_SELECT_L2	= 0x00,
> > +	OCRDMA_PROTO_SELECT_L4	= 0x01
> > +};
> > +
> > +enum OCRDMA_DCBX_APP_PARAM {
> > +	OCRDMA_APP_PARAM_APP_PROTO_MASK = 0xFFFF,
> > +	OCRDMA_APP_PARAM_PROTO_SEL_MASK = 0xFF,
> > +	OCRDMA_APP_PARAM_PROTO_SEL_SHIFT = 0x10,
> > +	OCRDMA_APP_PARAM_VALID_MASK	= 0xFF,
> > +	OCRDMA_APP_PARAM_VALID_SHIFT	= 0x18
> > +};
> > +
> > +enum OCRDMA_DCBX_STATE_FLAGS {
> > +	OCRDMA_STATE_FLAG_ENABLED	= 0x01,
> > +	OCRDMA_STATE_FLAG_ADDVERTISED	= 0x02,
> > +	OCRDMA_STATE_FLAG_WILLING	= 0x04,
> > +	OCRDMA_STATE_FLAG_SYNC		= 0x08,
> > +	OCRDMA_STATE_FLAG_UNSUPPORTED	= 0x40000000,
> > +	OCRDMA_STATE_FLAG_NEG_FAILD	= 0x80000000
> > +};
> > +
> > +enum OCRDMA_TCV_AEV_OPV_ST {
> > +	OCRDMA_DCBX_TC_SUPPORT_MASK	= 0xFF,
> > +	OCRDMA_DCBX_TC_SUPPORT_SHIFT	= 0x18,
> > +	OCRDMA_DCBX_APP_ENTRY_SHIFT	= 0x10,
> > +	OCRDMA_DCBX_OP_PARAM_SHIFT	= 0x08,
> > +	OCRDMA_DCBX_STATE_MASK		= 0xFF
> > +};
> > +
> > +struct ocrdma_app_parameter {
> > +	u32 valid_proto_app;
> > +	u32 oui;
> > +	u32 app_prio[2];
> > +};
> > +
> > +struct ocrdma_dcbx_cfg {
> > +	u32 tcv_aev_opv_st;
> > +	u32 tc_state;
> > +	u32 pfc_state;
> > +	u32 qcn_state;
> > +	u32 appl_state;
> > +	u32 ll_state;
> > +	u32 tc_bw[2];
> > +	u32 tc_prio[8];
> > +	u32 pfc_prio[2];
> > +	struct ocrdma_app_parameter app_param[15]; };
> > +
> > +struct ocrdma_get_dcbx_cfg_req {
> > +	struct ocrdma_mbx_hdr hdr;
> > +	u32 param_type;
> > +} __packed;
> > +
> > +struct ocrdma_get_dcbx_cfg_rsp {
> > +	struct ocrdma_mbx_rsp hdr;
> > +	struct ocrdma_dcbx_cfg cfg;
> > +} __packed;
> >
> >   #endif				/* __OCRDMA_SLI_H__ */

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 03/16] RDMA/ocrdma: Adding hca_type and fixing fw_version string in device atrributes

[Selvin Xavier]

Added a new entry under sysfs for getting the HW type.
Added a new-line character for the FW version string

Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 9368d52..227a542 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -353,15 +353,25 @@ static ssize_t show_fw_ver(struct device *device, struct device_attribute *attr,
 {
 	struct ocrdma_dev *dev = dev_get_drvdata(device);
 
-	return scnprintf(buf, PAGE_SIZE, "%s", &dev->attr.fw_ver[0]);
+	return scnprintf(buf, PAGE_SIZE, "%s\n", &dev->attr.fw_ver[0]);
+}
+
+static ssize_t show_hca_type(struct device *device,
+			     struct device_attribute *attr, char *buf)
+{
+	struct ocrdma_dev *dev = dev_get_drvdata(device);
+
+	return scnprintf(buf, PAGE_SIZE, "%s\n", &dev->model_number[0]);
 }
 
 static DEVICE_ATTR(hw_rev, S_IRUGO, show_rev, NULL);
 static DEVICE_ATTR(fw_ver, S_IRUGO, show_fw_ver, NULL);
+static DEVICE_ATTR(hca_type, S_IRUGO, show_hca_type, NULL);
 
 static struct device_attribute *ocrdma_attributes[] = {
 	&dev_attr_hw_rev,
-	&dev_attr_fw_ver
+	&dev_attr_fw_ver,
+	&dev_attr_hca_type
 };
 
 static void ocrdma_remove_sysfiles(struct ocrdma_dev *dev)
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 04/16] be2net: issue shutdown event to ocrdma driver

[Selvin Xavier]

From: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>

In the shutdown path, when be2net calls pci_disable_msix(),
it complains (BUG_ON) that irqs requested by ocrdma driver are
still in use. This patch fixes this problem by issuing shutdown
event to ocrdma from be2net shutdown path. As part of shutdown event
processing, ocrdma driver will free-up all the resources and free irqs.
Once this completes be2net completes pci_disable_msix successfully.

Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/net/ethernet/emulex/benet/be.h      |    1 +
 drivers/net/ethernet/emulex/benet/be_main.c |    1 +
 drivers/net/ethernet/emulex/benet/be_roce.c |   18 ++++++++++++++++--
 drivers/net/ethernet/emulex/benet/be_roce.h |    3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 97db5a7..5f610bd 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -881,5 +881,6 @@ void be_roce_dev_remove(struct be_adapter *);
  */
 void be_roce_dev_open(struct be_adapter *);
 void be_roce_dev_close(struct be_adapter *);
+void be_roce_dev_shutdown(struct be_adapter *);
 
 #endif				/* BE_H */
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index a186454..cce9628 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4859,6 +4859,7 @@ static void be_shutdown(struct pci_dev *pdev)
 	if (!adapter)
 		return;
 
+	be_roce_dev_shutdown(adapter);
 	cancel_delayed_work_sync(&adapter->work);
 	cancel_delayed_work_sync(&adapter->func_recovery_work);
 
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c
index 5bf1660..ef4672d 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.c
+++ b/drivers/net/ethernet/emulex/benet/be_roce.c
@@ -120,7 +120,8 @@ static void _be_roce_dev_open(struct be_adapter *adapter)
 {
 	if (ocrdma_drv && adapter->ocrdma_dev &&
 	    ocrdma_drv->state_change_handler)
-		ocrdma_drv->state_change_handler(adapter->ocrdma_dev, 0);
+		ocrdma_drv->state_change_handler(adapter->ocrdma_dev,
+						 BE_DEV_UP);
 }
 
 void be_roce_dev_open(struct be_adapter *adapter)
@@ -136,7 +137,8 @@ static void _be_roce_dev_close(struct be_adapter *adapter)
 {
 	if (ocrdma_drv && adapter->ocrdma_dev &&
 	    ocrdma_drv->state_change_handler)
-		ocrdma_drv->state_change_handler(adapter->ocrdma_dev, 1);
+		ocrdma_drv->state_change_handler(adapter->ocrdma_dev,
+						 BE_DEV_DOWN);
 }
 
 void be_roce_dev_close(struct be_adapter *adapter)
@@ -148,6 +150,18 @@ void be_roce_dev_close(struct be_adapter *adapter)
 	}
 }
 
+void be_roce_dev_shutdown(struct be_adapter *adapter)
+{
+	if (be_roce_supported(adapter)) {
+		mutex_lock(&be_adapter_list_lock);
+		if (ocrdma_drv && adapter->ocrdma_dev &&
+		    ocrdma_drv->state_change_handler)
+			ocrdma_drv->state_change_handler(adapter->ocrdma_dev,
+							 BE_DEV_SHUTDOWN);
+		mutex_unlock(&be_adapter_list_lock);
+	}
+}
+
 int be_roce_register_driver(struct ocrdma_driver *drv)
 {
 	struct be_adapter *dev;
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.h b/drivers/net/ethernet/emulex/benet/be_roce.h
index a3d9e96..e6f7eb1 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.h
+++ b/drivers/net/ethernet/emulex/benet/be_roce.h
@@ -62,7 +62,8 @@ struct ocrdma_driver {
 
 enum {
 	BE_DEV_UP	= 0,
-	BE_DEV_DOWN	= 1
+	BE_DEV_DOWN	= 1,
+	BE_DEV_SHUTDOWN = 2
 };
 
 /* APIs for RoCE driver to register callback handlers,
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 05/16] RDMA/ocrdma: Handle shutdown event from be2net driver

[Selvin Xavier]

From: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>

be2net driver sends shutdown event to ocrdma during shutdown/reboot.
As part of event processing, ocrdma calls close() and remove() to
free all the resources associated with ocrdma. This also frees
irqs used by ocrdma

Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 227a542..3cb20c6 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -519,6 +519,12 @@ static int ocrdma_close(struct ocrdma_dev *dev)
 	return 0;
 }
 
+static void ocrdma_shutdown(struct ocrdma_dev *dev)
+{
+	ocrdma_close(dev);
+	ocrdma_remove(dev);
+}
+
 /* event handling via NIC driver ensures that all the NIC specific
  * initialization done before RoCE driver notifies
  * event to stack.
@@ -532,6 +538,9 @@ static void ocrdma_event_handler(struct ocrdma_dev *dev, u32 event)
 	case BE_DEV_DOWN:
 		ocrdma_close(dev);
 		break;
+	case BE_DEV_SHUTDOWN:
+		ocrdma_shutdown(dev);
+		break;
 	}
 }
 
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 06/16] RDMA/ocrdma: Remove hardcoding of the max DPP QPs supported

[Selvin Xavier]

From: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>

Removing hardcoded value of max dpp qps and calculate the same from
doorbell page size and WQE size

Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_sli.h   |    1 -
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
index 4defae8..14a84b2 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
@@ -1236,7 +1236,6 @@ struct ocrdma_destroy_srq {
 
 enum {
 	OCRDMA_ALLOC_PD_ENABLE_DPP	= BIT(16),
-	OCRDMA_PD_MAX_DPP_ENABLED_QP	= 8,
 	OCRDMA_DPP_PAGE_SIZE		= 4096
 };
 
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index edf6211..0d7d808 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -268,7 +268,8 @@ static struct ocrdma_pd *_ocrdma_alloc_pd(struct ocrdma_dev *dev,
 		pd->dpp_enabled =
 			ocrdma_get_asic_type(dev) == OCRDMA_ASIC_GEN_SKH_R;
 		pd->num_dpp_qp =
-			pd->dpp_enabled ? OCRDMA_PD_MAX_DPP_ENABLED_QP : 0;
+			pd->dpp_enabled ? (dev->nic_info.db_page_size /
+					   dev->attr.wqe_size) : 0;
 	}
 
 retry:
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 07/16] RDMA/ocrdma: Delete AH table if ocrdma_init_hw fails after AH table creation

[Selvin Xavier]

From: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>

Cleanup the AH table in error path, if HW initialization fails
after AH table creation.

Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index e6463cb..55308b6 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1505,6 +1505,7 @@ static void ocrdma_mbx_delete_ah_tbl(struct ocrdma_dev *dev)
 	ocrdma_mbx_cmd(dev, (struct ocrdma_mqe *)cmd);
 	dma_free_coherent(&pdev->dev, dev->av_tbl.size, dev->av_tbl.va,
 			  dev->av_tbl.pa);
+	dev->av_tbl.va = NULL;
 	dma_free_coherent(&pdev->dev, PAGE_SIZE, dev->av_tbl.pbl.va,
 			  dev->av_tbl.pbl.pa);
 	kfree(cmd);
@@ -2882,13 +2883,15 @@ int ocrdma_init_hw(struct ocrdma_dev *dev)
 		goto conf_err;
 	status = ocrdma_mbx_get_phy_info(dev);
 	if (status)
-		goto conf_err;
+		goto info_attrb_err;
 	status = ocrdma_mbx_get_ctrl_attribs(dev);
 	if (status)
-		goto conf_err;
+		goto info_attrb_err;
 
 	return 0;
 
+info_attrb_err:
+	ocrdma_mbx_delete_ah_tbl(dev);
 conf_err:
 	ocrdma_destroy_mq(dev);
 mq_err:
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 08/16] RDMA/ocrdma: Avoid reporting wrong completions in case of error CQEs

[Selvin Xavier]

During cable pull test with a mount over nfs rdma, driver was reporting
error completions when there was no pending requests in the SQ and RQ.
This was triggering a host crash because of reporting wrong work req id.
Avoid this crash by adding a check for SQ and RQ empty condition and
prevent reporting completions if queues are empty.

Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 0d7d808..2b68235 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -2489,6 +2489,11 @@ static bool ocrdma_poll_err_scqe(struct ocrdma_qp *qp,
 			*stop = true;
 			expand = false;
 		}
+	} else if (is_hw_sq_empty(qp)) {
+		/* Do nothing */
+		expand = false;
+		*polled = false;
+		*stop = false;
 	} else {
 		*polled = true;
 		expand = ocrdma_update_err_scqe(ibwc, cqe, qp, status);
@@ -2594,6 +2599,11 @@ static bool ocrdma_poll_err_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe,
 			*stop = true;
 			expand = false;
 		}
+	} else if (is_hw_rq_empty(qp)) {
+		/* Do nothing */
+		expand = false;
+		*polled = false;
+		*stop = false;
 	} else {
 		*polled = true;
 		expand = ocrdma_update_err_rcqe(ibwc, cqe, qp, status);
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 09/16] RDMA/ocrdma: Allow only SEND opcode in case of UD QPs

[Selvin Xavier]

From: Mitesh Ahuja <mitesh.ahuja-HfQkIhtri/DQT0dZR+AlfA@public.gmane.org>

Prevent posting opcodes other than send and send immediate on the UD QPs

Signed-off-by: Mitesh Ahuja <mitesh.ahuja-HfQkIhtri/DQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 2b68235..7f54d24 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -2055,6 +2055,13 @@ int ocrdma_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
 	}
 
 	while (wr) {
+		if (qp->qp_type == IB_QPT_UD &&
+		    (wr->opcode != IB_WR_SEND &&
+		     wr->opcode != IB_WR_SEND_WITH_IMM)) {
+			*bad_wr = wr;
+			status = -EINVAL;
+			break;
+		}
 		if (ocrdma_hwq_free_cnt(&qp->sq) == 0 ||
 		    wr->num_sge > qp->sq.max_sges) {
 			*bad_wr = wr;
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 10/16] RDMA/ocrdma: Do proper cleanup evenif FW is in error state

[Selvin Xavier]

From: Mitesh Ahuja <mitesh.ahuja-HfQkIhtri/DQT0dZR+AlfA@public.gmane.org>

If any mailbox command reports timeout, save the state in the driver, to prevent
issuing any more commands to the HW. Do proper cleanup even if FW is in error state.

Signed-off-by: Mitesh Ahuja <mitesh.ahuja-HfQkIhtri/DQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma.h       |    1 +
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c    |    8 +++++++-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |   12 +++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index 5cd65c2..fc27378 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -137,6 +137,7 @@ struct mqe_ctx {
 	u16 cqe_status;
 	u16 ext_status;
 	bool cmd_done;
+	bool fw_error_state;
 };
 
 struct ocrdma_hw_mr {
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 55308b6..5b6e9d9 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -966,8 +966,12 @@ static int ocrdma_wait_mqe_cmpl(struct ocrdma_dev *dev)
 				    msecs_to_jiffies(30000));
 	if (status)
 		return 0;
-	else
+	else {
+		dev->mqe_ctx.fw_error_state = true;
+		pr_err("%s(%d) mailbox timeout: fw not responding\n",
+		       __func__, dev->id);
 		return -1;
+	}
 }
 
 /* issue a mailbox command on the MQ */
@@ -979,6 +983,8 @@ static int ocrdma_mbx_cmd(struct ocrdma_dev *dev, struct ocrdma_mqe *mqe)
 	struct ocrdma_mbx_rsp *rsp = NULL;
 
 	mutex_lock(&dev->mqe_ctx.lock);
+	if (dev->mqe_ctx.fw_error_state)
+		goto mbx_err;
 	ocrdma_post_mqe(dev, mqe);
 	status = ocrdma_wait_mqe_cmpl(dev);
 	if (status)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 7f54d24..8cd16a1 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -329,7 +329,10 @@ static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
 	struct ocrdma_pd *pd = uctx->cntxt_pd;
 	struct ocrdma_dev *dev = get_ocrdma_dev(pd->ibpd.device);
 
-	BUG_ON(uctx->pd_in_use);
+	if (uctx->pd_in_use) {
+		pr_err("%s(%d) Freeing in use pdid=0x%x.\n",
+		       __func__, dev->id, pd->id);
+	}
 	uctx->cntxt_pd = NULL;
 	status = _ocrdma_dealloc_pd(dev, pd);
 	return status;
@@ -844,6 +847,13 @@ int ocrdma_dereg_mr(struct ib_mr *ib_mr)
 	if (mr->umem)
 		ib_umem_release(mr->umem);
 	kfree(mr);
+
+	/* Don't stop cleanup, in case FW is unresponsive */
+	if (dev->mqe_ctx.fw_error_state) {
+		status = 0;
+		pr_err("%s(%d) fw not responding.\n",
+		       __func__, dev->id);
+	}
 	return status;
 }
 
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 11/16] RDMA/ocrdma: Return proper value for max_mr_size

[Selvin Xavier]

From: Mitesh Ahuja <mitesh.ahuja-HfQkIhtri/DQT0dZR+AlfA@public.gmane.org>

Update the max_mr_size with proper value. Corrected the response structure
of query config mailbox command.

Signed-off-by: Mitesh Ahuja <mitesh.ahuja-HfQkIhtri/DQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c    |    3 ++-
 drivers/infiniband/hw/ocrdma/ocrdma_sli.h   |    2 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 5b6e9d9..105659d 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1088,7 +1088,8 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
 	    OCRDMA_MBX_QUERY_CFG_CA_ACK_DELAY_SHIFT;
 	attr->max_mw = rsp->max_mw;
 	attr->max_mr = rsp->max_mr;
-	attr->max_mr_size = ~0ull;
+	attr->max_mr_size = ((u64)rsp->max_mr_size_hi << 32) |
+			      rsp->max_mr_size_lo;
 	attr->max_fmr = 0;
 	attr->max_pages_per_frmr = rsp->max_pages_per_frmr;
 	attr->max_num_mr_pbl = rsp->max_num_mr_pbl;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
index 14a84b2..3cb88f0 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
@@ -530,8 +530,8 @@ struct ocrdma_mbx_query_config {
 	u32 max_ird_ord_per_qp;
 	u32 max_shared_ird_ord;
 	u32 max_mr;
-	u32 max_mr_size_lo;
 	u32 max_mr_size_hi;
+	u32 max_mr_size_lo;
 	u32 max_num_mr_pbl;
 	u32 max_mw;
 	u32 max_fmr;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 8cd16a1..90152de 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -69,7 +69,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr)
 	memcpy(&attr->fw_ver, &dev->attr.fw_ver[0],
 	       min(sizeof(dev->attr.fw_ver), sizeof(attr->fw_ver)));
 	ocrdma_get_guid(dev, (u8 *)&attr->sys_image_guid);
-	attr->max_mr_size = ~0ull;
+	attr->max_mr_size = dev->attr.max_mr_size;
 	attr->page_size_cap = 0xffff000;
 	attr->vendor_id = dev->nic_info.pdev->vendor;
 	attr->vendor_part_id = dev->nic_info.pdev->device;
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 12/16] RDMA/ocrdma : Add missing adapter mailbox opcodes

[Selvin Xavier]

Fixing the Statistics command opcode. Also specifying the
opcode of each command for better readablilty.

Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_sli.h |   62 +++++++++++++++-------------
 1 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
index 3cb88f0..a20d348 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
@@ -44,35 +44,39 @@ enum {
 #define OCRDMA_SUBSYS_ROCE 10
 enum {
 	OCRDMA_CMD_QUERY_CONFIG = 1,
-	OCRDMA_CMD_ALLOC_PD,
-	OCRDMA_CMD_DEALLOC_PD,
-
-	OCRDMA_CMD_CREATE_AH_TBL,
-	OCRDMA_CMD_DELETE_AH_TBL,
-
-	OCRDMA_CMD_CREATE_QP,
-	OCRDMA_CMD_QUERY_QP,
-	OCRDMA_CMD_MODIFY_QP,
-	OCRDMA_CMD_DELETE_QP,
-
-	OCRDMA_CMD_RSVD1,
-	OCRDMA_CMD_ALLOC_LKEY,
-	OCRDMA_CMD_DEALLOC_LKEY,
-	OCRDMA_CMD_REGISTER_NSMR,
-	OCRDMA_CMD_REREGISTER_NSMR,
-	OCRDMA_CMD_REGISTER_NSMR_CONT,
-	OCRDMA_CMD_QUERY_NSMR,
-	OCRDMA_CMD_ALLOC_MW,
-	OCRDMA_CMD_QUERY_MW,
-
-	OCRDMA_CMD_CREATE_SRQ,
-	OCRDMA_CMD_QUERY_SRQ,
-	OCRDMA_CMD_MODIFY_SRQ,
-	OCRDMA_CMD_DELETE_SRQ,
-
-	OCRDMA_CMD_ATTACH_MCAST,
-	OCRDMA_CMD_DETACH_MCAST,
-	OCRDMA_CMD_GET_RDMA_STATS,
+	OCRDMA_CMD_ALLOC_PD = 2,
+	OCRDMA_CMD_DEALLOC_PD = 3,
+
+	OCRDMA_CMD_CREATE_AH_TBL = 4,
+	OCRDMA_CMD_DELETE_AH_TBL = 5,
+
+	OCRDMA_CMD_CREATE_QP = 6,
+	OCRDMA_CMD_QUERY_QP = 7,
+	OCRDMA_CMD_MODIFY_QP = 8 ,
+	OCRDMA_CMD_DELETE_QP = 9,
+
+	OCRDMA_CMD_RSVD1 = 10,
+	OCRDMA_CMD_ALLOC_LKEY = 11,
+	OCRDMA_CMD_DEALLOC_LKEY = 12,
+	OCRDMA_CMD_REGISTER_NSMR = 13,
+	OCRDMA_CMD_REREGISTER_NSMR = 14,
+	OCRDMA_CMD_REGISTER_NSMR_CONT = 15,
+	OCRDMA_CMD_QUERY_NSMR = 16,
+	OCRDMA_CMD_ALLOC_MW = 17,
+	OCRDMA_CMD_QUERY_MW = 18,
+
+	OCRDMA_CMD_CREATE_SRQ = 19,
+	OCRDMA_CMD_QUERY_SRQ = 20,
+	OCRDMA_CMD_MODIFY_SRQ = 21,
+	OCRDMA_CMD_DELETE_SRQ = 22,
+
+	OCRDMA_CMD_ATTACH_MCAST = 23,
+	OCRDMA_CMD_DETACH_MCAST = 24,
+
+	OCRDMA_CMD_CREATE_RBQ = 25,
+	OCRDMA_CMD_DESTROY_RBQ = 26,
+
+	OCRDMA_CMD_GET_RDMA_STATS = 27,
 
 	OCRDMA_CMD_MAX
 };
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 13/16] RDMA/ocrdma: Increase the size of STAG array in dev structure to 16K

[Selvin Xavier]

HW can support 16K STAG entries. Changing this max limit.
Also, moving this array out of ocrdma_dev to reduce
the size of this structure

Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma.h      |    2 +-
 drivers/infiniband/hw/ocrdma/ocrdma_main.c |    6 ++++++
 drivers/infiniband/hw/ocrdma/ocrdma_sli.h  |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index fc27378..5716513 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -236,7 +236,7 @@ struct ocrdma_dev {
 	struct list_head entry;
 	struct rcu_head rcu;
 	int id;
-	u64 stag_arr[OCRDMA_MAX_STAG];
+	u64 *stag_arr;
 	u8 sl; /* service level */
 	bool pfc_state;
 	atomic_t update_sl;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 3cb20c6..0d90c7f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -324,6 +324,11 @@ static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
 		if (!dev->qp_tbl)
 			goto alloc_err;
 	}
+
+	dev->stag_arr = kzalloc(sizeof(u64) * OCRDMA_MAX_STAG, GFP_KERNEL);
+	if (dev->stag_arr == NULL)
+		goto alloc_err;
+
 	spin_lock_init(&dev->av_tbl.lock);
 	spin_lock_init(&dev->flush_q_lock);
 	return 0;
@@ -334,6 +339,7 @@ alloc_err:
 
 static void ocrdma_free_resources(struct ocrdma_dev *dev)
 {
+	kfree(dev->stag_arr);
 	kfree(dev->qp_tbl);
 	kfree(dev->cq_tbl);
 	kfree(dev->sgid_tbl);
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
index a20d348..3d08e66 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
@@ -107,7 +107,7 @@ enum {
 
 #define OCRDMA_MAX_QP    2048
 #define OCRDMA_MAX_CQ    2048
-#define OCRDMA_MAX_STAG  8192
+#define OCRDMA_MAX_STAG 16384
 
 enum {
 	OCRDMA_DB_RQ_OFFSET		= 0xE0,
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 14/16] RDMA/ocrdma: Initialize the GID table while registering the device

[Selvin Xavier]

Current GID table gets updated only at the time of inet notification.
Fixing this by initializing the table at the time of device registration.

Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Devesh Sharma <devesh.sharma-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Somnath Kotur <somnath.kotur-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c |   53 ++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 0d90c7f..256a06b 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -388,6 +388,58 @@ static void ocrdma_remove_sysfiles(struct ocrdma_dev *dev)
 		device_remove_file(&dev->ibdev.dev, ocrdma_attributes[i]);
 }
 
+static void ocrdma_init_ipv4_gids(struct ocrdma_dev *dev,
+				  struct net_device *net)
+{
+	struct in_device *in_dev;
+	union ib_gid gid;
+	in_dev = in_dev_get(net);
+	if (in_dev) {
+		for_ifa(in_dev) {
+			ipv6_addr_set_v4mapped(ifa->ifa_address,
+					       (struct in6_addr *)&gid);
+			ocrdma_add_sgid(dev, &gid);
+		}
+		endfor_ifa(in_dev);
+		in_dev_put(in_dev);
+	}
+}
+
+static void ocrdma_init_ipv6_gids(struct ocrdma_dev *dev,
+				  struct net_device *net)
+{
+#if IS_ENABLED(CONFIG_IPV6)
+	struct inet6_dev *in6_dev;
+	union ib_gid  *pgid;
+	struct inet6_ifaddr *ifp;
+	in6_dev = in6_dev_get(net);
+	if (in6_dev) {
+		read_lock_bh(&in6_dev->lock);
+		list_for_each_entry(ifp, &in6_dev->addr_list, if_list) {
+			pgid = (union ib_gid *)&ifp->addr;
+			ocrdma_add_sgid(dev, pgid);
+		}
+		read_unlock_bh(&in6_dev->lock);
+		in6_dev_put(in6_dev);
+	}
+#endif
+}
+
+static void ocrdma_init_gid_table(struct ocrdma_dev *dev)
+{
+	struct  net_device *net_dev;
+
+	for_each_netdev(&init_net, net_dev) {
+		struct net_device *real_dev = rdma_vlan_dev_real_dev(net_dev) ?
+				rdma_vlan_dev_real_dev(net_dev) : net_dev;
+
+		if (real_dev == dev->nic_info.netdev) {
+			ocrdma_init_ipv4_gids(dev, net_dev);
+			ocrdma_init_ipv6_gids(dev, net_dev);
+		}
+	}
+}
+
 static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
 {
 	int status = 0, i;
@@ -416,6 +468,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
 		goto alloc_err;
 
 	ocrdma_init_service_level(dev);
+	ocrdma_init_gid_table(dev);
 	status = ocrdma_register_device(dev);
 	if (status)
 		goto alloc_err;
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 15/16] RDMA/ocrdma: Fixing a sparse warning

[Selvin Xavier]

Fixing the warning about the usage of plain integer as NULL pointer

Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 105659d..a4d27c7 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -661,7 +661,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
 {
 	struct ocrdma_qp *qp = NULL;
 	struct ocrdma_cq *cq = NULL;
-	struct ib_event ib_evt = { 0 };
+	struct ib_event ib_evt;
 	int cq_event = 0;
 	int qp_event = 1;
 	int srq_event = 0;
@@ -674,6 +674,8 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
 	if (cqe->cqvalid_cqid & OCRDMA_AE_MCQE_CQVALID)
 		cq = dev->cq_tbl[cqe->cqvalid_cqid & OCRDMA_AE_MCQE_CQID_MASK];
 
+	memset(&ib_evt, 0, sizeof(ib_evt));
+
 	ib_evt.device = &dev->ibdev;
 
 	switch (type) {
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v1 for-next 16/16] RDMA/ocrdma: Update the ocrdma module version string

[Selvin Xavier]

Updating the ocrdma driver version string

Signed-off-by: Selvin Xavier <selvin.xavier-laKkSmNT4hbQT0dZR+AlfA@public.gmane.org>
---
 drivers/infiniband/hw/ocrdma/ocrdma.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index 5716513..b43456a 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -40,7 +40,7 @@
 #include <be_roce.h>
 #include "ocrdma_sli.h"
 
-#define OCRDMA_ROCE_DRV_VERSION "10.2.145.0u"
+#define OCRDMA_ROCE_DRV_VERSION "10.2.287.0u"
 
 #define OCRDMA_ROCE_DRV_DESC "Emulex OneConnect RoCE Driver"
 #define OCRDMA_NODE_DESC "Emulex OneConnect RoCE HCA"
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html