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

Commit dacf8154 authored by Francois Romieu's avatar Francois Romieu
Browse files

r8169: add hw start helpers for the 8168 and the 8101 



This commit triggers three 'defined but not used' warnings but
I prefer avoiding to tie these helpers to a specific change in
the hw start sequences of the 8168 or of the 8101.

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent f162a5d1

drivers/net/r8169.c

+96 −0
Original line number Original line Diff line number Diff line
@@ -526,6 +526,11 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) 
	return value;

	return value;

}

}





static void mdio_patch(void __iomem *ioaddr, int reg_addr, int value)

{

	mdio_write(ioaddr, reg_addr, mdio_read(ioaddr, reg_addr) | value);

}



static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,

static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,

			   int val)

			   int val)

{

{
@@ -543,6 +548,72 @@ static int rtl_mdio_read(struct net_device *dev, int phy_id, int location) 
	return mdio_read(ioaddr, location);

	return mdio_read(ioaddr, location);

}

}





static void rtl_ephy_write(void __iomem *ioaddr, int reg_addr, int value)

{

	unsigned int i;



	RTL_W32(EPHYAR, EPHYAR_WRITE_CMD | (value & EPHYAR_DATA_MASK) |

		(reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);



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

		if (!(RTL_R32(EPHYAR) & EPHYAR_FLAG))

			break;

		udelay(10);

	}

}



static u16 rtl_ephy_read(void __iomem *ioaddr, int reg_addr)

{

	u16 value = 0xffff;

	unsigned int i;



	RTL_W32(EPHYAR, (reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);



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

		if (RTL_R32(EPHYAR) & EPHYAR_FLAG) {

			value = RTL_R32(EPHYAR) & EPHYAR_DATA_MASK;

			break;

		}

		udelay(10);

	}



	return value;

}



static void rtl_csi_write(void __iomem *ioaddr, int addr, int value)

{

	unsigned int i;



	RTL_W32(CSIDR, value);

	RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |

		CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);



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

		if (!(RTL_R32(CSIAR) & CSIAR_FLAG))

			break;

		udelay(10);

	}

}



static u32 rtl_csi_read(void __iomem *ioaddr, int addr)

{

	u32 value = ~0x00;

	unsigned int i;



	RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) |

		CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);



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

		if (RTL_R32(CSIAR) & CSIAR_FLAG) {

			value = RTL_R32(CSIDR);

			break;

		}

		udelay(10);

	}



	return value;

}



static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)

static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)

{

{

	RTL_W16(IntrMask, 0x0000);

	RTL_W16(IntrMask, 0x0000);
@@ -2114,6 +2185,31 @@ static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force) 
	}

	}

}

}





static void rtl_csi_access_enable(void __iomem *ioaddr)

{

	u32 csi;



	csi = rtl_csi_read(ioaddr, 0x070c) & 0x00ffffff;

	rtl_csi_write(ioaddr, 0x070c, csi | 0x27000000);

}



struct ephy_info {

	unsigned int offset;

	u16 mask;

	u16 bits;

};



static void rtl_ephy_init(void __iomem *ioaddr, struct ephy_info *e, int len)

{

	u16 w;



	while (len-- > 0) {

		w = (rtl_ephy_read(ioaddr, e->offset) & ~e->mask) | e->bits;

		rtl_ephy_write(ioaddr, e->offset, w);

		e++;

	}

}



static void rtl_hw_start_8168(struct net_device *dev)

static void rtl_hw_start_8168(struct net_device *dev)

{

{

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);