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

Commit ca5585ed authored by Andrew Victor's avatar Andrew Victor Committed by Jeff Garzik
Browse files

[PATCH] AT91RM9200 Ethernet #2: MII interface 



Adds support for the MII ioctls via generic_mii_ioctl().
Patch from Brian Stafford.

Set the mii.phy_id to the detected PHY address, otherwise ethtool cannot
access PHYs other than 0.
Patch from Roman Kolesnikov.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 775637df

drivers/net/arm/at91_ether.c

+20 −0
Original line number Diff line number Diff line
@@ -660,6 +660,22 @@ static struct ethtool_ops at91ether_ethtool_ops = { 
	.get_link	= ethtool_op_get_link,

};



static int at91ether_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	struct at91_private *lp = (struct at91_private *) dev->priv;

	int res;



	if (!netif_running(dev))

		return -EINVAL;



	spin_lock_irq(&lp->lock);

	enable_mdi();

	res = generic_mii_ioctl(&lp->mii, if_mii(rq), cmd, NULL);

	disable_mdi();

	spin_unlock_irq(&lp->lock);



	return res;

}



/* ................................ MAC ................................ */
@@ -963,6 +979,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add 
	dev->set_multicast_list = at91ether_set_rx_mode;

	dev->set_mac_address = set_mac_address;

	dev->ethtool_ops = &at91ether_ethtool_ops;

	dev->do_ioctl = at91ether_ioctl;



	SET_NETDEV_DEV(dev, &pdev->dev);
@@ -993,6 +1010,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add 
	lp->mii.dev = dev;		/* Support for ethtool */

	lp->mii.mdio_read = mdio_read;

	lp->mii.mdio_write = mdio_write;

	lp->mii.phy_id = phy_address;

	lp->mii.phy_id_mask = 0x1f;

	lp->mii.reg_num_mask = 0x1f;



	lp->phy_type = phy_type;	/* Type of PHY connected */

	lp->phy_address = phy_address;	/* MDI address of PHY */