From patchwork Thu Jan 3 01:10:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1020127 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43VVHG6l7Cz9s2P for ; Thu, 3 Jan 2019 12:11:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728868AbfACBLT (ORCPT ); Wed, 2 Jan 2019 20:11:19 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:37442 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728606AbfACBLQ (ORCPT ); Wed, 2 Jan 2019 20:11:16 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43VVH55Y8jz1qvgR; Thu, 3 Jan 2019 02:11:13 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43VVH55Md7z1qvWh; Thu, 3 Jan 2019 02:11:13 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id awC6qBpRPofm; Thu, 3 Jan 2019 02:11:12 +0100 (CET) X-Auth-Info: 9poh50Js/YuAxS250X/ZfayBOeVSrpDxfZOnkQrAeOc= Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz [86.49.110.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Thu, 3 Jan 2019 02:11:12 +0100 (CET) From: Marek Vasut To: netdev@vger.kernel.org Cc: Marek Vasut , "David S . Miller" , Nisar Sayed , Woojung Huh , Andrew Lunn , Florian Fainelli , linux-usb@vger.kernel.org Subject: [PATCH 08/19] usbnet: smsc95xx: Register MII bus Date: Thu, 3 Jan 2019 02:10:29 +0100 Message-Id: <20190103011040.25974-9-marex@denx.de> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190103011040.25974-1-marex@denx.de> References: <20190103011040.25974-1-marex@denx.de> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Register MII bus so that a phydev can attach to it. This works in parallel with the existing MII bus accessors within the driver, however the existing accessors will be removed in subsequent patch. Signed-off-by: Marek Vasut Cc: David S. Miller Cc: Nisar Sayed Cc: Woojung Huh Cc: Andrew Lunn Cc: Florian Fainelli Cc: linux-usb@vger.kernel.org To: netdev@vger.kernel.org --- drivers/net/usb/smsc95xx.c | 77 ++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 12 deletions(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index e40cde490a42..2cd5e1d34559 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "smsc95xx.h" #define SMSC_CHIPNAME "smsc95xx" @@ -76,6 +77,7 @@ struct smsc95xx_priv { bool link_ok; struct delayed_work carrier_check; struct usbnet *dev; + struct mii_bus *mii_bus; }; static bool turbo_mode = true; @@ -209,6 +211,14 @@ static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx) return ret; } +static int smsc95xx_mii_read(struct mii_bus *bus, int phy_id, int reg) +{ + struct usbnet *dev = bus->priv; + struct net_device *netdev = dev->net; + + return smsc95xx_mdio_read(netdev, phy_id, reg); +} + static void smsc95xx_mdio_write(struct net_device *netdev, int phy_id, int idx, int regval) { @@ -252,6 +262,16 @@ static void smsc95xx_mdio_write(struct net_device *netdev, int phy_id, mutex_unlock(&dev->phy_mutex); } +static int smsc95xx_mii_write(struct mii_bus *bus, int phy_id, int reg, u16 val) +{ + struct usbnet *dev = bus->priv; + struct net_device *netdev = dev->net; + + smsc95xx_mdio_write(netdev, phy_id, reg, val); + + return 0; +} + static int __must_check smsc95xx_wait_eeprom(struct usbnet *dev) { unsigned long start_time = jiffies; @@ -1206,14 +1226,6 @@ static int smsc95xx_reset(struct usbnet *dev) if (ret) return ret; - /* Initialize MII structure */ - dev->mii.dev = dev->net; - dev->mii.mdio_read = smsc95xx_mdio_read; - dev->mii.mdio_write = smsc95xx_mdio_write; - dev->mii.phy_id_mask = 0x1f; - dev->mii.reg_num_mask = 0x1f; - dev->mii.phy_id = SMSC95XX_INTERNAL_PHY_ID; - return smsc95xx_reset_post(dev); } @@ -1234,6 +1246,7 @@ static const struct net_device_ops smsc95xx_netdev_ops = { static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) { struct smsc95xx_priv *pdata = NULL; + struct mii_bus *bus; u32 val; int ret; @@ -1252,6 +1265,25 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) if (!pdata) return -ENOMEM; + pdata->dev = dev; + + bus = mdiobus_alloc(); + if (!bus) { + ret = -ENOMEM; + goto err_mdiobus_alloc; + } + + bus->priv = dev; + bus->name = "smsc95xx_mii_bus"; + bus->read = smsc95xx_mii_read; + bus->write = smsc95xx_mii_write; + bus->parent = dev->net->dev.parent; + bus->phy_mask = BIT(0); + snprintf(bus->id, MII_BUS_ID_SIZE, "usb-%03d:%03d", + dev->udev->bus->busnum, dev->udev->devnum); + + pdata->mii_bus = bus; + spin_lock_init(&pdata->mac_cr_lock); /* LAN95xx devices do not alter the computed checksum of 0 to 0xffff. @@ -1272,12 +1304,30 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) smsc95xx_init_mac_address(dev); /* Init all registers */ - ret = smsc95xx_reset(dev); + ret = smsc95xx_reset_pre(dev); + if (ret) + goto err_mdiobus_alloc; + + /* Initialize MII structure */ + dev->mii.dev = dev->net; + dev->mii.mdio_read = smsc95xx_mdio_read; + dev->mii.mdio_write = smsc95xx_mdio_write; + dev->mii.phy_id_mask = 0x1f; + dev->mii.reg_num_mask = 0x1f; + dev->mii.phy_id = SMSC95XX_INTERNAL_PHY_ID; + + ret = mdiobus_register(bus); + if (ret) + goto err_mdiobus_register; + + ret = smsc95xx_reset_post(dev); + if (ret) + goto err_mdiobus_register; /* detect device revision as different features may be available */ ret = smsc95xx_read_reg(dev, ID_REV, &val); if (ret < 0) - goto err_read_reg; + goto err_mdiobus_register; val >>= 16; pdata->chip_id = val; pdata->mdix_ctrl = get_mdix_status(dev->net); @@ -1298,12 +1348,13 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->max_mtu = ETH_DATA_LEN; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; - pdata->dev = dev; INIT_DELAYED_WORK(&pdata->carrier_check, check_carrier); schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY); return 0; -err_read_reg: +err_mdiobus_register: + mdiobus_free(bus); +err_mdiobus_alloc: kfree(pdata); return ret; } @@ -1315,6 +1366,8 @@ static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf) if (pdata) { cancel_delayed_work(&pdata->carrier_check); netif_dbg(dev, ifdown, dev->net, "free pdata\n"); + mdiobus_unregister(pdata->mii_bus); + mdiobus_free(pdata->mii_bus); kfree(pdata); pdata = NULL; dev->data[0] = 0;