nixge: Fixed-link support
Subsystems (3)
cover nixge: Fixed-link support
From: Moritz Fischer <[email protected]>
This series adds fixed-link support to nixge.
The first patch corrects the binding to correctly reflect hardware that does not come with MDIO cores instantiated.
The second patch adds fixed link support to the driver.
The third patch updates the binding document with the now optional (formerly required) phy-handle property and references the fixed-link docs.
Thanks,
Moritz
Moritz Fischer (3):
net: nixge: Make mdio child node optional
net: nixge: Add support for fixed-link configurations
dt-bindings: net: Add fixed-link support
.../devicetree/bindings/net/nixge.txt | 60 +++++++++++++++++-- drivers/net/ethernet/ni/nixge.c | 44 ++++++++++---- 2 files changed, 88 insertions(+), 16 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 net: nixge: Make mdio child node optional
From: Moritz Fischer <[email protected]>
Make MDIO child optional and only instantiate the MDIO bus if the child is actually present.
There are currently no (in-tree) users of this binding; all (out-of-tree) users use overlays that get shipped together with the FPGA images that contain the IP.
This will significantly increase maintainabilty of future revisions of this IP.
---
Changes from RFC:
- Add Andrew's Reviewed-by tag
- Rebased on top of net-next
--- .../devicetree/bindings/net/nixge.txt | 27 ++++++++++++++++--- drivers/net/ethernet/ni/nixge.c | 19 ++++++++----- 2 files changed, 37 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/net/nixge.txt +24 -3
@@ -16,6 +16,9 @@ Required properties: - nvmem-cells: Phandle of nvmem cell containing the MAC address - nvmem-cell-names: Should be "address" +Optional properties: +- mdio subnode to indicate presence of MDIO controller + Examples (10G generic PHY): nixge0: ethernet@40000000 { compatible = "ni,xge-enet-3.00";
@@ -33,8 +36,26 @@ Examples (10G generic PHY): phy-mode = "xgmii"; phy-handle = <ðernet_phy1>; - ethernet_phy1: ethernet-phy@4 { - compatible = "ethernet-phy-ieee802.3-c45"; - reg = <4>; + mdio { + ethernet_phy1: ethernet-phy@4 { + compatible = "ethernet-phy-ieee802.3-c45"; + reg = <4>; + }; }; }; + +Examples (10G generic PHY, no MDIO): + nixge0: ethernet@40000000 { + compatible = "ni,xge-enet-2.00"; + reg = <0x40000000 0x6000>; + + nvmem-cells = <ð1_addr>; + nvmem-cell-names = "address"; + + interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>, <0 30 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "rx", "tx"; + interrupt-parent = <&intc>; + + phy-mode = "xgmii"; + phy-handle = <ðernet_phy1>; + };
drivers/net/ethernet/ni/nixge.c +13 -6
@@ -1284,6 +1284,7 @@ static int nixge_probe(struct platform_device *pdev) {struct nixge_priv *priv;struct net_device *ndev; +struct device_node *mn;const u8 *mac_addr;int err;
@@ -1335,10 +1336,14 @@ static int nixge_probe(struct platform_device *pdev) priv->coalesce_count_rx =XAXIDMA_DFT_RX_THRESHOLD ; priv->coalesce_count_tx =XAXIDMA_DFT_TX_THRESHOLD ; - err =nixge_mdio_setup (priv, pdev->dev.of_node); -if (err) { -netdev_err (ndev,"error registering mdio bus" ); - goto free_netdev; + mn =of_get_child_by_name (pdev->dev.of_node,"mdio" ); +if (mn) { + err =nixge_mdio_setup (priv, mn); +of_node_put (mn); +if (err) { +netdev_err (ndev,"error registering mdio bus" ); + goto free_netdev; + } } priv->phy_mode =of_get_phy_mode (pdev->dev.of_node);
@@ -1364,7 +1369,8 @@ static int nixge_probe(struct platform_device *pdev)return 0 ; unregister_mdio: -mdiobus_unregister (priv->mii_bus); +if (priv->mii_bus) +mdiobus_unregister (priv->mii_bus); free_netdev:free_netdev (ndev);
@@ -1379,7 +1385,8 @@ static int nixge_remove(struct platform_device *pdev)unregister_netdev (ndev); -mdiobus_unregister (priv->mii_bus); +if (priv->mii_bus) +mdiobus_unregister (priv->mii_bus);free_netdev (ndev);
Signature · 1 line
2.20.1
PATCH 2/3 net: nixge: Add support for fixed-link configurations
In reply to Moritz FischerFrom: Moritz Fischer <[email protected]>
Add support for fixed-link configurations to nixge driver.
--- drivers/net/ethernet/ni/nixge.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/net/ethernet/ni/nixge.c +20 -7
@@ -1282,9 +1282,9 @@ static int nixge_of_get_resources(struct platform_device *pdev)static int nixge_probe (struct platform_device *pdev) { +struct device_node *mn, *phy_node;struct nixge_priv *priv;struct net_device *ndev; -struct device_node *mn;const u8 *mac_addr;int err;
@@ -1353,21 +1353,30 @@ static int nixge_probe(struct platform_device *pdev) goto unregister_mdio; } - priv->phy_node =of_parse_phandle (pdev->dev.of_node,"phy-handle" ,0 ); -if (!priv->phy_node) { -netdev_err (ndev,"not find \"phy-handle\" property\n" ); - err = -EINVAL ; - goto unregister_mdio; + phy_node =of_parse_phandle (pdev->dev.of_node,"phy-handle" ,0 ); +if (!phy_node &&of_phy_is_fixed_link (pdev->dev.of_node)) { + err =of_phy_register_fixed_link (pdev->dev.of_node); +if (err <0 ) { +netdev_err (ndev,"broken fixed-link specification\n" ); + goto unregister_mdio; + } + phy_node =of_node_get (pdev->dev.of_node); } + priv->phy_node = phy_node; err =register_netdev (priv->ndev);if (err) {netdev_err (ndev,"register_netdev() error (%i)\n" , err); - goto unregister_mdio; + goto free_phy; }return 0 ; +free_phy: +if (of_phy_is_fixed_link (pdev->dev.of_node)) +of_phy_deregister_fixed_link (pdev->dev.of_node); +of_node_put (phy_node); + unregister_mdio:if (priv->mii_bus)mdiobus_unregister (priv->mii_bus);
@@ -1385,6 +1394,10 @@ static int nixge_remove(struct platform_device *pdev)unregister_netdev (ndev); +if (of_phy_is_fixed_link (pdev->dev.of_node)) +of_phy_deregister_fixed_link (pdev->dev.of_node); +of_node_put (priv->phy_node); +if (priv->mii_bus)mdiobus_unregister (priv->mii_bus);
Signature · 1 line
2.20.1
PATCH 3/3 dt-bindings: net: Add fixed-link support
In reply to Moritz FischerFrom: Moritz Fischer <[email protected]>
Update device-tree binding with fixed-link support.
With fixed-link support the formerly required property 'phy-handle' is now optional if 'fixed-link' child is present.
--- .../devicetree/bindings/net/nixge.txt | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/nixge.txt +32 -1
@@ -12,12 +12,14 @@ Required properties: - interrupts: Should contain tx and rx interrupt - interrupt-names: Should be "rx" and "tx" - phy-mode: See ethernet.txt file in the same directory. -- phy-handle: See ethernet.txt file in the same directory. - nvmem-cells: Phandle of nvmem cell containing the MAC address - nvmem-cell-names: Should be "address" Optional properties: - mdio subnode to indicate presence of MDIO controller +- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory. + Use instead of phy-handle. +- phy-handle: See ethernet.txt file in the same directory. Examples (10G generic PHY): nixge0: ethernet@40000000 {
@@ -59,3 +61,32 @@ Examples (10G generic PHY, no MDIO): phy-mode = "xgmii"; phy-handle = <ðernet_phy1>; }; + +Examples (1G generic fixed-link + MDIO): + nixge0: ethernet@40000000 { + compatible = "ni,xge-enet-2.00"; + reg = <0x40000000 0x6000>; + + nvmem-cells = <ð1_addr>; + nvmem-cell-names = "address"; + + interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>, <0 30 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "rx", "tx"; + interrupt-parent = <&intc>; + + phy-mode = "xgmii"; + + fixed-link { + speed = <1000>; + pause; + link-gpios = <&gpio0 63 GPIO_ACTIVE_HIGH>; + }; + + mdio { + ethernet_phy1: ethernet-phy@4 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <4>; + }; + }; + + };
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Moritz Fischer <[email protected]>
Date: Mon, 4 Feb 2019 09:30:37 -0800
Quoted 4 lines
From: Moritz Fischer <[email protected]>
This series adds fixed-link support to nixge.
Quoted 8 lines
The first patch corrects the binding to correctly reflect hardware that does not come with MDIO cores instantiated.
The second patch adds fixed link support to the driver.
The third patch updates the binding document with the now optional (formerly required) phy-handle property and references the fixed-link docs.
Series applied, thank you.