bnxt_en: Remove struct bnxt access from RoCE driver

Decouple RoCE driver from directly accessing L2's private bnxt
structure. Move the fields needed by RoCE driver into bnxt_en_dev.
They'll be passed to RoCE driver by bnxt_rdma_aux_device_add()
function.

Signed-off-by: Hongguang Gao <hongguang.gao@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: Selvin Xavier <selvin.xavier@broadcom.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index ffcd2a4d9f9aa7ba9ea60504651b86ebab888737..ed7ac6acaaff9d0587f64cd3990b85939beaed1e 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -112,16 +112,14 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev, u8 wqe_mode)
 {
        struct bnxt_qplib_chip_ctx *chip_ctx;
        struct bnxt_en_dev *en_dev;
-       struct bnxt *bp;
 
        en_dev = rdev->en_dev;
-       bp = netdev_priv(en_dev->net);
 
        chip_ctx = kzalloc(sizeof(*chip_ctx), GFP_KERNEL);
        if (!chip_ctx)
                return -ENOMEM;
-       chip_ctx->chip_num = bp->chip_num;
-       chip_ctx->hw_stats_size = bp->hw_ring_stats_size;
+       chip_ctx->chip_num = en_dev->chip_num;
+       chip_ctx->hw_stats_size = en_dev->hw_ring_stats_size;
 
        rdev->chip_ctx = chip_ctx;
        /* rest members to follow eventually */
@@ -129,7 +127,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev, u8 wqe_mode)
        rdev->qplib_res.cctx = rdev->chip_ctx;
        rdev->rcfw.res = &rdev->qplib_res;
        rdev->qplib_res.dattr = &rdev->dev_attr;
-       rdev->qplib_res.is_vf = BNXT_VF(bp);
+       rdev->qplib_res.is_vf = BNXT_EN_VF(en_dev);
 
        bnxt_re_set_drv_mode(rdev, wqe_mode);
        if (bnxt_qplib_determine_atomics(en_dev->pdev))
@@ -142,10 +140,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev, u8 wqe_mode)
 
 static void bnxt_re_get_sriov_func_type(struct bnxt_re_dev *rdev)
 {
-       struct bnxt *bp;
-
-       bp = netdev_priv(rdev->en_dev->net);
-       if (BNXT_VF(bp))
+       if (BNXT_EN_VF(rdev->en_dev))
                rdev->is_virtfn = 1;
 }
 
@@ -957,7 +952,6 @@ static int bnxt_re_query_hwrm_pri2cos(struct bnxt_re_dev *rdev, u8 dir,
                                      u64 *cid_map)
 {
        struct hwrm_queue_pri2cos_qcfg_input req = {0};
-       struct bnxt *bp = netdev_priv(rdev->netdev);
        struct hwrm_queue_pri2cos_qcfg_output resp;
        struct bnxt_en_dev *en_dev = rdev->en_dev;
        struct bnxt_fw_msg fw_msg;
@@ -974,7 +968,7 @@ static int bnxt_re_query_hwrm_pri2cos(struct bnxt_re_dev *rdev, u8 dir,
        flags |= (dir & 0x01);
        flags |= HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_IVLAN;
        req.flags = cpu_to_le32(flags);
-       req.port_id = bp->pf.port_id;
+       req.port_id = en_dev->pf_port_id;
 
        bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
                            sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
@@ -1547,7 +1541,6 @@ err:
 static int bnxt_re_suspend(struct auxiliary_device *adev, pm_message_t state)
 {
        struct bnxt_re_dev *rdev = auxiliary_get_drvdata(adev);
-       struct bnxt *bp;
 
        if (!rdev)
                return 0;
@@ -1559,15 +1552,14 @@ static int bnxt_re_suspend(struct auxiliary_device *adev, pm_message_t state)
         * ie. by calling bnxt_re_dev_stop and release the MSIx vectors as
         * L2 driver want to modify the MSIx table.
         */
-       bp = netdev_priv(rdev->netdev);
 
        ibdev_info(&rdev->ibdev, "Handle device suspend call");
-       /* Check the current device state from L2 structure and move the
+       /* Check the current device state from bnxt_en_dev and move the
         * device to detached state if FW_FATAL_COND is set.
         * This prevents more commands to HW during clean-up,
         * in case the device is already in error.
         */
-       if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state))
+       if (test_bit(BNXT_STATE_FW_FATAL_COND, &rdev->en_dev->en_state))
                set_bit(ERR_DEVICE_DETACHED, &rdev->rcfw.cmdq.flags);
 
        bnxt_re_dev_stop(rdev);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index 72815f3b1bd206f3d48ac2a8c1e15f8e6b81041c..132df8275ab11e5efd0fccafdf4589d1f403affb 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -287,6 +287,7 @@ void bnxt_ulp_stop(struct bnxt *bp)
                        pm_message_t pm = {};
 
                        adrv = to_auxiliary_drv(adev->dev.driver);
+                       edev->en_state = bp->state;
                        adrv->suspend(adev, pm);
                }
        }
@@ -313,6 +314,7 @@ void bnxt_ulp_start(struct bnxt *bp, int err)
                        struct auxiliary_driver *adrv;
 
                        adrv = to_auxiliary_drv(adev->dev.driver);
+                       edev->en_state = bp->state;
                        adrv->resume(adev);
                }
        }
@@ -444,6 +446,13 @@ static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp)
                edev->flags |= BNXT_EN_FLAG_ROCEV1_CAP;
        if (bp->flags & BNXT_FLAG_ROCEV2_CAP)
                edev->flags |= BNXT_EN_FLAG_ROCEV2_CAP;
+       if (bp->flags & BNXT_FLAG_VF)
+               edev->flags |= BNXT_EN_FLAG_VF;
+
+       edev->chip_num = bp->chip_num;
+       edev->hw_ring_stats_size = bp->hw_ring_stats_size;
+       edev->pf_port_id = bp->pf.port_id;
+       edev->en_state = bp->state;
 }
 
 void bnxt_rdma_aux_device_init(struct bnxt *bp)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
index adc5a9a235c2f6a14fa21d7bd2590dc53612370d..c62986e4cc82ceac6bbaf977f25d36957cec051e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
@@ -59,6 +59,9 @@ struct bnxt_en_dev {
                                                 BNXT_EN_FLAG_ROCEV2_CAP)
        #define BNXT_EN_FLAG_MSIX_REQUESTED     0x4
        #define BNXT_EN_FLAG_ULP_STOPPED        0x8
+       #define BNXT_EN_FLAG_VF                 0x10
+#define BNXT_EN_VF(edev)       ((edev)->flags & BNXT_EN_FLAG_VF)
+
        struct bnxt_ulp                 *ulp_tbl;
        int                             l2_db_size;     /* Doorbell BAR size in
                                                         * bytes mapped by L2
@@ -68,6 +71,14 @@ struct bnxt_en_dev {
                                                         * bytes mapped as non-
                                                         * cacheable.
                                                         */
+       u16                             chip_num;
+       u16                             hw_ring_stats_size;
+       u16                             pf_port_id;
+       unsigned long                   en_state;       /* Could be checked in
+                                                        * RoCE driver suspend
+                                                        * mode only. Will be
+                                                        * updated in resume.
+                                                        */
 };
 
 static inline bool bnxt_ulp_registered(struct bnxt_en_dev *edev)