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

Commit df35d283 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: support ethtool eee 



Support get_eee() and set_eee() of ethtool_ops.

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d24f6134

drivers/net/usb/r8152.c

+128 −0
Original line number Diff line number Diff line
@@ -131,7 +131,9 @@ 
#define OCP_SRAM_ADDR		0xa436

#define OCP_SRAM_DATA		0xa438

#define OCP_DOWN_SPEED		0xa442

#define OCP_EEE_ABLE		0xa5c4

#define OCP_EEE_ADV		0xa5d0

#define OCP_EEE_LPABLE		0xa5d2

#define OCP_ADC_CFG		0xbc06



/* SRAM Register */
@@ -572,6 +574,8 @@ struct r8152 { 
		void (*up)(struct r8152 *);

		void (*down)(struct r8152 *);

		void (*unload)(struct r8152 *);

		int (*eee_get)(struct r8152 *, struct ethtool_eee *);

		int (*eee_set)(struct r8152 *, struct ethtool_eee *);

	} rtl_ops;



	int intr_interval;
@@ -3366,6 +3370,122 @@ 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;

	u16 val;



	val = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE);

	supported = mmd_eee_cap_to_ethtool_sup_t(val);



	val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV);

	adv = mmd_eee_adv_to_ethtool_adv_t(val);



	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_active = !!(supported & adv & lp);

	eee->supported = supported;

	eee->advertised = adv;

	eee->lp_advertised = lp;



	return 0;

}



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;



	r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);



	return 0;

}



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

{

	u32 ocp_data, lp, adv, supported = 0;

	u16 val;



	val = ocp_reg_read(tp, OCP_EEE_ABLE);

	supported = mmd_eee_cap_to_ethtool_sup_t(val);



	val = ocp_reg_read(tp, OCP_EEE_ADV);

	adv = mmd_eee_adv_to_ethtool_adv_t(val);



	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_active = !!(supported & adv & lp);

	eee->supported = supported;

	eee->advertised = 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

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

{

	struct r8152 *tp = netdev_priv(net);

	int ret;



	ret = usb_autopm_get_interface(tp->intf);

	if (ret < 0)

		goto out;



	ret = tp->rtl_ops.eee_get(tp, edata);



	usb_autopm_put_interface(tp->intf);



out:

	return ret;

}



static int

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

{

	struct r8152 *tp = netdev_priv(net);

	int ret;



	ret = usb_autopm_get_interface(tp->intf);

	if (ret < 0)

		goto out;



	ret = tp->rtl_ops.eee_set(tp, edata);



	usb_autopm_put_interface(tp->intf);



out:

	return ret;

}



static struct ethtool_ops ops = {

	.get_drvinfo = rtl8152_get_drvinfo,

	.get_settings = rtl8152_get_settings,
@@ -3378,6 +3498,8 @@ static struct ethtool_ops ops = { 
	.get_strings = rtl8152_get_strings,

	.get_sset_count = rtl8152_get_sset_count,

	.get_ethtool_stats = rtl8152_get_ethtool_stats,

	.get_eee = rtl_ethtool_get_eee,

	.set_eee = rtl_ethtool_set_eee,

};



static int rtl8152_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
@@ -3519,6 +3641,8 @@ static int rtl_ops_init(struct r8152 *tp, const struct usb_device_id *id) 
			ops->up			= rtl8152_up;

			ops->down		= rtl8152_down;

			ops->unload		= rtl8152_unload;

			ops->eee_get		= r8152_get_eee;

			ops->eee_set		= r8152_set_eee;

			ret = 0;

			break;

		case PRODUCT_ID_RTL8153:
@@ -3528,6 +3652,8 @@ static int rtl_ops_init(struct r8152 *tp, const struct usb_device_id *id) 
			ops->up			= rtl8153_up;

			ops->down		= rtl8153_down;

			ops->unload		= rtl8153_unload;

			ops->eee_get		= r8153_get_eee;

			ops->eee_set		= r8153_set_eee;

			ret = 0;

			break;

		default:
@@ -3544,6 +3670,8 @@ static int rtl_ops_init(struct r8152 *tp, const struct usb_device_id *id) 
			ops->up			= rtl8153_up;

			ops->down		= rtl8153_down;

			ops->unload		= rtl8153_unload;

			ops->eee_get		= r8153_get_eee;

			ops->eee_set		= r8153_set_eee;

			ret = 0;

			break;

		default: