| Message ID | e46b06510f7eb6ca51ea8b96335b2d32ec8bf6f8.1265173480.git.amit.kucheria@canonical.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Feb 2, 2010 at 10:16 PM, Amit Kucheria <amit.kucheria@canonical.com> wrote: > From: Rob Herring <r.herring@freescale.com> > > The fec driver was enabling receive buffer descriptor without allocating > the buffers. Make sure the buffer descriptors are initialized to not > start receiving packets. > > Open also calls fec_restart after the rx buffers are allocated. With the code > in fec_restart, it zeroes out the buffer descriptors that have just been > setup. fec related patches 8 & 9 look okay to me. g.
On Wed, Feb 3, 2010 at 8:46 AM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Tue, Feb 2, 2010 at 10:16 PM, Amit Kucheria > <amit.kucheria@canonical.com> wrote: >> From: Rob Herring <r.herring@freescale.com> >> >> The fec driver was enabling receive buffer descriptor without allocating >> the buffers. Make sure the buffer descriptors are initialized to not >> start receiving packets. >> >> Open also calls fec_restart after the rx buffers are allocated. With the code >> in fec_restart, it zeroes out the buffer descriptors that have just been >> setup. > > fec related patches 8 & 9 look okay to me. > > g. > > -- > Grant Likely, B.Sc., P.Eng. > Secret Lab Technologies Ltd. Can I take that as an Acked-by? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 3, 2010 at 11:33 AM, Amit Kucheria <amit.kucheria@canonical.com> wrote: > On Wed, Feb 3, 2010 at 8:46 AM, Grant Likely <grant.likely@secretlab.ca> wrote: >> On Tue, Feb 2, 2010 at 10:16 PM, Amit Kucheria >> <amit.kucheria@canonical.com> wrote: >>> From: Rob Herring <r.herring@freescale.com> >>> >>> The fec driver was enabling receive buffer descriptor without allocating >>> the buffers. Make sure the buffer descriptors are initialized to not >>> start receiving packets. >>> >>> Open also calls fec_restart after the rx buffers are allocated. With the code >>> in fec_restart, it zeroes out the buffer descriptors that have just been >>> setup. >> >> fec related patches 8 & 9 look okay to me. >> >> g. >> >> -- >> Grant Likely, B.Sc., P.Eng. >> Secret Lab Technologies Ltd. > > Can I take that as an Acked-by? of course. g. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 3, 2010 at 11:38 AM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Wed, Feb 3, 2010 at 11:33 AM, Amit Kucheria > <amit.kucheria@canonical.com> wrote: >> On Wed, Feb 3, 2010 at 8:46 AM, Grant Likely <grant.likely@secretlab.ca> wrote: >>> >>> fec related patches 8 & 9 look okay to me. >>> >>> g. >> >> Can I take that as an Acked-by? > > of course. BTW, since these 2 patches are essentially independent, you may find it easier to get all the patches merged if you post the FEC changes in a separate patch series. g. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 16a1d58..9a8743d 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -1658,6 +1658,7 @@ static int fec_enet_init(struct net_device *dev, int index) { struct fec_enet_private *fep = netdev_priv(dev); struct bufdesc *cbd_base; + struct bufdesc *bdp; int i; /* Allocate memory for buffer descriptors. */ @@ -1710,6 +1711,34 @@ static int fec_enet_init(struct net_device *dev, int index) /* Set MII speed to 2.5 MHz */ fep->phy_speed = ((((clk_get_rate(fep->clk) / 2 + 4999999) / 2500000) / 2) & 0x3F) << 1; + + /* Initialize the receive buffer descriptors. */ + bdp = fep->rx_bd_base; + for (i = 0; i < RX_RING_SIZE; i++) { + + /* Initialize the BD for every fragment in the page. */ + bdp->cbd_sc = 0; + bdp++; + } + + /* Set the last buffer to wrap */ + bdp--; + bdp->cbd_sc |= BD_SC_WRAP; + + /* ...and the same for transmit */ + bdp = fep->tx_bd_base; + for (i = 0; i < TX_RING_SIZE; i++) { + + /* Initialize the BD for every fragment in the page. */ + bdp->cbd_sc = 0; + bdp->cbd_bufaddr = 0; + bdp++; + } + + /* Set the last buffer to wrap */ + bdp--; + bdp->cbd_sc |= BD_SC_WRAP; + fec_restart(dev, 0); /* Queue up command to detect the PHY and initialize the @@ -1730,7 +1759,6 @@ static void fec_restart(struct net_device *dev, int duplex) { struct fec_enet_private *fep = netdev_priv(dev); - struct bufdesc *bdp; int i; /* Whack a reset. We should wait for this. */ @@ -1768,33 +1796,6 @@ fec_restart(struct net_device *dev, int duplex) } } - /* Initialize the receive buffer descriptors. */ - bdp = fep->rx_bd_base; - for (i = 0; i < RX_RING_SIZE; i++) { - - /* Initialize the BD for every fragment in the page. */ - bdp->cbd_sc = BD_ENET_RX_EMPTY; - bdp++; - } - - /* Set the last buffer to wrap */ - bdp--; - bdp->cbd_sc |= BD_SC_WRAP; - - /* ...and the same for transmit */ - bdp = fep->tx_bd_base; - for (i = 0; i < TX_RING_SIZE; i++) { - - /* Initialize the BD for every fragment in the page. */ - bdp->cbd_sc = 0; - bdp->cbd_bufaddr = 0; - bdp++; - } - - /* Set the last buffer to wrap */ - bdp--; - bdp->cbd_sc |= BD_SC_WRAP; - /* Enable MII mode */ if (duplex) { /* MII enable / FD enable */