qed: Make VF legacy a bitfield

Until now we used to have a single VF legacy compatibility mode,
one that affected the place of the Rx producers of those VFs [mostly].

As PF would soon support allocating CIDs for VFs instead of having
a static CID<->queue configuration for them, we'll need to have
an additional legacy mode since existing VFs would need to continue
on using the older mode of operation.

Change the infrastrucutre so that the legacy would be able to indicate
which of the legacy behaviors is needed for a given VF.

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

diff --git a/drivers/net/ethernet/qlogic/qed/qed_l2.c b/drivers/net/ethernet/qlogic/qed/qed_l2.c
index 0a8d3a82d248f5923d7cc6dbf947cda9a2640b61..7096a3c0103d03ae5f2658bf08badf17dc03cc90 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_l2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_l2.c
@@ -243,7 +243,7 @@ _qed_eth_queue_to_cid(struct qed_hwfn *p_hwfn,
        if (p_vf_params) {
                p_cid->vfid = p_vf_params->vfid;
                p_cid->vf_qid = p_vf_params->vf_qid;
-               p_cid->b_legacy_vf = p_vf_params->vf_legacy;
+               p_cid->vf_legacy = p_vf_params->vf_legacy;
        } else {
                p_cid->vfid = QED_QUEUE_CID_SELF;
        }
@@ -878,12 +878,14 @@ int qed_eth_rxq_start_ramrod(struct qed_hwfn *p_hwfn,
        DMA_REGPAIR_LE(p_ramrod->cqe_pbl_addr, cqe_pbl_addr);
 
        if (p_cid->vfid != QED_QUEUE_CID_SELF) {
+               bool b_legacy_vf = !!(p_cid->vf_legacy &
+                                     QED_QCID_LEGACY_VF_RX_PROD);
+
                p_ramrod->vf_rx_prod_index = p_cid->vf_qid;
                DP_VERBOSE(p_hwfn, QED_MSG_SP,
                           "Queue%s is meant for VF rxq[%02x]\n",
-                          !!p_cid->b_legacy_vf ? " [legacy]" : "",
-                          p_cid->vf_qid);
-               p_ramrod->vf_rx_prod_use_zone_a = !!p_cid->b_legacy_vf;
+                          b_legacy_vf ? " [legacy]" : "", p_cid->vf_qid);
+               p_ramrod->vf_rx_prod_use_zone_a = b_legacy_vf;
        }
 
        return qed_spq_post(p_hwfn, p_ent, NULL);

diff --git a/drivers/net/ethernet/qlogic/qed/qed_l2.h b/drivers/net/ethernet/qlogic/qed/qed_l2.h
index 59c2ba3eb6c13377c75bc6146bab839495598f3e..3f94c2207dff1c7d1daa5baf8985610098ec028f 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_l2.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_l2.h
@@ -301,10 +301,11 @@ struct qed_queue_cid_vf_params {
         */
        u8 vf_qid;
 
-       /* Indicates a VF is legacy, making it differ in:
+       /* Indicates a VF is legacy, making it differ in several things:
         *  - Producers would be placed in a different place.
+        *  - Makes assumptions regarding the CIDs.
         */
-       bool vf_legacy;
+       u8 vf_legacy;
 
        u8 qid_usage_idx;
 };
@@ -335,8 +336,9 @@ struct qed_queue_cid {
         */
        u8 qid_usage_idx;
 
-       /* Legacy VFs might have Rx producer located elsewhere */
-       bool b_legacy_vf;
+       u8 vf_legacy;
+#define QED_QCID_LEGACY_VF_RX_PROD     (BIT(0))
+#define QED_QCID_LEGACY_VF_CID         (BIT(1))
 
        struct qed_hwfn *p_owner;
 };

diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
index c205e476d39e1c94491707c77f59d13402d51b42..ed35ae03d0800ba3a0c4c5f352bb189f4bfb7232 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
@@ -45,6 +45,17 @@
 #include "qed_sriov.h"
 #include "qed_vf.h"
 
+static u8 qed_vf_calculate_legacy(struct qed_vf_info *p_vf)
+{
+       u8 legacy = QED_QCID_LEGACY_VF_CID;
+
+       if (p_vf->acquire.vfdev_info.eth_fp_hsi_minor ==
+           ETH_HSI_VER_NO_PKT_LEN_TUNN)
+               legacy |= QED_QCID_LEGACY_VF_RX_PROD;
+
+       return legacy;
+}
+
 /* IOV ramrods */
 static int qed_sp_vf_start(struct qed_hwfn *p_hwfn, struct qed_vf_info *p_vf)
 {
@@ -1959,11 +1970,10 @@ static void qed_iov_vf_mbx_start_rxq(struct qed_hwfn *p_hwfn,
        struct qed_queue_cid_vf_params vf_params;
        struct qed_iov_vf_mbx *mbx = &vf->vf_mbx;
        u8 status = PFVF_STATUS_NO_RESOURCE;
+       u8 qid_usage_idx, vf_legacy = 0;
        struct qed_vf_q_info *p_queue;
        struct vfpf_start_rxq_tlv *req;
        struct qed_sb_info sb_dummy;
-       bool b_legacy_vf = false;
-       u8 qid_usage_idx;
        int rc;
 
        req = &mbx->req_virt->start_rxq;
@@ -1976,8 +1986,7 @@ static void qed_iov_vf_mbx_start_rxq(struct qed_hwfn *p_hwfn,
        qid_usage_idx = qed_iov_vf_mbx_qid(p_hwfn, vf, false);
        p_queue = &vf->vf_queues[req->rx_qid];
 
-       if (vf->acquire.vfdev_info.eth_fp_hsi_minor ==
-           ETH_HSI_VER_NO_PKT_LEN_TUNN)
+       vf_legacy = qed_vf_calculate_legacy(vf);
 
        /* Acquire a new queue-cid */
        memset(&params, 0, sizeof(params));
@@ -1993,7 +2002,7 @@ static void qed_iov_vf_mbx_start_rxq(struct qed_hwfn *p_hwfn,
        memset(&vf_params, 0, sizeof(vf_params));
        vf_params.vfid = vf->relative_vf_id;
        vf_params.vf_qid = (u8)req->rx_qid;
-       vf_params.vf_legacy = b_legacy_vf;
+       vf_params.vf_legacy = vf_legacy;
        vf_params.qid_usage_idx = qid_usage_idx;
        p_queue->p_rx_cid = qed_eth_queue_to_cid(p_hwfn, vf->opaque_fid,
                                                 &params, &vf_params);
@@ -2003,7 +2012,7 @@ static void qed_iov_vf_mbx_start_rxq(struct qed_hwfn *p_hwfn,
        /* Legacy VFs have their Producers in a different location, which they
         * calculate on their own and clean the producer prior to this.
         */
-       if (!b_legacy_vf)
+       if (!(vf_legacy & QED_QCID_LEGACY_VF_RX_PROD))
                REG_WR(p_hwfn,
                       GTT_BAR0_MAP_REG_MSDM_RAM +
                       MSTORM_ETH_VF_PRODS_OFFSET(vf->abs_vf_id, req->rx_qid),
@@ -2024,7 +2033,9 @@ static void qed_iov_vf_mbx_start_rxq(struct qed_hwfn *p_hwfn,
        }
 
 out:
-       qed_iov_vf_mbx_start_rxq_resp(p_hwfn, p_ptt, vf, status, b_legacy_vf);
+       qed_iov_vf_mbx_start_rxq_resp(p_hwfn, p_ptt, vf, status,
+                                     !!(vf_legacy &
+                                        QED_QCID_LEGACY_VF_RX_PROD));
 }
 
 static void
@@ -2292,8 +2303,7 @@ static void qed_iov_vf_mbx_start_txq(struct qed_hwfn *p_hwfn,
        struct vfpf_start_txq_tlv *req;
        struct qed_vf_q_info *p_queue;
        struct qed_sb_info sb_dummy;
-       bool b_vf_legacy = false;
-       u8 qid_usage_idx;
+       u8 qid_usage_idx, vf_legacy;
        int rc;
        u16 pq;
 
@@ -2308,9 +2318,7 @@ static void qed_iov_vf_mbx_start_txq(struct qed_hwfn *p_hwfn,
        qid_usage_idx = qed_iov_vf_mbx_qid(p_hwfn, vf, true);
        p_queue = &vf->vf_queues[req->tx_qid];
 
-       if (vf->acquire.vfdev_info.eth_fp_hsi_minor ==
-           ETH_HSI_VER_NO_PKT_LEN_TUNN)
-               b_vf_legacy = true;
+       vf_legacy = qed_vf_calculate_legacy(vf);
 
        /* Acquire a new queue-cid */
        params.queue_id = p_queue->fw_tx_qid;
@@ -2326,7 +2334,7 @@ static void qed_iov_vf_mbx_start_txq(struct qed_hwfn *p_hwfn,
        memset(&vf_params, 0, sizeof(vf_params));
        vf_params.vfid = vf->relative_vf_id;
        vf_params.vf_qid = (u8)req->tx_qid;
-       vf_params.vf_legacy = b_vf_legacy;
+       vf_params.vf_legacy = vf_legacy;
        vf_params.qid_usage_idx = qid_usage_idx;
 
        p_queue->p_tx_cid = qed_eth_queue_to_cid(p_hwfn,