octeontx2-pf: CN20K mbox implementation between PF-VF

This patch implements the CN20k MBOX communication between PF and
it's VFs. CN20K silicon got extra interrupt of MBOX response for trigger
interrupt. Also few of the CSR offsets got changed in CN20K against
prior series of silicons.

Signed-off-by: Sai Krishna <saikrishnag@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Link: https://patch.msgid.link/1749639716-13868-7-git-send-email-sbhatta@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/common.h b/drivers/net/ethernet/marvell/octeontx2/af/common.h
index 406c59100a35a1c6ed2770846fa6657f06aacb8a..8a08bebf08c2c75d4c2ce01172c706c5943a24dd 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/common.h
@@ -39,7 +39,7 @@ struct qmem {
        void            *base;
        dma_addr_t      iova;
        int             alloc_sz;
-       u16             entry_sz;
+       u32             entry_sz;
        u8              align;
        u32             qsize;
 };

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c
index fa5951645b352b94b0ae3d65bdb84b684b5a09ad..ec8cde98076dce6db094926fd47c1e52844ce2c6 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c
@@ -13,6 +13,7 @@
 static struct dev_hw_ops cn20k_hw_ops = {
        .pfaf_mbox_intr_handler = cn20k_pfaf_mbox_intr_handler,
        .vfaf_mbox_intr_handler = cn20k_vfaf_mbox_intr_handler,
+       .pfvf_mbox_intr_handler = cn20k_pfvf_mbox_intr_handler,
 };
 
 void cn20k_init(struct otx2_nic *pfvf)
@@ -108,3 +109,144 @@ irqreturn_t cn20k_vfaf_mbox_intr_handler(int irq, void *vf_irq)
 
        return IRQ_HANDLED;
 }
+
+void cn20k_enable_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs)
+{
+       /* Clear PF <=> VF mailbox IRQ */
+       otx2_write64(pf, RVU_MBOX_PF_VFPF_INTX(0), ~0ull);
+       otx2_write64(pf, RVU_MBOX_PF_VFPF_INTX(1), ~0ull);
+       otx2_write64(pf, RVU_MBOX_PF_VFPF1_INTX(0), ~0ull);
+       otx2_write64(pf, RVU_MBOX_PF_VFPF1_INTX(1), ~0ull);
+
+       /* Enable PF <=> VF mailbox IRQ */
+       otx2_write64(pf, RVU_MBOX_PF_VFPF_INT_ENA_W1SX(0), INTR_MASK(numvfs));
+       otx2_write64(pf, RVU_MBOX_PF_VFPF1_INT_ENA_W1SX(0), INTR_MASK(numvfs));
+       if (numvfs > 64) {
+               numvfs -= 64;
+               otx2_write64(pf, RVU_MBOX_PF_VFPF_INT_ENA_W1SX(1),
+                            INTR_MASK(numvfs));
+               otx2_write64(pf, RVU_MBOX_PF_VFPF1_INT_ENA_W1SX(1),
+                            INTR_MASK(numvfs));
+       }
+}
+
+void cn20k_disable_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs)
+{
+       int vector, intr_vec, vec = 0;
+
+       /* Disable PF <=> VF mailbox IRQ */
+       otx2_write64(pf, RVU_MBOX_PF_VFPF_INT_ENA_W1CX(0), ~0ull);
+       otx2_write64(pf, RVU_MBOX_PF_VFPF_INT_ENA_W1CX(1), ~0ull);
+       otx2_write64(pf, RVU_MBOX_PF_VFPF1_INT_ENA_W1CX(0), ~0ull);
+       otx2_write64(pf, RVU_MBOX_PF_VFPF1_INT_ENA_W1CX(1), ~0ull);
+
+       otx2_write64(pf, RVU_MBOX_PF_VFPF_INTX(0), ~0ull);
+       otx2_write64(pf, RVU_MBOX_PF_VFPF1_INTX(0), ~0ull);
+
+       if (numvfs > 64) {
+               otx2_write64(pf, RVU_MBOX_PF_VFPF_INTX(1), ~0ull);
+               otx2_write64(pf, RVU_MBOX_PF_VFPF1_INTX(1), ~0ull);
+       }
+
+       for (intr_vec = RVU_MBOX_PF_INT_VEC_VFPF_MBOX0; intr_vec <=
+                       RVU_MBOX_PF_INT_VEC_VFPF1_MBOX1; intr_vec++, vec++) {
+               vector = pci_irq_vector(pf->pdev, intr_vec);
+               free_irq(vector, pf->hw.pfvf_irq_devid[vec]);
+       }
+}
+
+irqreturn_t cn20k_pfvf_mbox_intr_handler(int irq, void *pf_irq)
+{
+       struct pf_irq_data *irq_data = pf_irq;
+       struct otx2_nic *pf = irq_data->pf;
+       struct mbox *mbox;
+       u64 intr;
+
+       /* Sync with mbox memory region */
+       rmb();
+
+       /* Clear interrupts */
+       intr = otx2_read64(pf, irq_data->intr_status);
+       otx2_write64(pf, irq_data->intr_status, intr);
+       mbox = pf->mbox_pfvf;
+
+       if (intr)
+               trace_otx2_msg_interrupt(pf->pdev, "VF(s) to PF", intr);
+
+       irq_data->pf_queue_work_hdlr(mbox, pf->mbox_pfvf_wq, irq_data->start,
+                                    irq_data->mdevs, intr);
+
+       return IRQ_HANDLED;
+}
+
+int cn20k_register_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs)
+{
+       struct otx2_hw *hw = &pf->hw;
+       struct pf_irq_data *irq_data;
+       int intr_vec, ret, vec = 0;
+       char *irq_name;
+
+       /* irq data for 4 PF intr vectors */
+       irq_data = devm_kcalloc(pf->dev, 4,
+                               sizeof(struct pf_irq_data), GFP_KERNEL);
+       if (!irq_data)
+               return -ENOMEM;
+
+       for (intr_vec = RVU_MBOX_PF_INT_VEC_VFPF_MBOX0; intr_vec <=
+                       RVU_MBOX_PF_INT_VEC_VFPF1_MBOX1; intr_vec++, vec++) {
+               switch (intr_vec) {
+               case RVU_MBOX_PF_INT_VEC_VFPF_MBOX0:
+                       irq_data[vec].intr_status =
+                                               RVU_MBOX_PF_VFPF_INTX(0);
+                       irq_data[vec].start = 0;
+                       irq_data[vec].mdevs = 64;
+                       break;
+               case RVU_MBOX_PF_INT_VEC_VFPF_MBOX1:
+                       irq_data[vec].intr_status =
+                                               RVU_MBOX_PF_VFPF_INTX(1);
+                       irq_data[vec].start = 64;
+                       irq_data[vec].mdevs = 96;
+                       break;
+               case RVU_MBOX_PF_INT_VEC_VFPF1_MBOX0:
+                       irq_data[vec].intr_status =
+                                               RVU_MBOX_PF_VFPF1_INTX(0);
+                       irq_data[vec].start = 0;
+                       irq_data[vec].mdevs = 64;
+                       break;
+               case RVU_MBOX_PF_INT_VEC_VFPF1_MBOX1:
+                       irq_data[vec].intr_status =
+                                               RVU_MBOX_PF_VFPF1_INTX(1);
+                       irq_data[vec].start = 64;
+                       irq_data[vec].mdevs = 96;
+                       break;
+               }
+               irq_data[vec].pf_queue_work_hdlr = otx2_queue_vf_work;
+               irq_data[vec].vec_num = intr_vec;
+               irq_data[vec].pf = pf;
+
+               /* Register mailbox interrupt handler */
+               irq_name = &hw->irq_name[intr_vec * NAME_SIZE];
+               if (pf->pcifunc)
+                       snprintf(irq_name, NAME_SIZE,
+                                "RVUPF%d_VF%d Mbox%d", rvu_get_pf(pf->pdev,
+                                pf->pcifunc), vec / 2, vec % 2);
+               else
+                       snprintf(irq_name, NAME_SIZE, "RVUPF_VF%d Mbox%d",
+                                vec / 2, vec % 2);
+
+               hw->pfvf_irq_devid[vec] = &irq_data[vec];
+               ret = request_irq(pci_irq_vector(pf->pdev, intr_vec),
+                                 pf->hw_ops->pfvf_mbox_intr_handler, 0,
+                                 irq_name,
+                                 &irq_data[vec]);
+               if (ret) {
+                       dev_err(pf->dev,
+                               "RVUPF: IRQ registration failed for PFVF mbox0 irq\n");
+                       return ret;
+               }
+       }
+
+       cn20k_enable_pfvf_mbox_intr(pf, numvfs);
+
+       return 0;
+}

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h b/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h
index 712bb2b5e2ae39e51b5f3686cfcc1a67d3a62330..832adaf8c57f6b526b9934caf02730032564386c 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h
@@ -11,4 +11,7 @@
 #include "otx2_common.h"
 
 void cn20k_init(struct otx2_nic *pfvf);
+int cn20k_register_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs);
+void cn20k_disable_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs);
+void cn20k_enable_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs);
 #endif /* CN20K_H */

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
index d8ae28b2c6c8981623b93cf01ffeed4973e775d2..6b59881f78e07c65941e1874db5ebec7e33142ae 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
@@ -66,6 +66,7 @@
 irqreturn_t otx2_pfaf_mbox_intr_handler(int irq, void *pf_irq);
 irqreturn_t cn20k_pfaf_mbox_intr_handler(int irq, void *pf_irq);
 irqreturn_t cn20k_vfaf_mbox_intr_handler(int irq, void *vf_irq);
+irqreturn_t cn20k_pfvf_mbox_intr_handler(int irq, void *pf_irq);
 irqreturn_t otx2_pfvf_mbox_intr_handler(int irq, void *pf_irq);
 
 enum arua_mapped_qtypes {
@@ -376,6 +377,7 @@ struct dev_hw_ops {
        void    (*aura_freeptr)(void *dev, int aura, u64 buf);
        irqreturn_t (*pfaf_mbox_intr_handler)(int irq, void *pf_irq);
        irqreturn_t (*vfaf_mbox_intr_handler)(int irq, void *pf_irq);
+       irqreturn_t (*pfvf_mbox_intr_handler)(int irq, void *pf_irq);
 };
 
 #define CN10K_MCS_SA_PER_SC    4

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index 8f67fa42dc94f194d8d97f27a769e1d77d1adcce..4e2d1206e1b01a7f499cd5db21f410f43ca123d1 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -576,6 +576,23 @@ irqreturn_t otx2_pfvf_mbox_intr_handler(int irq, void *pf_irq)
        return IRQ_HANDLED;
 }
 
+static void *cn20k_pfvf_mbox_alloc(struct otx2_nic *pf, int numvfs)
+{
+       struct qmem *mbox_addr;
+       int err;
+
+       err = qmem_alloc(&pf->pdev->dev, &mbox_addr, numvfs, MBOX_SIZE);
+       if (err) {
+               dev_err(pf->dev, "qmem alloc fail\n");
+               return ERR_PTR(-ENOMEM);
+       }
+
+       otx2_write64(pf, RVU_PF_VF_MBOX_ADDR, (u64)mbox_addr->iova);
+       pf->pfvf_mbox_addr = mbox_addr;
+
+       return mbox_addr->base;
+}
+
 static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs)
 {
        void __iomem *hwbase;
@@ -597,19 +614,27 @@ static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs)
        if (!pf->mbox_pfvf_wq)
                return -ENOMEM;
 
-       /* On CN10K platform, PF <-> VF mailbox region follows after
-        * PF <-> AF mailbox region.
+       /* For CN20K, PF allocates mbox memory in DRAM and writes PF/VF
+        * regions/offsets in RVU_PF_VF_MBOX_ADDR, the RVU_PFX_FUNC_PFAF_MBOX
+        * gives the aliased address to access PF/VF mailbox regions.
         */
-       if (test_bit(CN10K_MBOX, &pf->hw.cap_flag))
-               base = pci_resource_start(pf->pdev, PCI_MBOX_BAR_NUM) +
-                      MBOX_SIZE;
-       else
-               base = readq(pf->reg_base + RVU_PF_VF_BAR4_ADDR);
+       if (is_cn20k(pf->pdev)) {
+               hwbase = (void __iomem *)cn20k_pfvf_mbox_alloc(pf, numvfs);
+       } else {
+               /* On CN10K platform, PF <-> VF mailbox region follows after
+                * PF <-> AF mailbox region.
+                */
+               if (test_bit(CN10K_MBOX, &pf->hw.cap_flag))
+                       base = pci_resource_start(pf->pdev, PCI_MBOX_BAR_NUM) +
+                                                 MBOX_SIZE;
+               else
+                       base = readq(pf->reg_base + RVU_PF_VF_BAR4_ADDR);
 
-       hwbase = ioremap_wc(base, MBOX_SIZE * pf->total_vfs);
-       if (!hwbase) {
-               err = -ENOMEM;
-               goto free_wq;
+               hwbase = ioremap_wc(base, MBOX_SIZE * pf->total_vfs);
+               if (!hwbase) {
+                       err = -ENOMEM;
+                       goto free_wq;
+               }
        }
 
        mbox = &pf->mbox_pfvf[0];
@@ -633,7 +658,7 @@ static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs)
        return 0;
 
 free_iomem:
-       if (hwbase)
+       if (hwbase && !(is_cn20k(pf->pdev)))
                iounmap(hwbase);
 free_wq:
        destroy_workqueue(pf->mbox_pfvf_wq);
@@ -652,8 +677,10 @@ static void otx2_pfvf_mbox_destroy(struct otx2_nic *pf)
                pf->mbox_pfvf_wq = NULL;
        }
 
-       if (mbox->mbox.hwbase)
+       if (mbox->mbox.hwbase && !is_cn20k(pf->pdev))
                iounmap(mbox->mbox.hwbase);
+       else
+               qmem_free(&pf->pdev->dev, pf->pfvf_mbox_addr);
 
        otx2_mbox_destroy(&mbox->mbox);
 }
@@ -677,6 +704,9 @@ static void otx2_disable_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs)
 {
        int vector;
 
+       if (is_cn20k(pf->pdev))
+               return cn20k_disable_pfvf_mbox_intr(pf, numvfs);
+
        /* Disable PF <=> VF mailbox IRQ */
        otx2_write64(pf, RVU_PF_VFPF_MBOX_INT_ENA_W1CX(0), ~0ull);
        otx2_write64(pf, RVU_PF_VFPF_MBOX_INT_ENA_W1CX(1), ~0ull);
@@ -698,6 +728,9 @@ static int otx2_register_pfvf_mbox_intr(struct otx2_nic *pf, int numvfs)
        char *irq_name;
        int err;
 
+       if (is_cn20k(pf->pdev))
+               return cn20k_register_pfvf_mbox_intr(pf, numvfs);
+
        /* Register MBOX0 interrupt handler */
        irq_name = &hw->irq_name[RVU_PF_INT_VEC_VFPF_MBOX0 * NAME_SIZE];
        if (pf->pcifunc)