net: sparx5: redefine internal ports and PGID's as offsets

Internal ports and PGID's are both defined relative to the number of
front ports on Sparx5. This will not work on lan969x. Instead make them
offsets to the number of front ports and add two helpers to retrieve
them. Use the helpers throughout.

Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c b/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
index 63f6c5484fdb2a9dc937968624f1134a325669ac..b2a8d04ab509891e60810e0dece818f3e74f8b68 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
@@ -118,16 +118,22 @@ static enum sparx5_cal_bw sparx5_get_port_cal_speed(struct sparx5 *sparx5,
 
        if (portno >= sparx5->data->consts->n_ports) {
                /* Internal ports */
-               if (portno == SPX5_PORT_CPU_0 || portno == SPX5_PORT_CPU_1) {
+               if (portno ==
+                           sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_0) ||
+                   portno ==
+                           sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_1)) {
                        /* Equals 1.25G */
                        return SPX5_CAL_SPEED_2G5;
-               } else if (portno == SPX5_PORT_VD0) {
+               } else if (portno ==
+                          sparx5_get_internal_port(sparx5, SPX5_PORT_VD0)) {
                        /* IPMC only idle BW */
                        return SPX5_CAL_SPEED_NONE;
-               } else if (portno == SPX5_PORT_VD1) {
+               } else if (portno ==
+                          sparx5_get_internal_port(sparx5, SPX5_PORT_VD1)) {
                        /* OAM only idle BW */
                        return SPX5_CAL_SPEED_NONE;
-               } else if (portno == SPX5_PORT_VD2) {
+               } else if (portno ==
+                          sparx5_get_internal_port(sparx5, SPX5_PORT_VD2)) {
                        /* IPinIP gets only idle BW */
                        return SPX5_CAL_SPEED_NONE;
                }

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c b/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c
index 4919719da0cbe14a5afc2ea99ecb192b600fe7f6..88f7509f09807bf4a237365a1b2f2646089afeb1 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c
@@ -364,7 +364,9 @@ static void sparx5_fdma_injection_mode(struct sparx5 *sparx5)
                sparx5, QS_INJ_GRP_CFG(INJ_QUEUE));
 
        /* CPU ports capture setup */
-       for (portno = SPX5_PORT_CPU_0; portno <= SPX5_PORT_CPU_1; portno++) {
+       for (portno = sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_0);
+            portno <= sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_1);
+            portno++) {
                /* ASM CPU port: No preamble, IFH, enable padding */
                spx5_wr(ASM_PORT_CFG_PAD_ENA_SET(1) |
                        ASM_PORT_CFG_NO_PREAMBLE_ENA_SET(1) |

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c b/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
index 56f6b94c4ef34187da2691e98b59a328188eb0ae..f5584244612cd9b8164b71103e4087a94226b1eb 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
@@ -129,7 +129,8 @@ int sparx5_mc_sync(struct net_device *dev, const unsigned char *addr)
        struct sparx5_port *port = netdev_priv(dev);
        struct sparx5 *sparx5 = port->sparx5;
 
-       return sparx5_mact_learn(sparx5, PGID_CPU, addr, port->pvid);
+       return sparx5_mact_learn(sparx5, sparx5_get_pgid(sparx5, PGID_CPU),
+                                addr, port->pvid);
 }
 
 static int sparx5_mact_get(struct sparx5 *sparx5,

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index b887e2b740c7b6f9d71e17235d91b74593d4b476..d1e9bc030c8071237e210a6c3dcbc01691d6c4d3 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -649,13 +649,14 @@ static int sparx5_start(struct sparx5 *sparx5)
        sparx5_update_fwd(sparx5);
 
        /* CPU copy CPU pgids */
-       spx5_wr(ANA_AC_PGID_MISC_CFG_PGID_CPU_COPY_ENA_SET(1),
-               sparx5, ANA_AC_PGID_MISC_CFG(PGID_CPU));
-       spx5_wr(ANA_AC_PGID_MISC_CFG_PGID_CPU_COPY_ENA_SET(1),
-               sparx5, ANA_AC_PGID_MISC_CFG(PGID_BCAST));
+       spx5_wr(ANA_AC_PGID_MISC_CFG_PGID_CPU_COPY_ENA_SET(1), sparx5,
+               ANA_AC_PGID_MISC_CFG(sparx5_get_pgid(sparx5, PGID_CPU)));
+       spx5_wr(ANA_AC_PGID_MISC_CFG_PGID_CPU_COPY_ENA_SET(1), sparx5,
+               ANA_AC_PGID_MISC_CFG(sparx5_get_pgid(sparx5, PGID_BCAST)));
 
        /* Recalc injected frame FCS */
-       for (idx = SPX5_PORT_CPU_0; idx <= SPX5_PORT_CPU_1; idx++)
+       for (idx = sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_0);
+            idx <= sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_1); idx++)
                spx5_rmw(ANA_CL_FILTER_CTRL_FORCE_FCS_UPDATE_ENA_SET(1),
                         ANA_CL_FILTER_CTRL_FORCE_FCS_UPDATE_ENA,
                         sparx5, ANA_CL_FILTER_CTRL(idx));
@@ -670,7 +671,8 @@ static int sparx5_start(struct sparx5 *sparx5)
        sparx5_vlan_init(sparx5);
 
        /* Add host mode BC address (points only to CPU) */
-       sparx5_mact_learn(sparx5, PGID_CPU, broadcast, NULL_VID);
+       sparx5_mact_learn(sparx5, sparx5_get_pgid(sparx5, PGID_CPU), broadcast,
+                         NULL_VID);
 
        /* Enable queue limitation watermarks */
        sparx5_qlim_set(sparx5);

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
index fb179088588a729b1528f40ecfadd17a6493ab2f..364ae92969bc136a951a3a288fdba23c6c1b7bee 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
@@ -54,23 +54,21 @@ enum sparx5_vlan_port_type {
 #define SPX5_PORTS             65
 #define SPX5_PORTS_ALL         70 /* Total number of ports */
 
-#define SPX5_PORT_CPU          (SPX5_PORTS)  /* Next port is CPU port */
-#define SPX5_PORT_CPU_0        (SPX5_PORT_CPU + 0) /* CPU Port 65 */
-#define SPX5_PORT_CPU_1        (SPX5_PORT_CPU + 1) /* CPU Port 66 */
-#define SPX5_PORT_VD0          (SPX5_PORT_CPU + 2) /* VD0/Port 67 used for IPMC */
-#define SPX5_PORT_VD1          (SPX5_PORT_CPU + 3) /* VD1/Port 68 used for AFI/OAM */
-#define SPX5_PORT_VD2          (SPX5_PORT_CPU + 4) /* VD2/Port 69 used for IPinIP*/
-
-#define PGID_BASE              SPX5_PORTS /* Starts after port PGIDs */
-#define PGID_UC_FLOOD          (PGID_BASE + 0)
-#define PGID_MC_FLOOD          (PGID_BASE + 1)
-#define PGID_IPV4_MC_DATA      (PGID_BASE + 2)
-#define PGID_IPV4_MC_CTRL      (PGID_BASE + 3)
-#define PGID_IPV6_MC_DATA      (PGID_BASE + 4)
-#define PGID_IPV6_MC_CTRL      (PGID_BASE + 5)
-#define PGID_BCAST            (PGID_BASE + 6)
-#define PGID_CPU              (PGID_BASE + 7)
-#define PGID_MCAST_START       (PGID_BASE + 8)
+#define SPX5_PORT_CPU_0        0 /* CPU Port 0 */
+#define SPX5_PORT_CPU_1        1 /* CPU Port 1 */
+#define SPX5_PORT_VD0          2 /* VD0/Port used for IPMC */
+#define SPX5_PORT_VD1          3 /* VD1/Port used for AFI/OAM */
+#define SPX5_PORT_VD2          4 /* VD2/Port used for IPinIP*/
+
+#define PGID_UC_FLOOD          0
+#define PGID_MC_FLOOD          1
+#define PGID_IPV4_MC_DATA      2
+#define PGID_IPV4_MC_CTRL      3
+#define PGID_IPV6_MC_DATA      4
+#define PGID_IPV6_MC_CTRL      5
+#define PGID_BCAST             6
+#define PGID_CPU               7
+#define PGID_MCAST_START       8
 
 #define PGID_TABLE_SIZE               3290
 
@@ -500,6 +498,7 @@ enum sparx5_pgid_type {
 void sparx5_pgid_init(struct sparx5 *spx5);
 int sparx5_pgid_alloc_mcast(struct sparx5 *spx5, u16 *idx);
 int sparx5_pgid_free(struct sparx5 *spx5, u16 idx);
+int sparx5_get_pgid(struct sparx5 *sparx5, int pgid);
 
 /* sparx5_pool.c */
 struct sparx5_pool_entry {
@@ -516,6 +515,7 @@ int sparx5_pool_get_with_idx(struct sparx5_pool_entry *pool, int size, u32 idx,
 /* sparx5_port.c */
 int sparx5_port_mux_set(struct sparx5 *sparx5, struct sparx5_port *port,
                        struct sparx5_port_config *conf);
+int sparx5_get_internal_port(struct sparx5 *sparx5, int port);
 
 /* sparx5_sdlb.c */
 #define SPX5_SDLB_PUP_TOKEN_DISABLE 0x1FFF

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
index c61b22a96e2204118303698fbd99c1a062d9cd7a..d4e9986ef16a9e67f223181a86796abdfd121e7f 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
@@ -68,7 +68,8 @@ void sparx5_set_port_ifh(struct sparx5 *sparx5, void *ifh_hdr, u16 portno)
        /* MISC.PIPELINE_ACT */
        ifh_encode_bitfield(ifh_hdr, 1,        42, 3);
        /* FWD.SRC_PORT = CPU */
-       ifh_encode_bitfield(ifh_hdr, SPX5_PORT_CPU, 46, 7);
+       ifh_encode_bitfield(ifh_hdr, sparx5_get_pgid(sparx5, SPX5_PORT_CPU_0),
+                           46, 7);
        /* FWD.SFLOW_ID (disable SFlow sampling) */
        ifh_encode_bitfield(ifh_hdr, 124,      57, 7);
        /* FWD.UPDATE_FCS = Enable. Enforce update of FCS. */
@@ -190,7 +191,8 @@ static int sparx5_set_mac_address(struct net_device *dev, void *p)
        sparx5_mact_forget(sparx5, dev->dev_addr,  port->pvid);
 
        /* Add new */
-       sparx5_mact_learn(sparx5, PGID_CPU, addr->sa_data, port->pvid);
+       sparx5_mact_learn(sparx5, sparx5_get_pgid(sparx5, PGID_CPU),
+                         addr->sa_data, port->pvid);
 
        /* Record the address */
        eth_hw_addr_set(dev, addr->sa_data);

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
index 700842ec76086f90fbf83ecbad56dc602a171b5b..5bfa86a71ac87101ff1c10eca162b6195c1bddfc 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
@@ -317,7 +317,9 @@ int sparx5_manual_injection_mode(struct sparx5 *sparx5)
                sparx5, QS_INJ_GRP_CFG(INJ_QUEUE));
 
        /* CPU ports capture setup */
-       for (portno = SPX5_PORT_CPU_0; portno <= SPX5_PORT_CPU_1; portno++) {
+       for (portno = sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_0);
+            portno <= sparx5_get_internal_port(sparx5, SPX5_PORT_CPU_1);
+            portno++) {
                /* ASM CPU port: No preamble, IFH, enable padding */
                spx5_wr(ASM_PORT_CFG_PAD_ENA_SET(1) |
                        ASM_PORT_CFG_NO_PREAMBLE_ENA_SET(1) |

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_pgid.c b/drivers/net/ethernet/microchip/sparx5/sparx5_pgid.c
index 78ef99b833edb3d35be159ca6788236fdfac8fc6..eae819fa9486febba3587f89e09a14d8d3883183 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_pgid.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_pgid.c
@@ -11,7 +11,7 @@ void sparx5_pgid_init(struct sparx5 *spx5)
        /* Reserved for unicast, flood control, broadcast, and CPU.
         * These cannot be freed.
         */
-       for (i = 0; i <= PGID_CPU; i++)
+       for (i = 0; i <= sparx5_get_pgid(spx5, PGID_CPU); i++)
                spx5->pgid_map[i] = SPX5_PGID_RESERVED;
 }
 
@@ -22,7 +22,8 @@ int sparx5_pgid_alloc_mcast(struct sparx5 *spx5, u16 *idx)
        /* The multicast area starts at index 65, but the first 7
         * are reserved for flood masks and CPU. Start alloc after that.
         */
-       for (i = PGID_MCAST_START; i < spx5->data->consts->n_pgids; i++) {
+       for (i = sparx5_get_pgid(spx5, PGID_MCAST_START);
+            i < spx5->data->consts->n_pgids; i++) {
                if (spx5->pgid_map[i] == SPX5_PGID_FREE) {
                        spx5->pgid_map[i] = SPX5_PGID_MULTICAST;
                        *idx = i;
@@ -35,7 +36,8 @@ int sparx5_pgid_alloc_mcast(struct sparx5 *spx5, u16 *idx)
 
 int sparx5_pgid_free(struct sparx5 *spx5, u16 idx)
 {
-       if (idx <= PGID_CPU || idx >= spx5->data->consts->n_pgids)
+       if (idx <= sparx5_get_pgid(spx5, PGID_CPU) ||
+           idx >= spx5->data->consts->n_pgids)
                return -EINVAL;
 
        if (spx5->pgid_map[idx] == SPX5_PGID_FREE)
@@ -44,3 +46,8 @@ int sparx5_pgid_free(struct sparx5 *spx5, u16 idx)
        spx5->pgid_map[idx] = SPX5_PGID_FREE;
        return 0;
 }
+
+int sparx5_get_pgid(struct sparx5 *sparx5, int pgid)
+{
+       return sparx5->data->consts->n_ports + pgid;
+}

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_port.c b/drivers/net/ethernet/microchip/sparx5/sparx5_port.c
index 0dc2201fe653a50bd7ccc826dc44fdfe894a2c22..0b38b4cb09294b6dcc4cf453375051f7f3341289 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_port.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_port.c
@@ -1352,3 +1352,8 @@ int sparx5_port_qos_default_set(const struct sparx5_port *port,
 
        return 0;
 }
+
+int sparx5_get_internal_port(struct sparx5 *sparx5, int port)
+{
+       return sparx5->data->consts->n_ports + port;
+}

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
index d1e7b85bdffa41a2e85112e4761692f39957360c..bc9ecb9392cd35d178f9e20f0352dbeebc29a282 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
@@ -32,24 +32,34 @@ static int sparx5_port_attr_pre_bridge_flags(struct sparx5_port *port,
 static void sparx5_port_update_mcast_ip_flood(struct sparx5_port *port, bool flood_flag)
 {
        bool should_flood = flood_flag || port->is_mrouter;
+       struct sparx5 *sparx5 = port->sparx5;
        int pgid;
 
-       for (pgid = PGID_IPV4_MC_DATA; pgid <= PGID_IPV6_MC_CTRL; pgid++)
+       for (pgid = sparx5_get_pgid(sparx5, PGID_IPV4_MC_DATA);
+            pgid <= sparx5_get_pgid(sparx5, PGID_IPV6_MC_CTRL); pgid++)
                sparx5_pgid_update_mask(port, pgid, should_flood);
 }
 
 static void sparx5_port_attr_bridge_flags(struct sparx5_port *port,
                                          struct switchdev_brport_flags flags)
 {
+       struct sparx5 *sparx5 = port->sparx5;
+
        if (flags.mask & BR_MCAST_FLOOD) {
-               sparx5_pgid_update_mask(port, PGID_MC_FLOOD, !!(flags.val & BR_MCAST_FLOOD));
+               sparx5_pgid_update_mask(port,
+                                       sparx5_get_pgid(sparx5, PGID_MC_FLOOD),
+                                       !!(flags.val & BR_MCAST_FLOOD));
                sparx5_port_update_mcast_ip_flood(port, !!(flags.val & BR_MCAST_FLOOD));
        }
 
        if (flags.mask & BR_FLOOD)
-               sparx5_pgid_update_mask(port, PGID_UC_FLOOD, !!(flags.val & BR_FLOOD));
+               sparx5_pgid_update_mask(port,
+                                       sparx5_get_pgid(sparx5, PGID_UC_FLOOD),
+                                       !!(flags.val & BR_FLOOD));
        if (flags.mask & BR_BCAST_FLOOD)
-               sparx5_pgid_update_mask(port, PGID_BCAST, !!(flags.val & BR_BCAST_FLOOD));
+               sparx5_pgid_update_mask(port,
+                                       sparx5_get_pgid(sparx5, PGID_BCAST),
+                                       !!(flags.val & BR_BCAST_FLOOD));
 }
 
 static void sparx5_attr_stp_state_set(struct sparx5_port *port,
@@ -219,7 +229,8 @@ static void sparx5_port_bridge_leave(struct sparx5_port *port,
        port->vid = NULL_VID;
 
        /* Forward frames to CPU */
-       sparx5_mact_learn(sparx5, PGID_CPU, port->ndev->dev_addr, 0);
+       sparx5_mact_learn(sparx5, sparx5_get_pgid(sparx5, PGID_CPU),
+                         port->ndev->dev_addr, 0);
 
        /* Port enters in host more therefore restore mc list */
        __dev_mc_sync(port->ndev, sparx5_mc_sync, sparx5_mc_unsync);
@@ -254,7 +265,8 @@ static int sparx5_port_add_addr(struct net_device *dev, bool up)
        u16 vid = port->pvid;
 
        if (up)
-               sparx5_mact_learn(sparx5, PGID_CPU, port->ndev->dev_addr, vid);
+               sparx5_mact_learn(sparx5, sparx5_get_pgid(sparx5, PGID_CPU),
+                                 port->ndev->dev_addr, vid);
        else
                sparx5_mact_forget(sparx5, port->ndev->dev_addr, vid);
 
@@ -330,7 +342,8 @@ static void sparx5_switchdev_bridge_fdb_event_work(struct work_struct *work)
        switch (switchdev_work->event) {
        case SWITCHDEV_FDB_ADD_TO_DEVICE:
                if (host_addr)
-                       sparx5_add_mact_entry(sparx5, dev, PGID_CPU,
+                       sparx5_add_mact_entry(sparx5, dev,
+                                             sparx5_get_pgid(sparx5, PGID_CPU),
                                              fdb_info->addr, vid);
                else
                        sparx5_add_mact_entry(sparx5, port->ndev, port->portno,
@@ -418,8 +431,8 @@ static int sparx5_handle_port_vlan_add(struct net_device *dev,
                                     switchdev_blocking_nb);
 
                /* Flood broadcast to CPU */
-               sparx5_mact_learn(sparx5, PGID_BCAST, dev->broadcast,
-                                 v->vid);
+               sparx5_mact_learn(sparx5, sparx5_get_pgid(sparx5, PGID_BCAST),
+                                 dev->broadcast, v->vid);
                return 0;
        }
 

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c b/drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c
index 80d2d3e8f4588cbd489b77c6b604ab5573eeb3d3..d42097aa60a0e4c31c9294b3ec34759ad9313f93 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c
@@ -168,7 +168,8 @@ void sparx5_update_fwd(struct sparx5 *sparx5)
        bitmap_to_arr32(mask, sparx5->bridge_fwd_mask, SPX5_PORTS);
 
        /* Update flood masks */
-       for (port = PGID_UC_FLOOD; port <= PGID_BCAST; port++) {
+       for (port = sparx5_get_pgid(sparx5, PGID_UC_FLOOD);
+            port <= sparx5_get_pgid(sparx5, PGID_BCAST); port++) {
                spx5_wr(mask[0], sparx5, ANA_AC_PGID_CFG(port));
                if (is_sparx5(sparx5)) {
                        spx5_wr(mask[1], sparx5, ANA_AC_PGID_CFG1(port));