Merge branch 'r8169-sync-hw-config-for-few-chip-versions-with-r8168-vendor-driver' (d52caf04) · Commits · 戴 / test

drivers/net/ethernet/realtek/r8169_main.c

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2926,12 +2926,14 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)
	rtl_ephy_init(tp, e_info_8168e_2);		rtl_ephy_init(tp, e_info_8168e_2);

	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);		rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);		rtl_eri_write(tp, 0xb8, ERIAR_MASK_1111, 0x0000);
	rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);		rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);
			rtl_eri_set_bits(tp, 0x0d4, 0x1f00);
			rtl_eri_set_bits(tp, 0x1d0, BIT(1));
			rtl_reset_packet_filter(tp);
			rtl_eri_set_bits(tp, 0x1b0, BIT(4));
	rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050);		rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050);
	rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x07ff0060);		rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x07ff0060);
	rtl_eri_set_bits(tp, 0x1b0, BIT(4));
	rtl_w0w1_eri(tp, 0x0d4, 0x0c00, 0xff00);

	rtl_disable_clock_request(tp);		rtl_disable_clock_request(tp);

	@@ -2951,11 +2953,11 @@ static void rtl_hw_start_8168f(struct rtl8169_private *tp)
	rtl_set_def_aspm_entry_latency(tp);		rtl_set_def_aspm_entry_latency(tp);

	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);		rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);		rtl_eri_write(tp, 0xb8, ERIAR_MASK_1111, 0x0000);
	rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);		rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);
	rtl_reset_packet_filter(tp);		rtl_reset_packet_filter(tp);
	rtl_eri_set_bits(tp, 0x1b0, BIT(4));		rtl_eri_set_bits(tp, 0x1b0, BIT(4));
	rtl_eri_set_bits(tp, 0x1d0, BIT(4));		rtl_eri_set_bits(tp, 0x1d0, BIT(4) \| BIT(1));
	rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050);		rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050);
	rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x00000060);		rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x00000060);

	@@ -2984,7 +2986,7 @@ static void rtl_hw_start_8168f_1(struct rtl8169_private *tp)

	rtl_ephy_init(tp, e_info_8168f_1);		rtl_ephy_init(tp, e_info_8168f_1);

	rtl_w0w1_eri(tp, 0x0d4, 0x0c00, 0xff00);		rtl_eri_set_bits(tp, 0x0d4, 0x1f00);
	}		}

	static void rtl_hw_start_8411(struct rtl8169_private *tp)		static void rtl_hw_start_8411(struct rtl8169_private *tp)
	@@ -3019,6 +3021,7 @@ static void rtl_hw_start_8168g(struct rtl8169_private *tp)

	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);		rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);		rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
			rtl_eri_set_bits(tp, 0x0d4, 0x1f80);

	rtl8168_config_eee_mac(tp);		rtl8168_config_eee_mac(tp);

	@@ -3249,9 +3252,8 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)

	rtl_reset_packet_filter(tp);		rtl_reset_packet_filter(tp);

	rtl_eri_set_bits(tp, 0xdc, BIT(4));

	rtl_eri_set_bits(tp, 0xd4, 0x1f00);		rtl_eri_set_bits(tp, 0xd4, 0x1f00);
			rtl_eri_set_bits(tp, 0xdc, 0x001c);

	rtl_eri_write(tp, 0x5f0, ERIAR_MASK_0011, 0x4f87);		rtl_eri_write(tp, 0x5f0, ERIAR_MASK_0011, 0x4f87);

Admin message