net: dsa: mv88e6xxx: allow SPEED_200 for 6320 family on supported ports

The 6320 family supports the ALT_SPEED bit on ports 2, 5 and 6. Allow
this speed by implementing 6320 family specific .port_set_speed_duplex()
method.

Signed-off-by: Marek Behún <kabel@kernel.org>
Link: https://patch.msgid.link/20260504153227.1390546-3-kabel@kernel.org
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 338cba0c8364a4a75adb76930f07b47ff68065b0..78799666e6b78eeb99057663b0518892b406fc8d 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5168,7 +5168,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
        .port_set_link = mv88e6xxx_port_set_link,
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,
-       .port_set_speed_duplex = mv88e6185_port_set_speed_duplex,
+       .port_set_speed_duplex = mv88e6320_port_set_speed_duplex,
        .port_tag_remap = mv88e6095_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -5221,7 +5221,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
        .port_set_link = mv88e6xxx_port_set_link,
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,
-       .port_set_speed_duplex = mv88e6185_port_set_speed_duplex,
+       .port_set_speed_duplex = mv88e6320_port_set_speed_duplex,
        .port_tag_remap = mv88e6095_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,

diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
index 74cfc0bb7b5be282fa00a6d42bbbcb301a015e3b..ea1fab71968a0ab8b7de9abbff181471320cc128 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/port.c
+++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -327,6 +327,21 @@ int mv88e6250_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                               duplex);
 }
 
+int mv88e6320_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
+                                   int speed, int duplex)
+{
+       bool has_200 = (port == 2 || port == 5 || port == 6);
+
+       if (speed > 1000)
+               return -EOPNOTSUPP;
+
+       if (speed == 200 && !has_200)
+               return -EOPNOTSUPP;
+
+       return mv88e6xxx_port_set_speed_duplex(chip, port, speed, has_200,
+                                              false, duplex);
+}
+
 /* Support 10, 100, 200, 1000, 2500 Mbps (e.g. 88E6341) */
 int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                    int speed, int duplex)

diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h
index 44b100dd618bd8429159efbdeda7468f9e14f397..5b6cde9f7406f5997ed06ccd63855b0dd74fb1a6 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/port.h
+++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -493,6 +493,8 @@ int mv88e6185_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                    int speed, int duplex);
 int mv88e6250_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                    int speed, int duplex);
+int mv88e6320_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
+                                   int speed, int duplex);
 int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                    int speed, int duplex);
 int mv88e6352_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,