Commit 2fa15bbd authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

r6040: add a MAC operation timeout define 



2048 is the usual value for busy-waiting on a register r/w, define it
as MAC_DEF_TIMEOUT and use it where it is appropriate.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0db0cfcc

drivers/net/ethernet/rdc/r6040.c

+5 −3
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ 
#define MBCR_DEFAULT	0x012A	/* MAC Bus Control Register */

#define MCAST_MAX	3	/* Max number multicast addresses to filter */



#define MAC_DEF_TIMEOUT	2048	/* Default MAC read/write operation timeout */



/* Descriptor status */

#define DSC_OWNER_MAC	0x8000	/* MAC is the owner of this descriptor */

#define DSC_RX_OK	0x4000	/* RX was successful */
@@ -204,7 +206,7 @@ static char version[] __devinitdata = DRV_NAME 
/* Read a word data from PHY Chip */

static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)

{

	int limit = 2048;

	int limit = MAC_DEF_TIMEOUT;

	u16 cmd;



	iowrite16(MDIO_READ + reg + (phy_addr << 8), ioaddr + MMDIO);
@@ -222,7 +224,7 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg) 
static void r6040_phy_write(void __iomem *ioaddr,

					int phy_addr, int reg, u16 val)

{

	int limit = 2048;

	int limit = MAC_DEF_TIMEOUT;

	u16 cmd;



	iowrite16(val, ioaddr + MMWD);
@@ -361,7 +363,7 @@ err_exit: 
static void r6040_reset_mac(struct r6040_private *lp)

{

	void __iomem *ioaddr = lp->base;

	int limit = 2048;

	int limit = MAC_DEF_TIMEOUT;

	u16 cmd;



	iowrite16(MAC_RST, ioaddr + MCR1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE