Commit fe733618 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

r8169: add RTL_GIGA_MAC_VER_LAST to facilitate adding support for new chip versions 



Add a new mac_version enum value RTL_GIGA_MAC_VER_LAST. Benefit is that
when adding support for a new chip version we have to touch less code,
except something changes fundamentally.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/06991f47-2aec-4aa2-8918-2c6e79332303@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2b065c09

drivers/net/ethernet/realtek/r8169.h

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ enum mac_version { 
	RTL_GIGA_MAC_VER_66,

	RTL_GIGA_MAC_VER_70,

	RTL_GIGA_MAC_VER_71,

	RTL_GIGA_MAC_NONE

	RTL_GIGA_MAC_NONE,

	RTL_GIGA_MAC_VER_LAST = RTL_GIGA_MAC_NONE - 1

};



struct rtl8169_private;

drivers/net/ethernet/realtek/r8169_main.c

+14 −14
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ static void rtl_writephy(struct rtl8169_private *tp, int location, int val) 
	case RTL_GIGA_MAC_VER_31:

		r8168dp_2_mdio_write(tp, location, val);

		break;

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_LAST:

		r8168g_mdio_write(tp, location, val);

		break;

	default:
@@ -1304,7 +1304,7 @@ static int rtl_readphy(struct rtl8169_private *tp, int location) 
	case RTL_GIGA_MAC_VER_28:

	case RTL_GIGA_MAC_VER_31:

		return r8168dp_2_mdio_read(tp, location);

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_LAST:

		return r8168g_mdio_read(tp, location);

	default:

		return r8169_mdio_read(tp, location);
@@ -1656,7 +1656,7 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) 
		break;

	case RTL_GIGA_MAC_VER_34:

	case RTL_GIGA_MAC_VER_37:

	case RTL_GIGA_MAC_VER_39 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_39 ... RTL_GIGA_MAC_VER_LAST:

		r8169_mod_reg8_cond(tp, Config2, PME_SIGNAL, wolopts);

		break;

	default:
@@ -2129,7 +2129,7 @@ static void rtl_set_eee_txidle_timer(struct rtl8169_private *tp) 
		tp->tx_lpi_timer = timer_val;

		r8168_mac_ocp_write(tp, 0xe048, timer_val);

		break;

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_LAST:

		tp->tx_lpi_timer = timer_val;

		RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);

		break;
@@ -2491,7 +2491,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_61:

		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST);

		break;

	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_LAST:

		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST |

			RX_PAUSE_SLOT_ON);

		break;
@@ -2623,7 +2623,7 @@ static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_61:

		rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);

		break;

	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_LAST:

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

		rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);

		rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond_2, 100, 42);
@@ -2898,7 +2898,7 @@ static void rtl_enable_exit_l1(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_37 ... RTL_GIGA_MAC_VER_38:

		rtl_eri_set_bits(tp, 0xd4, 0x0c00);

		break;

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_LAST:

		r8168_mac_ocp_modify(tp, 0xc0ac, 0, 0x1f80);

		break;

	default:
@@ -2912,7 +2912,7 @@ static void rtl_disable_exit_l1(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_38:

		rtl_eri_clear_bits(tp, 0xd4, 0x1f00);

		break;

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_LAST:

		r8168_mac_ocp_modify(tp, 0xc0ac, 0x1f80, 0);

		break;

	default:
@@ -2950,7 +2950,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable) 


		switch (tp->mac_version) {

		case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:

		case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_71:

		case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_LAST:

			/* reset ephy tx/rx disable timer */

			r8168_mac_ocp_modify(tp, 0xe094, 0xff00, 0);

			/* chip can trigger L1.2 */
@@ -2962,7 +2962,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable) 
	} else {

		switch (tp->mac_version) {

		case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:

		case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_71:

		case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_LAST:

			r8168_mac_ocp_modify(tp, 0xe092, 0x00ff, 0);

			break;

		default:
@@ -4094,7 +4094,7 @@ static void rtl8169_cleanup(struct rtl8169_private *tp) 
		RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq);

		rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 666);

		break;

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_LAST:

		rtl_enable_rxdvgate(tp);

		fsleep(2000);

		break;
@@ -4251,7 +4251,7 @@ static unsigned int rtl_quirk_packet_padto(struct rtl8169_private *tp, 


	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_34:

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_LAST:

		padto = max_t(unsigned int, padto, ETH_ZLEN);

		break;

	default:
@@ -5302,7 +5302,7 @@ static void rtl_hw_initialize(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:

		rtl_hw_init_8168g(tp);

		break;

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_LAST:

		rtl_hw_init_8125(tp);

		break;

	default:
@@ -5327,7 +5327,7 @@ static int rtl_jumbo_max(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_24:

		return JUMBO_6K;

	/* RTL8125/8126 */

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_71:

	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_LAST:

		return JUMBO_16K;

	default:

		return JUMBO_9K;