From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: [net-next PATCH v2 2/3] net: macb: Add support for jumbo frames Date: Mon, 4 May 2015 10:48:39 +0200 Message-ID: <55473267.5040100@atmel.com> References: <1430725960-8441-1-git-send-email-harinik@xilinx.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: netdev-owner@vger.kernel.org To: Harini Katakam , davem@davemloft.net, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, boris.brezillon@free-electrons.com, alexandre.belloni@free-electrons.com, harinikatakamlinux@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, harinik@xilinx.com, punnaia@xilinx.com, michals@xilinx.com List-Id: devicetree@vger.kernel.org Le 04/05/2015 09:52, Harini Katakam a =E9crit : > Check for "cdns,zynqmp-gem" compatible string and enable jumbo frame = support > in NWCFG register, update descriptor length masks and registers accor= dingly. > Jumbo max length register should be set according to support in SoC; = it is > set to 10240 for Zynq Ultrascale+ MPSoC. >=20 > Signed-off-by: Harini Katakam > Reviewed-by: Punnaiah Choudary Kalluri > --- >=20 > On v1, Michal commented that I should use macb_config for jumbo param= eters > instead of defining them by reading the compatible string directly. > I can use .caps for isjumbo. But jumbo-max-length needs to be defined= =2E > Can I add this to the structure? Any suggestions on how to handle thi= s? Yes, adding it to the "caps" field and adding a field for the max lengt= h is definitively the way to go. So "NAK" for this implementation. Thanks, bye. > v2: > Add constant definition and update SoC name >=20 > --- > drivers/net/ethernet/cadence/macb.c | 21 ++++++++++++++++++--- > drivers/net/ethernet/cadence/macb.h | 8 ++++++++ > 2 files changed, 26 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethern= et/cadence/macb.c > index 4104d49..a065283 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -54,6 +54,8 @@ > #define MACB_MAX_TX_LEN ((unsigned int)((1 << MACB_TX_FRMLEN_SIZE) = - 1)) > #define GEM_MAX_TX_LEN ((unsigned int)((1 << GEM_TX_FRMLEN_SIZE) - = 1)) > =20 > +#define GEM_ZYNQMP_JUMBO_MAX 10240 > + > /* > * Graceful stop timeouts in us. We should allow up to > * 1 frame time (10 Mbits/s, full-duplex, ignoring collisions) > @@ -782,7 +784,7 @@ static int gem_rx(struct macb *bp, int budget) > } > /* now everything is ready for receiving packet */ > bp->rx_skbuff[entry] =3D NULL; > - len =3D MACB_BFEXT(RX_FRMLEN, ctrl); > + len =3D ctrl & bp->rx_frm_len_mask; > =20 > netdev_vdbg(bp->dev, "gem_rx %u (len %u)\n", entry, len); > =20 > @@ -828,7 +830,7 @@ static int macb_rx_frame(struct macb *bp, unsigne= d int first_frag, > struct macb_dma_desc *desc; > =20 > desc =3D macb_rx_desc(bp, last_frag); > - len =3D MACB_BFEXT(RX_FRMLEN, desc->ctrl); > + len =3D desc->ctrl & bp->rx_frm_len_mask; > =20 > netdev_vdbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n", > macb_rx_ring_wrap(first_frag), > @@ -1633,7 +1635,10 @@ static void macb_init_hw(struct macb *bp) > config |=3D MACB_BF(RBOF, NET_IP_ALIGN); /* Make eth data aligned *= / > config |=3D MACB_BIT(PAE); /* PAuse Enable */ > config |=3D MACB_BIT(DRFCS); /* Discard Rx FCS */ > - config |=3D MACB_BIT(BIG); /* Receive oversized frames */ > + if (bp->isjumbo) > + config |=3D MACB_BIT(JFRAME); /* Enable jumbo frames */ > + else > + config |=3D MACB_BIT(BIG); /* Receive oversized frames */ > if (bp->dev->flags & IFF_PROMISC) > config |=3D MACB_BIT(CAF); /* Copy All Frames */ > else if (macb_is_gem(bp) && bp->dev->features & NETIF_F_RXCSUM) > @@ -1642,8 +1647,13 @@ static void macb_init_hw(struct macb *bp) > config |=3D MACB_BIT(NBC); /* No BroadCast */ > config |=3D macb_dbw(bp); > macb_writel(bp, NCFGR, config); > + if (bp->isjumbo && bp->jumbo_max_len) > + gem_writel(bp, JML, bp->jumbo_max_len); > bp->speed =3D SPEED_10; > bp->duplex =3D DUPLEX_HALF; > + bp->rx_frm_len_mask =3D MACB_RX_FRMLEN_MASK; > + if (bp->isjumbo) > + bp->rx_frm_len_mask =3D MACB_RX_JFRMLEN_MASK; > =20 > macb_configure_dma(bp); > =20 > @@ -2762,6 +2772,11 @@ static int macb_probe(struct platform_device *= pdev) > bp->pclk =3D pclk; > bp->hclk =3D hclk; > bp->tx_clk =3D tx_clk; > + if (of_device_is_compatible(pdev->dev.of_node, "cdns,zynqmp-gem")) = { > + bp->isjumbo =3D 1; > + bp->jumbo_max_len =3D GEM_ZYNQMP_JUMBO_MAX; > + } > + > spin_lock_init(&bp->lock); > =20 > /* setup capabilities */ > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethern= et/cadence/macb.h > index eb7d76f..e25f77e 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -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 */ > @@ -514,6 +515,9 @@ struct macb_dma_desc { > #define MACB_RX_BROADCAST_OFFSET 31 > #define MACB_RX_BROADCAST_SIZE 1 > =20 > +#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 > @@ -826,6 +830,10 @@ struct macb { > unsigned int max_tx_length; > =20 > u64 ethtool_stats[GEM_STATS_LEN]; > + > + unsigned int rx_frm_len_mask; > + unsigned int jumbo_max_len; > + bool isjumbo; > }; > =20 > static inline bool macb_is_gem(struct macb *bp) >=20 --=20 Nicolas Ferre