All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] net: dsa: b53: add support for BCM63xx RGMIIs
@ 2023-03-19 18:33 Álvaro Fernández Rojas
  2023-03-19 18:50 ` Andrew Lunn
  2023-03-19 22:08 ` [PATCH v2] " Álvaro Fernández Rojas
  0 siblings, 2 replies; 5+ messages in thread
From: Álvaro Fernández Rojas @ 2023-03-19 18:33 UTC (permalink / raw)
  To: f.fainelli, jonas.gorski, andrew, olteanv, davem, edumazet, kuba,
	pabeni, netdev, linux-kernel
  Cc: Álvaro Fernández Rojas

BCM63xx RGMII ports require additional configuration in order to work.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 drivers/net/dsa/b53/b53_common.c | 36 ++++++++++++++++++++++++++++++++
 drivers/net/dsa/b53/b53_priv.h   |  1 +
 2 files changed, 37 insertions(+)

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 59cdfc51ce06..378327add363 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1209,6 +1209,36 @@ static void b53_force_port_config(struct b53_device *dev, int port,
 	b53_write8(dev, B53_CTRL_PAGE, off, reg);
 }
 
+static void b53_adjust_63xx_rgmii(struct dsa_switch *ds, int port,
+				  phy_interface_t interface)
+{
+	struct b53_device *dev = ds->priv;
+	u8 rgmii_ctrl = 0, off;
+
+	if (port == dev->imp_port)
+		off = B53_RGMII_CTRL_IMP;
+	else
+		off = B53_RGMII_CTRL_P(port);
+
+	b53_read8(dev, B53_CTRL_PAGE, off, &rgmii_ctrl);
+
+	rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
+	if (interface == PHY_INTERFACE_MODE_RGMII_ID)
+		rgmii_ctrl |= (RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
+	else if (interface == PHY_INTERFACE_MODE_RGMII_RXID)
+		rgmii_ctrl |= RGMII_CTRL_DLL_RXC;
+	else if (interface == PHY_INTERFACE_MODE_RGMII_TXID)
+		rgmii_ctrl |= RGMII_CTRL_DLL_TXC;
+
+	if (port != dev->imp_port)
+		rgmii_ctrl |= RGMII_CTRL_ENABLE_GMII;
+
+	b53_write8(dev, B53_CTRL_PAGE, off, rgmii_ctrl);
+
+	dev_info(ds->dev, "Configured port %d for %s\n", port,
+		 phy_modes(interface));
+}
+
 static void b53_adjust_link(struct dsa_switch *ds, int port,
 			    struct phy_device *phydev)
 {
@@ -1235,6 +1265,9 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,
 			      tx_pause, rx_pause);
 	b53_force_link(dev, port, phydev->link);
 
+	if (is63xx(dev) && port >= B53_63XX_RGMII0)
+		b53_adjust_63xx_rgmii(ds, port, phydev->interface);
+
 	if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
 		if (port == dev->imp_port)
 			off = B53_RGMII_CTRL_IMP;
@@ -1402,6 +1435,9 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,
 {
 	struct b53_device *dev = ds->priv;
 
+	if (is63xx(dev) && port >= B53_63XX_RGMII0)
+		b53_adjust_63xx_rgmii(ds, port, interface);
+
 	if (mode == MLO_AN_PHY)
 		return;
 
diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index 795cbffd5c2b..4cf9f540696e 100644
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -211,6 +211,7 @@ static inline int is58xx(struct b53_device *dev)
 		dev->chip_id == BCM7278_DEVICE_ID;
 }
 
+#define B53_63XX_RGMII0	4
 #define B53_CPU_PORT_25	5
 #define B53_CPU_PORT	8
 
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] net: dsa: b53: add support for BCM63xx RGMIIs
  2023-03-19 18:33 [PATCH] net: dsa: b53: add support for BCM63xx RGMIIs Álvaro Fernández Rojas
@ 2023-03-19 18:50 ` Andrew Lunn
  2023-03-19 22:08 ` [PATCH v2] " Álvaro Fernández Rojas
  1 sibling, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2023-03-19 18:50 UTC (permalink / raw)
  To: Álvaro Fernández Rojas
  Cc: f.fainelli, jonas.gorski, olteanv, davem, edumazet, kuba, pabeni,
	netdev, linux-kernel

> +static void b53_adjust_63xx_rgmii(struct dsa_switch *ds, int port,
> +				  phy_interface_t interface)
> +{
> +	struct b53_device *dev = ds->priv;
> +	u8 rgmii_ctrl = 0, off;
> +
> +	if (port == dev->imp_port)
> +		off = B53_RGMII_CTRL_IMP;
> +	else
> +		off = B53_RGMII_CTRL_P(port);
> +
> +	b53_read8(dev, B53_CTRL_PAGE, off, &rgmii_ctrl);
> +
> +	rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
> +	if (interface == PHY_INTERFACE_MODE_RGMII_ID)
> +		rgmii_ctrl |= (RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
> +	else if (interface == PHY_INTERFACE_MODE_RGMII_RXID)
> +		rgmii_ctrl |= RGMII_CTRL_DLL_RXC;
> +	else if (interface == PHY_INTERFACE_MODE_RGMII_TXID)
> +		rgmii_ctrl |= RGMII_CTRL_DLL_TXC;

Please change this to a switch statement. Then i would suggest having
a case PHY_INTERFACE_MODE_RGMII: to make it clear you are handling
that as well, removing all delays. You do look to be handling it, so
it is not a big problem, but in the past we have had code where one of
the RGMII modes has been ignored resulting in some horrible problems
later. So it is something i now always look for, and like to be obvious.

> +
> +	if (port != dev->imp_port)
> +		rgmii_ctrl |= RGMII_CTRL_ENABLE_GMII;
> +
> +	b53_write8(dev, B53_CTRL_PAGE, off, rgmii_ctrl);
> +
> +	dev_info(ds->dev, "Configured port %d for %s\n", port,
> +		 phy_modes(interface));

dev_dbg().

	Andrew

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH v2] net: dsa: b53: add support for BCM63xx RGMIIs
  2023-03-19 18:33 [PATCH] net: dsa: b53: add support for BCM63xx RGMIIs Álvaro Fernández Rojas
  2023-03-19 18:50 ` Andrew Lunn
@ 2023-03-19 22:08 ` Álvaro Fernández Rojas
  2023-03-20 12:19   ` Andrew Lunn
  2023-03-21 12:30   ` patchwork-bot+netdevbpf
  1 sibling, 2 replies; 5+ messages in thread
From: Álvaro Fernández Rojas @ 2023-03-19 22:08 UTC (permalink / raw)
  To: f.fainelli, jonas.gorski, andrew, olteanv, davem, edumazet, kuba,
	pabeni, netdev, linux-kernel
  Cc: Álvaro Fernández Rojas

BCM63xx RGMII ports require additional configuration in order to work.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 v2: add changes suggested by Andrew:
  - Use a switch statement.
  - Use dev_dbg() instead of dev_info().

 drivers/net/dsa/b53/b53_common.c | 46 ++++++++++++++++++++++++++++++++
 drivers/net/dsa/b53/b53_priv.h   |  1 +
 2 files changed, 47 insertions(+)

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 59cdfc51ce06..6e212f6f1cb9 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1209,6 +1209,46 @@ static void b53_force_port_config(struct b53_device *dev, int port,
 	b53_write8(dev, B53_CTRL_PAGE, off, reg);
 }
 
+static void b53_adjust_63xx_rgmii(struct dsa_switch *ds, int port,
+				  phy_interface_t interface)
+{
+	struct b53_device *dev = ds->priv;
+	u8 rgmii_ctrl = 0, off;
+
+	if (port == dev->imp_port)
+		off = B53_RGMII_CTRL_IMP;
+	else
+		off = B53_RGMII_CTRL_P(port);
+
+	b53_read8(dev, B53_CTRL_PAGE, off, &rgmii_ctrl);
+
+	switch (interface) {
+	case PHY_INTERFACE_MODE_RGMII_ID:
+		rgmii_ctrl |= (RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
+		break;
+	case PHY_INTERFACE_MODE_RGMII_RXID:
+		rgmii_ctrl &= ~(RGMII_CTRL_DLL_TXC);
+		rgmii_ctrl |= RGMII_CTRL_DLL_RXC;
+		break;
+	case PHY_INTERFACE_MODE_RGMII_TXID:
+		rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC);
+		rgmii_ctrl |= RGMII_CTRL_DLL_TXC;
+		break;
+	case PHY_INTERFACE_MODE_RGMII:
+	default:
+		rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
+		break;
+	}
+
+	if (port != dev->imp_port)
+		rgmii_ctrl |= RGMII_CTRL_ENABLE_GMII;
+
+	b53_write8(dev, B53_CTRL_PAGE, off, rgmii_ctrl);
+
+	dev_dbg(ds->dev, "Configured port %d for %s\n", port,
+		phy_modes(interface));
+}
+
 static void b53_adjust_link(struct dsa_switch *ds, int port,
 			    struct phy_device *phydev)
 {
@@ -1235,6 +1275,9 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,
 			      tx_pause, rx_pause);
 	b53_force_link(dev, port, phydev->link);
 
+	if (is63xx(dev) && port >= B53_63XX_RGMII0)
+		b53_adjust_63xx_rgmii(ds, port, phydev->interface);
+
 	if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
 		if (port == dev->imp_port)
 			off = B53_RGMII_CTRL_IMP;
@@ -1402,6 +1445,9 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,
 {
 	struct b53_device *dev = ds->priv;
 
+	if (is63xx(dev) && port >= B53_63XX_RGMII0)
+		b53_adjust_63xx_rgmii(ds, port, interface);
+
 	if (mode == MLO_AN_PHY)
 		return;
 
diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index 795cbffd5c2b..4cf9f540696e 100644
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -211,6 +211,7 @@ static inline int is58xx(struct b53_device *dev)
 		dev->chip_id == BCM7278_DEVICE_ID;
 }
 
+#define B53_63XX_RGMII0	4
 #define B53_CPU_PORT_25	5
 #define B53_CPU_PORT	8
 
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] net: dsa: b53: add support for BCM63xx RGMIIs
  2023-03-19 22:08 ` [PATCH v2] " Álvaro Fernández Rojas
@ 2023-03-20 12:19   ` Andrew Lunn
  2023-03-21 12:30   ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2023-03-20 12:19 UTC (permalink / raw)
  To: Álvaro Fernández Rojas
  Cc: f.fainelli, jonas.gorski, olteanv, davem, edumazet, kuba, pabeni,
	netdev, linux-kernel

On Sun, Mar 19, 2023 at 11:08:05PM +0100, Álvaro Fernández Rojas wrote:
> BCM63xx RGMII ports require additional configuration in order to work.
> 
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] net: dsa: b53: add support for BCM63xx RGMIIs
  2023-03-19 22:08 ` [PATCH v2] " Álvaro Fernández Rojas
  2023-03-20 12:19   ` Andrew Lunn
@ 2023-03-21 12:30   ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-03-21 12:30 UTC (permalink / raw)
  To: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas_=3Cnoltari=40gmail=2Ecom=3E?=
  Cc: f.fainelli, jonas.gorski, andrew, olteanv, davem, edumazet, kuba,
	pabeni, netdev, linux-kernel

Hello:

This patch was applied to netdev/net-next.git (main)
by Paolo Abeni <pabeni@redhat.com>:

On Sun, 19 Mar 2023 23:08:05 +0100 you wrote:
> BCM63xx RGMII ports require additional configuration in order to work.
> 
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  v2: add changes suggested by Andrew:
>   - Use a switch statement.
>   - Use dev_dbg() instead of dev_info().
> 
> [...]

Here is the summary with links:
  - [v2] net: dsa: b53: add support for BCM63xx RGMIIs
    https://git.kernel.org/netdev/net-next/c/ce3bf94871f7

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-21 12:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-19 18:33 [PATCH] net: dsa: b53: add support for BCM63xx RGMIIs Álvaro Fernández Rojas
2023-03-19 18:50 ` Andrew Lunn
2023-03-19 22:08 ` [PATCH v2] " Álvaro Fernández Rojas
2023-03-20 12:19   ` Andrew Lunn
2023-03-21 12:30   ` patchwork-bot+netdevbpf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.