Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89b36fb5 authored by Raghuram Chary J's avatar Raghuram Chary J Committed by David S. Miller
Browse files

lan78xx: Lan7801 Support for Fixed PHY



Adding Fixed PHY support to the lan78xx driver.

Signed-off-by: default avatarRaghuram Chary J <raghuramchary.jallipalli@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d659b1d
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ config USB_LAN78XX
	select MII
	select MII
	select PHYLIB
	select PHYLIB
	select MICROCHIP_PHY
	select MICROCHIP_PHY
	select FIXED_PHY
	help
	help
	  This option adds support for Microchip LAN78XX based USB 2
	  This option adds support for Microchip LAN78XX based USB 2
	  & USB 3 10/100/1000 Ethernet adapters.
	  & USB 3 10/100/1000 Ethernet adapters.
+76 −28
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@
#include <linux/irq.h>
#include <linux/irq.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/microchipphy.h>
#include <linux/microchipphy.h>
#include <linux/phy.h>
#include <linux/phy_fixed.h>
#include <linux/of_mdio.h>
#include <linux/of_mdio.h>
#include <linux/of_net.h>
#include <linux/of_net.h>
#include "lan78xx.h"
#include "lan78xx.h"
@@ -2063,52 +2063,91 @@ static int ksz9031rnx_fixup(struct phy_device *phydev)
	return 1;
	return 1;
}
}


static int lan78xx_phy_init(struct lan78xx_net *dev)
static struct phy_device *lan7801_phy_init(struct lan78xx_net *dev)
{
{
	u32 buf;
	int ret;
	int ret;
	u32 mii_adv;
	struct fixed_phy_status fphy_status = {
		.link = 1,
		.speed = SPEED_1000,
		.duplex = DUPLEX_FULL,
	};
	struct phy_device *phydev;
	struct phy_device *phydev;


	phydev = phy_find_first(dev->mdiobus);
	phydev = phy_find_first(dev->mdiobus);
	if (!phydev) {
	if (!phydev) {
		netdev_err(dev->net, "no PHY found\n");
		netdev_dbg(dev->net, "PHY Not Found!! Registering Fixed PHY\n");
		return -EIO;
		phydev = fixed_phy_register(PHY_POLL, &fphy_status, -1,
					    NULL);
		if (IS_ERR(phydev)) {
			netdev_err(dev->net, "No PHY/fixed_PHY found\n");
			return NULL;
		}
		}

		netdev_dbg(dev->net, "Registered FIXED PHY\n");
	if ((dev->chipid == ID_REV_CHIP_ID_7800_) ||
		dev->interface = PHY_INTERFACE_MODE_RGMII;
	    (dev->chipid == ID_REV_CHIP_ID_7850_)) {
		ret = lan78xx_write_reg(dev, MAC_RGMII_ID,
		phydev->is_internal = true;
					MAC_RGMII_ID_TXC_DELAY_EN_);
		dev->interface = PHY_INTERFACE_MODE_GMII;
		ret = lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00);

		ret = lan78xx_read_reg(dev, HW_CFG, &buf);
	} else if (dev->chipid == ID_REV_CHIP_ID_7801_) {
		buf |= HW_CFG_CLK125_EN_;
		buf |= HW_CFG_REFCLK25_EN_;
		ret = lan78xx_write_reg(dev, HW_CFG, buf);
	} else {
		if (!phydev->drv) {
		if (!phydev->drv) {
			netdev_err(dev->net, "no PHY driver found\n");
			netdev_err(dev->net, "no PHY driver found\n");
			return -EIO;
			return NULL;
		}
		}

		dev->interface = PHY_INTERFACE_MODE_RGMII;
		dev->interface = PHY_INTERFACE_MODE_RGMII;

		/* external PHY fixup for KSZ9031RNX */
		/* external PHY fixup for KSZ9031RNX */
		ret = phy_register_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0,
		ret = phy_register_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0,
						 ksz9031rnx_fixup);
						 ksz9031rnx_fixup);
		if (ret < 0) {
		if (ret < 0) {
			netdev_err(dev->net, "fail to register fixup\n");
			netdev_err(dev->net, "fail to register fixup\n");
			return ret;
			return NULL;
		}
		}
		/* external PHY fixup for LAN8835 */
		/* external PHY fixup for LAN8835 */
		ret = phy_register_fixup_for_uid(PHY_LAN8835, 0xfffffff0,
		ret = phy_register_fixup_for_uid(PHY_LAN8835, 0xfffffff0,
						 lan8835_fixup);
						 lan8835_fixup);
		if (ret < 0) {
		if (ret < 0) {
			netdev_err(dev->net, "fail to register fixup\n");
			netdev_err(dev->net, "fail to register fixup\n");
			return ret;
			return NULL;
		}
		}
		/* add more external PHY fixup here if needed */
		/* add more external PHY fixup here if needed */


		phydev->is_internal = false;
		phydev->is_internal = false;
	} else {
	}
		netdev_err(dev->net, "unknown ID found\n");
	return phydev;
		ret = -EIO;
}
		goto error;

static int lan78xx_phy_init(struct lan78xx_net *dev)
{
	int ret;
	u32 mii_adv;
	struct phy_device *phydev;

	switch (dev->chipid) {
	case ID_REV_CHIP_ID_7801_:
		phydev = lan7801_phy_init(dev);
		if (!phydev) {
			netdev_err(dev->net, "lan7801: PHY Init Failed");
			return -EIO;
		}
		break;

	case ID_REV_CHIP_ID_7800_:
	case ID_REV_CHIP_ID_7850_:
		phydev = phy_find_first(dev->mdiobus);
		if (!phydev) {
			netdev_err(dev->net, "no PHY found\n");
			return -EIO;
		}
		phydev->is_internal = true;
		dev->interface = PHY_INTERFACE_MODE_GMII;
		break;

	default:
		netdev_err(dev->net, "Unknown CHIP ID found\n");
		return -EIO;
	}
	}


	/* if phyirq is not set, use polling mode in phylib */
	/* if phyirq is not set, use polling mode in phylib */
@@ -2127,6 +2166,16 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
	if (ret) {
	if (ret) {
		netdev_err(dev->net, "can't attach PHY to %s\n",
		netdev_err(dev->net, "can't attach PHY to %s\n",
			   dev->mdiobus->id);
			   dev->mdiobus->id);
		if (dev->chipid == ID_REV_CHIP_ID_7801_) {
			if (phy_is_pseudo_fixed_link(phydev)) {
				fixed_phy_unregister(phydev);
			} else {
				phy_unregister_fixup_for_uid(PHY_KSZ9031RNX,
							     0xfffffff0);
				phy_unregister_fixup_for_uid(PHY_LAN8835,
							     0xfffffff0);
			}
		}
		return -EIO;
		return -EIO;
	}
	}


@@ -2166,12 +2215,6 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
	dev->fc_autoneg = phydev->autoneg;
	dev->fc_autoneg = phydev->autoneg;


	return 0;
	return 0;

error:
	phy_unregister_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0);
	phy_unregister_fixup_for_uid(PHY_LAN8835, 0xfffffff0);

	return ret;
}
}


static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int size)
static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int size)
@@ -3569,6 +3612,7 @@ static void lan78xx_disconnect(struct usb_interface *intf)
	struct lan78xx_net		*dev;
	struct lan78xx_net		*dev;
	struct usb_device		*udev;
	struct usb_device		*udev;
	struct net_device		*net;
	struct net_device		*net;
	struct phy_device		*phydev;


	dev = usb_get_intfdata(intf);
	dev = usb_get_intfdata(intf);
	usb_set_intfdata(intf, NULL);
	usb_set_intfdata(intf, NULL);
@@ -3577,12 +3621,16 @@ static void lan78xx_disconnect(struct usb_interface *intf)


	udev = interface_to_usbdev(intf);
	udev = interface_to_usbdev(intf);
	net = dev->net;
	net = dev->net;
	phydev = net->phydev;


	phy_unregister_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0);
	phy_unregister_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0);
	phy_unregister_fixup_for_uid(PHY_LAN8835, 0xfffffff0);
	phy_unregister_fixup_for_uid(PHY_LAN8835, 0xfffffff0);


	phy_disconnect(net->phydev);
	phy_disconnect(net->phydev);


	if (phy_is_pseudo_fixed_link(phydev))
		fixed_phy_unregister(phydev);

	unregister_netdev(net);
	unregister_netdev(net);


	cancel_delayed_work_sync(&dev->wq);
	cancel_delayed_work_sync(&dev->wq);