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

Merge branch 'r8152-save-EEE' 



Hayes Wang says:

====================
r8152: save EEE

v4:
For patch #2, remove redundant calling of "ocp_reg_write(tp, OCP_EEE_ADV, 0)".

v3:
For patch #2, fix the mistake caused by copying and pasting.

v2:
Adjust patch #1. The EEE has been disabled in the beginning of
r8153_hw_phy_cfg() and r8153b_hw_phy_cfg(), so only check if
it is necessary to enable EEE.

Add the patch #2 for the helper function.

v1:
Saving the settings of EEE to avoid they become the default settings
after reset_resume().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d24e141 e7bde56b

drivers/net/usb/r8152.c

+95 −89
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ struct r8152 { 


	atomic_t rx_count;



	bool eee_en;

	int intr_interval;

	u32 saved_wolopts;

	u32 msg_enable;
@@ -762,6 +763,7 @@ struct r8152 { 


	u16 ocp_base;

	u16 speed;

	u16 eee_adv;

	u8 *intr_buff;

	u8 version;

	u8 duplex;
@@ -3200,10 +3202,76 @@ static void r8152_eee_en(struct r8152 *tp, bool enable) 
	ocp_reg_write(tp, OCP_EEE_CONFIG3, config3);

}



static void r8152b_enable_eee(struct r8152 *tp)

static void r8153_eee_en(struct r8152 *tp, bool enable)

{

	u32 ocp_data;

	u16 config;



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);

	config = ocp_reg_read(tp, OCP_EEE_CFG);



	if (enable) {

		ocp_data |= EEE_RX_EN | EEE_TX_EN;

		config |= EEE10_EN;

	} else {

		ocp_data &= ~(EEE_RX_EN | EEE_TX_EN);

		config &= ~EEE10_EN;

	}



	ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);

	ocp_reg_write(tp, OCP_EEE_CFG, config);

}



static void r8153b_eee_en(struct r8152 *tp, bool enable)

{

	r8153_eee_en(tp, enable);



	if (enable)

		r8153b_ups_flags_w1w0(tp, UPS_FLAGS_EN_EEE, 0);

	else

		r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_EEE);

}



static void rtl_eee_enable(struct r8152 *tp, bool enable)

{

	switch (tp->version) {

	case RTL_VER_01:

	case RTL_VER_02:

	case RTL_VER_07:

		if (enable) {

			r8152_eee_en(tp, true);

	r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, MDIO_EEE_100TX);

			r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV,

					tp->eee_adv);

		} else {

			r8152_eee_en(tp, false);

			r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);

		}

		break;

	case RTL_VER_03:

	case RTL_VER_04:

	case RTL_VER_05:

	case RTL_VER_06:

		if (enable) {

			r8153_eee_en(tp, true);

			ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);

		} else {

			r8153_eee_en(tp, false);

			ocp_reg_write(tp, OCP_EEE_ADV, 0);

		}

		break;

	case RTL_VER_08:

	case RTL_VER_09:

		if (enable) {

			r8153b_eee_en(tp, true);

			ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);

		} else {

			r8153b_eee_en(tp, false);

			ocp_reg_write(tp, OCP_EEE_ADV, 0);

		}

		break;

	default:

		break;

	}

}



static void r8152b_enable_fc(struct r8152 *tp)
@@ -3224,7 +3292,7 @@ static void rtl8152_disable(struct r8152 *tp) 


static void r8152b_hw_phy_cfg(struct r8152 *tp)

{

	r8152b_enable_eee(tp);

	rtl_eee_enable(tp, tp->eee_en);

	r8152_aldps_en(tp, true);

	r8152b_enable_fc(tp);
@@ -3418,36 +3486,6 @@ static void r8153b_aldps_en(struct r8152 *tp, bool enable) 
		r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_ALDPS);

}



static void r8153_eee_en(struct r8152 *tp, bool enable)

{

	u32 ocp_data;

	u16 config;



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);

	config = ocp_reg_read(tp, OCP_EEE_CFG);



	if (enable) {

		ocp_data |= EEE_RX_EN | EEE_TX_EN;

		config |= EEE10_EN;

	} else {

		ocp_data &= ~(EEE_RX_EN | EEE_TX_EN);

		config &= ~EEE10_EN;

	}



	ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);

	ocp_reg_write(tp, OCP_EEE_CFG, config);

}



static void r8153b_eee_en(struct r8152 *tp, bool enable)

{

	r8153_eee_en(tp, enable);



	if (enable)

		r8153b_ups_flags_w1w0(tp, UPS_FLAGS_EN_EEE, 0);

	else

		r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_EEE);

}



static void r8153b_enable_fc(struct r8152 *tp)

{

	r8152b_enable_fc(tp);
@@ -3463,8 +3501,7 @@ static void r8153_hw_phy_cfg(struct r8152 *tp) 
	r8153_aldps_en(tp, false);



	/* disable EEE before updating the PHY parameters */

	r8153_eee_en(tp, false);

	ocp_reg_write(tp, OCP_EEE_ADV, 0);

	rtl_eee_enable(tp, false);



	if (tp->version == RTL_VER_03) {

		data = ocp_reg_read(tp, OCP_EEE_CFG);
@@ -3495,8 +3532,8 @@ static void r8153_hw_phy_cfg(struct r8152 *tp) 
	sram_write(tp, SRAM_10M_AMP1, 0x00af);

	sram_write(tp, SRAM_10M_AMP2, 0x0208);



	r8153_eee_en(tp, true);

	ocp_reg_write(tp, OCP_EEE_ADV, MDIO_EEE_1000T | MDIO_EEE_100TX);

	if (tp->eee_en)

		rtl_eee_enable(tp, true);



	r8153_aldps_en(tp, true);

	r8152b_enable_fc(tp);
@@ -3536,8 +3573,7 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp) 
	r8153b_aldps_en(tp, false);



	/* disable EEE before updating the PHY parameters */

	r8153b_eee_en(tp, false);

	ocp_reg_write(tp, OCP_EEE_ADV, 0);

	rtl_eee_enable(tp, false);



	r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags));
@@ -3599,8 +3635,8 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp) 


	r8153b_ups_flags_w1w0(tp, ups_flags, 0);



	r8153b_eee_en(tp, true);

	ocp_reg_write(tp, OCP_EEE_ADV, MDIO_EEE_1000T | MDIO_EEE_100TX);

	if (tp->eee_en)

		rtl_eee_enable(tp, true);



	r8153b_aldps_en(tp, true);

	r8153b_enable_fc(tp);
@@ -4891,7 +4927,7 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data) 


static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee)

{

	u32 ocp_data, lp, adv, supported = 0;

	u32 lp, adv, supported = 0;

	u16 val;



	val = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE);
@@ -4903,13 +4939,10 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee) 
	val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE);

	lp = mmd_eee_adv_to_ethtool_adv_t(val);



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);

	ocp_data &= EEE_RX_EN | EEE_TX_EN;



	eee->eee_enabled = !!ocp_data;

	eee->eee_enabled = tp->eee_en;

	eee->eee_active = !!(supported & adv & lp);

	eee->supported = supported;

	eee->advertised = adv;

	eee->advertised = tp->eee_adv;

	eee->lp_advertised = lp;



	return 0;
@@ -4919,19 +4952,17 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee) 
{

	u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);



	r8152_eee_en(tp, eee->eee_enabled);



	if (!eee->eee_enabled)

		val = 0;

	tp->eee_en = eee->eee_enabled;

	tp->eee_adv = val;



	r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);

	rtl_eee_enable(tp, tp->eee_en);



	return 0;

}



static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee)

{

	u32 ocp_data, lp, adv, supported = 0;

	u32 lp, adv, supported = 0;

	u16 val;



	val = ocp_reg_read(tp, OCP_EEE_ABLE);
@@ -4943,46 +4974,15 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee) 
	val = ocp_reg_read(tp, OCP_EEE_LPABLE);

	lp = mmd_eee_adv_to_ethtool_adv_t(val);



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);

	ocp_data &= EEE_RX_EN | EEE_TX_EN;



	eee->eee_enabled = !!ocp_data;

	eee->eee_enabled = tp->eee_en;

	eee->eee_active = !!(supported & adv & lp);

	eee->supported = supported;

	eee->advertised = adv;

	eee->advertised = tp->eee_adv;

	eee->lp_advertised = lp;



	return 0;

}



static int r8153_set_eee(struct r8152 *tp, struct ethtool_eee *eee)

{

	u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);



	r8153_eee_en(tp, eee->eee_enabled);



	if (!eee->eee_enabled)

		val = 0;



	ocp_reg_write(tp, OCP_EEE_ADV, val);



	return 0;

}



static int r8153b_set_eee(struct r8152 *tp, struct ethtool_eee *eee)

{

	u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);



	r8153b_eee_en(tp, eee->eee_enabled);



	if (!eee->eee_enabled)

		val = 0;



	ocp_reg_write(tp, OCP_EEE_ADV, val);



	return 0;

}



static int

rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)

{
@@ -5353,6 +5353,8 @@ static int rtl_ops_init(struct r8152 *tp) 
		ops->hw_phy_cfg		= r8152b_hw_phy_cfg;

		ops->autosuspend_en	= rtl_runtime_suspend_enable;

		tp->rx_buf_sz		= 16 * 1024;

		tp->eee_en		= true;

		tp->eee_adv		= MDIO_EEE_100TX;

		break;



	case RTL_VER_03:
@@ -5366,11 +5368,13 @@ static int rtl_ops_init(struct r8152 *tp) 
		ops->down		= rtl8153_down;

		ops->unload		= rtl8153_unload;

		ops->eee_get		= r8153_get_eee;

		ops->eee_set		= r8153_set_eee;

		ops->eee_set		= r8152_set_eee;

		ops->in_nway		= rtl8153_in_nway;

		ops->hw_phy_cfg		= r8153_hw_phy_cfg;

		ops->autosuspend_en	= rtl8153_runtime_enable;

		tp->rx_buf_sz		= 32 * 1024;

		tp->eee_en		= true;

		tp->eee_adv		= MDIO_EEE_1000T | MDIO_EEE_100TX;

		break;



	case RTL_VER_08:
@@ -5382,11 +5386,13 @@ static int rtl_ops_init(struct r8152 *tp) 
		ops->down		= rtl8153b_down;

		ops->unload		= rtl8153b_unload;

		ops->eee_get		= r8153_get_eee;

		ops->eee_set		= r8153b_set_eee;

		ops->eee_set		= r8152_set_eee;

		ops->in_nway		= rtl8153_in_nway;

		ops->hw_phy_cfg		= r8153b_hw_phy_cfg;

		ops->autosuspend_en	= rtl8153b_runtime_enable;

		tp->rx_buf_sz		= 32 * 1024;

		tp->eee_en		= true;

		tp->eee_adv		= MDIO_EEE_1000T | MDIO_EEE_100TX;

		break;



	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE