realtek: rtl931x: Sync family parameters with RTL930x

Some of the parameters added to RTL9300_FAMILY_ID are missing for
RTL9310_FAMILY_ID. Simply add the missing ones to keep sharing code between
the two SoCs.

Signed-off-by: Harshal Gohel <hg@simonwunderlich.de>
Signed-off-by: Sharadanand Karanjkar <sk@simonwunderlich.de>
Link: https://github.com/openwrt/openwrt/pull/19574
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

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 069faf7ed9100828d8b58daec0f33dd789e3da24..2dd93de5522fb836d537724396c7270bc5a7c12f 100644 (file)
--- 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
@@ -1536,6 +1536,9 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
                priv->r = &rtl930x_reg;
                priv->ds->num_ports = 29;
                priv->fib_entries = 16384;
+               /* TODO A version based on CHIP_INFO and MODEL_NAME_INFO should
+                * be constructed. For now, just set it to a static 'A'
+                */
                priv->version = RTL8390_VERSION_A;
                priv->n_lags = 16;
                sw_w32(1, RTL930X_ST_CTRL);
@@ -1553,9 +1556,16 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
                priv->r = &rtl931x_reg;
                priv->ds->num_ports = 57;
                priv->fib_entries = 16384;
+               /* TODO A version based on CHIP_INFO and MODEL_NAME_INFO should
+                * be constructed. For now, just set it to a static 'A'
+                */
                priv->version = RTL8390_VERSION_A;
                priv->n_lags = 16;
+               sw_w32(1, RTL931x_ST_CTRL);
                priv->l2_bucket_size = 8;
+               priv->n_pie_blocks = 16;
+               priv->port_ignore = 0x3f;
+               priv->n_counters = 2048;
                break;
        }
        pr_debug("Chip version %c\n", priv->version);

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 18405bdc02d9bdb35644f06946678608808d82e5..b8f543bd9ea55ecf63a765a8864580c56550522b 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
@@ -276,6 +276,7 @@
 #define MV_ACT_COPY2CPU                                3
 
 #define RTL930X_ST_CTRL                                (0x8798)
+#define RTL931x_ST_CTRL                                (0x8000)
 
 #define RTL930X_L2_PORT_SABLK_CTRL             (0x905c)
 #define RTL930X_L2_PORT_DABLK_CTRL             (0x9060)