net: dsa: mv88e6xxx: Fill in STU support for all supported chips

Some chips using the split VTU/STU design will not accept VTU entries
who's SID points to an invalid STU entry. Therefore, mark all those
chips with either the mv88e6352_g1_stu_* or mv88e6390_g1_stu_* ops as
appropriate.

Notably, chips for the Opal Plus (6085/6097) era seem to use a
different implementation than those from Agate (6352) and onwards,
even though their external interface is the same. The former happily
accepts VTU entries referencing invalid STU entries, while the latter
does not.

This fixes an issue where the driver would fail to probe switch trees
that contained chips of the Agate/Topaz generation which did not
declare STU support, as loaded VTU entries would be read back as
invalid.

Fixes: 49c98c1dc7d9 ("net: dsa: mv88e6xxx: Disentangle STU from VTU")
Reported-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Tested-by: Marek Behún <kabel@kernel.org>
Link: https://lore.kernel.org/r/20220319110345.555270-1-tobias@waldekranz.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index afb9417ffca02cab7049a8b88eef2aeabfd5582e..64f4fdd029027313320413b7b08c577f7e30ae46 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4067,6 +4067,8 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {
        .rmu_disable = mv88e6085_g1_rmu_disable,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
        .set_max_frame_size = mv88e6185_g1_set_max_frame_size,
 };
@@ -4187,6 +4189,8 @@ static const struct mv88e6xxx_ops mv88e6123_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
        .set_max_frame_size = mv88e6185_g1_set_max_frame_size,
 };
@@ -4276,6 +4280,8 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6341_serdes_get_lane,
        /* Check status register pause & lpa register */
@@ -4332,6 +4338,8 @@ static const struct mv88e6xxx_ops mv88e6161_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .avb_ops = &mv88e6165_avb_ops,
        .ptp_ops = &mv88e6165_ptp_ops,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
@@ -4368,6 +4376,8 @@ static const struct mv88e6xxx_ops mv88e6165_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .avb_ops = &mv88e6165_avb_ops,
        .ptp_ops = &mv88e6165_ptp_ops,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
@@ -4412,6 +4422,8 @@ static const struct mv88e6xxx_ops mv88e6171_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
 };
 
@@ -4458,6 +4470,8 @@ static const struct mv88e6xxx_ops mv88e6172_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .serdes_get_lane = mv88e6352_serdes_get_lane,
        .serdes_pcs_get_state = mv88e6352_serdes_pcs_get_state,
        .serdes_pcs_config = mv88e6352_serdes_pcs_config,
@@ -4509,6 +4523,8 @@ static const struct mv88e6xxx_ops mv88e6175_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
 };
 
@@ -4555,6 +4571,8 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .serdes_get_lane = mv88e6352_serdes_get_lane,
        .serdes_pcs_get_state = mv88e6352_serdes_pcs_get_state,
        .serdes_pcs_config = mv88e6352_serdes_pcs_config,
@@ -4654,6 +4672,8 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6390_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6390_g1_stu_getnext,
+       .stu_loadpurge = mv88e6390_g1_stu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390_serdes_get_lane,
        /* Check status register pause & lpa register */
@@ -4715,6 +4735,8 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6390_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6390_g1_stu_getnext,
+       .stu_loadpurge = mv88e6390_g1_stu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390x_serdes_get_lane,
        /* Check status register pause & lpa register */
@@ -4774,6 +4796,8 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6390_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6390_g1_stu_getnext,
+       .stu_loadpurge = mv88e6390_g1_stu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390_serdes_get_lane,
        /* Check status register pause & lpa register */
@@ -4836,6 +4860,8 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .serdes_get_lane = mv88e6352_serdes_get_lane,
        .serdes_pcs_get_state = mv88e6352_serdes_pcs_get_state,
        .serdes_pcs_config = mv88e6352_serdes_pcs_config,
@@ -4936,6 +4962,8 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6390_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6390_g1_stu_getnext,
+       .stu_loadpurge = mv88e6390_g1_stu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390_serdes_get_lane,
        /* Check status register pause & lpa register */
@@ -5087,6 +5115,8 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6341_serdes_get_lane,
        /* Check status register pause & lpa register */
@@ -5147,6 +5177,8 @@ static const struct mv88e6xxx_ops mv88e6350_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
 };
 
@@ -5189,6 +5221,8 @@ static const struct mv88e6xxx_ops mv88e6351_ops = {
        .atu_set_hash = mv88e6165_g1_atu_set_hash,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .stu_getnext = mv88e6352_g1_stu_getnext,
+       .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .avb_ops = &mv88e6352_avb_ops,
        .ptp_ops = &mv88e6352_ptp_ops,
        .phylink_get_caps = mv88e6185_phylink_get_caps,
@@ -5469,6 +5503,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 10,
                .num_internal_phys = 5,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5535,6 +5570,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 3,
                .num_internal_phys = 5,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5579,6 +5615,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_internal_phys = 5,
                .num_gpio = 11,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x10,
                .global1_addr = 0x1b,
@@ -5602,6 +5639,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 6,
                .num_internal_phys = 5,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5626,6 +5664,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 6,
                .num_internal_phys = 0,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5649,6 +5688,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 7,
                .num_internal_phys = 5,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5673,6 +5713,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_internal_phys = 5,
                .num_gpio = 15,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5696,6 +5737,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 7,
                .num_internal_phys = 5,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5720,6 +5762,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_internal_phys = 5,
                .num_gpio = 15,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5909,6 +5952,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_internal_phys = 5,
                .num_gpio = 15,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -5954,6 +5998,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_internal_phys = 9,
                .num_gpio = 16,
                .max_vid = 8191,
+               .max_sid = 63,
                .port_base_addr = 0x0,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -6027,6 +6072,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 6,
                .num_gpio = 11,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x10,
                .global1_addr = 0x1b,
@@ -6051,6 +6097,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 7,
                .num_internal_phys = 5,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,
@@ -6074,6 +6121,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                .num_ports = 7,
                .num_internal_phys = 5,
                .max_vid = 4095,
+               .max_sid = 63,
                .port_base_addr = 0x10,
                .phy_base_addr = 0x0,
                .global1_addr = 0x1b,