lkml.org 
[lkml]   [2011]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v3] net: add Faraday FTMAC100 10/100 Ethernet driver
From
Date
On Thu, 2011-01-20 at 23:30 +0800, Po-Yu Chuang wrote:
> drivers/net/ftmac100.c | 1243 ++++++++++++++++++++++++++++++++++++++++++++++++

[]

> +/******************************************************************************
> + * struct napi_struct functions
> + *****************************************************************************/
> +static int ftmac100_poll(struct napi_struct *napi, int budget)
> +{
> + struct ftmac100 *priv = container_of(napi, struct ftmac100, napi);
> + struct net_device *netdev = priv->netdev;
> + unsigned int status;
> + bool completed = true;
> + int rx = 0;
> +
> + status = ioread32(priv->base + FTMAC100_OFFSET_ISR);
> +
> + if (status & (FTMAC100_INT_RPKT_FINISH | FTMAC100_INT_NORXBUF)) {
> + /*
> + * FTMAC100_INT_RPKT_FINISH:
> + * RX DMA has received packets into RX buffer successfully
> + *
> + * FTMAC100_INT_NORXBUF:
> + * RX buffer unavailable
> + */
> + bool retry;
> +
> + do {
> + retry = ftmac100_rx_packet(priv, &rx);
> + } while (retry && rx < budget);
> +
> + if (retry && rx == budget)
> + completed = false;

Is it useful to retry the NORXBUF case?

> + }
> +
> + if (status & FTMAC100_INT_NORXBUF) {
> + /* RX buffer unavailable */
> + if (net_ratelimit())
> + netdev_info(netdev, "INT_NORXBUF\n");
> +
> + netdev->stats.rx_over_errors++;
> + }

Perhaps this "if (status & FTMAC100_INT_NORXBUF)" block should be
moved into the test block above it before the retry?

> +
> + if (status & (FTMAC100_INT_XPKT_OK | FTMAC100_INT_XPKT_LOST)) {
> + /*
> + * FTMAC100_INT_XPKT_OK:
> + * packet transmitted to ethernet successfully
> + *
> + * FTMAC100_INT_XPKT_LOST:
> + * packet transmitted to ethernet lost due to late
> + * collision or excessive collision
> + */
> + ftmac100_tx_complete(priv);
> + }
> +
> + if (status & FTMAC100_INT_RPKT_LOST) {
> + /* received packet lost due to RX FIFO full */
> + if (net_ratelimit())
> + netdev_info(netdev, "INT_RPKT_LOST\n");
> +
> + netdev->stats.rx_fifo_errors++;
> + }
> +
> + if (status & FTMAC100_INT_AHB_ERR) {
> + /* AHB error */
> + if (net_ratelimit())
> + netdev_info(netdev, "INT_AHB_ERR\n");
> +
> + /* do nothing */
> + }
> +
> + if (status & FTMAC100_INT_PHYSTS_CHG) {
> + /* PHY link status change */
> + if (net_ratelimit())
> + netdev_info(netdev, "INT_PHYSTS_CHG\n");
> +
> + mii_check_link(&priv->mii);
> + }
> +
> + if (completed) {
> + /* stop polling */
> + napi_complete(napi);
> + ftmac100_enable_all_int(priv);
> + }
> +
> + return rx;
> +}

It's possible to miss multiple states because of the ratelimit.

If multiple ISR status bits are possible, it might be better to
combine all netdev_info uses into a single call.

Something like:

if ((status & (FTMAC100_INT_NORXBUF | FTMAC100_INT_RPKT_LOST |
FTMAC100_INT_AHB_ERR | FTMAC100_INT_PHYSTS_CHG)) &&
net_ratelimit())
netdev_info(netdev, "ISR status: %x%s%s%s%s\n",
status & FTMAC100_INT_NORXBUF ? ": INT_NORXBUF" : "",
status & FTMAC100_INT_RPKT_LOST ? ": INT_RPKT_LOST" : "",
status & FTMAC100_INT_AHB_ERR ? ": INT_AHB_ERR" : "",
status & FTMAC100_INT_PHYSTS_CHG ? " : INT_PHYSTS_CHG" : "");




\
 
 \ /
  Last update: 2011-01-20 20:03    [W:0.260 / U:24.836 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site