realtek: dsa: Clarify meaning of secondary lag member variable

The name "is_lagmember" implies that the port is part of a LAG. But this
information is already stored in lagmembers. In reality, it is stored the
non-primary LAG members. Renaming it accordingly, makes the code a lot more
readable

Also the type (u32 array) looks like it would contain some kind of large id
(like the group ID). But it only stores a single bit. It is more appropriate
to just use a single bit per port.

Signed-off-by: Sven Eckelmann <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20707
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c
index 362b80ffd48d8665635530b512f33dbe6ea3bedf..dc3154437744afe0a7cb48f6cbc53aa3bc0c21ad 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c
@@ -1378,7 +1378,7 @@ static int rtldsa_port_enable(struct dsa_switch *ds, int port, struct phy_device
        /* add port to switch mask of CPU_PORT */
        priv->r->traffic_enable(priv->cpu_port, port);
 
-       if (priv->is_lagmember[port]) {
+       if (priv->lag_non_primary & BIT_ULL(port)) {
                pr_debug("%s: %d is lag slave. ignore\n", __func__, port);
                return 0;
        }
@@ -1479,7 +1479,7 @@ static void rtldsa_update_port_member(struct rtl838x_switch_priv *priv, int port
                if (!dsa_port_offloads_bridge_dev(other_dp, bridge_dev))
                        continue;
 
-               if (join && priv->is_lagmember[other_port])
+               if (join && priv->lag_non_primary & BIT_ULL(other_port))
                        continue;
 
                isolated = p->isolated && other_p->isolated;
@@ -1508,7 +1508,7 @@ static int rtldsa_port_bridge_join(struct dsa_switch *ds, int port, struct dsa_b
 
        pr_debug("%s %x: %d", __func__, (u32)priv, port);
 
-       if (priv->is_lagmember[port]) {
+       if (priv->lag_non_primary & BIT_ULL(port)) {
                pr_debug("%s: %d is lag slave. ignore\n", __func__, port);
                return 0;
        }
@@ -1940,7 +1940,7 @@ static int rtl83xx_port_fdb_add(struct dsa_switch *ds, int port,
        int err = 0, idx;
        u64 seed = priv->r->l2_hash_seed(mac, vid);
 
-       if (priv->is_lagmember[port]) {
+       if (priv->lag_non_primary & BIT_ULL(port)) {
                pr_debug("%s: %d is lag slave. ignore\n", __func__, port);
                return 0;
        }
@@ -2082,7 +2082,7 @@ static int rtl83xx_port_mdb_add(struct dsa_switch *ds, int port,
 
        pr_debug("In %s port %d, mac %llx, vid: %d\n", __func__, port, mac, vid);
 
-       if (priv->is_lagmember[port]) {
+       if (priv->lag_non_primary & BIT_ULL(port)) {
                pr_debug("%s: %d is lag slave. ignore\n", __func__, port);
                return -EINVAL;
        }
@@ -2162,7 +2162,7 @@ static int rtl83xx_port_mdb_del(struct dsa_switch *ds, int port,
 
        pr_debug("In %s, port %d, mac %llx, vid: %d\n", __func__, port, mac, vid);
 
-       if (priv->is_lagmember[port]) {
+       if (priv->lag_non_primary & BIT_ULL(port)) {
                pr_info("%s: %d is lag slave. ignore\n", __func__, port);
                return 0;
        }
@@ -2420,9 +2420,9 @@ static int rtl83xx_port_lag_join(struct dsa_switch *ds,
        if (priv->lag_primary[group] == -1)
                priv->lag_primary[group] = port;
        else
-               priv->is_lagmember[port] = 1;
+               priv->lag_non_primary |= BIT_ULL(port);
 
-       priv->lagmembers |= (1ULL << port);
+       priv->lagmembers |= BIT_ULL(port);
 
        pr_debug("lag_members = %llX\n", priv->lagmembers);
        err = rtl83xx_lag_add(priv->ds, group, port, info);
@@ -2457,9 +2457,9 @@ static int rtl83xx_port_lag_leave(struct dsa_switch *ds, int port,
                goto out;
        }
        pr_info("port_lag_del: group %d, port %d\n",group, port);
-       priv->lagmembers &=~ (1ULL << port);
+       priv->lagmembers &= ~BIT_ULL(port);
        priv->lag_primary[group] = -1;
-       priv->is_lagmember[port] = 0;
+       priv->lag_non_primary &= ~BIT_ULL(port);
        pr_debug("lag_members = %llX\n", priv->lagmembers);
        err = rtl83xx_lag_del(priv->ds, group, port);
        if (err) {

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
index 32e124091ecc27619efe7c32789fc7497791b37f..5aaac878d56e463fa817c2340778c2304bc32d46 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
@@ -1174,10 +1174,10 @@ struct rtl838x_switch_priv {
        u32 lag_primary[MAX_LAGS];
 
        /**
-        * @is_lagmember: Port is part of any LAG but not the first/primary
-        * port which needs to be added in the port matrix
+        * @lag_non_primary: Port (bit) is part of any LAG but not the
+        * first/primary port which needs to be added in the port matrix
         */
-       u32 is_lagmember[57];
+       u64 lag_non_primary;
 
        /** @lagmembers: Port (bit) is part of any LAG */
        u64 lagmembers;