2024-06-06 09:17:44

by Martin Schiller

Subject: [PATCH net-next 08/13] net: dsa: lantiq_gswip: Consistently use macros for the mac bridge table

From: Martin Blumenstingl <[email protected]>

Introduce a new GSWIP_TABLE_MAC_BRIDGE_PORT macro and use it throughout
the driver. Also update GSWIP_TABLE_MAC_BRIDGE_STATIC to use the BIT()
macro. This makes the driver code easier to understand.

Signed-off-by: Martin Blumenstingl <[email protected]>
---
drivers/net/dsa/lantiq_gswip.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index c049f505fcc7..ee8296d5b901 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -236,7 +236,8 @@
#define GSWIP_TABLE_ACTIVE_VLAN 0x01
#define GSWIP_TABLE_VLAN_MAPPING 0x02
#define GSWIP_TABLE_MAC_BRIDGE 0x0b
-#define GSWIP_TABLE_MAC_BRIDGE_STATIC 0x01 /* Static not, aging entry */
+#define GSWIP_TABLE_MAC_BRIDGE_STATIC BIT(0) /* Static not, aging entry */
+#define GSWIP_TABLE_MAC_BRIDGE_PORT GENMASK(7, 4) /* Port on learned entries */

#define XRX200_GPHY_FW_ALIGN (16 * 1024)

@@ -1307,7 +1308,8 @@ static void gswip_port_fast_age(struct dsa_switch *ds, int port)
if (mac_bridge.val[1] & GSWIP_TABLE_MAC_BRIDGE_STATIC)
continue;

- if (((mac_bridge.val[0] & GENMASK(7, 4)) >> 4) != port)
+ if (port != FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_PORT,
+ mac_bridge.val[0]))
continue;

mac_bridge.valid = false;
@@ -1445,7 +1447,8 @@ static int gswip_port_fdb_dump(struct dsa_switch *ds, int port,
return err;
}
} else {
- if (((mac_bridge.val[0] & GENMASK(7, 4)) >> 4) == port) {
+ if (port == FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_PORT,
+ mac_bridge.val[0])) {
err = cb(addr, 0, false, data);
if (err)
return err;
--
2.39.2

2024-06-07 11:24:45

by Vladimir Oltean

Subject: Re: [PATCH net-next 08/13] net: dsa: lantiq_gswip: Consistently use macros for the mac bridge table

On Thu, Jun 06, 2024 at 10:52:29AM +0200, Martin Schiller wrote:
> From: Martin Blumenstingl <[email protected]>
>
> Introduce a new GSWIP_TABLE_MAC_BRIDGE_PORT macro and use it throughout
> the driver. Also update GSWIP_TABLE_MAC_BRIDGE_STATIC to use the BIT()
> macro. This makes the driver code easier to understand.
>
> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---

Reviewed-by: Vladimir Oltean <[email protected]>