[openwrt/openwrt] realtek: dsa: rtl93xx: Switch to MSTP compatible STP mode

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/6236291cb4ebfde9ef73cba0e3bd7a1d5fd18ac5

commit 6236291cb4ebfde9ef73cba0e3bd7a1d5fd18ac5
Author: Issam Hamdi <ih at simonwunderlich.de>
AuthorDate: Fri Dec 20 16:24:53 2024 +0100

    realtek: dsa: rtl93xx: Switch to MSTP compatible STP mode
    
    The realtek DSA switch driver sets up all VLANs using CIST. It is therefore
    not necessary to enforce CIST using the ST_CTRL register.
    
    This allows us later to overwrite the MSTI of VLANs. This is necessary to
    get MSTP working on RTL93xx.
    
    Signed-off-by: Issam Hamdi <ih at simonwunderlich.de>
    Signed-off-by: Sven Eckelmann <se at simonwunderlich.de>
    Link: https://github.com/openwrt/openwrt/pull/20421
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
index 59abba7807..3cbbb1a522 100644
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
@@ -1501,7 +1501,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 		 */
 		priv->version = RTL8390_VERSION_A;
 		priv->ds->num_lag_ids = 16;
-		sw_w32(1, RTL930X_ST_CTRL);
+		sw_w32(0, RTL930X_ST_CTRL);
 		priv->l2_bucket_size = 8;
 		priv->n_pie_blocks = 16;
 		priv->port_ignore = 0x3f;
@@ -1521,7 +1521,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 		 */
 		priv->version = RTL8390_VERSION_A;
 		priv->ds->num_lag_ids = 16;
-		sw_w32(1, RTL931x_ST_CTRL);
+		sw_w32(0, RTL931x_ST_CTRL);
 		priv->l2_bucket_size = 8;
 		priv->n_pie_blocks = 16;
 		priv->port_ignore = 0x3f;