octeontx2-af: Support variable number of lmacs

Most of the code in CGX/RPM driver assumes that max lmacs per
given MAC as always, 4 and the number of MAC blocks also as 4.
With this assumption, the max number of interfaces supported is
hardcoded to 16. This creates a problem as next gen CN10KB silicon
MAC supports 8 lmacs per MAC block.

This patch solves the problem by using "max lmac per MAC block"
value from constant csrs and uses cgx_cnt_max value which is
populated based number of MAC blocks supported by silicon.

Signed-off-by: Rakesh Babu Saladi <rsaladi2@marvell.com>
Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
index c8724bfa86b0e089aae2580968c9680de8c9ee2e..fa5a1e88cb8453eefb262d06475a6b6752a9d00b 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
@@ -78,7 +78,7 @@ static bool is_dev_rpm(void *cgxd)
 
 bool is_lmac_valid(struct cgx *cgx, int lmac_id)
 {
-       if (!cgx || lmac_id < 0 || lmac_id >= MAX_LMAC_PER_CGX)
+       if (!cgx || lmac_id < 0 || lmac_id >= cgx->max_lmac_per_mac)
                return false;
        return test_bit(lmac_id, &cgx->lmac_bmap);
 }
@@ -90,7 +90,7 @@ static int get_sequence_id_of_lmac(struct cgx *cgx, int lmac_id)
 {
        int tmp, id = 0;
 
-       for_each_set_bit(tmp, &cgx->lmac_bmap, MAX_LMAC_PER_CGX) {
+       for_each_set_bit(tmp, &cgx->lmac_bmap, cgx->max_lmac_per_mac) {
                if (tmp == lmac_id)
                        break;
                id++;
@@ -121,7 +121,7 @@ u64 cgx_read(struct cgx *cgx, u64 lmac, u64 offset)
 
 struct lmac *lmac_pdata(u8 lmac_id, struct cgx *cgx)
 {
-       if (!cgx || lmac_id >= MAX_LMAC_PER_CGX)
+       if (!cgx || lmac_id >= cgx->max_lmac_per_mac)
                return NULL;
 
        return cgx->lmac_idmap[lmac_id];
@@ -1395,7 +1395,7 @@ int cgx_get_fwdata_base(u64 *base)
        if (!cgx)
                return -ENXIO;
 
-       first_lmac = find_first_bit(&cgx->lmac_bmap, MAX_LMAC_PER_CGX);
+       first_lmac = find_first_bit(&cgx->lmac_bmap, cgx->max_lmac_per_mac);
        req = FIELD_SET(CMDREG_ID, CGX_CMD_GET_FWD_BASE, req);
        err = cgx_fwi_cmd_generic(req, &resp, cgx, first_lmac);
        if (!err)
@@ -1484,7 +1484,7 @@ static int cgx_fwi_link_change(struct cgx *cgx, int lmac_id, bool enable)
 
 static inline int cgx_fwi_read_version(u64 *resp, struct cgx *cgx)
 {
-       int first_lmac = find_first_bit(&cgx->lmac_bmap, MAX_LMAC_PER_CGX);
+       int first_lmac = find_first_bit(&cgx->lmac_bmap, cgx->max_lmac_per_mac);
        u64 req = 0;
 
        req = FIELD_SET(CMDREG_ID, CGX_CMD_GET_FW_VER, req);
@@ -1522,7 +1522,7 @@ static void cgx_lmac_linkup_work(struct work_struct *work)
        int i, err;
 
        /* Do Link up for all the enabled lmacs */
-       for_each_set_bit(i, &cgx->lmac_bmap, MAX_LMAC_PER_CGX) {
+       for_each_set_bit(i, &cgx->lmac_bmap, cgx->max_lmac_per_mac) {
                err = cgx_fwi_link_change(cgx, i, true);
                if (err)
                        dev_info(dev, "cgx port %d:%d Link up command failed\n",
@@ -1542,14 +1542,6 @@ int cgx_lmac_linkup_start(void *cgxd)
        return 0;
 }
 
-static void cgx_lmac_get_fifolen(struct cgx *cgx)
-{
-       u64 cfg;
-
-       cfg = cgx_read(cgx, 0, CGX_CONST);
-       cgx->mac_ops->fifo_len = FIELD_GET(CGX_CONST_RXFIFO_SIZE, cfg);
-}
-
 static int cgx_configure_interrupt(struct cgx *cgx, struct lmac *lmac,
                                   int cnt, bool req_free)
 {
@@ -1604,17 +1596,14 @@ static int cgx_lmac_init(struct cgx *cgx)
        u64 lmac_list;
        int i, err;
 
-       cgx_lmac_get_fifolen(cgx);
-
-       cgx->lmac_count = cgx->mac_ops->get_nr_lmacs(cgx);
        /* lmac_list specifies which lmacs are enabled
         * when bit n is set to 1, LMAC[n] is enabled
         */
        if (cgx->mac_ops->non_contiguous_serdes_lane)
                lmac_list = cgx_read(cgx, 0, CGXX_CMRX_RX_LMACS) & 0xFULL;
 
-       if (cgx->lmac_count > MAX_LMAC_PER_CGX)
-               cgx->lmac_count = MAX_LMAC_PER_CGX;
+       if (cgx->lmac_count > cgx->max_lmac_per_mac)
+               cgx->lmac_count = cgx->max_lmac_per_mac;
 
        for (i = 0; i < cgx->lmac_count; i++) {
                lmac = kzalloc(sizeof(struct lmac), GFP_KERNEL);
@@ -1692,7 +1681,7 @@ static int cgx_lmac_exit(struct cgx *cgx)
        }
 
        /* Free all lmac related resources */
-       for_each_set_bit(i, &cgx->lmac_bmap, MAX_LMAC_PER_CGX) {
+       for_each_set_bit(i, &cgx->lmac_bmap, cgx->max_lmac_per_mac) {
                lmac = cgx->lmac_idmap[i];
                if (!lmac)
                        continue;
@@ -1708,6 +1697,12 @@ static int cgx_lmac_exit(struct cgx *cgx)
 
 static void cgx_populate_features(struct cgx *cgx)
 {
+       u64 cfg;
+
+       cfg = cgx_read(cgx, 0, CGX_CONST);
+       cgx->mac_ops->fifo_len = FIELD_GET(CGX_CONST_RXFIFO_SIZE, cfg);
+       cgx->max_lmac_per_mac = FIELD_GET(CGX_CONST_MAX_LMACS, cfg);
+
        if (is_dev_rpm(cgx))
                cgx->hw_features = (RVU_LMAC_FEAT_DMACF | RVU_MAC_RPM |
                                    RVU_LMAC_FEAT_FC | RVU_LMAC_FEAT_PTP);

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
index 0b06788b8d80a8a1801c79b39def303f7a07021b..ce66c7271e3aa6f8fb5fc23db37fec5d4578d888 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
@@ -18,11 +18,8 @@
 /* PCI BAR nos */
 #define PCI_CFG_REG_BAR_NUM            0
 
-#define CGX_ID_MASK                    0x7
-#define MAX_LMAC_PER_CGX               4
+#define CGX_ID_MASK                    0xF
 #define MAX_DMAC_ENTRIES_PER_CGX       32
-#define CGX_FIFO_LEN                   65536 /* 64K for both Rx & Tx */
-#define CGX_OFFSET(x)                  ((x) * MAX_LMAC_PER_CGX)
 
 /* Registers */
 #define CGXX_CMRX_CFG                  0x00
@@ -57,6 +54,7 @@
 #define CGXX_SCRATCH1_REG              0x1058
 #define CGX_CONST                      0x2000
 #define CGX_CONST_RXFIFO_SIZE          GENMASK_ULL(23, 0)
+#define CGX_CONST_MAX_LMACS            GENMASK_ULL(31, 24)
 #define CGXX_SPUX_CONTROL1             0x10000
 #define CGXX_SPUX_LNX_FEC_CORR_BLOCKS  0x10700
 #define CGXX_SPUX_LNX_FEC_UNCORR_BLOCKS        0x10800

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h b/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h
index 52b6016789fa42dffbaa21115dc7aee7e43d5042..697cfec74aa1e9920392f230ca6faccfc36e9332 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h
@@ -128,7 +128,10 @@ struct cgx {
        struct pci_dev          *pdev;
        u8                      cgx_id;
        u8                      lmac_count;
-       struct lmac             *lmac_idmap[MAX_LMAC_PER_CGX];
+       /* number of LMACs per MAC could be 4 or 8 */
+       u8                      max_lmac_per_mac;
+#define MAX_LMAC_COUNT         8
+       struct lmac             *lmac_idmap[MAX_LMAC_COUNT];
        struct                  work_struct cgx_cmd_work;
        struct                  workqueue_struct *cgx_cmd_workq;
        struct list_head        cgx_list;

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
index f718cbd32a944bed5bf99b3e0773e91029aed5bb..04333f1272821f3d2fd0f99dfa1d14cfd18debc0 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
@@ -478,7 +478,7 @@ struct rvu {
        u8                      cgx_mapped_pfs;
        u8                      cgx_cnt_max;     /* CGX port count max */
        u8                      *pf2cgxlmac_map; /* pf to cgx_lmac map */
-       u16                     *cgxlmac2pf_map; /* bitmap of mapped pfs for
+       u64                     *cgxlmac2pf_map; /* bitmap of mapped pfs for
                                                  * every cgx lmac port
                                                  */
        unsigned long           pf_notify_bmap; /* Flags for PF notification */

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
index addc69f4b65c6dd1287a40ddab658908155130af..8d9f9bbc262bd1a2329677f2780f7f52e75f1387 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
@@ -55,8 +55,9 @@ bool is_mac_feature_supported(struct rvu *rvu, int pf, int feature)
        return  (cgx_features_get(cgxd) & feature);
 }
 
+#define CGX_OFFSET(x)                  ((x) * rvu->hw->lmac_per_cgx)
 /* Returns bitmap of mapped PFs */
-static u16 cgxlmac_to_pfmap(struct rvu *rvu, u8 cgx_id, u8 lmac_id)
+static u64 cgxlmac_to_pfmap(struct rvu *rvu, u8 cgx_id, u8 lmac_id)
 {
        return rvu->cgxlmac2pf_map[CGX_OFFSET(cgx_id) + lmac_id];
 }
@@ -71,7 +72,8 @@ int cgxlmac_to_pf(struct rvu *rvu, int cgx_id, int lmac_id)
        if (!pfmap)
                return -ENODEV;
        else
-               return find_first_bit(&pfmap, 16);
+               return find_first_bit(&pfmap,
+                                     rvu->cgx_cnt_max * rvu->hw->lmac_per_cgx);
 }
 
 static u8 cgxlmac_id_to_bmap(u8 cgx_id, u8 lmac_id)
@@ -129,14 +131,14 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu)
        if (!cgx_cnt_max)
                return 0;
 
-       if (cgx_cnt_max > 0xF || MAX_LMAC_PER_CGX > 0xF)
+       if (cgx_cnt_max > 0xF || rvu->hw->lmac_per_cgx > 0xF)
                return -EINVAL;
 
        /* Alloc map table
         * An additional entry is required since PF id starts from 1 and
         * hence entry at offset 0 is invalid.
         */
-       size = (cgx_cnt_max * MAX_LMAC_PER_CGX + 1) * sizeof(u8);
+       size = (cgx_cnt_max * rvu->hw->lmac_per_cgx + 1) * sizeof(u8);
        rvu->pf2cgxlmac_map = devm_kmalloc(rvu->dev, size, GFP_KERNEL);
        if (!rvu->pf2cgxlmac_map)
                return -ENOMEM;
@@ -145,9 +147,10 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu)
        memset(rvu->pf2cgxlmac_map, 0xFF, size);
 
        /* Reverse map table */
-       rvu->cgxlmac2pf_map = devm_kzalloc(rvu->dev,
-                                 cgx_cnt_max * MAX_LMAC_PER_CGX * sizeof(u16),
-                                 GFP_KERNEL);
+       rvu->cgxlmac2pf_map =
+               devm_kzalloc(rvu->dev,
+                            cgx_cnt_max * rvu->hw->lmac_per_cgx * sizeof(u64),
+                            GFP_KERNEL);
        if (!rvu->cgxlmac2pf_map)
                return -ENOMEM;
 
@@ -156,7 +159,7 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu)
                if (!rvu_cgx_pdata(cgx, rvu))
                        continue;
                lmac_bmap = cgx_get_lmac_bmap(rvu_cgx_pdata(cgx, rvu));
-               for_each_set_bit(iter, &lmac_bmap, MAX_LMAC_PER_CGX) {
+               for_each_set_bit(iter, &lmac_bmap, rvu->hw->lmac_per_cgx) {
                        lmac = cgx_get_lmacid(rvu_cgx_pdata(cgx, rvu),
                                              iter);
                        rvu->pf2cgxlmac_map[pf] = cgxlmac_id_to_bmap(cgx, lmac);
@@ -235,7 +238,8 @@ static void cgx_notify_pfs(struct cgx_link_event *event, struct rvu *rvu)
        pfmap = cgxlmac_to_pfmap(rvu, event->cgx_id, event->lmac_id);
 
        do {
-               pfid = find_first_bit(&pfmap, 16);
+               pfid = find_first_bit(&pfmap,
+                                     rvu->cgx_cnt_max * rvu->hw->lmac_per_cgx);
                clear_bit(pfid, &pfmap);
 
                /* check if notification is enabled */
@@ -310,7 +314,7 @@ static int cgx_lmac_event_handler_init(struct rvu *rvu)
                if (!cgxd)
                        continue;
                lmac_bmap = cgx_get_lmac_bmap(cgxd);
-               for_each_set_bit(lmac, &lmac_bmap, MAX_LMAC_PER_CGX) {
+               for_each_set_bit(lmac, &lmac_bmap, rvu->hw->lmac_per_cgx) {
                        err = cgx_lmac_evh_register(&cb, cgxd, lmac);
                        if (err)
                                dev_err(rvu->dev,
@@ -396,7 +400,7 @@ int rvu_cgx_exit(struct rvu *rvu)
                if (!cgxd)
                        continue;
                lmac_bmap = cgx_get_lmac_bmap(cgxd);
-               for_each_set_bit(lmac, &lmac_bmap, MAX_LMAC_PER_CGX)
+               for_each_set_bit(lmac, &lmac_bmap, rvu->hw->lmac_per_cgx)
                        cgx_lmac_evh_unregister(cgxd, lmac);
        }
 

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
index 0eb3085c4c210afa0f86459ec9f21edba5969fa0..fa280ebd3052b8ddd6bc7fe90a417f48643af6e7 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
@@ -2613,7 +2613,7 @@ static void rvu_dbg_cgx_init(struct rvu *rvu)
                rvu->rvu_dbg.cgx = debugfs_create_dir(dname,
                                                      rvu->rvu_dbg.cgx_root);
 
-               for_each_set_bit(lmac_id, &lmac_bmap, MAX_LMAC_PER_CGX) {
+               for_each_set_bit(lmac_id, &lmac_bmap, rvu->hw->lmac_per_cgx) {
                        /* lmac debugfs dir */
                        sprintf(dname, "lmac%d", lmac_id);
                        rvu->rvu_dbg.lmac =

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index a62c1b3220120c299c938ff638d93eba826e0adc..de489e7366da073769069c587fc4f385161f6bce 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -4109,7 +4109,7 @@ static void nix_link_config(struct rvu *rvu, int blkaddr,
 
                /* Get LMAC id's from bitmap */
                lmac_bmap = cgx_get_lmac_bmap(rvu_cgx_pdata(cgx, rvu));
-               for_each_set_bit(iter, &lmac_bmap, MAX_LMAC_PER_CGX) {
+               for_each_set_bit(iter, &lmac_bmap, rvu->hw->lmac_per_cgx) {
                        lmac_fifo_len = rvu_cgx_get_lmac_fifolen(rvu, cgx, iter);
                        if (!lmac_fifo_len) {
                                dev_err(rvu->dev,

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
index 00aef8f5ac2923014d0dcfcf6d84f2064ec37a82..f69102d20c903d6eedbe9240ff01b32bd3631ea7 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
@@ -1956,7 +1956,9 @@ int rvu_npc_exact_init(struct rvu *rvu)
        /* Install SDP drop rule */
        drop_mcam_idx = &table->num_drop_rules;
 
-       max_lmac_cnt = rvu->cgx_cnt_max * MAX_LMAC_PER_CGX + PF_CGXMAP_BASE;
+       max_lmac_cnt = rvu->cgx_cnt_max * rvu->hw->lmac_per_cgx +
+                      PF_CGXMAP_BASE;
+
        for (i = PF_CGXMAP_BASE; i < max_lmac_cnt; i++) {
                if (rvu->pf2cgxlmac_map[i] == 0xFF)
                        continue;