octeontx2-af: Skip PFs if not enabled

[ Upstream commit 5eb1b7220948a69298a436148a735f32ec325289 ]

Firmware enables PFs and allocate mbox resources for each of the PFs.
Currently PF driver configures mbox resources without checking whether
PF is enabled or not. This results in crash. This patch fixes this issue
by skipping disabled PF's mbox initialization.

Fixes: 9bdc47a6e328 ("octeontx2-af: Mbox communication support btw AF and it's VFs")
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: Sai Krishna <saikrishnag@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.c b/drivers/net/ethernet/marvell/octeontx2/af/mbox.c
index 2898931d5260a8754cf0a023528225deee15c1fb..9690ac01f02c8db9b9ed2e524b05aa124b077c7a 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.c
@@ -157,7 +157,7 @@ EXPORT_SYMBOL(otx2_mbox_init);
  */
 int otx2_mbox_regions_init(struct otx2_mbox *mbox, void **hwbase,
                           struct pci_dev *pdev, void *reg_base,
-                          int direction, int ndevs)
+                          int direction, int ndevs, unsigned long *pf_bmap)
 {
        struct otx2_mbox_dev *mdev;
        int devid, err;
@@ -169,6 +169,9 @@ int otx2_mbox_regions_init(struct otx2_mbox *mbox, void **hwbase,
        mbox->hwbase = hwbase[0];
 
        for (devid = 0; devid < ndevs; devid++) {
+               if (!test_bit(devid, pf_bmap))
+                       continue;
+
                mdev = &mbox->dev[devid];
                mdev->mbase = hwbase[devid];
                mdev->hwbase = hwbase[devid];

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
index c6643c7db1fc4cba834c13451682bd58ce9d2fe4..2b6cbd5af100de1bfef3f8ed48a5379950fc4577 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
@@ -96,9 +96,10 @@ void otx2_mbox_destroy(struct otx2_mbox *mbox);
 int otx2_mbox_init(struct otx2_mbox *mbox, void __force *hwbase,
                   struct pci_dev *pdev, void __force *reg_base,
                   int direction, int ndevs);
+
 int otx2_mbox_regions_init(struct otx2_mbox *mbox, void __force **hwbase,
                           struct pci_dev *pdev, void __force *reg_base,
-                          int direction, int ndevs);
+                          int direction, int ndevs, unsigned long *bmap);
 void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid);
 int otx2_mbox_wait_for_rsp(struct otx2_mbox *mbox, int devid);
 int otx2_mbox_busy_poll_for_rsp(struct otx2_mbox *mbox, int devid);

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index bd33b90aaa67b102a1e129992311cb272a62b99d..f64509b1d120ce0bdc6a22d63e5b9a7c74e9f423 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -2196,7 +2196,7 @@ static inline void rvu_afvf_mbox_up_handler(struct work_struct *work)
 }
 
 static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
-                               int num, int type)
+                               int num, int type, unsigned long *pf_bmap)
 {
        struct rvu_hwinfo *hw = rvu->hw;
        int region;
@@ -2208,6 +2208,9 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
         */
        if (type == TYPE_AFVF) {
                for (region = 0; region < num; region++) {
+                       if (!test_bit(region, pf_bmap))
+                               continue;
+
                        if (hw->cap.per_pf_mbox_regs) {
                                bar4 = rvu_read64(rvu, BLKADDR_RVUM,
                                                  RVU_AF_PFX_BAR4_ADDR(0)) +
@@ -2229,6 +2232,9 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
         * RVU_AF_PF_BAR4_ADDR register.
         */
        for (region = 0; region < num; region++) {
+               if (!test_bit(region, pf_bmap))
+                       continue;
+
                if (hw->cap.per_pf_mbox_regs) {
                        bar4 = rvu_read64(rvu, BLKADDR_RVUM,
                                          RVU_AF_PFX_BAR4_ADDR(region));
@@ -2257,20 +2263,41 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
        int err = -EINVAL, i, dir, dir_up;
        void __iomem *reg_base;
        struct rvu_work *mwork;
+       unsigned long *pf_bmap;
        void **mbox_regions;
        const char *name;
+       u64 cfg;
 
-       mbox_regions = kcalloc(num, sizeof(void *), GFP_KERNEL);
-       if (!mbox_regions)
+       pf_bmap = bitmap_zalloc(num, GFP_KERNEL);
+       if (!pf_bmap)
                return -ENOMEM;
 
+       /* RVU VFs */
+       if (type == TYPE_AFVF)
+               bitmap_set(pf_bmap, 0, num);
+
+       if (type == TYPE_AFPF) {
+               /* Mark enabled PFs in bitmap */
+               for (i = 0; i < num; i++) {
+                       cfg = rvu_read64(rvu, BLKADDR_RVUM, RVU_PRIV_PFX_CFG(i));
+                       if (cfg & BIT_ULL(20))
+                               set_bit(i, pf_bmap);
+               }
+       }
+
+       mbox_regions = kcalloc(num, sizeof(void *), GFP_KERNEL);
+       if (!mbox_regions) {
+               err = -ENOMEM;
+               goto free_bitmap;
+       }
+
        switch (type) {
        case TYPE_AFPF:
                name = "rvu_afpf_mailbox";
                dir = MBOX_DIR_AFPF;
                dir_up = MBOX_DIR_AFPF_UP;
                reg_base = rvu->afreg_base;
-               err = rvu_get_mbox_regions(rvu, mbox_regions, num, TYPE_AFPF);
+               err = rvu_get_mbox_regions(rvu, mbox_regions, num, TYPE_AFPF, pf_bmap);
                if (err)
                        goto free_regions;
                break;
@@ -2279,7 +2306,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
                dir = MBOX_DIR_PFVF;
                dir_up = MBOX_DIR_PFVF_UP;
                reg_base = rvu->pfreg_base;
-               err = rvu_get_mbox_regions(rvu, mbox_regions, num, TYPE_AFVF);
+               err = rvu_get_mbox_regions(rvu, mbox_regions, num, TYPE_AFVF, pf_bmap);
                if (err)
                        goto free_regions;
                break;
@@ -2310,16 +2337,19 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
        }
 
        err = otx2_mbox_regions_init(&mw->mbox, mbox_regions, rvu->pdev,
-                                    reg_base, dir, num);
+                                    reg_base, dir, num, pf_bmap);
        if (err)
                goto exit;
 
        err = otx2_mbox_regions_init(&mw->mbox_up, mbox_regions, rvu->pdev,
-                                    reg_base, dir_up, num);
+                                    reg_base, dir_up, num, pf_bmap);
        if (err)
                goto exit;
 
        for (i = 0; i < num; i++) {
+               if (!test_bit(i, pf_bmap))
+                       continue;
+
                mwork = &mw->mbox_wrk[i];
                mwork->rvu = rvu;
                INIT_WORK(&mwork->work, mbox_handler);
@@ -2328,8 +2358,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
                mwork->rvu = rvu;
                INIT_WORK(&mwork->work, mbox_up_handler);
        }
-       kfree(mbox_regions);
-       return 0;
+       goto free_regions;
 
 exit:
        destroy_workqueue(mw->mbox_wq);
@@ -2338,6 +2367,8 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
                iounmap((void __iomem *)mbox_regions[num]);
 free_regions:
        kfree(mbox_regions);
+free_bitmap:
+       bitmap_free(pf_bmap);
        return err;
 }