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

Commit 98b5a0f4 authored by Harini Katakam's avatar Harini Katakam Committed by David S. Miller
Browse files

net: macb: Add support for jumbo frames 



Enable jumbo frame support for Zynq Ultrascale+ MPSoC.
Update the NWCFG register and descriptor length masks accordingly.
Jumbo max length register should be set according to support in SoC; it is
set to 10240 for Zynq Ultrascale+ MPSoC.

Signed-off-by: default avatarHarini Katakam <harinik@xilinx.com>
Reviewed-by: default avatarPunnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b61f9c1

drivers/net/ethernet/cadence/macb.c

+18 −4
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static int gem_rx(struct macb *bp, int budget) 
		}

		/* now everything is ready for receiving packet */

		bp->rx_skbuff[entry] = NULL;

		len = MACB_BFEXT(RX_FRMLEN, ctrl);

		len = ctrl & bp->rx_frm_len_mask;



		netdev_vdbg(bp->dev, "gem_rx %u (len %u)\n", entry, len);
@@ -828,7 +828,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag, 
	struct macb_dma_desc *desc;



	desc = macb_rx_desc(bp, last_frag);

	len = MACB_BFEXT(RX_FRMLEN, desc->ctrl);

	len = desc->ctrl & bp->rx_frm_len_mask;



	netdev_vdbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n",

		macb_rx_ring_wrap(first_frag),
@@ -1633,6 +1633,9 @@ static void macb_init_hw(struct macb *bp) 
	config |= MACB_BF(RBOF, NET_IP_ALIGN);	/* Make eth data aligned */

	config |= MACB_BIT(PAE);		/* PAuse Enable */

	config |= MACB_BIT(DRFCS);		/* Discard Rx FCS */

	if (bp->caps | MACB_CAPS_JUMBO)

		config |= MACB_BIT(JFRAME);	/* Enable jumbo frames */

	else

		config |= MACB_BIT(BIG);	/* Receive oversized frames */

	if (bp->dev->flags & IFF_PROMISC)

		config |= MACB_BIT(CAF);	/* Copy All Frames */
@@ -1642,8 +1645,13 @@ static void macb_init_hw(struct macb *bp) 
		config |= MACB_BIT(NBC);	/* No BroadCast */

	config |= macb_dbw(bp);

	macb_writel(bp, NCFGR, config);

	if ((bp->caps | MACB_CAPS_JUMBO) && bp->jumbo_max_len)

		gem_writel(bp, JML, bp->jumbo_max_len);

	bp->speed = SPEED_10;

	bp->duplex = DUPLEX_HALF;

	bp->rx_frm_len_mask = MACB_RX_FRMLEN_MASK;

	if (bp->caps | MACB_CAPS_JUMBO)

		bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK;



	macb_configure_dma(bp);
@@ -2685,10 +2693,12 @@ static const struct macb_config emac_config = { 
};



static const struct macb_config zynqmp_config = {

	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,

	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |

		MACB_CAPS_JUMBO,

	.dma_burst_length = 16,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.jumbo_max_len = 10240,

};



static const struct of_device_id macb_dt_ids[] = {
@@ -2770,6 +2780,10 @@ static int macb_probe(struct platform_device *pdev) 
	bp->pclk = pclk;

	bp->hclk = hclk;

	bp->tx_clk = tx_clk;

	if (macb_config->jumbo_max_len) {

		bp->jumbo_max_len = macb_config->jumbo_max_len;

	}



	spin_lock_init(&bp->lock);



	/* setup capabilities */

drivers/net/ethernet/cadence/macb.h

+9 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#define GEM_NCFGR		0x0004 /* Network Config */

#define GEM_USRIO		0x000c /* User IO */

#define GEM_DMACFG		0x0010 /* DMA Configuration */

#define GEM_JML			0x0048 /* Jumbo Max Length */

#define GEM_HRB			0x0080 /* Hash Bottom */

#define GEM_HRT			0x0084 /* Hash Top */

#define GEM_SA1B		0x0088 /* Specific1 Bottom */
@@ -397,6 +398,7 @@ 
#define MACB_CAPS_GIGABIT_MODE_AVAILABLE	0x20000000

#define MACB_CAPS_SG_DISABLED			0x40000000

#define MACB_CAPS_MACB_IS_GEM			0x80000000

#define MACB_CAPS_JUMBO				0x00000008



/* Bit manipulation macros */

#define MACB_BIT(name)					\
@@ -514,6 +516,9 @@ struct macb_dma_desc { 
#define MACB_RX_BROADCAST_OFFSET		31

#define MACB_RX_BROADCAST_SIZE			1



#define MACB_RX_FRMLEN_MASK			0xFFF

#define MACB_RX_JFRMLEN_MASK			0x3FFF



/* RX checksum offload disabled: bit 24 clear in NCFGR */

#define GEM_RX_TYPEID_MATCH_OFFSET		22

#define GEM_RX_TYPEID_MATCH_SIZE		2
@@ -757,6 +762,7 @@ struct macb_config { 
	int	(*clk_init)(struct platform_device *pdev, struct clk **pclk,

			    struct clk **hclk, struct clk **tx_clk);

	int	(*init)(struct platform_device *pdev);

	int	jumbo_max_len;

};



struct macb_queue {
@@ -826,6 +832,9 @@ struct macb { 
	unsigned int		max_tx_length;



	u64			ethtool_stats[GEM_STATS_LEN];



	unsigned int		rx_frm_len_mask;

	unsigned int		jumbo_max_len;

};



static inline bool macb_is_gem(struct macb *bp)