qed: Add iWARP protocol support in context allocation

When computing how much memory is required for the different hw clients
iWARP protocol should be taken into account

Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
index 38716f77c21ddc7503ccd8a615ed2c403fbc23e4..af106be8cc080bcd57986e4bbbb14bc2c09cc547 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
@@ -246,14 +246,16 @@ struct qed_cxt_mngr {
 static bool src_proto(enum protocol_type type)
 {
        return type == PROTOCOLID_ISCSI ||
-              type == PROTOCOLID_FCOE;
+              type == PROTOCOLID_FCOE ||
+              type == PROTOCOLID_IWARP;
 }
 
 static bool tm_cid_proto(enum protocol_type type)
 {
        return type == PROTOCOLID_ISCSI ||
               type == PROTOCOLID_FCOE ||
-              type == PROTOCOLID_ROCE;
+              type == PROTOCOLID_ROCE ||
+              type == PROTOCOLID_IWARP;
 }
 
 static bool tm_tid_proto(enum protocol_type type)
@@ -2068,6 +2070,11 @@ static void qed_rdma_set_pf_params(struct qed_hwfn *p_hwfn,
        num_srqs = min_t(u32, 32 * 1024, p_params->num_srqs);
 
        switch (p_hwfn->hw_info.personality) {
+       case QED_PCI_ETH_IWARP:
+               /* Each QP requires one connection */
+               num_cons = min_t(u32, IWARP_MAX_QPS, p_params->num_qps);
+               proto = PROTOCOLID_IWARP;
+               break;
        case QED_PCI_ETH_ROCE:
                num_qps = min_t(u32, ROCE_MAX_QPS, p_params->num_qps);
                num_cons = num_qps * 2; /* each QP requires two connections */
@@ -2103,6 +2110,8 @@ int qed_cxt_set_pf_params(struct qed_hwfn *p_hwfn, u32 rdma_tasks)
        qed_cxt_set_proto_cid_count(p_hwfn, PROTOCOLID_CORE, core_cids, 0);
 
        switch (p_hwfn->hw_info.personality) {
+       case QED_PCI_ETH_RDMA:
+       case QED_PCI_ETH_IWARP:
        case QED_PCI_ETH_ROCE:
        {
                        qed_rdma_set_pf_params(p_hwfn,