r8152: adjust the settings of ups flags (0e5b36bc) · Commits · 戴 / test

drivers/net/usb/r8152.c

+120 −88

Original line number	Original line	Diff line number	Diff line
	@@ -445,18 +445,18 @@
	#define UPS_FLAGS_250M_CKDIV BIT(2)		#define UPS_FLAGS_250M_CKDIV BIT(2)
	#define UPS_FLAGS_EN_ALDPS BIT(3)		#define UPS_FLAGS_EN_ALDPS BIT(3)
	#define UPS_FLAGS_CTAP_SHORT_DIS BIT(4)		#define UPS_FLAGS_CTAP_SHORT_DIS BIT(4)
	#define UPS_FLAGS_SPEED_MASK (0xf << 16)
	#define ups_flags_speed(x) ((x) << 16)		#define ups_flags_speed(x) ((x) << 16)
	#define UPS_FLAGS_EN_EEE BIT(20)		#define UPS_FLAGS_EN_EEE BIT(20)
	#define UPS_FLAGS_EN_500M_EEE BIT(21)		#define UPS_FLAGS_EN_500M_EEE BIT(21)
	#define UPS_FLAGS_EN_EEE_CKDIV BIT(22)		#define UPS_FLAGS_EN_EEE_CKDIV BIT(22)
			#define UPS_FLAGS_EEE_PLLOFF_100 BIT(23)
	#define UPS_FLAGS_EEE_PLLOFF_GIGA BIT(24)		#define UPS_FLAGS_EEE_PLLOFF_GIGA BIT(24)
	#define UPS_FLAGS_EEE_CMOD_LV_EN BIT(25)		#define UPS_FLAGS_EEE_CMOD_LV_EN BIT(25)
	#define UPS_FLAGS_EN_GREEN BIT(26)		#define UPS_FLAGS_EN_GREEN BIT(26)
	#define UPS_FLAGS_EN_FLOW_CTR BIT(27)		#define UPS_FLAGS_EN_FLOW_CTR BIT(27)

	enum spd_duplex {		enum spd_duplex {
	NWAY_10M_HALF = 1,		NWAY_10M_HALF,
	NWAY_10M_FULL,		NWAY_10M_FULL,
	NWAY_100M_HALF,		NWAY_100M_HALF,
	NWAY_100M_FULL,		NWAY_100M_FULL,
	@@ -749,6 +749,23 @@ struct r8152 {
	void (autosuspend_en)(struct r8152 tp, bool enable);		void (autosuspend_en)(struct r8152 tp, bool enable);
	} rtl_ops;		} rtl_ops;

			struct ups_info {
			u32 _10m_ckdiv:1;
			u32 _250m_ckdiv:1;
			u32 aldps:1;
			u32 lite_mode:2;
			u32 speed_duplex:4;
			u32 eee:1;
			u32 eee_lite:1;
			u32 eee_ckdiv:1;
			u32 eee_plloff_100:1;
			u32 eee_plloff_giga:1;
			u32 eee_cmod_lv:1;
			u32 green:1;
			u32 flow_control:1;
			u32 ctap_short_off:1;
			} ups_info;

	atomic_t rx_count;		atomic_t rx_count;

	bool eee_en;		bool eee_en;
	@@ -2865,14 +2882,76 @@ static void r8153_u2p3en(struct r8152 *tp, bool enable)
	ocp_write_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL, ocp_data);		ocp_write_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL, ocp_data);
	}		}

	static void r8153b_ups_flags_w1w0(struct r8152 *tp, u32 set, u32 clear)		static void r8153b_ups_flags(struct r8152 *tp)
	{		{
	u32 ocp_data;		u32 ups_flags = 0;

			if (tp->ups_info.green)
			ups_flags \|= UPS_FLAGS_EN_GREEN;

			if (tp->ups_info.aldps)
			ups_flags \|= UPS_FLAGS_EN_ALDPS;

			if (tp->ups_info.eee)
			ups_flags \|= UPS_FLAGS_EN_EEE;

			if (tp->ups_info.flow_control)
			ups_flags \|= UPS_FLAGS_EN_FLOW_CTR;

			if (tp->ups_info.eee_ckdiv)
			ups_flags \|= UPS_FLAGS_EN_EEE_CKDIV;

			if (tp->ups_info.eee_cmod_lv)
			ups_flags \|= UPS_FLAGS_EEE_CMOD_LV_EN;

			if (tp->ups_info._10m_ckdiv)
			ups_flags \|= UPS_FLAGS_EN_10M_CKDIV;

			if (tp->ups_info.eee_plloff_100)
			ups_flags \|= UPS_FLAGS_EEE_PLLOFF_100;

	ocp_data = ocp_read_dword(tp, MCU_TYPE_USB, USB_UPS_FLAGS);		if (tp->ups_info.eee_plloff_giga)
	ocp_data &= ~clear;		ups_flags \|= UPS_FLAGS_EEE_PLLOFF_GIGA;
	ocp_data \|= set;
	ocp_write_dword(tp, MCU_TYPE_USB, USB_UPS_FLAGS, ocp_data);		if (tp->ups_info._250m_ckdiv)
			ups_flags \|= UPS_FLAGS_250M_CKDIV;

			if (tp->ups_info.ctap_short_off)
			ups_flags \|= UPS_FLAGS_CTAP_SHORT_DIS;

			switch (tp->ups_info.speed_duplex) {
			case NWAY_10M_HALF:
			ups_flags \|= ups_flags_speed(1);
			break;
			case NWAY_10M_FULL:
			ups_flags \|= ups_flags_speed(2);
			break;
			case NWAY_100M_HALF:
			ups_flags \|= ups_flags_speed(3);
			break;
			case NWAY_100M_FULL:
			ups_flags \|= ups_flags_speed(4);
			break;
			case NWAY_1000M_FULL:
			ups_flags \|= ups_flags_speed(5);
			break;
			case FORCE_10M_HALF:
			ups_flags \|= ups_flags_speed(6);
			break;
			case FORCE_10M_FULL:
			ups_flags \|= ups_flags_speed(7);
			break;
			case FORCE_100M_HALF:
			ups_flags \|= ups_flags_speed(8);
			break;
			case FORCE_100M_FULL:
			ups_flags \|= ups_flags_speed(9);
			break;
			default:
			break;
			}

			ocp_write_dword(tp, MCU_TYPE_USB, USB_UPS_FLAGS, ups_flags);
	}		}

	static void r8153b_green_en(struct r8152 *tp, bool enable)		static void r8153b_green_en(struct r8152 *tp, bool enable)
	@@ -2893,7 +2972,7 @@ static void r8153b_green_en(struct r8152 *tp, bool enable)
	data \|= GREEN_ETH_EN;		data \|= GREEN_ETH_EN;
	sram_write(tp, SRAM_GREEN_CFG, data);		sram_write(tp, SRAM_GREEN_CFG, data);

	r8153b_ups_flags_w1w0(tp, UPS_FLAGS_EN_GREEN, 0);		tp->ups_info.green = enable;
	}		}

	static u16 r8153_phy_status(struct r8152 *tp, u16 desired)		static u16 r8153_phy_status(struct r8152 *tp, u16 desired)
	@@ -2923,6 +3002,8 @@ static void r8153b_ups_en(struct r8152 *tp, bool enable)
	u32 ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_POWER_CUT);		u32 ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_POWER_CUT);

	if (enable) {		if (enable) {
			r8153b_ups_flags(tp);

	ocp_data \|= UPS_EN \| USP_PREWAKE \| PHASE2_EN;		ocp_data \|= UPS_EN \| USP_PREWAKE \| PHASE2_EN;
	ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data);		ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data);

	@@ -3231,16 +3312,8 @@ static void r8153_eee_en(struct r8152 *tp, bool enable)

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);		ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
	ocp_reg_write(tp, OCP_EEE_CFG, config);		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)		tp->ups_info.eee = 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)		static void rtl_eee_enable(struct r8152 *tp, bool enable)
	@@ -3262,21 +3335,13 @@ static void rtl_eee_enable(struct r8152 *tp, bool enable)
	case RTL_VER_04:		case RTL_VER_04:
	case RTL_VER_05:		case RTL_VER_05:
	case RTL_VER_06:		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_08:
	case RTL_VER_09:		case RTL_VER_09:
	if (enable) {		if (enable) {
	r8153b_eee_en(tp, true);		r8153_eee_en(tp, true);
	ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);		ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);
	} else {		} else {
	r8153b_eee_en(tp, false);		r8153_eee_en(tp, false);
	ocp_reg_write(tp, OCP_EEE_ADV, 0);		ocp_reg_write(tp, OCP_EEE_ADV, 0);
	}		}
	break;		break;
	@@ -3292,6 +3357,8 @@ static void r8152b_enable_fc(struct r8152 *tp)
	anar = r8152_mdio_read(tp, MII_ADVERTISE);		anar = r8152_mdio_read(tp, MII_ADVERTISE);
	anar \|= ADVERTISE_PAUSE_CAP \| ADVERTISE_PAUSE_ASYM;		anar \|= ADVERTISE_PAUSE_CAP \| ADVERTISE_PAUSE_ASYM;
	r8152_mdio_write(tp, MII_ADVERTISE, anar);		r8152_mdio_write(tp, MII_ADVERTISE, anar);

			tp->ups_info.flow_control = true;
	}		}

	static void rtl8152_disable(struct r8152 *tp)		static void rtl8152_disable(struct r8152 *tp)
	@@ -3485,22 +3552,8 @@ static void r8153_aldps_en(struct r8152 *tp, bool enable)
	break;		break;
	}		}
	}		}
	}

	static void r8153b_aldps_en(struct r8152 *tp, bool enable)		tp->ups_info.aldps = enable;
	{
	r8153_aldps_en(tp, enable);

	if (enable)
	r8153b_ups_flags_w1w0(tp, UPS_FLAGS_EN_ALDPS, 0);
	else
	r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_ALDPS);
	}

	static void r8153b_enable_fc(struct r8152 *tp)
	{
	r8152b_enable_fc(tp);
	r8153b_ups_flags_w1w0(tp, UPS_FLAGS_EN_FLOW_CTR, 0);
	}		}

	static void r8153_hw_phy_cfg(struct r8152 *tp)		static void r8153_hw_phy_cfg(struct r8152 *tp)
	@@ -3577,11 +3630,11 @@ static u32 r8152_efuse_read(struct r8152 *tp, u8 addr)

	static void r8153b_hw_phy_cfg(struct r8152 *tp)		static void r8153b_hw_phy_cfg(struct r8152 *tp)
	{		{
	u32 ocp_data, ups_flags = 0;		u32 ocp_data;
	u16 data;		u16 data;

	/* disable ALDPS before updating the PHY parameters */		/* disable ALDPS before updating the PHY parameters */
	r8153b_aldps_en(tp, false);		r8153_aldps_en(tp, false);

	/* disable EEE before updating the PHY parameters */		/* disable EEE before updating the PHY parameters */
	rtl_eee_enable(tp, false);		rtl_eee_enable(tp, false);
	@@ -3629,28 +3682,27 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp)
	data = ocp_reg_read(tp, OCP_POWER_CFG);		data = ocp_reg_read(tp, OCP_POWER_CFG);
	data \|= EEE_CLKDIV_EN;		data \|= EEE_CLKDIV_EN;
	ocp_reg_write(tp, OCP_POWER_CFG, data);		ocp_reg_write(tp, OCP_POWER_CFG, data);
			tp->ups_info.eee_ckdiv = true;

	data = ocp_reg_read(tp, OCP_DOWN_SPEED);		data = ocp_reg_read(tp, OCP_DOWN_SPEED);
	data \|= EN_EEE_CMODE \| EN_EEE_1000 \| EN_10M_CLKDIV;		data \|= EN_EEE_CMODE \| EN_EEE_1000 \| EN_10M_CLKDIV;
	ocp_reg_write(tp, OCP_DOWN_SPEED, data);		ocp_reg_write(tp, OCP_DOWN_SPEED, data);
			tp->ups_info.eee_cmod_lv = true;
			tp->ups_info._10m_ckdiv = true;
			tp->ups_info.eee_plloff_giga = true;

	ocp_reg_write(tp, OCP_SYSCLK_CFG, 0);		ocp_reg_write(tp, OCP_SYSCLK_CFG, 0);
	ocp_reg_write(tp, OCP_SYSCLK_CFG, clk_div_expo(5));		ocp_reg_write(tp, OCP_SYSCLK_CFG, clk_div_expo(5));
			tp->ups_info._250m_ckdiv = true;
	ups_flags \|= UPS_FLAGS_EN_10M_CKDIV \| UPS_FLAGS_250M_CKDIV \|
	UPS_FLAGS_EN_EEE_CKDIV \| UPS_FLAGS_EEE_CMOD_LV_EN \|
	UPS_FLAGS_EEE_PLLOFF_GIGA;

	r8153_patch_request(tp, false);		r8153_patch_request(tp, false);
	}		}

	r8153b_ups_flags_w1w0(tp, ups_flags, 0);

	if (tp->eee_en)		if (tp->eee_en)
	rtl_eee_enable(tp, true);		rtl_eee_enable(tp, true);

	r8153b_aldps_en(tp, true);		r8153_aldps_en(tp, true);
	r8153b_enable_fc(tp);		r8152b_enable_fc(tp);
	r8153_u2p3en(tp, true);		r8153_u2p3en(tp, true);

	set_bit(PHY_RESET, &tp->flags);		set_bit(PHY_RESET, &tp->flags);
	@@ -3801,18 +3853,9 @@ static void rtl8153_disable(struct r8152 *tp)
	r8153_aldps_en(tp, true);		r8153_aldps_en(tp, true);
	}		}

	static void rtl8153b_disable(struct r8152 *tp)
	{
	r8153b_aldps_en(tp, false);
	rtl_disable(tp);
	rtl_reset_bmu(tp);
	r8153b_aldps_en(tp, true);
	}

	static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex,		static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex,
	u32 advertising)		u32 advertising)
	{		{
	enum spd_duplex speed_duplex;
	u16 bmcr;		u16 bmcr;
	int ret = 0;		int ret = 0;

	@@ -3825,24 +3868,24 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex,
	bmcr = BMCR_SPEED10;		bmcr = BMCR_SPEED10;
	if (duplex == DUPLEX_FULL) {		if (duplex == DUPLEX_FULL) {
	bmcr \|= BMCR_FULLDPLX;		bmcr \|= BMCR_FULLDPLX;
	speed_duplex = FORCE_10M_FULL;		tp->ups_info.speed_duplex = FORCE_10M_FULL;
	} else {		} else {
	speed_duplex = FORCE_10M_HALF;		tp->ups_info.speed_duplex = FORCE_10M_HALF;
	}		}
	break;		break;
	case SPEED_100:		case SPEED_100:
	bmcr = BMCR_SPEED100;		bmcr = BMCR_SPEED100;
	if (duplex == DUPLEX_FULL) {		if (duplex == DUPLEX_FULL) {
	bmcr \|= BMCR_FULLDPLX;		bmcr \|= BMCR_FULLDPLX;
	speed_duplex = FORCE_100M_FULL;		tp->ups_info.speed_duplex = FORCE_100M_FULL;
	} else {		} else {
	speed_duplex = FORCE_100M_HALF;		tp->ups_info.speed_duplex = FORCE_100M_HALF;
	}		}
	break;		break;
	case SPEED_1000:		case SPEED_1000:
	if (tp->mii.supports_gmii) {		if (tp->mii.supports_gmii) {
	bmcr = BMCR_SPEED1000 \| BMCR_FULLDPLX;		bmcr = BMCR_SPEED1000 \| BMCR_FULLDPLX;
	speed_duplex = NWAY_1000M_FULL;		tp->ups_info.speed_duplex = NWAY_1000M_FULL;
	break;		break;
	}		}
	/* fall through */		/* fall through */
	@@ -3875,20 +3918,20 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex,
	ADVERTISE_100HALF \| ADVERTISE_100FULL);		ADVERTISE_100HALF \| ADVERTISE_100FULL);
	if (advertising & RTL_ADVERTISED_10_HALF) {		if (advertising & RTL_ADVERTISED_10_HALF) {
	tmp1 \|= ADVERTISE_10HALF;		tmp1 \|= ADVERTISE_10HALF;
	speed_duplex = NWAY_10M_HALF;		tp->ups_info.speed_duplex = NWAY_10M_HALF;
	}		}
	if (advertising & RTL_ADVERTISED_10_FULL) {		if (advertising & RTL_ADVERTISED_10_FULL) {
	tmp1 \|= ADVERTISE_10FULL;		tmp1 \|= ADVERTISE_10FULL;
	speed_duplex = NWAY_10M_FULL;		tp->ups_info.speed_duplex = NWAY_10M_FULL;
	}		}

	if (advertising & RTL_ADVERTISED_100_HALF) {		if (advertising & RTL_ADVERTISED_100_HALF) {
	tmp1 \|= ADVERTISE_100HALF;		tmp1 \|= ADVERTISE_100HALF;
	speed_duplex = NWAY_100M_HALF;		tp->ups_info.speed_duplex = NWAY_100M_HALF;
	}		}
	if (advertising & RTL_ADVERTISED_100_FULL) {		if (advertising & RTL_ADVERTISED_100_FULL) {
	tmp1 \|= ADVERTISE_100FULL;		tmp1 \|= ADVERTISE_100FULL;
	speed_duplex = NWAY_100M_FULL;		tp->ups_info.speed_duplex = NWAY_100M_FULL;
	}		}

	if (anar != tmp1) {		if (anar != tmp1) {
	@@ -3905,7 +3948,7 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex,

	if (advertising & RTL_ADVERTISED_1000_FULL) {		if (advertising & RTL_ADVERTISED_1000_FULL) {
	tmp1 \|= ADVERTISE_1000FULL;		tmp1 \|= ADVERTISE_1000FULL;
	speed_duplex = NWAY_1000M_FULL;		tp->ups_info.speed_duplex = NWAY_1000M_FULL;
	}		}

	if (gbcr != tmp1)		if (gbcr != tmp1)
	@@ -3922,17 +3965,6 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex,

	r8152_mdio_write(tp, MII_BMCR, bmcr);		r8152_mdio_write(tp, MII_BMCR, bmcr);

	switch (tp->version) {
	case RTL_VER_08:
	case RTL_VER_09:
	r8153b_ups_flags_w1w0(tp, ups_flags_speed(speed_duplex),
	UPS_FLAGS_SPEED_MASK);
	break;

	default:
	break;
	}

	if (bmcr & BMCR_RESET) {		if (bmcr & BMCR_RESET) {
	int i;		int i;

	@@ -4017,12 +4049,12 @@ static void rtl8153b_up(struct r8152 *tp)

	r8153b_u1u2en(tp, false);		r8153b_u1u2en(tp, false);
	r8153_u2p3en(tp, false);		r8153_u2p3en(tp, false);
	r8153b_aldps_en(tp, false);		r8153_aldps_en(tp, false);

	r8153_first_init(tp);		r8153_first_init(tp);
	ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_B);		ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_B);

	r8153b_aldps_en(tp, true);		r8153_aldps_en(tp, true);
	r8153_u2p3en(tp, true);		r8153_u2p3en(tp, true);
	r8153b_u1u2en(tp, true);		r8153b_u1u2en(tp, true);
	}		}
	@@ -4037,9 +4069,9 @@ static void rtl8153b_down(struct r8152 *tp)
	r8153b_u1u2en(tp, false);		r8153b_u1u2en(tp, false);
	r8153_u2p3en(tp, false);		r8153_u2p3en(tp, false);
	r8153b_power_cut_en(tp, false);		r8153b_power_cut_en(tp, false);
	r8153b_aldps_en(tp, false);		r8153_aldps_en(tp, false);
	r8153_enter_oob(tp);		r8153_enter_oob(tp);
	r8153b_aldps_en(tp, true);		r8153_aldps_en(tp, true);
	}		}

	static bool rtl8152_in_nway(struct r8152 *tp)		static bool rtl8152_in_nway(struct r8152 *tp)
	@@ -5445,7 +5477,7 @@ static int rtl_ops_init(struct r8152 *tp)
	case RTL_VER_09:		case RTL_VER_09:
	ops->init = r8153b_init;		ops->init = r8153b_init;
	ops->enable = rtl8153_enable;		ops->enable = rtl8153_enable;
	ops->disable = rtl8153b_disable;		ops->disable = rtl8153_disable;
	ops->up = rtl8153b_up;		ops->up = rtl8153b_up;
	ops->down = rtl8153b_down;		ops->down = rtl8153b_down;
	ops->unload = rtl8153b_unload;		ops->unload = rtl8153b_unload;

Admin message