Commit 2bd64701 authored by Petko Manolov's avatar Petko Manolov Committed by David S. Miller
Browse files

drivers: net: usb: pegasus: read/write_mii_word optimised 



Duplicated code in routines reading and writing MII registers is now
packed in __mii_op().

Signed-off-by: default avatarPetko Manolov <petkan@nucleusys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 313a58e4

drivers/net/usb/pegasus.c

+35 −50
Original line number Diff line number Diff line
@@ -323,81 +323,66 @@ static int update_eth_regs_async(pegasus_t *pegasus) 
	return ret;

}



/* Returns 0 on success, error on failure */

static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)

static int __mii_op(pegasus_t *p, __u8 phy, __u8 indx, __u16 *regd, __u8 cmd)

{

	int i;

	__u8 data[4] = { phy, 0, 0, indx };

	__le16 regdi;

	int ret;

	int ret = -ETIMEDOUT;



	set_register(pegasus, PhyCtrl, 0);

	set_registers(pegasus, PhyAddr, sizeof(data), data);

	set_register(pegasus, PhyCtrl, (indx | PHY_READ));

	if (cmd & PHY_WRITE) {

		__le16 *t = (__le16 *) & data[1];

		*t = cpu_to_le16(*regd);

	}

	set_register(p, PhyCtrl, 0);

	set_registers(p, PhyAddr, sizeof(data), data);

	set_register(p, PhyCtrl, (indx | cmd));

	for (i = 0; i < REG_TIMEOUT; i++) {

		ret = get_registers(pegasus, PhyCtrl, 1, data);

		if (ret == -ESHUTDOWN)

		ret = get_registers(p, PhyCtrl, 1, data);

		if (ret < 0)

			goto fail;

		if (data[0] & PHY_DONE)

			break;

	}



	if (i >= REG_TIMEOUT)

		goto fail;



	ret = get_registers(pegasus, PhyData, 2, &regdi);

	if (cmd & PHY_READ) {

		ret = get_registers(p, PhyData, 2, &regdi);

		*regd = le16_to_cpu(regdi);

		return ret;



	}

	return 0;

fail:

	netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);



	netif_dbg(p, drv, p->net, "%s failed\n", __func__);

	return ret;

}



static int mdio_read(struct net_device *dev, int phy_id, int loc)

/* Returns non-negative int on success, error on failure */

static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)

{

	pegasus_t *pegasus = netdev_priv(dev);

	u16 res;



	read_mii_word(pegasus, phy_id, loc, &res);

	return (int)res;

	return __mii_op(pegasus, phy, indx, regd, PHY_READ);

}



static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 regd)

/* Returns zero on success, error on failure */

static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)

{

	int i;

	__u8 data[4] = { phy, 0, 0, indx };

	int ret;



	data[1] = (u8) regd;

	data[2] = (u8) (regd >> 8);

	set_register(pegasus, PhyCtrl, 0);

	set_registers(pegasus, PhyAddr, sizeof(data), data);

	set_register(pegasus, PhyCtrl, (indx | PHY_WRITE));

	for (i = 0; i < REG_TIMEOUT; i++) {

		ret = get_registers(pegasus, PhyCtrl, 1, data);

		if (ret == -ESHUTDOWN)

			goto fail;

		if (data[0] & PHY_DONE)

			break;

	return __mii_op(pegasus, phy, indx, regd, PHY_WRITE);

}



	if (i >= REG_TIMEOUT)

		goto fail;



	return ret;

static int mdio_read(struct net_device *dev, int phy_id, int loc)

{

	pegasus_t *pegasus = netdev_priv(dev);

	u16 res;



fail:

	netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);

	return -ETIMEDOUT;

	read_mii_word(pegasus, phy_id, loc, &res);

	return (int)res;

}



static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)

{

	pegasus_t *pegasus = netdev_priv(dev);



	write_mii_word(pegasus, phy_id, loc, val);

	write_mii_word(pegasus, phy_id, loc, (__u16 *)&val);

}



static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata)
@@ -434,7 +419,6 @@ static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata) 
static inline void enable_eprom_write(pegasus_t *pegasus)

{

	__u8 tmp;

	int ret;



	get_registers(pegasus, EthCtrl2, 1, &tmp);

	set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE);
@@ -443,7 +427,6 @@ static inline void enable_eprom_write(pegasus_t *pegasus) 
static inline void disable_eprom_write(pegasus_t *pegasus)

{

	__u8 tmp;

	int ret;



	get_registers(pegasus, EthCtrl2, 1, &tmp);

	set_register(pegasus, EpromCtrl, 0);
@@ -537,7 +520,8 @@ static inline int reset_mac(pegasus_t *pegasus) 
	if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_ELCON) {

		__u16 auxmode;

		read_mii_word(pegasus, 3, 0x1b, &auxmode);

		write_mii_word(pegasus, 3, 0x1b, auxmode | 4);

		auxmode |= 4;

		write_mii_word(pegasus, 3, 0x1b, &auxmode);

	}



	return 0;
@@ -569,7 +553,8 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) 
	    usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) {

		u16 auxmode;

		read_mii_word(pegasus, 0, 0x1b, &auxmode);

		write_mii_word(pegasus, 0, 0x1b, auxmode | 4);

		auxmode |= 4;

		write_mii_word(pegasus, 0, 0x1b, &auxmode);

	}



	return ret;
@@ -1144,7 +1129,7 @@ static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd) 
	case SIOCDEVPRIVATE + 2:

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

		write_mii_word(pegasus, pegasus->phy, data[1] & 0x1f, data[2]);

		write_mii_word(pegasus, pegasus->phy, data[1] & 0x1f, &data[2]);

		res = 0;

		break;

	default: