net: dsa: realtek: rtl8365mb: add change_mtu

The rtl8365mb was using a fixed MTU size of 1536, which was probably
inspired by the rtl8366rb's initial frame size. However, unlike that
family, the rtl8365mb family can specify the max frame size in bytes,
rather than in fixed steps.

DSA calls change_mtu for the CPU port once the max MTU value among the
ports changes. As the max frame size is defined globally, the switch
is configured only when the call affects the CPU port.

The available specifications do not directly define the max supported
frame size, but it mentions a 16k limit. This driver will use the 0x3FFF
limit as it is used in the vendor API code. However, the switch sets the
max frame size to 16368 bytes (0x3FF0) after it resets.

change_mtu uses MTU size, or ethernet payload size, while the switch
works with frame size. The frame size is calculated considering the
ethernet header (14 bytes), a possible 802.1Q tag (4 bytes), the payload
size (MTU), and the Ethernet FCS (4 bytes). The CPU tag (8 bytes) is
consumed before the switch enforces the limit.

During setup, the driver will use the default 1500-byte MTU of DSA to
set the maximum frame size. The current sum will be
VLAN_ETH_HLEN+1500+ETH_FCS_LEN, which results in 1522 bytes.  Although
it is lower than the previous initial value of 1536 bytes, the driver
will increase the frame size for a larger MTU. However, if something
requires more space without increasing the MTU, such as QinQ, we would
need to add the extra length to the rtl8365mb_port_change_mtu() formula.

MTU was tested up to 2018 (with 802.1Q) as that is as far as mt7620
(where rtl8367s is stacked) can go. The register was manually
manipulated byte-by-byte to ensure the MTU to frame size conversion was
correct. For frames without 802.1Q tag, the frame size limit will be 4
bytes over the required size.

There is a jumbo register, enabled by default at 6k frame size.
However, the jumbo settings do not seem to limit nor expand the maximum
tested MTU (2018), even when jumbo is disabled. More tests are needed
with a device that can handle larger frames.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
index da31d8b839ac65c2673a3fefb3b93d581b1cd34e..41ea3b5a42b1455f07628f4f2658bd553b2db0e5 100644 (file)
--- a/drivers/net/dsa/realtek/rtl8365mb.c
+++ b/drivers/net/dsa/realtek/rtl8365mb.c
@@ -98,6 +98,7 @@
 #include <linux/of_irq.h>
 #include <linux/regmap.h>
 #include <linux/if_bridge.h>
+#include <linux/if_vlan.h>
 
 #include "realtek.h"
 
@@ -267,6 +268,7 @@
 /* Maximum packet length register */
 #define RTL8365MB_CFG0_MAX_LEN_REG     0x088C
 #define   RTL8365MB_CFG0_MAX_LEN_MASK  0x3FFF
+#define RTL8365MB_CFG0_MAX_LEN_MAX     0x3FFF
 
 /* Port learning limit registers */
 #define RTL8365MB_LUT_PORT_LEARN_LIMIT_BASE            0x0A20
@@ -1135,6 +1137,35 @@ static void rtl8365mb_phylink_mac_link_up(struct dsa_switch *ds, int port,
        }
 }
 
+static int rtl8365mb_port_change_mtu(struct dsa_switch *ds, int port,
+                                    int new_mtu)
+{
+       struct realtek_priv *priv = ds->priv;
+       int frame_size;
+
+       /* When a new MTU is set, DSA always sets the CPU port's MTU to the
+        * largest MTU of the slave ports. Because the switch only has a global
+        * RX length register, only allowing CPU port here is enough.
+        */
+       if (!dsa_is_cpu_port(ds, port))
+               return 0;
+
+       frame_size = new_mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
+
+       dev_dbg(priv->dev, "changing mtu to %d (frame size: %d)\n",
+               new_mtu, frame_size);
+
+       return regmap_update_bits(priv->map, RTL8365MB_CFG0_MAX_LEN_REG,
+                                 RTL8365MB_CFG0_MAX_LEN_MASK,
+                                 FIELD_PREP(RTL8365MB_CFG0_MAX_LEN_MASK,
+                                            frame_size));
+}
+
+static int rtl8365mb_port_max_mtu(struct dsa_switch *ds, int port)
+{
+       return RTL8365MB_CFG0_MAX_LEN_MAX - VLAN_ETH_HLEN - ETH_FCS_LEN;
+}
+
 static void rtl8365mb_port_stp_state_set(struct dsa_switch *ds, int port,
                                         u8 state)
 {
@@ -1980,10 +2011,7 @@ static int rtl8365mb_setup(struct dsa_switch *ds)
                p->index = i;
        }
 
-       /* Set maximum packet length to 1536 bytes */
-       ret = regmap_update_bits(priv->map, RTL8365MB_CFG0_MAX_LEN_REG,
-                                RTL8365MB_CFG0_MAX_LEN_MASK,
-                                FIELD_PREP(RTL8365MB_CFG0_MAX_LEN_MASK, 1536));
+       ret = rtl8365mb_port_change_mtu(ds, cpu->trap_port, ETH_DATA_LEN);
        if (ret)
                goto out_teardown_irq;
 
@@ -2103,6 +2131,8 @@ static const struct dsa_switch_ops rtl8365mb_switch_ops_smi = {
        .get_eth_mac_stats = rtl8365mb_get_mac_stats,
        .get_eth_ctrl_stats = rtl8365mb_get_ctrl_stats,
        .get_stats64 = rtl8365mb_get_stats64,
+       .port_change_mtu = rtl8365mb_port_change_mtu,
+       .port_max_mtu = rtl8365mb_port_max_mtu,
 };
 
 static const struct dsa_switch_ops rtl8365mb_switch_ops_mdio = {
@@ -2124,6 +2154,8 @@ static const struct dsa_switch_ops rtl8365mb_switch_ops_mdio = {
        .get_eth_mac_stats = rtl8365mb_get_mac_stats,
        .get_eth_ctrl_stats = rtl8365mb_get_ctrl_stats,
        .get_stats64 = rtl8365mb_get_stats64,
+       .port_change_mtu = rtl8365mb_port_change_mtu,
+       .port_max_mtu = rtl8365mb_port_max_mtu,
 };
 
 static const struct realtek_ops rtl8365mb_ops = {