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

+64 -15

2 changed files

expand all

drivers

net

ethernet

freescale

fec.h

fec_main.c

+9 -2

drivers/net/ethernet/freescale/fec.h

··· 348 348 * the skbuffer directly. 349 349 */ 350 350 351 + #define FEC_DRV_RESERVE_SPACE (XDP_PACKET_HEADROOM + \ 352 + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) 351 353 #define FEC_ENET_XDP_HEADROOM (XDP_PACKET_HEADROOM) 352 354 #define FEC_ENET_RX_PAGES 256 353 - #define FEC_ENET_RX_FRSIZE (PAGE_SIZE - FEC_ENET_XDP_HEADROOM \ 354 - - SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) 355 + #define FEC_ENET_RX_FRSIZE (PAGE_SIZE - FEC_DRV_RESERVE_SPACE) 355 356 #define FEC_ENET_RX_FRPPG (PAGE_SIZE / FEC_ENET_RX_FRSIZE) 356 357 #define RX_RING_SIZE (FEC_ENET_RX_FRPPG * FEC_ENET_RX_PAGES) 357 358 #define FEC_ENET_TX_FRSIZE 2048 ··· 514 513 */ 515 514 #define FEC_QUIRK_HAS_MDIO_C45 BIT(24) 516 515 516 + /* Jumbo Frame support */ 517 + #define FEC_QUIRK_JUMBO_FRAME BIT(25) 518 + 517 519 struct bufdesc_prop { 518 520 int qid; 519 521 /* Address of Rx and Tx buffers */ ··· 623 619 624 620 unsigned int total_tx_ring_size; 625 621 unsigned int total_rx_ring_size; 622 + unsigned int max_buf_size; 623 + unsigned int pagepool_order; 624 + unsigned int rx_frame_size; 626 625 627 626 struct platform_device *pdev; 628 627

+55 -13

drivers/net/ethernet/freescale/fec_main.c

··· 167 167 FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE | 168 168 FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE | 169 169 FEC_QUIRK_CLEAR_SETUP_MII | FEC_QUIRK_HAS_MULTI_QUEUES | 170 - FEC_QUIRK_DELAYED_CLKS_SUPPORT | FEC_QUIRK_HAS_MDIO_C45, 170 + FEC_QUIRK_DELAYED_CLKS_SUPPORT | FEC_QUIRK_HAS_MDIO_C45 | 171 + FEC_QUIRK_JUMBO_FRAME, 171 172 }; 172 173 173 174 static const struct fec_devinfo fec_s32v234_info = { ··· 234 233 * 2048 byte skbufs are allocated. However, alignment requirements 235 234 * varies between FEC variants. Worst case is 64, so round down by 64. 236 235 */ 236 + #define MAX_JUMBO_BUF_SIZE (round_down(16384 - FEC_DRV_RESERVE_SPACE - 64, 64)) 237 237 #define PKT_MAXBUF_SIZE (round_down(2048 - 64, 64)) 238 238 #define PKT_MINBUF_SIZE 64 239 239 ··· 255 253 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ 256 254 defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \ 257 255 defined(CONFIG_ARM64) 258 - #define OPT_FRAME_SIZE (PKT_MAXBUF_SIZE << 16) 256 + #define OPT_ARCH_HAS_MAX_FL 1 259 257 #else 260 - #define OPT_FRAME_SIZE 0 258 + #define OPT_ARCH_HAS_MAX_FL 0 261 259 #endif 262 260 263 261 /* FEC MII MMFR bits definition */ ··· 472 470 { 473 471 struct bpf_prog *xdp_prog = READ_ONCE(fep->xdp_prog); 474 472 struct page_pool_params pp_params = { 475 - .order = 0, 473 + .order = fep->pagepool_order, 476 474 .flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV, 477 475 .pool_size = size, 478 476 .nid = dev_to_node(&fep->pdev->dev), 479 477 .dev = &fep->pdev->dev, 480 478 .dma_dir = xdp_prog ? DMA_BIDIRECTIONAL : DMA_FROM_DEVICE, 481 479 .offset = FEC_ENET_XDP_HEADROOM, 482 - .max_len = FEC_ENET_RX_FRSIZE, 480 + .max_len = fep->rx_frame_size, 483 481 }; 484 482 int err; 485 483 ··· 1085 1083 for (i = 0; i < fep->num_rx_queues; i++) { 1086 1084 rxq = fep->rx_queue[i]; 1087 1085 writel(rxq->bd.dma, fep->hwp + FEC_R_DES_START(i)); 1088 - writel(PKT_MAXBUF_SIZE, fep->hwp + FEC_R_BUFF_SIZE(i)); 1086 + writel(fep->max_buf_size, fep->hwp + FEC_R_BUFF_SIZE(i)); 1089 1087 1090 1088 /* enable DMA1/2 */ 1091 1089 if (i) ··· 1147 1145 fec_restart(struct net_device *ndev) 1148 1146 { 1149 1147 struct fec_enet_private *fep = netdev_priv(ndev); 1150 - u32 rcntl = OPT_FRAME_SIZE | FEC_RCR_MII; 1151 1148 u32 ecntl = FEC_ECR_ETHEREN; 1149 + u32 rcntl = FEC_RCR_MII; 1150 + 1151 + if (OPT_ARCH_HAS_MAX_FL) 1152 + rcntl |= (fep->netdev->mtu + ETH_HLEN + ETH_FCS_LEN) << 16; 1152 1153 1153 1154 if (fep->bufdesc_ex) 1154 1155 fec_ptp_save_state(fep); ··· 1196 1191 else 1197 1192 val &= ~FEC_RACC_OPTIONS; 1198 1193 writel(val, fep->hwp + FEC_RACC); 1199 - writel(PKT_MAXBUF_SIZE, fep->hwp + FEC_FTRL); 1194 + writel(min(fep->rx_frame_size, fep->max_buf_size), fep->hwp + FEC_FTRL); 1200 1195 } 1201 1196 #endif 1202 1197 ··· 1283 1278 if (fep->quirks & FEC_QUIRK_ENET_MAC) { 1284 1279 /* enable ENET endian swap */ 1285 1280 ecntl |= FEC_ECR_BYTESWP; 1286 - /* enable ENET store and forward mode */ 1287 - writel(FEC_TXWMRK_STRFWD, fep->hwp + FEC_X_WMRK); 1281 + 1282 + /* When Jumbo Frame is enabled, the FIFO may not be large enough 1283 + * to hold an entire frame. In such cases, if the MTU exceeds 1284 + * (PKT_MAXBUF_SIZE - ETH_HLEN - ETH_FCS_LEN), configure the interface 1285 + * to operate in cut-through mode, triggered by the FIFO threshold. 1286 + * Otherwise, enable the ENET store-and-forward mode. 1287 + */ 1288 + if ((fep->quirks & FEC_QUIRK_JUMBO_FRAME) && 1289 + (ndev->mtu > (PKT_MAXBUF_SIZE - ETH_HLEN - ETH_FCS_LEN))) 1290 + writel(0xF, fep->hwp + FEC_X_WMRK); 1291 + else 1292 + writel(FEC_TXWMRK_STRFWD, fep->hwp + FEC_X_WMRK); 1288 1293 } 1289 1294 1290 1295 if (fep->bufdesc_ex) ··· 1795 1780 * These get messed up if we get called due to a busy condition. 1796 1781 */ 1797 1782 bdp = rxq->bd.cur; 1798 - xdp_init_buff(&xdp, PAGE_SIZE, &rxq->xdp_rxq); 1783 + xdp_init_buff(&xdp, PAGE_SIZE << fep->pagepool_order, &rxq->xdp_rxq); 1799 1784 1800 1785 while (!((status = fec16_to_cpu(bdp->cbd_sc)) & BD_ENET_RX_EMPTY)) { 1801 1786 ··· 1865 1850 * include that when passing upstream as it messes up 1866 1851 * bridging applications. 1867 1852 */ 1868 - skb = build_skb(page_address(page), PAGE_SIZE); 1853 + skb = build_skb(page_address(page), 1854 + PAGE_SIZE << fep->pagepool_order); 1869 1855 if (unlikely(!skb)) { 1870 1856 page_pool_recycle_direct(rxq->page_pool, page); 1871 1857 ndev->stats.rx_dropped++; ··· 4037 4021 return fec_ptp_set(ndev, config, extack); 4038 4022 } 4039 4023 4024 + static int fec_change_mtu(struct net_device *ndev, int new_mtu) 4025 + { 4026 + struct fec_enet_private *fep = netdev_priv(ndev); 4027 + int order; 4028 + 4029 + if (netif_running(ndev)) 4030 + return -EBUSY; 4031 + 4032 + order = get_order(new_mtu + ETH_HLEN + ETH_FCS_LEN 4033 + + FEC_DRV_RESERVE_SPACE); 4034 + fep->rx_frame_size = (PAGE_SIZE << order) - FEC_DRV_RESERVE_SPACE; 4035 + fep->pagepool_order = order; 4036 + WRITE_ONCE(ndev->mtu, new_mtu); 4037 + 4038 + return 0; 4039 + } 4040 + 4040 4041 static const struct net_device_ops fec_netdev_ops = { 4041 4042 .ndo_open = fec_enet_open, 4042 4043 .ndo_stop = fec_enet_close, ··· 4063 4030 .ndo_validate_addr = eth_validate_addr, 4064 4031 .ndo_tx_timeout = fec_timeout, 4065 4032 .ndo_set_mac_address = fec_set_mac_address, 4033 + .ndo_change_mtu = fec_change_mtu, 4066 4034 .ndo_eth_ioctl = phy_do_ioctl_running, 4067 4035 .ndo_set_features = fec_set_features, 4068 4036 .ndo_bpf = fec_enet_bpf, ··· 4594 4560 fec_enet_clk_enable(ndev, false); 4595 4561 pinctrl_pm_select_sleep_state(&pdev->dev); 4596 4562 4597 - ndev->max_mtu = PKT_MAXBUF_SIZE - ETH_HLEN - ETH_FCS_LEN; 4563 + fep->pagepool_order = 0; 4564 + fep->rx_frame_size = FEC_ENET_RX_FRSIZE; 4565 + 4566 + if (fep->quirks & FEC_QUIRK_JUMBO_FRAME) 4567 + fep->max_buf_size = MAX_JUMBO_BUF_SIZE; 4568 + else 4569 + fep->max_buf_size = PKT_MAXBUF_SIZE; 4570 + 4571 + ndev->max_mtu = fep->max_buf_size - ETH_HLEN - ETH_FCS_LEN; 4598 4572 4599 4573 ret = register_netdev(ndev); 4600 4574 if (ret)

Configure Feed

Configure Feed