Commit b957665d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-fec-add-the-jumbo-frame-support' 

Shenwei Wang says:

====================
net: fec: add the Jumbo frame support
====================

Link: https://patch.msgid.link/20250910185211.721341-1-shenwei.wang@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d586676a d466c160

drivers/net/ethernet/freescale/fec.h

+9 −2
Original line number Diff line number Diff line
@@ -348,10 +348,11 @@ struct bufdesc_ex { 
 * the skbuffer directly.

 */



#define FEC_DRV_RESERVE_SPACE (XDP_PACKET_HEADROOM + \

		SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))

#define FEC_ENET_XDP_HEADROOM	(XDP_PACKET_HEADROOM)

#define FEC_ENET_RX_PAGES	256

#define FEC_ENET_RX_FRSIZE	(PAGE_SIZE - FEC_ENET_XDP_HEADROOM \

		- SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))

#define FEC_ENET_RX_FRSIZE	(PAGE_SIZE - FEC_DRV_RESERVE_SPACE)

#define FEC_ENET_RX_FRPPG	(PAGE_SIZE / FEC_ENET_RX_FRSIZE)

#define RX_RING_SIZE		(FEC_ENET_RX_FRPPG * FEC_ENET_RX_PAGES)

#define FEC_ENET_TX_FRSIZE	2048
@@ -513,6 +514,9 @@ struct bufdesc_ex { 
 */

#define FEC_QUIRK_HAS_MDIO_C45		BIT(24)



/* Jumbo Frame support */

#define FEC_QUIRK_JUMBO_FRAME		BIT(25)



struct bufdesc_prop {

	int qid;

	/* Address of Rx and Tx buffers */
@@ -619,6 +623,9 @@ struct fec_enet_private { 


	unsigned int total_tx_ring_size;

	unsigned int total_rx_ring_size;

	unsigned int max_buf_size;

	unsigned int pagepool_order;

	unsigned int rx_frame_size;



	struct	platform_device *pdev;

drivers/net/ethernet/freescale/fec_main.c

+55 −13
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ static const struct fec_devinfo fec_imx8qm_info = { 
		  FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE |

		  FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE |

		  FEC_QUIRK_CLEAR_SETUP_MII | FEC_QUIRK_HAS_MULTI_QUEUES |

		  FEC_QUIRK_DELAYED_CLKS_SUPPORT | FEC_QUIRK_HAS_MDIO_C45,

		  FEC_QUIRK_DELAYED_CLKS_SUPPORT | FEC_QUIRK_HAS_MDIO_C45 |

		  FEC_QUIRK_JUMBO_FRAME,

};



static const struct fec_devinfo fec_s32v234_info = {
@@ -233,6 +234,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); 
 * 2048 byte skbufs are allocated. However, alignment requirements

 * varies between FEC variants. Worst case is 64, so round down by 64.

 */

#define MAX_JUMBO_BUF_SIZE	(round_down(16384 - FEC_DRV_RESERVE_SPACE - 64, 64))

#define PKT_MAXBUF_SIZE		(round_down(2048 - 64, 64))

#define PKT_MINBUF_SIZE		64
@@ -253,9 +255,9 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); 
#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \

    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \

    defined(CONFIG_ARM64)

#define	OPT_FRAME_SIZE	(PKT_MAXBUF_SIZE << 16)

#define	OPT_ARCH_HAS_MAX_FL	1

#else

#define	OPT_FRAME_SIZE	0

#define	OPT_ARCH_HAS_MAX_FL	0

#endif



/* FEC MII MMFR bits definition */
@@ -470,14 +472,14 @@ fec_enet_create_page_pool(struct fec_enet_private *fep, 
{

	struct bpf_prog *xdp_prog = READ_ONCE(fep->xdp_prog);

	struct page_pool_params pp_params = {

		.order = 0,

		.order = fep->pagepool_order,

		.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV,

		.pool_size = size,

		.nid = dev_to_node(&fep->pdev->dev),

		.dev = &fep->pdev->dev,

		.dma_dir = xdp_prog ? DMA_BIDIRECTIONAL : DMA_FROM_DEVICE,

		.offset = FEC_ENET_XDP_HEADROOM,

		.max_len = FEC_ENET_RX_FRSIZE,

		.max_len = fep->rx_frame_size,

	};

	int err;
@@ -1083,7 +1085,7 @@ static void fec_enet_enable_ring(struct net_device *ndev) 
	for (i = 0; i < fep->num_rx_queues; i++) {

		rxq = fep->rx_queue[i];

		writel(rxq->bd.dma, fep->hwp + FEC_R_DES_START(i));

		writel(PKT_MAXBUF_SIZE, fep->hwp + FEC_R_BUFF_SIZE(i));

		writel(fep->max_buf_size, fep->hwp + FEC_R_BUFF_SIZE(i));



		/* enable DMA1/2 */

		if (i)
@@ -1145,8 +1147,11 @@ static void 
fec_restart(struct net_device *ndev)

{

	struct fec_enet_private *fep = netdev_priv(ndev);

	u32 rcntl = OPT_FRAME_SIZE | FEC_RCR_MII;

	u32 ecntl = FEC_ECR_ETHEREN;

	u32 rcntl = FEC_RCR_MII;



	if (OPT_ARCH_HAS_MAX_FL)

		rcntl |= (fep->netdev->mtu + ETH_HLEN + ETH_FCS_LEN) << 16;



	if (fep->bufdesc_ex)

		fec_ptp_save_state(fep);
@@ -1191,7 +1196,7 @@ fec_restart(struct net_device *ndev) 
		else

			val &= ~FEC_RACC_OPTIONS;

		writel(val, fep->hwp + FEC_RACC);

		writel(PKT_MAXBUF_SIZE, fep->hwp + FEC_FTRL);

		writel(min(fep->rx_frame_size, fep->max_buf_size), fep->hwp + FEC_FTRL);

	}

#endif
@@ -1278,7 +1283,17 @@ fec_restart(struct net_device *ndev) 
	if (fep->quirks & FEC_QUIRK_ENET_MAC) {

		/* enable ENET endian swap */

		ecntl |= FEC_ECR_BYTESWP;

		/* enable ENET store and forward mode */



		/* When Jumbo Frame is enabled, the FIFO may not be large enough

		 * to hold an entire frame. In such cases, if the MTU exceeds

		 * (PKT_MAXBUF_SIZE - ETH_HLEN - ETH_FCS_LEN), configure the interface

		 * to operate in cut-through mode, triggered by the FIFO threshold.

		 * Otherwise, enable the ENET store-and-forward mode.

		 */

		if ((fep->quirks & FEC_QUIRK_JUMBO_FRAME) &&

		    (ndev->mtu > (PKT_MAXBUF_SIZE - ETH_HLEN - ETH_FCS_LEN)))

			writel(0xF, fep->hwp + FEC_X_WMRK);

		else

			writel(FEC_TXWMRK_STRFWD, fep->hwp + FEC_X_WMRK);

	}
@@ -1780,7 +1795,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget) 
	 * These get messed up if we get called due to a busy condition.

	 */

	bdp = rxq->bd.cur;

	xdp_init_buff(&xdp, PAGE_SIZE, &rxq->xdp_rxq);

	xdp_init_buff(&xdp, PAGE_SIZE << fep->pagepool_order, &rxq->xdp_rxq);



	while (!((status = fec16_to_cpu(bdp->cbd_sc)) & BD_ENET_RX_EMPTY)) {
@@ -1850,7 +1865,8 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget) 
		 * include that when passing upstream as it messes up

		 * bridging applications.

		 */

		skb = build_skb(page_address(page), PAGE_SIZE);

		skb = build_skb(page_address(page),

				PAGE_SIZE << fep->pagepool_order);

		if (unlikely(!skb)) {

			page_pool_recycle_direct(rxq->page_pool, page);

			ndev->stats.rx_dropped++;
@@ -4021,6 +4037,23 @@ static int fec_hwtstamp_set(struct net_device *ndev, 
	return fec_ptp_set(ndev, config, extack);

}



static int fec_change_mtu(struct net_device *ndev, int new_mtu)

{

	struct fec_enet_private *fep = netdev_priv(ndev);

	int order;



	if (netif_running(ndev))

		return -EBUSY;



	order = get_order(new_mtu + ETH_HLEN + ETH_FCS_LEN

			  + FEC_DRV_RESERVE_SPACE);

	fep->rx_frame_size = (PAGE_SIZE << order) - FEC_DRV_RESERVE_SPACE;

	fep->pagepool_order = order;

	WRITE_ONCE(ndev->mtu, new_mtu);



	return 0;

}



static const struct net_device_ops fec_netdev_ops = {

	.ndo_open		= fec_enet_open,

	.ndo_stop		= fec_enet_close,
@@ -4030,6 +4063,7 @@ static const struct net_device_ops fec_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_tx_timeout		= fec_timeout,

	.ndo_set_mac_address	= fec_set_mac_address,

	.ndo_change_mtu		= fec_change_mtu,

	.ndo_eth_ioctl		= phy_do_ioctl_running,

	.ndo_set_features	= fec_set_features,

	.ndo_bpf		= fec_enet_bpf,
@@ -4560,7 +4594,15 @@ fec_probe(struct platform_device *pdev) 
	fec_enet_clk_enable(ndev, false);

	pinctrl_pm_select_sleep_state(&pdev->dev);



	ndev->max_mtu = PKT_MAXBUF_SIZE - ETH_HLEN - ETH_FCS_LEN;

	fep->pagepool_order = 0;

	fep->rx_frame_size = FEC_ENET_RX_FRSIZE;



	if (fep->quirks & FEC_QUIRK_JUMBO_FRAME)

		fep->max_buf_size = MAX_JUMBO_BUF_SIZE;

	else

		fep->max_buf_size = PKT_MAXBUF_SIZE;



	ndev->max_mtu = fep->max_buf_size - ETH_HLEN - ETH_FCS_LEN;



	ret = register_netdev(ndev);

	if (ret)