Register an SFP platform device backed by the SFP software node when SFP support is enabled, and associate the I2C adapter's firmware node so the SFP subsystem can manage module detection and EEPROM reads. Signed-off-by: Thangaraj Samynathan --- drivers/net/ethernet/microchip/lan743x_main.c | 64 +++++++++++++++++-- drivers/net/ethernet/microchip/lan743x_main.h | 1 + 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c index b7bdf361705e..649065c36434 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.c +++ b/drivers/net/ethernet/microchip/lan743x_main.c @@ -192,8 +192,8 @@ static int pci1xxxx_i2c_adapter_get(struct lan743x_adapter *adapter) return -EPROBE_DEFER; } - if (!device_link_add(&perif_dev->dev, &adapter->pdev->dev, - DL_FLAG_MANAGED | DL_FLAG_AUTOREMOVE_CONSUMER)) { + if (!device_link_add(&adapter->pdev->dev, &perif_dev->dev, + DL_FLAG_AUTOREMOVE_CONSUMER)) { netif_err(adapter, drv, adapter->netdev, "failed to link I2C peripheral device\n"); put_device(adap_dev); @@ -234,8 +234,8 @@ static int pci1xxxx_gpio_dev_get(struct lan743x_adapter *adapter) return -EPROBE_DEFER; } - if (!device_link_add(&perif_dev->dev, &adapter->pdev->dev, - DL_FLAG_MANAGED | DL_FLAG_AUTOREMOVE_CONSUMER)) { + if (!device_link_add(&adapter->pdev->dev, &perif_dev->dev, + DL_FLAG_AUTOREMOVE_CONSUMER)) { netif_err(adapter, drv, adapter->netdev, "failed to link GPIO peripheral device\n"); put_device(gpio_dev); @@ -3132,6 +3132,34 @@ static int lan743x_swnodes_register(struct lan743x_adapter *adapter) } #endif /* CONFIG_LAN743X_SFP */ +#ifdef CONFIG_LAN743X_SFP +static int lan743x_sfp_register(struct lan743x_adapter *adapter) +{ + struct pci_dev *pdev = adapter->pdev; + struct platform_device_info sfp_info; + struct platform_device *sfp_dev; + + memset(&sfp_info, 0, sizeof(sfp_info)); + sfp_info.parent = &adapter->pdev->dev; + sfp_info.fwnode = software_node_fwnode(adapter->nodes->group[SWNODE_SFP]); + sfp_info.name = "sfp"; + sfp_info.id = (pci_domain_nr(pdev->bus) << 16) | + (pdev->bus->number << 8) | pdev->devfn; + sfp_dev = platform_device_register_full(&sfp_info); + if (IS_ERR(sfp_dev)) { + netif_err(adapter, drv, adapter->netdev, + "Failed to register SFP device\n"); + return PTR_ERR(sfp_dev); + } + + adapter->sfp_dev = sfp_dev; + netif_dbg(adapter, drv, adapter->netdev, + "SFP platform device registered\n"); + + return 0; +} +#endif /* CONFIG_LAN743X_SFP */ + static int lan743x_phylink_sgmii_config(struct lan743x_adapter *adapter) { u32 sgmii_ctl; @@ -3754,6 +3782,12 @@ static void lan743x_destroy_phylink(struct lan743x_adapter *adapter) static void lan743x_full_cleanup(struct lan743x_adapter *adapter) { unregister_netdev(adapter->netdev); + if (adapter->sfp_dev) { + platform_device_unregister(adapter->sfp_dev); + adapter->sfp_dev = NULL; + } + if (adapter->i2c_adap) + adapter->i2c_adap = NULL; lan743x_destroy_phylink(adapter); lan743x_mdiobus_cleanup(adapter); @@ -3981,11 +4015,31 @@ static int lan743x_pcidev_probe(struct pci_dev *pdev, goto cleanup_mdiobus; } +#ifdef CONFIG_LAN743X_SFP + if (adapter->is_sfp_support_en) { + adapter->i2c_adap->dev.fwnode = + software_node_fwnode(adapter->nodes->group[SWNODE_I2C]); + + ret = lan743x_sfp_register(adapter); + if (ret < 0) { + netif_err(adapter, probe, netdev, + "failed to sfp register (%d)\n", ret); + goto cleanup_phylink; + } + } +#endif + ret = register_netdev(adapter->netdev); if (ret < 0) - goto cleanup_phylink; + goto cleanup_sfp; return 0; +cleanup_sfp: + if (adapter->sfp_dev) { + platform_device_unregister(adapter->sfp_dev); + adapter->sfp_dev = NULL; + } + cleanup_phylink: lan743x_destroy_phylink(adapter); diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h index 1bff59f43d50..a25864bd8328 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.h +++ b/drivers/net/ethernet/microchip/lan743x_main.h @@ -1150,6 +1150,7 @@ struct lan743x_adapter { int rx_tstamp_filter; struct lan743x_sw_nodes *nodes; struct i2c_adapter *i2c_adap; + struct platform_device *sfp_dev; }; #define LAN743X_COMPONENT_FLAG_RX(channel) BIT(20 + (channel)) -- 2.34.1