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

Commit 851e6022 authored by Francois Romieu's avatar Francois Romieu
Browse files

r8169: Config1 is read-only on 8168c and later. 



Suggested by Hayes.

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
parent ecffe75f

drivers/net/ethernet/realtek/r8169.c

+13 −2
Original line number Diff line number Diff line
@@ -1396,7 +1396,6 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) 
		u16 reg;

		u8  mask;

	} cfg[] = {

		{ WAKE_ANY,   Config1, PMEnable },

		{ WAKE_PHY,   Config3, LinkUp },

		{ WAKE_MAGIC, Config3, MagicPacket },

		{ WAKE_UCAST, Config5, UWF },
@@ -1404,16 +1403,28 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) 
		{ WAKE_MCAST, Config5, MWF },

		{ WAKE_ANY,   Config5, LanWake }

	};

	u8 options;



	RTL_W8(Cfg9346, Cfg9346_Unlock);



	for (i = 0; i < ARRAY_SIZE(cfg); i++) {

		u8 options = RTL_R8(cfg[i].reg) & ~cfg[i].mask;

		options = RTL_R8(cfg[i].reg) & ~cfg[i].mask;

		if (wolopts & cfg[i].opt)

			options |= cfg[i].mask;

		RTL_W8(cfg[i].reg, options);

	}



	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_01 ... RTL_GIGA_MAC_VER_17:

		options = RTL_R8(Config1) & ~PMEnable;

		if (wolopts)

			options |= PMEnable;

		RTL_W8(Config1, options);

		break;

	default:

		break;

	}



	RTL_W8(Cfg9346, Cfg9346_Lock);

}