From patchwork Fri May 11 08:38:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 158464 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E02B5B6FEE for ; Fri, 11 May 2012 18:39:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758201Ab2EKIjd (ORCPT ); Fri, 11 May 2012 04:39:33 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:42117 "EHLO relmlor2.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758021Ab2EKIja (ORCPT ); Fri, 11 May 2012 04:39:30 -0400 Received: from relmlir1.idc.renesas.com ([10.200.68.151]) by relmlor2.idc.renesas.com ( SJSMS) with ESMTP id <0M3U00AFBO08G7C0@relmlor2.idc.renesas.com>; Fri, 11 May 2012 17:38:32 +0900 (JST) Received: from relmlac3.idc.renesas.com ([10.200.69.23]) by relmlir1.idc.renesas.com (SJSMS) with ESMTP id <0M3U004HFO08QS80@relmlir1.idc.renesas.com>; Fri, 11 May 2012 17:38:32 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 5724D18098; Fri, 11 May 2012 17:38:32 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 4055E1809C; Fri, 11 May 2012 17:38:32 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id TAG14932; Fri, 11 May 2012 17:38:32 +0900 X-IronPort-AV: E=Sophos; i="4.75,570,1330873200"; d="scan'208"; a="80858457" Received: from unknown (HELO [172.30.8.157]) ([172.30.8.157]) by relmlii2.idc.renesas.com with ESMTP; Fri, 11 May 2012 17:38:31 +0900 Message-id: <4FACD007.1070308@renesas.com> Date: Fri, 11 May 2012 17:38:31 +0900 From: "Shimoda, Yoshihiro" User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-version: 1.0 To: netdev Cc: SH-Linux Subject: [PATCH v2 5/5] net: sh_eth: use NAPI Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch modifies the driver to use NAPI. Signed-off-by: Yoshihiro Shimoda --- about v2: - remove the spin_lock/spin_unlock() in sh_eth_poll() - modify comment in sh_eth_interrupt() - change back the dev_kfree_skb() to dev_kfree_skb_irq() in sh_eth_txfree() drivers/net/ethernet/renesas/sh_eth.c | 84 ++++++++++++++++++++++---------- drivers/net/ethernet/renesas/sh_eth.h | 3 + 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 1bcf205..e9b1953 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1008,7 +1008,7 @@ static int sh_eth_txfree(struct net_device *ndev) } /* Packet receive function */ -static int sh_eth_rx(struct net_device *ndev) +static int sh_eth_rx(struct net_device *ndev, int *work, int budget) { struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_rxdesc *rxdesc; @@ -1020,7 +1020,8 @@ static int sh_eth_rx(struct net_device *ndev) u32 desc_status; rxdesc = &mdp->rx_ring[entry]; - while (!(rxdesc->status & cpu_to_edmac(mdp, RD_RACT))) { + while (!(rxdesc->status & cpu_to_edmac(mdp, RD_RACT)) && + *work < budget) { desc_status = edmac_to_cpu(mdp, rxdesc->status); pkt_len = rxdesc->frame_length; @@ -1060,13 +1061,17 @@ static int sh_eth_rx(struct net_device *ndev) skb_reserve(skb, NET_IP_ALIGN); skb_put(skb, pkt_len); skb->protocol = eth_type_trans(skb, ndev); - netif_rx(skb); - ndev->stats.rx_packets++; - ndev->stats.rx_bytes += pkt_len; + if (netif_receive_skb(skb) == NET_RX_DROP) { + ndev->stats.rx_dropped++; + } else { + ndev->stats.rx_packets++; + ndev->stats.rx_bytes += pkt_len; + } } rxdesc->status |= cpu_to_edmac(mdp, RD_RACT); entry = (++mdp->cur_rx) % mdp->num_rx_ring; rxdesc = &mdp->rx_ring[entry]; + (*work)++; } /* Refill the Rx ring buffers. */ @@ -1098,7 +1103,7 @@ static int sh_eth_rx(struct net_device *ndev) /* Restart Rx engine if stopped. */ /* If we don't need to check status, don't. -KDU */ - if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) { + if (*work < budget && !(sh_eth_read(ndev, EDRRR) & EDRRR_R)) { /* fix the values for the next receiving */ mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) - sh_eth_read(ndev, RDLAR)) >> 4; @@ -1254,38 +1259,58 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev) /* Get interrpt stat */ intr_status = sh_eth_read(ndev, EESR); - /* Clear interrupt */ if (intr_status & (EESR_FRC | EESR_RMAF | EESR_RRF | EESR_RTLF | EESR_RTSF | EESR_PRE | EESR_CERF | cd->tx_check | cd->eesr_err_check)) { - sh_eth_write(ndev, intr_status, EESR); + if (napi_schedule_prep(&mdp->napi)) { + /* Disable interrupts of the channel */ + sh_eth_write(ndev, 0, EESIPR); + __napi_schedule(&mdp->napi); + } ret = IRQ_HANDLED; - } else - goto other_irq; - - if (intr_status & (EESR_FRC | /* Frame recv*/ - EESR_RMAF | /* Multi cast address recv*/ - EESR_RRF | /* Bit frame recv */ - EESR_RTLF | /* Long frame recv*/ - EESR_RTSF | /* short frame recv */ - EESR_PRE | /* PHY-LSI recv error */ - EESR_CERF)){ /* recv frame CRC error */ - sh_eth_rx(ndev); } - /* Tx Check */ - if (intr_status & cd->tx_check) { - sh_eth_txfree(ndev); + spin_unlock(&mdp->lock); + + return ret; +} + +static int sh_eth_poll(struct napi_struct *napi, int budget) +{ + struct sh_eth_private *mdp = container_of(napi, struct sh_eth_private, + napi); + struct net_device *ndev = mdp->ndev; + struct sh_eth_cpu_data *cd = mdp->cd; + int work_done = 0, txfree_num; + u32 intr_status = sh_eth_read(ndev, EESR); + + /* Clear interrupt flags */ + sh_eth_write(ndev, intr_status, EESR); + + /* check txdesc */ + txfree_num = sh_eth_txfree(ndev); + if (txfree_num) netif_wake_queue(ndev); - } + /* check rxdesc */ + sh_eth_rx(ndev, &work_done, budget); + + /* check error flags */ if (intr_status & cd->eesr_err_check) sh_eth_error(ndev, intr_status); -other_irq: - spin_unlock(&mdp->lock); + /* get current interrupt flags */ + intr_status = sh_eth_read(ndev, EESR); - return ret; + /* check whether the controller doesn't have any events */ + if (!txfree_num && !(intr_status & cd->eesr_err_check) && + work_done < budget) { + napi_complete(napi); + /* Enable all interrupts */ + sh_eth_write(ndev, cd->eesipr_value, EESIPR); + } + + return work_done; } /* PHY state control function */ @@ -1565,6 +1590,8 @@ static int sh_eth_open(struct net_device *ndev) pm_runtime_get_sync(&mdp->pdev->dev); + napi_enable(&mdp->napi); + ret = request_irq(ndev->irq, sh_eth_interrupt, #if defined(CONFIG_CPU_SUBTYPE_SH7763) || \ defined(CONFIG_CPU_SUBTYPE_SH7764) || \ @@ -1705,6 +1732,8 @@ static int sh_eth_close(struct net_device *ndev) phy_disconnect(mdp->phydev); } + napi_disable(&mdp->napi); + free_irq(ndev->irq, ndev); /* Free all the skbuffs in the Rx queue. */ @@ -2339,6 +2368,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev) #endif sh_eth_set_default_cpu_data(mdp->cd); + mdp->ndev = ndev; + netif_napi_add(ndev, &mdp->napi, sh_eth_poll, SH_ETH_NAPI_WEIGHT); + /* set function */ ndev->netdev_ops = &sh_eth_netdev_ops; SET_ETHTOOL_OPS(ndev, &sh_eth_ethtool_ops); diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index f1dbc27..93dad7b 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h @@ -35,6 +35,7 @@ #define PKT_BUF_SZ 1538 #define SH_ETH_TSU_TIMEOUT_MS 500 #define SH_ETH_TSU_CAM_ENTRIES 32 +#define SH_ETH_NAPI_WEIGHT 32 enum { /* E-DMAC registers */ @@ -728,6 +729,8 @@ struct sh_eth_private { int duplex; int port; /* for TSU */ int vlan_num_ids; /* for VLAN tag filter */ + struct napi_struct napi; + struct net_device *ndev; unsigned no_ether_link:1; unsigned ether_link_active_low:1;