From: Tao Ren <[email protected]>
The patch series adds fixed link support to ftgmac100 driver.
Patch #1 adds fixed link logic into ftgmac100 driver.
Patch #2 enables mac3 controller in Elbert dts: Elbert mac3 is connected
to the onboard switch BCM53134P's IMP_RGMII port directly (no PHY
between BMC MAC and BCM53134P).
Tao Ren (2):
net: ftgmac100: support fixed link
ARM: dts: aspeed: elbert: Enable mac3 controller
.../boot/dts/aspeed-bmc-facebook-elbert.dts | 18 ++++++++++++++
drivers/net/ethernet/faraday/ftgmac100.c | 24 +++++++++++++++++++
2 files changed, 42 insertions(+)
--
2.37.3
From: Tao Ren <[email protected]>
Support fixed link in ftgmac100 driver. Fixed link is used on several
Meta OpenBMC platforms, such as Elbert (AST2620) and Wedge400 (AST2520).
Signed-off-by: Tao Ren <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
---
Changes in v3: None
Changes in v2: None
drivers/net/ethernet/faraday/ftgmac100.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 9277d5fb5052..da04beee5865 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1701,10 +1701,14 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)
static void ftgmac100_phy_disconnect(struct net_device *netdev)
{
+ struct ftgmac100 *priv = netdev_priv(netdev);
+
if (!netdev->phydev)
return;
phy_disconnect(netdev->phydev);
+ if (of_phy_is_fixed_link(priv->dev->of_node))
+ of_phy_deregister_fixed_link(priv->dev->of_node);
}
static void ftgmac100_destroy_mdio(struct net_device *netdev)
@@ -1867,6 +1871,26 @@ static int ftgmac100_probe(struct platform_device *pdev)
err = -EINVAL;
goto err_phy_connect;
}
+ } else if (np && of_phy_is_fixed_link(np)) {
+ struct phy_device *phy;
+
+ err = of_phy_register_fixed_link(np);
+ if (err) {
+ dev_err(&pdev->dev, "Failed to register fixed PHY\n");
+ goto err_phy_connect;
+ }
+
+ phy = of_phy_get_and_connect(priv->netdev, np,
+ &ftgmac100_adjust_link);
+ if (!phy) {
+ dev_err(&pdev->dev, "Failed to connect to fixed PHY\n");
+ of_phy_deregister_fixed_link(np);
+ err = -EINVAL;
+ goto err_phy_connect;
+ }
+
+ /* Display what we found */
+ phy_attached_info(phy);
} else if (np && of_get_property(np, "phy-handle", NULL)) {
struct phy_device *phy;
--
2.37.3
From: Tao Ren <[email protected]>
Enable mac3 controller in Elbert dts: Elbert MAC3 is connected to the
BCM53134P onboard switch's IMP_RGMII port directly (fixed link, no PHY
between BMC MAC and BCM53134P).
Note: BMC's mdio0 controller is connected to BCM53134P's MDIO interface,
and the MDIO channel will be enabled later, when BCM53134 is added to
"bcm53xx" DSA driver.
Signed-off-by: Tao Ren <[email protected]>
---
Changes in v3:
- updated comments and patch description.
Changes in v2:
- updated comments and patch description.
.../boot/dts/aspeed-bmc-facebook-elbert.dts | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts
index 27b43fe099f1..8e1a1d1b282d 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts
@@ -183,3 +183,21 @@ imux31: i2c@7 {
&i2c11 {
status = "okay";
};
+
+/*
+ * BMC's "mac3" controller is connected to BCM53134P's IMP_RGMII port
+ * directly (fixed link, no PHY in between).
+ * Note: BMC's "mdio0" controller is connected to BCM53134P's MDIO
+ * interface, and the MDIO channel will be enabled in dts later, when
+ * BCM53134 is added to "bcm53xx" DSA driver.
+ */
+&mac3 {
+ status = "okay";
+ phy-mode = "rgmii";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_rgmii4_default>;
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+};
--
2.37.3
On 9/6/2022 10:44 PM, [email protected] wrote:
> From: Tao Ren <[email protected]>
>
> Support fixed link in ftgmac100 driver. Fixed link is used on several
> Meta OpenBMC platforms, such as Elbert (AST2620) and Wedge400 (AST2520).
>
> Signed-off-by: Tao Ren <[email protected]>
> Reviewed-by: Andrew Lunn <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
--
Florian
On Tue, Sep 06, 2022 at 10:44:53PM -0700, [email protected] wrote:
> From: Tao Ren <[email protected]>
>
> Enable mac3 controller in Elbert dts: Elbert MAC3 is connected to the
> BCM53134P onboard switch's IMP_RGMII port directly (fixed link, no PHY
> between BMC MAC and BCM53134P).
>
> Note: BMC's mdio0 controller is connected to BCM53134P's MDIO interface,
> and the MDIO channel will be enabled later, when BCM53134 is added to
> "bcm53xx" DSA driver.
>
> Signed-off-by: Tao Ren <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Andrew
On 9/6/2022 10:44 PM, [email protected] wrote:
> From: Tao Ren <[email protected]>
>
> Enable mac3 controller in Elbert dts: Elbert MAC3 is connected to the
> BCM53134P onboard switch's IMP_RGMII port directly (fixed link, no PHY
> between BMC MAC and BCM53134P).
>
> Note: BMC's mdio0 controller is connected to BCM53134P's MDIO interface,
> and the MDIO channel will be enabled later, when BCM53134 is added to
> "bcm53xx" DSA driver.
>
> Signed-off-by: Tao Ren <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
--
Florian
Hello:
This series was applied to netdev/net-next.git (master)
by Paolo Abeni <[email protected]>:
On Tue, 6 Sep 2022 22:44:51 -0700 you wrote:
> From: Tao Ren <[email protected]>
>
> The patch series adds fixed link support to ftgmac100 driver.
>
> Patch #1 adds fixed link logic into ftgmac100 driver.
>
> Patch #2 enables mac3 controller in Elbert dts: Elbert mac3 is connected
> to the onboard switch BCM53134P's IMP_RGMII port directly (no PHY
> between BMC MAC and BCM53134P).
>
> [...]
Here is the summary with links:
- [net-next,v3,1/2] net: ftgmac100: support fixed link
https://git.kernel.org/netdev/net-next/c/38561ded50d0
- [net-next,v3,2/2] ARM: dts: aspeed: elbert: Enable mac3 controller
https://git.kernel.org/netdev/net-next/c/ce6ce9176975
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html