| Message ID | 20240605232608.65471-7-fujita.tomonori@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | add ethernet driver for Tehuti Networks TN40xx chips | expand |
On Thu, Jun 06, 2024 at 08:26:08AM +0900, FUJITA Tomonori wrote: > @@ -1670,6 +1681,12 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > goto err_unset_drvdata; > } > > + ret = tn40_mdiobus_init(priv); > + if (ret) { > + dev_err(&pdev->dev, "failed to initialize mdio bus.\n"); > + goto err_free_irq; > + } > + ... > +err_unregister_phydev: > + tn40_phy_unregister(priv); > err_free_irq: > pci_free_irq_vectors(pdev); > err_unset_drvdata: and from previous patches: + pci_set_drvdata(pdev, NULL); +err_iounmap: + iounmap(regs); +err_free_regions: + pci_release_regions(pdev); +err_disable_device: + pci_disable_device(pdev); + return ret; +} So, if tn40_mdiobus_init() returns non-zero, this value will be returned to higher kernel levels via tn40_probe(). ... > +int tn40_phy_register(struct tn40_priv *priv) > +{ > + struct phylink_config *config; > + struct phy_device *phydev; > + struct phylink *phylink; > + > + phydev = phy_find_first(priv->mdio); > + if (!phydev) { > + dev_err(&priv->pdev->dev, "PHY isn't found\n"); > + return -1; And my email client, setup with rules to catch common programming mistakes, highlights the above line. I have no idea why people do this... why people think "lets return -1 on error". It seems to be a very common pattern... but it's utterly wrong. -1 is -EPERM, aka "Operation not permitted". This is not what you mean here. Please return a more suitable negative errno symbol... and please refrain from using "return -1" in kernel code. (The only case where "return -1" may be permissible is where the value doesn't get propagated outside of the compilation unit, but even there, there is the possibility that later changes may end up propagating it outside... personally, I would like to see "return -1" totally banned from the kernel.) Thanks.
Hi, On Sun, 9 Jun 2024 11:34:28 +0100 "Russell King (Oracle)" <linux@armlinux.org.uk> wrote: >> +int tn40_phy_register(struct tn40_priv *priv) >> +{ >> + struct phylink_config *config; >> + struct phy_device *phydev; >> + struct phylink *phylink; >> + >> + phydev = phy_find_first(priv->mdio); >> + if (!phydev) { >> + dev_err(&priv->pdev->dev, "PHY isn't found\n"); >> + return -1; > > And my email client, setup with rules to catch common programming > mistakes, highlights the above line. I have no idea why people do > this... why people think "lets return -1 on error". It seems to be > a very common pattern... but it's utterly wrong. -1 is -EPERM, aka > "Operation not permitted". This is not what you mean here. Please > return a more suitable negative errno symbol... and please refrain > from using "return -1" in kernel code. Indeed, my bad. How about -ENODEV? Or -ENOXIO? > (The only case where "return -1" may be permissible is where the > value doesn't get propagated outside of the compilation unit, but > even there, there is the possibility that later changes may end > up propagating it outside... personally, I would like to see > "return -1" totally banned from the kernel.) Understood. This driver should only use "return -1" here.
On Mon, Jun 10, 2024 at 03:10:23PM +0900, FUJITA Tomonori wrote: > Hi, > > On Sun, 9 Jun 2024 11:34:28 +0100 > "Russell King (Oracle)" <linux@armlinux.org.uk> wrote: > > >> +int tn40_phy_register(struct tn40_priv *priv) > >> +{ > >> + struct phylink_config *config; > >> + struct phy_device *phydev; > >> + struct phylink *phylink; > >> + > >> + phydev = phy_find_first(priv->mdio); > >> + if (!phydev) { > >> + dev_err(&priv->pdev->dev, "PHY isn't found\n"); > >> + return -1; > > > > And my email client, setup with rules to catch common programming > > mistakes, highlights the above line. I have no idea why people do > > this... why people think "lets return -1 on error". It seems to be > > a very common pattern... but it's utterly wrong. -1 is -EPERM, aka > > "Operation not permitted". This is not what you mean here. Please > > return a more suitable negative errno symbol... and please refrain > > from using "return -1" in kernel code. > > Indeed, my bad. How about -ENODEV? Or -ENOXIO? ENODEV. Andrew
On Mon, 10 Jun 2024 17:42:30 +0200 Andrew Lunn <andrew@lunn.ch> wrote: >> > And my email client, setup with rules to catch common programming >> > mistakes, highlights the above line. I have no idea why people do >> > this... why people think "lets return -1 on error". It seems to be >> > a very common pattern... but it's utterly wrong. -1 is -EPERM, aka >> > "Operation not permitted". This is not what you mean here. Please >> > return a more suitable negative errno symbol... and please refrain >> > from using "return -1" in kernel code. >> >> Indeed, my bad. How about -ENODEV? Or -ENOXIO? > > ENODEV. Thanks for the confirmation. There are drivers that return -ENOXIO in the same situation so I was not sure which should be used.
diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig index 2b3b5a8c7fbf..6db2c9817445 100644 --- a/drivers/net/ethernet/tehuti/Kconfig +++ b/drivers/net/ethernet/tehuti/Kconfig @@ -28,6 +28,7 @@ config TEHUTI_TN40 depends on PCI select PAGE_POOL select FW_LOADER + select PHYLINK help This driver supports 10G Ethernet adapters using Tehuti Networks TN40xx chips. Currently, adapters with Applied Micro Circuits diff --git a/drivers/net/ethernet/tehuti/Makefile b/drivers/net/ethernet/tehuti/Makefile index 7a0fe586a243..0d4f4d63a65c 100644 --- a/drivers/net/ethernet/tehuti/Makefile +++ b/drivers/net/ethernet/tehuti/Makefile @@ -5,5 +5,5 @@ obj-$(CONFIG_TEHUTI) += tehuti.o -tn40xx-y := tn40.o tn40_mdio.o +tn40xx-y := tn40.o tn40_mdio.o tn40_phy.o obj-$(CONFIG_TEHUTI_TN40) += tn40xx.o diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c index 4354ac52e098..ef3f607c230c 100644 --- a/drivers/net/ethernet/tehuti/tn40.c +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -7,6 +7,7 @@ #include <linux/if_vlan.h> #include <linux/netdevice.h> #include <linux/pci.h> +#include <linux/phylink.h> #include <linux/vmalloc.h> #include <net/page_pool/helpers.h> @@ -945,7 +946,7 @@ static void tn40_tx_push_desc_safe(struct tn40_priv *priv, void *data, int size) } } -static int tn40_set_link_speed(struct tn40_priv *priv, u32 speed) +int tn40_set_link_speed(struct tn40_priv *priv, u32 speed) { u32 val; int i; @@ -1376,6 +1377,9 @@ static int tn40_close(struct net_device *ndev) { struct tn40_priv *priv = netdev_priv(ndev); + phylink_stop(priv->phylink); + phylink_disconnect_phy(priv->phylink); + napi_disable(&priv->napi); netif_napi_del(&priv->napi); tn40_stop(priv); @@ -1387,13 +1391,20 @@ static int tn40_open(struct net_device *dev) struct tn40_priv *priv = netdev_priv(dev); int ret; + ret = phylink_connect_phy(priv->phylink, priv->phydev); + if (ret) { + netdev_err(dev, "failed to connect to phy %d\n", ret); + return ret; + } tn40_sw_reset(priv); ret = tn40_start(priv); if (ret) { + phylink_disconnect_phy(priv->phylink); netdev_err(dev, "failed to start %d\n", ret); return ret; } napi_enable(&priv->napi); + phylink_start(priv->phylink); netif_start_queue(priv->ndev); return 0; } @@ -1670,6 +1681,12 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_unset_drvdata; } + ret = tn40_mdiobus_init(priv); + if (ret) { + dev_err(&pdev->dev, "failed to initialize mdio bus.\n"); + goto err_free_irq; + } + priv->stats_flag = ((tn40_read_reg(priv, TN40_FPGA_VER) & 0xFFF) != 308); @@ -1678,19 +1695,26 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) TN40_IR_TMR1; tn40_mac_init(priv); + ret = tn40_phy_register(priv); + if (ret) { + dev_err(&pdev->dev, "failed to set up PHY.\n"); + goto err_free_irq; + } ret = tn40_priv_init(priv); if (ret) { dev_err(&pdev->dev, "failed to initialize tn40_priv.\n"); - goto err_free_irq; + goto err_unregister_phydev; } ret = register_netdev(ndev); if (ret) { dev_err(&pdev->dev, "failed to register netdev.\n"); - goto err_free_irq; + goto err_unregister_phydev; } return 0; +err_unregister_phydev: + tn40_phy_unregister(priv); err_free_irq: pci_free_irq_vectors(pdev); err_unset_drvdata: @@ -1711,6 +1735,7 @@ static void tn40_remove(struct pci_dev *pdev) unregister_netdev(ndev); + tn40_phy_unregister(priv); pci_free_irq_vectors(priv->pdev); pci_set_drvdata(pdev, NULL); iounmap(priv->regs); diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h index 05a9adf9fe5a..fbdc62612f1f 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -143,6 +143,9 @@ struct tn40_priv { char *b0_va; /* Virtual address of buffer */ struct mii_bus *mdio; + struct phy_device *phydev; + struct phylink *phylink; + struct phylink_config phylink_config; }; /* RX FREE descriptor - 64bit */ @@ -220,6 +223,11 @@ static inline void tn40_write_reg(struct tn40_priv *priv, u32 reg, u32 val) writel(val, priv->regs + reg); } +int tn40_set_link_speed(struct tn40_priv *priv, u32 speed); + int tn40_mdiobus_init(struct tn40_priv *priv); +int tn40_phy_register(struct tn40_priv *priv); +void tn40_phy_unregister(struct tn40_priv *priv); + #endif /* _TN40XX_H */ diff --git a/drivers/net/ethernet/tehuti/tn40_phy.c b/drivers/net/ethernet/tehuti/tn40_phy.c new file mode 100644 index 000000000000..4a498ef8dcac --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40_phy.c @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) Tehuti Networks Ltd. */ + +#include <linux/netdevice.h> +#include <linux/pci.h> +#include <linux/phylink.h> + +#include "tn40.h" + +static struct tn40_priv *tn40_config_to_priv(struct phylink_config *config) +{ + return container_of(config, struct tn40_priv, phylink_config); +} + +static void tn40_link_up(struct phylink_config *config, struct phy_device *phy, + unsigned int mode, phy_interface_t interface, + int speed, int duplex, bool tx_pause, bool rx_pause) +{ + struct tn40_priv *priv = tn40_config_to_priv(config); + + tn40_set_link_speed(priv, speed); + netif_wake_queue(priv->ndev); +} + +static void tn40_link_down(struct phylink_config *config, unsigned int mode, + phy_interface_t interface) +{ + struct tn40_priv *priv = tn40_config_to_priv(config); + + netif_stop_queue(priv->ndev); + tn40_set_link_speed(priv, 0); +} + +static void tn40_mac_config(struct phylink_config *config, unsigned int mode, + const struct phylink_link_state *state) +{ +} + +static const struct phylink_mac_ops tn40_mac_ops = { + .mac_config = tn40_mac_config, + .mac_link_up = tn40_link_up, + .mac_link_down = tn40_link_down, +}; + +int tn40_phy_register(struct tn40_priv *priv) +{ + struct phylink_config *config; + struct phy_device *phydev; + struct phylink *phylink; + + phydev = phy_find_first(priv->mdio); + if (!phydev) { + dev_err(&priv->pdev->dev, "PHY isn't found\n"); + return -1; + } + + config = &priv->phylink_config; + config->dev = &priv->ndev->dev; + config->type = PHYLINK_NETDEV; + config->mac_capabilities = MAC_10000FD; + __set_bit(PHY_INTERFACE_MODE_XAUI, config->supported_interfaces); + + phylink = phylink_create(config, NULL, PHY_INTERFACE_MODE_XAUI, + &tn40_mac_ops); + if (IS_ERR(phylink)) + return PTR_ERR(phylink); + + priv->phydev = phydev; + priv->phylink = phylink; + return 0; +} + +void tn40_phy_unregister(struct tn40_priv *priv) +{ + phylink_destroy(priv->phylink); +}
This patch adds supports for multiple PHY hardware with phylink. The adapters with TN40xx chips use multiple PHY hardware; AMCC QT2025, TI TLK10232, Aqrate AQR105, and Marvell 88X3120, 88X3310, and MV88E2010. For now, the PCI ID table of this driver enables adapters using only QT2025 PHY. I've tested this driver and the QT2025 PHY driver (SFP+ 10G SR) with Edimax EN-9320 10G adapter. Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com> --- drivers/net/ethernet/tehuti/Kconfig | 1 + drivers/net/ethernet/tehuti/Makefile | 2 +- drivers/net/ethernet/tehuti/tn40.c | 31 ++++++++++- drivers/net/ethernet/tehuti/tn40.h | 8 +++ drivers/net/ethernet/tehuti/tn40_phy.c | 76 ++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 drivers/net/ethernet/tehuti/tn40_phy.c