octeontx2-af: Set discovery ID for RVUM block

Currently there is no way for AF dependent drivers in
any domain to check if the AF driver is loaded. This
patch sets an ID for RVUM block which will automatically
reflects in PF/VFs discovery register which they can
check and defer their probe until AF is up.

Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index e56b1f8d28b15ce7e8a18e95bdd1f4899e8d9284..e851477368855607446435f7fba05bddbbc332f7 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -421,6 +421,19 @@ static void rvu_check_block_implemented(struct rvu *rvu)
        }
 }
 
+static void rvu_setup_rvum_blk_revid(struct rvu *rvu)
+{
+       rvu_write64(rvu, BLKADDR_RVUM,
+                   RVU_PRIV_BLOCK_TYPEX_REV(BLKTYPE_RVUM),
+                   RVU_BLK_RVUM_REVID);
+}
+
+static void rvu_clear_rvum_blk_revid(struct rvu *rvu)
+{
+       rvu_write64(rvu, BLKADDR_RVUM,
+                   RVU_PRIV_BLOCK_TYPEX_REV(BLKTYPE_RVUM), 0x00);
+}
+
 int rvu_lf_reset(struct rvu *rvu, struct rvu_block *block, int lf)
 {
        int err;
@@ -2591,6 +2604,8 @@ static int rvu_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (err)
                goto err_flr;
 
+       rvu_setup_rvum_blk_revid(rvu);
+
        /* Enable AF's VFs (if any) */
        err = rvu_enable_sriov(rvu);
        if (err)
@@ -2611,6 +2626,7 @@ err_hwsetup:
        rvu_fwdata_exit(rvu);
        rvu_reset_all_blocks(rvu);
        rvu_free_hw_resources(rvu);
+       rvu_clear_rvum_blk_revid(rvu);
 err_release_regions:
        pci_release_regions(pdev);
 err_disable_device:
@@ -2635,7 +2651,7 @@ static void rvu_remove(struct pci_dev *pdev)
        rvu_disable_sriov(rvu);
        rvu_reset_all_blocks(rvu);
        rvu_free_hw_resources(rvu);
-
+       rvu_clear_rvum_blk_revid(rvu);
        pci_release_regions(pdev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h
index 9d8942acc232aa7db74f3fdd155ce959b5d016f7..a3ecb5de900058572b13e1742d2a2522beaa4379 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h
@@ -11,6 +11,9 @@
 #ifndef RVU_STRUCT_H
 #define RVU_STRUCT_H
 
+/* RVU Block revision IDs */
+#define RVU_BLK_RVUM_REVID             0x01
+
 /* RVU Block Address Enumeration */
 enum rvu_block_addr_e {
        BLKADDR_RVUM            = 0x0ULL,