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

Commit fe7d189d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'davem.r8169.fixes' of git://violet.fr.zoreil.com/romieu/linux

parents eebb6fb4 2544bfc0

drivers/net/r8169.c

+27 −5
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ enum rtl_register_content { 
	RxOK		= 0x0001,



	/* RxStatusDesc */

	RxBOVF	= (1 << 24),

	RxFOVF	= (1 << 23),

	RxRWT	= (1 << 22),

	RxRES	= (1 << 21),
@@ -682,6 +683,7 @@ struct rtl8169_private { 
	struct mii_if_info mii;

	struct rtl8169_counters counters;

	u32 saved_wolopts;

	u32 opts1_mask;



	struct rtl_fw {

		const struct firmware *fw;
@@ -710,6 +712,7 @@ MODULE_FIRMWARE(FIRMWARE_8168D_1); 
MODULE_FIRMWARE(FIRMWARE_8168D_2);

MODULE_FIRMWARE(FIRMWARE_8168E_1);

MODULE_FIRMWARE(FIRMWARE_8168E_2);

MODULE_FIRMWARE(FIRMWARE_8168E_3);

MODULE_FIRMWARE(FIRMWARE_8105E_1);



static int rtl8169_open(struct net_device *dev);
@@ -3077,6 +3080,14 @@ static void rtl8169_phy_reset(struct net_device *dev, 
	netif_err(tp, link, dev, "PHY reset failed\n");

}



static bool rtl_tbi_enabled(struct rtl8169_private *tp)

{

	void __iomem *ioaddr = tp->mmio_addr;



	return (tp->mac_version == RTL_GIGA_MAC_VER_01) &&

	    (RTL_R8(PHYstatus) & TBI_Enable);

}



static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)

{

	void __iomem *ioaddr = tp->mmio_addr;
@@ -3109,7 +3120,7 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) 
			   ADVERTISED_1000baseT_Half |

			   ADVERTISED_1000baseT_Full : 0));



	if (RTL_R8(PHYstatus) & TBI_Enable)

	if (rtl_tbi_enabled(tp))

		netif_info(tp, link, dev, "TBI auto-negotiating\n");

}
@@ -3319,9 +3330,16 @@ static void r810x_phy_power_up(struct rtl8169_private *tp) 


static void r810x_pll_power_down(struct rtl8169_private *tp)

{

	void __iomem *ioaddr = tp->mmio_addr;



	if (__rtl8169_get_wol(tp) & WAKE_ANY) {

		rtl_writephy(tp, 0x1f, 0x0000);

		rtl_writephy(tp, MII_BMCR, 0x0000);



		if (tp->mac_version == RTL_GIGA_MAC_VER_29 ||

		    tp->mac_version == RTL_GIGA_MAC_VER_30)

			RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast |

				AcceptMulticast | AcceptMyPhys);

		return;

	}
@@ -3417,7 +3435,8 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) 
		rtl_writephy(tp, MII_BMCR, 0x0000);



		if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||

		    tp->mac_version == RTL_GIGA_MAC_VER_33)

		    tp->mac_version == RTL_GIGA_MAC_VER_33 ||

		    tp->mac_version == RTL_GIGA_MAC_VER_34)

			RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast |

				AcceptMulticast | AcceptMyPhys);

		return;
@@ -3727,8 +3746,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	tp->features |= rtl_try_msi(pdev, ioaddr, cfg);

	RTL_W8(Cfg9346, Cfg9346_Lock);



	if ((tp->mac_version <= RTL_GIGA_MAC_VER_06) &&

	    (RTL_R8(PHYstatus) & TBI_Enable)) {

	if (rtl_tbi_enabled(tp)) {

		tp->set_speed = rtl8169_set_speed_tbi;

		tp->get_settings = rtl8169_gset_tbi;

		tp->phy_reset_enable = rtl8169_tbi_reset_enable;
@@ -3777,6 +3795,9 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	tp->intr_event = cfg->intr_event;

	tp->napi_event = cfg->napi_event;



	tp->opts1_mask = (tp->mac_version != RTL_GIGA_MAC_VER_01) ?

		~(RxBOVF | RxFOVF) : ~0;



	init_timer(&tp->timer);

	tp->timer.data = (unsigned long) dev;

	tp->timer.function = rtl8169_phy_timer;
@@ -3988,6 +4009,7 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp) 
		while (RTL_R8(TxPoll) & NPQ)

			udelay(20);

	} else if (tp->mac_version == RTL_GIGA_MAC_VER_34) {

		RTL_W8(ChipCmd, RTL_R8(ChipCmd) | StopReq);

		while (!(RTL_R32(TxConfig) & TXCFG_EMPTY))

			udelay(100);

	} else {
@@ -5314,7 +5336,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, 
		u32 status;



		rmb();

		status = le32_to_cpu(desc->opts1);

		status = le32_to_cpu(desc->opts1) & tp->opts1_mask;



		if (status & DescOwn)

			break;