change v5:
- add Reviewed-by: Vladimir Oltean <[email protected]>
- use regs[S_BROADCAST_CTRL] instead of REG_SW_CTRL_4 as requested.
- s/synchronous/symmetric/
- make phylink_mac_link_up() not optional, as requested
change v4:
- instead of downstream/upstream use CPU-port and PHY-port
- adjust comments
- minor fixes
changes v3:
- remove half duplex flow control configuration
- add comments
- s/stram/stream
changes v2:
- split the patch to upstream and downstream part
- add comments
- fix downstream register offset
- fix CPU configuration
This patch set focuses on enhancing the configurability of flow
control, speed, and duplex settings in the Microchip KSZ8xxx DSA driver.
The first patch allows more granular control over the CPU port's flow
control, speed, and duplex settings. The second patch introduces a
method for port configurations for port with integrated PHYs, primarily
concerning flow control based on duplex mode.
Oleksij Rempel (3):
net: dsa: microchip: ksz8: Make flow control, speed, and duplex on CPU
port configurable
net: dsa: microchip: ksz8: Add function to configure ports with
integrated PHYs
net: dsa: microchip: make phylink_mac_link_up() not optional
drivers/net/dsa/microchip/ksz8.h | 4 +
drivers/net/dsa/microchip/ksz8795.c | 133 ++++++++++++++++++++++++-
drivers/net/dsa/microchip/ksz_common.c | 7 +-
3 files changed, 138 insertions(+), 6 deletions(-)
--
2.39.2
This patch introduces the function 'ksz8_phy_port_link_up' to the
Microchip KSZ8xxx driver. This function is responsible for setting up
flow control and duplex settings for the ports that are integrated with
PHYs.
The KSZ8795 switch supports asymmetric pause control, which can't be
fully utilized since a single bit controls both RX and TX pause. Despite
this, the flow control can be adjusted based on the auto-negotiation
process, taking into account the capabilities of both link partners.
On the other hand, the KSZ8873's PORT_FORCE_FLOW_CTRL bit can be set by
the hardware bootstrap, which ignores the auto-negotiation result.
Therefore, even in auto-negotiation mode, we need to ensure that this
bit is correctly set.
When auto-negotiation isn't in use, we enforce symmetric pause control
for the KSZ8795 switch.
Please note, forcing flow control disable on a port while still
advertising pause support isn't possible. While this scenario
might not be practical or desired, it's important to be aware of this
limitation when working with the KSZ8873 and similar devices.
Signed-off-by: Oleksij Rempel <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
---
drivers/net/dsa/microchip/ksz8795.c | 79 +++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 3504e7238eba..0b263c42b191 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1528,6 +1528,83 @@ void ksz8_config_cpu_port(struct dsa_switch *ds)
}
}
+/**
+ * ksz8_phy_port_link_up - Configures ports with integrated PHYs
+ * @dev: The KSZ device instance.
+ * @port: The port number to configure.
+ * @duplex: The desired duplex mode.
+ * @tx_pause: If true, enables transmit pause.
+ * @rx_pause: If true, enables receive pause.
+ *
+ * Description:
+ * The function configures flow control settings for a given port based on the
+ * desired settings and current duplex mode.
+ *
+ * According to the KSZ8873 datasheet, the PORT_FORCE_FLOW_CTRL bit in the
+ * Port Control 2 register (0x1A for Port 1, 0x22 for Port 2, 0x32 for Port 3)
+ * determines how flow control is handled on the port:
+ * "1 = will always enable full-duplex flow control on the port, regardless
+ * of AN result.
+ * 0 = full-duplex flow control is enabled based on AN result."
+ *
+ * This means that the flow control behavior depends on the state of this bit:
+ * - If PORT_FORCE_FLOW_CTRL is set to 1, the switch will ignore AN results and
+ * force flow control on the port.
+ * - If PORT_FORCE_FLOW_CTRL is set to 0, the switch will enable or disable
+ * flow control based on the AN results.
+ *
+ * However, there is a potential limitation in this configuration. It is
+ * currently not possible to force disable flow control on a port if we still
+ * advertise pause support. While such a configuration is not currently
+ * supported by Linux, and may not make practical sense, it's important to be
+ * aware of this limitation when working with the KSZ8873 and similar devices.
+ */
+static void ksz8_phy_port_link_up(struct ksz_device *dev, int port, int duplex,
+ bool tx_pause, bool rx_pause)
+{
+ const u16 *regs = dev->info->regs;
+ u8 ctrl = 0;
+ int ret;
+
+ /* The KSZ8795 switch differs from the KSZ8873 by supporting
+ * asymmetric pause control. However, since a single bit is used to
+ * control both RX and TX pause, we can't enforce asymmetric pause
+ * control - both TX and RX pause will be either enabled or disabled
+ * together.
+ *
+ * If auto-negotiation is enabled, we usually allow the flow control to
+ * be determined by the auto-negotiation process based on the
+ * capabilities of both link partners. However, for KSZ8873, the
+ * PORT_FORCE_FLOW_CTRL bit may be set by the hardware bootstrap,
+ * ignoring the auto-negotiation result. Thus, even in auto-negotiation
+ * mode, we need to ensure that the PORT_FORCE_FLOW_CTRL bit is
+ * properly cleared.
+ *
+ * In the absence of auto-negotiation, we will enforce symmetric
+ * pause control for both variants of switches - KSZ8873 and KSZ8795.
+ */
+ if (duplex) {
+ bool aneg_en = false;
+
+ ret = ksz_pread8(dev, port, regs[P_FORCE_CTRL], &ctrl);
+ if (ret)
+ return;
+
+ if (ksz_is_ksz88x3(dev)) {
+ if ((ctrl & PORT_AUTO_NEG_ENABLE))
+ aneg_en = true;
+ } else {
+ if (!(ctrl & PORT_AUTO_NEG_DISABLE))
+ aneg_en = true;
+ }
+
+ if (!aneg_en && (tx_pause || rx_pause))
+ ctrl |= PORT_FORCE_FLOW_CTRL;
+ }
+
+ ksz_prmw8(dev, port, regs[P_STP_CTRL], PORT_FORCE_FLOW_CTRL, ctrl);
+}
+
/**
* ksz8_cpu_port_link_up - Configures the CPU port of the switch.
* @dev: The KSZ device instance.
@@ -1578,6 +1655,8 @@ void ksz8_phylink_mac_link_up(struct ksz_device *dev, int port,
*/
if (dev->cpu_port == port)
ksz8_cpu_port_link_up(dev, speed, duplex, tx_pause, rx_pause);
+ else if (dev->info->internal_phy[port])
+ ksz8_phy_port_link_up(dev, port, duplex, tx_pause, rx_pause);
}
static int ksz8_handle_global_errata(struct dsa_switch *ds)
--
2.39.2
Allow flow control, speed, and duplex settings on the CPU port to be
configurable. Previously, the speed and duplex relied on default switch
values, which limited flexibility. Additionally, flow control was
hardcoded and only functional in duplex mode. This update enhances the
configurability of these parameters.
Signed-off-by: Oleksij Rempel <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Reviewed-by: Vladimir Oltean <[email protected]>
---
drivers/net/dsa/microchip/ksz8.h | 4 ++
drivers/net/dsa/microchip/ksz8795.c | 54 +++++++++++++++++++++++++-
drivers/net/dsa/microchip/ksz_common.c | 1 +
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/ksz8.h
index ef653bbfde75..571c26ce71e4 100644
--- a/drivers/net/dsa/microchip/ksz8.h
+++ b/drivers/net/dsa/microchip/ksz8.h
@@ -54,5 +54,9 @@ int ksz8_reset_switch(struct ksz_device *dev);
int ksz8_switch_init(struct ksz_device *dev);
void ksz8_switch_exit(struct ksz_device *dev);
int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu);
+void ksz8_phylink_mac_link_up(struct ksz_device *dev, int port,
+ unsigned int mode, phy_interface_t interface,
+ struct phy_device *phydev, int speed, int duplex,
+ bool tx_pause, bool rx_pause);
#endif
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 8deb217638d3..3504e7238eba 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1528,6 +1528,58 @@ void ksz8_config_cpu_port(struct dsa_switch *ds)
}
}
+/**
+ * ksz8_cpu_port_link_up - Configures the CPU port of the switch.
+ * @dev: The KSZ device instance.
+ * @speed: The desired link speed.
+ * @duplex: The desired duplex mode.
+ * @tx_pause: If true, enables transmit pause.
+ * @rx_pause: If true, enables receive pause.
+ *
+ * Description:
+ * The function configures flow control and speed settings for the CPU
+ * port of the switch based on the desired settings, current duplex mode, and
+ * speed.
+ */
+static void ksz8_cpu_port_link_up(struct ksz_device *dev, int speed, int duplex,
+ bool tx_pause, bool rx_pause)
+{
+ const u16 *regs = dev->info->regs;
+ u8 ctrl = 0;
+
+ /* SW_FLOW_CTRL, SW_HALF_DUPLEX, and SW_10_MBIT bits are bootstrappable
+ * at least on KSZ8873. They can have different values depending on your
+ * board setup.
+ */
+ if (duplex) {
+ if (tx_pause || rx_pause)
+ ctrl |= SW_FLOW_CTRL;
+ } else {
+ ctrl |= SW_HALF_DUPLEX;
+ }
+
+ /* This hardware only supports SPEED_10 and SPEED_100. For SPEED_10
+ * we need to set the SW_10_MBIT bit. Otherwise, we can leave it 0.
+ */
+ if (speed == SPEED_10)
+ ctrl |= SW_10_MBIT;
+
+ ksz_rmw8(dev, regs[S_BROADCAST_CTRL], SW_HALF_DUPLEX | SW_FLOW_CTRL |
+ SW_10_MBIT, ctrl);
+}
+
+void ksz8_phylink_mac_link_up(struct ksz_device *dev, int port,
+ unsigned int mode, phy_interface_t interface,
+ struct phy_device *phydev, int speed, int duplex,
+ bool tx_pause, bool rx_pause)
+{
+ /* If the port is the CPU port, apply special handling. Only the CPU
+ * port is configured via global registers.
+ */
+ if (dev->cpu_port == port)
+ ksz8_cpu_port_link_up(dev, speed, duplex, tx_pause, rx_pause);
+}
+
static int ksz8_handle_global_errata(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
@@ -1576,8 +1628,6 @@ int ksz8_setup(struct dsa_switch *ds)
*/
ds->vlan_filtering_is_global = true;
- ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_FLOW_CTRL, true);
-
/* Enable automatic fast aging when link changed detected. */
ksz_cfg(dev, S_LINK_AGING_CTRL, SW_LINK_AUTO_AGING, true);
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 3fed406fb46a..0ee7cfb8d4bd 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -277,6 +277,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = {
.mirror_add = ksz8_port_mirror_add,
.mirror_del = ksz8_port_mirror_del,
.get_caps = ksz8_get_caps,
+ .phylink_mac_link_up = ksz8_phylink_mac_link_up,
.config_cpu_port = ksz8_config_cpu_port,
.enable_stp_addr = ksz8_enable_stp_addr,
.reset = ksz8_reset_switch,
--
2.39.2
On Wed, Nov 22, 2023 at 10:25:43AM +0100, Oleksij Rempel wrote:
> Allow flow control, speed, and duplex settings on the CPU port to be
> configurable. Previously, the speed and duplex relied on default switch
> values, which limited flexibility. Additionally, flow control was
> hardcoded and only functional in duplex mode. This update enhances the
> configurability of these parameters.
>
> Signed-off-by: Oleksij Rempel <[email protected]>
> Reviewed-by: Simon Horman <[email protected]>
> Reviewed-by: Vladimir Oltean <[email protected]>
> ---
> drivers/net/dsa/microchip/ksz8.h | 4 ++
> drivers/net/dsa/microchip/ksz8795.c | 54 +++++++++++++++++++++++++-
> drivers/net/dsa/microchip/ksz_common.c | 1 +
> 3 files changed, 57 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/ksz8.h
> index ef653bbfde75..571c26ce71e4 100644
> --- a/drivers/net/dsa/microchip/ksz8.h
> +++ b/drivers/net/dsa/microchip/ksz8.h
> @@ -54,5 +54,9 @@ int ksz8_reset_switch(struct ksz_device *dev);
> int ksz8_switch_init(struct ksz_device *dev);
> void ksz8_switch_exit(struct ksz_device *dev);
> int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu);
> +void ksz8_phylink_mac_link_up(struct ksz_device *dev, int port,
> + unsigned int mode, phy_interface_t interface,
> + struct phy_device *phydev, int speed, int duplex,
> + bool tx_pause, bool rx_pause);
>
> #endif
> diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
> index 8deb217638d3..3504e7238eba 100644
> --- a/drivers/net/dsa/microchip/ksz8795.c
> +++ b/drivers/net/dsa/microchip/ksz8795.c
> @@ -1528,6 +1528,58 @@ void ksz8_config_cpu_port(struct dsa_switch *ds)
> }
> }
>
> +/**
> + * ksz8_cpu_port_link_up - Configures the CPU port of the switch.
> + * @dev: The KSZ device instance.
> + * @speed: The desired link speed.
> + * @duplex: The desired duplex mode.
> + * @tx_pause: If true, enables transmit pause.
> + * @rx_pause: If true, enables receive pause.
> + *
> + * Description:
> + * The function configures flow control and speed settings for the CPU
> + * port of the switch based on the desired settings, current duplex mode, and
> + * speed.
> + */
> +static void ksz8_cpu_port_link_up(struct ksz_device *dev, int speed, int duplex,
> + bool tx_pause, bool rx_pause)
> +{
> + const u16 *regs = dev->info->regs;
> + u8 ctrl = 0;
> +
> + /* SW_FLOW_CTRL, SW_HALF_DUPLEX, and SW_10_MBIT bits are bootstrappable
> + * at least on KSZ8873. They can have different values depending on your
> + * board setup.
> + */
> + if (duplex) {
> + if (tx_pause || rx_pause)
> + ctrl |= SW_FLOW_CTRL;
Please don't make this dependent on duplex, and allow phylink to enforce
that. For example, phylink_resolve_an_pause() will only enable tx/rx
pause if in full duplex mode.
> + } else {
> + ctrl |= SW_HALF_DUPLEX;
> + }
> +
> + /* This hardware only supports SPEED_10 and SPEED_100. For SPEED_10
> + * we need to set the SW_10_MBIT bit. Otherwise, we can leave it 0.
> + */
> + if (speed == SPEED_10)
> + ctrl |= SW_10_MBIT;
> +
> + ksz_rmw8(dev, regs[S_BROADCAST_CTRL], SW_HALF_DUPLEX | SW_FLOW_CTRL |
> + SW_10_MBIT, ctrl);
So this is using SW_FLOW_CTRL with the S_BROADCAST_CTRL register...
> @@ -1576,8 +1628,6 @@ int ksz8_setup(struct dsa_switch *ds)
> */
> ds->vlan_filtering_is_global = true;
>
> - ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_FLOW_CTRL, true);
But previously it was being used with the S_REPLACE_VID_CTRL register.
Doesn't make sense to me.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
On Wed, Nov 22, 2023 at 10:25:44AM +0100, Oleksij Rempel wrote:
> + if (duplex) {
Unnecessary.
> + bool aneg_en = false;
> +
> + ret = ksz_pread8(dev, port, regs[P_FORCE_CTRL], &ctrl);
> + if (ret)
> + return;
> +
> + if (ksz_is_ksz88x3(dev)) {
> + if ((ctrl & PORT_AUTO_NEG_ENABLE))
Too many parens.
> + aneg_en = true;
Simpler:
aneg_en = ctrl & PORT_AUTO_NEG_ENABLE;
> + } else {
> + if (!(ctrl & PORT_AUTO_NEG_DISABLE))
> + aneg_en = true;
Simpler:
aneg_en = !(ctrl & PORT_AUTO_NEG_DISABLE);
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
On Wed, Nov 22, 2023 at 09:38:09AM +0000, Russell King (Oracle) wrote:
> On Wed, Nov 22, 2023 at 10:25:43AM +0100, Oleksij Rempel wrote:
> > Allow flow control, speed, and duplex settings on the CPU port to be
> > configurable. Previously, the speed and duplex relied on default switch
> > values, which limited flexibility. Additionally, flow control was
> > hardcoded and only functional in duplex mode. This update enhances the
> > configurability of these parameters.
> >
> > Signed-off-by: Oleksij Rempel <[email protected]>
> > Reviewed-by: Simon Horman <[email protected]>
> > Reviewed-by: Vladimir Oltean <[email protected]>
> > ---
> > drivers/net/dsa/microchip/ksz8.h | 4 ++
> > drivers/net/dsa/microchip/ksz8795.c | 54 +++++++++++++++++++++++++-
> > drivers/net/dsa/microchip/ksz_common.c | 1 +
> > 3 files changed, 57 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/ksz8.h
> > index ef653bbfde75..571c26ce71e4 100644
> > --- a/drivers/net/dsa/microchip/ksz8.h
> > +++ b/drivers/net/dsa/microchip/ksz8.h
> > @@ -54,5 +54,9 @@ int ksz8_reset_switch(struct ksz_device *dev);
> > int ksz8_switch_init(struct ksz_device *dev);
> > void ksz8_switch_exit(struct ksz_device *dev);
> > int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu);
> > +void ksz8_phylink_mac_link_up(struct ksz_device *dev, int port,
> > + unsigned int mode, phy_interface_t interface,
> > + struct phy_device *phydev, int speed, int duplex,
> > + bool tx_pause, bool rx_pause);
> >
> > #endif
> > diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
> > index 8deb217638d3..3504e7238eba 100644
> > --- a/drivers/net/dsa/microchip/ksz8795.c
> > +++ b/drivers/net/dsa/microchip/ksz8795.c
> > @@ -1528,6 +1528,58 @@ void ksz8_config_cpu_port(struct dsa_switch *ds)
> > }
> > }
> >
> > +/**
> > + * ksz8_cpu_port_link_up - Configures the CPU port of the switch.
> > + * @dev: The KSZ device instance.
> > + * @speed: The desired link speed.
> > + * @duplex: The desired duplex mode.
> > + * @tx_pause: If true, enables transmit pause.
> > + * @rx_pause: If true, enables receive pause.
> > + *
> > + * Description:
> > + * The function configures flow control and speed settings for the CPU
> > + * port of the switch based on the desired settings, current duplex mode, and
> > + * speed.
> > + */
> > +static void ksz8_cpu_port_link_up(struct ksz_device *dev, int speed, int duplex,
> > + bool tx_pause, bool rx_pause)
> > +{
> > + const u16 *regs = dev->info->regs;
> > + u8 ctrl = 0;
> > +
> > + /* SW_FLOW_CTRL, SW_HALF_DUPLEX, and SW_10_MBIT bits are bootstrappable
> > + * at least on KSZ8873. They can have different values depending on your
> > + * board setup.
> > + */
> > + if (duplex) {
> > + if (tx_pause || rx_pause)
> > + ctrl |= SW_FLOW_CTRL;
>
> Please don't make this dependent on duplex, and allow phylink to enforce
> that. For example, phylink_resolve_an_pause() will only enable tx/rx
> pause if in full duplex mode.
OK, thx.
> > + } else {
> > + ctrl |= SW_HALF_DUPLEX;
> > + }
> > +
> > + /* This hardware only supports SPEED_10 and SPEED_100. For SPEED_10
> > + * we need to set the SW_10_MBIT bit. Otherwise, we can leave it 0.
> > + */
> > + if (speed == SPEED_10)
> > + ctrl |= SW_10_MBIT;
> > +
> > + ksz_rmw8(dev, regs[S_BROADCAST_CTRL], SW_HALF_DUPLEX | SW_FLOW_CTRL |
> > + SW_10_MBIT, ctrl);
>
> So this is using SW_FLOW_CTRL with the S_BROADCAST_CTRL register...
>
> > @@ -1576,8 +1628,6 @@ int ksz8_setup(struct dsa_switch *ds)
> > */
> > ds->vlan_filtering_is_global = true;
> >
> > - ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_FLOW_CTRL, true);
>
> But previously it was being used with the S_REPLACE_VID_CTRL register.
> Doesn't make sense to me.
Yes, it looks suspicious. There are multiple ways to access same
register. Vladimir pointed to in in the v4 review. S_BROADCAST_CTRL is
used in most recent code. So, i decided to settle down to the variant.
Regards,
Oleksij
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |