Commit 5dd2b6fa authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'clean-up-the-fec-driver' 

Wei Fang says:

====================
clean up the FEC driver

When reading the codes of the FEC driver recently, I found there are
some redundant or invalid codes, these codes make the FEC driver a
bit messy and not concise, so this patch set has cleaned up the FEC
driver. At present, I only found these, but I believe these are not
all, I will continue to clean up the FEC driver in the future.
====================

Link: https://lore.kernel.org/r/20230718090928.2654347-1-wei.fang@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 51318bf4 636a5e88

drivers/net/ethernet/freescale/fec.h

+0 −5
Original line number Diff line number Diff line
@@ -651,12 +651,9 @@ struct fec_enet_private { 


	struct ptp_clock *ptp_clock;

	struct ptp_clock_info ptp_caps;

	unsigned long last_overflow_check;

	spinlock_t tmreg_lock;

	struct cyclecounter cc;

	struct timecounter tc;

	int rx_hwtstamp_filter;

	u32 base_incval;

	u32 cycle_speed;

	int hwts_rx_en;

	int hwts_tx_en;
@@ -679,8 +676,6 @@ struct fec_enet_private { 
	struct ethtool_eee eee;

	unsigned int clk_ref_rate;



	u32 rx_copybreak;



	/* ptp clock period in ns*/

	unsigned int ptp_inc;

drivers/net/ethernet/freescale/fec_main.c

+0 −46
Original line number Diff line number Diff line
@@ -325,8 +325,6 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); 
#define FEC_WOL_FLAG_ENABLE		(0x1 << 1)

#define FEC_WOL_FLAG_SLEEP_ON		(0x1 << 2)



#define COPYBREAK_DEFAULT	256



/* Max number of allowed TCP segments for software TSO */

#define FEC_MAX_TSO_SEGS	100

#define FEC_MAX_SKB_DESCS	(FEC_MAX_TSO_SEGS * 2 + MAX_SKB_FRAGS)
@@ -3051,44 +3049,6 @@ static int fec_enet_set_coalesce(struct net_device *ndev, 
	return 0;

}



static int fec_enet_get_tunable(struct net_device *netdev,

				const struct ethtool_tunable *tuna,

				void *data)

{

	struct fec_enet_private *fep = netdev_priv(netdev);

	int ret = 0;



	switch (tuna->id) {

	case ETHTOOL_RX_COPYBREAK:

		*(u32 *)data = fep->rx_copybreak;

		break;

	default:

		ret = -EINVAL;

		break;

	}



	return ret;

}



static int fec_enet_set_tunable(struct net_device *netdev,

				const struct ethtool_tunable *tuna,

				const void *data)

{

	struct fec_enet_private *fep = netdev_priv(netdev);

	int ret = 0;



	switch (tuna->id) {

	case ETHTOOL_RX_COPYBREAK:

		fep->rx_copybreak = *(u32 *)data;

		break;

	default:

		ret = -EINVAL;

		break;

	}



	return ret;

}



/* LPI Sleep Ts count base on tx clk (clk_ref).

 * The lpi sleep cnt value = X us / (cycle_ns).

 */
@@ -3226,8 +3186,6 @@ static const struct ethtool_ops fec_enet_ethtool_ops = { 
	.get_sset_count		= fec_enet_get_sset_count,

#endif

	.get_ts_info		= fec_enet_get_ts_info,

	.get_tunable		= fec_enet_get_tunable,

	.set_tunable		= fec_enet_set_tunable,

	.get_wol		= fec_enet_get_wol,

	.set_wol		= fec_enet_set_wol,

	.get_eee		= fec_enet_get_eee,
@@ -4008,9 +3966,6 @@ static int fec_enet_init(struct net_device *ndev) 
	if (ret)

		goto free_queue_mem;



	/* make sure MAC we just acquired is programmed into the hw */

	fec_set_mac_address(ndev, NULL);



	/* Set receive and transmit descriptor base. */

	for (i = 0; i < fep->num_rx_queues; i++) {

		struct fec_enet_priv_rx_q *rxq = fep->rx_queue[i];
@@ -4476,7 +4431,6 @@ fec_probe(struct platform_device *pdev) 
	if (fep->bufdesc_ex && fep->ptp_clock)

		netdev_info(ndev, "registered PHC device %d\n", fep->dev_id);



	fep->rx_copybreak = COPYBREAK_DEFAULT;

	INIT_WORK(&fep->tx_timeout_work, fec_enet_timeout_work);



	pm_runtime_mark_last_busy(&pdev->dev);