Commit 5eb1b722 authored by Ratheesh Kannoth's avatar Ratheesh Kannoth Committed by David S. Miller

octeontx2-af: Skip PFs if not enabled

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: 9bdc47a6 ("octeontx2-af: Mbox communication support btw AF and it's VFs")
Signed-off-by: default avatarRatheesh Kannoth <rkannoth@marvell.com>
Signed-off-by: default avatarSunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarSai Krishna <saikrishnag@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6615590
...@@ -157,7 +157,7 @@ EXPORT_SYMBOL(otx2_mbox_init); ...@@ -157,7 +157,7 @@ EXPORT_SYMBOL(otx2_mbox_init);
*/ */
int otx2_mbox_regions_init(struct otx2_mbox *mbox, void **hwbase, int otx2_mbox_regions_init(struct otx2_mbox *mbox, void **hwbase,
struct pci_dev *pdev, void *reg_base, struct pci_dev *pdev, void *reg_base,
int direction, int ndevs) int direction, int ndevs, unsigned long *pf_bmap)
{ {
struct otx2_mbox_dev *mdev; struct otx2_mbox_dev *mdev;
int devid, err; int devid, err;
...@@ -169,6 +169,9 @@ int otx2_mbox_regions_init(struct otx2_mbox *mbox, void **hwbase, ...@@ -169,6 +169,9 @@ int otx2_mbox_regions_init(struct otx2_mbox *mbox, void **hwbase,
mbox->hwbase = hwbase[0]; mbox->hwbase = hwbase[0];
for (devid = 0; devid < ndevs; devid++) { for (devid = 0; devid < ndevs; devid++) {
if (!test_bit(devid, pf_bmap))
continue;
mdev = &mbox->dev[devid]; mdev = &mbox->dev[devid];
mdev->mbase = hwbase[devid]; mdev->mbase = hwbase[devid];
mdev->hwbase = hwbase[devid]; mdev->hwbase = hwbase[devid];
......
...@@ -96,9 +96,10 @@ void otx2_mbox_destroy(struct otx2_mbox *mbox); ...@@ -96,9 +96,10 @@ void otx2_mbox_destroy(struct otx2_mbox *mbox);
int otx2_mbox_init(struct otx2_mbox *mbox, void __force *hwbase, int otx2_mbox_init(struct otx2_mbox *mbox, void __force *hwbase,
struct pci_dev *pdev, void __force *reg_base, struct pci_dev *pdev, void __force *reg_base,
int direction, int ndevs); int direction, int ndevs);
int otx2_mbox_regions_init(struct otx2_mbox *mbox, void __force **hwbase, int otx2_mbox_regions_init(struct otx2_mbox *mbox, void __force **hwbase,
struct pci_dev *pdev, void __force *reg_base, 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); 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_wait_for_rsp(struct otx2_mbox *mbox, int devid);
int otx2_mbox_busy_poll_for_rsp(struct otx2_mbox *mbox, int devid); int otx2_mbox_busy_poll_for_rsp(struct otx2_mbox *mbox, int devid);
......
...@@ -2282,7 +2282,7 @@ static inline void rvu_afvf_mbox_up_handler(struct work_struct *work) ...@@ -2282,7 +2282,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, 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; struct rvu_hwinfo *hw = rvu->hw;
int region; int region;
...@@ -2294,6 +2294,9 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, ...@@ -2294,6 +2294,9 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
*/ */
if (type == TYPE_AFVF) { if (type == TYPE_AFVF) {
for (region = 0; region < num; region++) { for (region = 0; region < num; region++) {
if (!test_bit(region, pf_bmap))
continue;
if (hw->cap.per_pf_mbox_regs) { if (hw->cap.per_pf_mbox_regs) {
bar4 = rvu_read64(rvu, BLKADDR_RVUM, bar4 = rvu_read64(rvu, BLKADDR_RVUM,
RVU_AF_PFX_BAR4_ADDR(0)) + RVU_AF_PFX_BAR4_ADDR(0)) +
...@@ -2315,6 +2318,9 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, ...@@ -2315,6 +2318,9 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
* RVU_AF_PF_BAR4_ADDR register. * RVU_AF_PF_BAR4_ADDR register.
*/ */
for (region = 0; region < num; region++) { for (region = 0; region < num; region++) {
if (!test_bit(region, pf_bmap))
continue;
if (hw->cap.per_pf_mbox_regs) { if (hw->cap.per_pf_mbox_regs) {
bar4 = rvu_read64(rvu, BLKADDR_RVUM, bar4 = rvu_read64(rvu, BLKADDR_RVUM,
RVU_AF_PFX_BAR4_ADDR(region)); RVU_AF_PFX_BAR4_ADDR(region));
...@@ -2343,20 +2349,41 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, ...@@ -2343,20 +2349,41 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
int err = -EINVAL, i, dir, dir_up; int err = -EINVAL, i, dir, dir_up;
void __iomem *reg_base; void __iomem *reg_base;
struct rvu_work *mwork; struct rvu_work *mwork;
unsigned long *pf_bmap;
void **mbox_regions; void **mbox_regions;
const char *name; const char *name;
u64 cfg;
mbox_regions = kcalloc(num, sizeof(void *), GFP_KERNEL); pf_bmap = bitmap_zalloc(num, GFP_KERNEL);
if (!mbox_regions) if (!pf_bmap)
return -ENOMEM; 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) { switch (type) {
case TYPE_AFPF: case TYPE_AFPF:
name = "rvu_afpf_mailbox"; name = "rvu_afpf_mailbox";
dir = MBOX_DIR_AFPF; dir = MBOX_DIR_AFPF;
dir_up = MBOX_DIR_AFPF_UP; dir_up = MBOX_DIR_AFPF_UP;
reg_base = rvu->afreg_base; 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) if (err)
goto free_regions; goto free_regions;
break; break;
...@@ -2365,7 +2392,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, ...@@ -2365,7 +2392,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
dir = MBOX_DIR_PFVF; dir = MBOX_DIR_PFVF;
dir_up = MBOX_DIR_PFVF_UP; dir_up = MBOX_DIR_PFVF_UP;
reg_base = rvu->pfreg_base; 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) if (err)
goto free_regions; goto free_regions;
break; break;
...@@ -2396,16 +2423,19 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, ...@@ -2396,16 +2423,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, err = otx2_mbox_regions_init(&mw->mbox, mbox_regions, rvu->pdev,
reg_base, dir, num); reg_base, dir, num, pf_bmap);
if (err) if (err)
goto exit; goto exit;
err = otx2_mbox_regions_init(&mw->mbox_up, mbox_regions, rvu->pdev, 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) if (err)
goto exit; goto exit;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
if (!test_bit(i, pf_bmap))
continue;
mwork = &mw->mbox_wrk[i]; mwork = &mw->mbox_wrk[i];
mwork->rvu = rvu; mwork->rvu = rvu;
INIT_WORK(&mwork->work, mbox_handler); INIT_WORK(&mwork->work, mbox_handler);
...@@ -2414,8 +2444,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, ...@@ -2414,8 +2444,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
mwork->rvu = rvu; mwork->rvu = rvu;
INIT_WORK(&mwork->work, mbox_up_handler); INIT_WORK(&mwork->work, mbox_up_handler);
} }
kfree(mbox_regions); goto free_regions;
return 0;
exit: exit:
destroy_workqueue(mw->mbox_wq); destroy_workqueue(mw->mbox_wq);
...@@ -2424,6 +2453,8 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, ...@@ -2424,6 +2453,8 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
iounmap((void __iomem *)mbox_regions[num]); iounmap((void __iomem *)mbox_regions[num]);
free_regions: free_regions:
kfree(mbox_regions); kfree(mbox_regions);
free_bitmap:
bitmap_free(pf_bmap);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment