From: Ben Hutchings <bhutchings@solarflare.com>
To: "Shimoda, Yoshihiro" <yoshihiro.shimoda.uh@renesas.com>
Cc: netdev <netdev@vger.kernel.org>, SH-Linux <linux-sh@vger.kernel.org>
Subject: Re: [PATCH v2 5/5] net: sh_eth: use NAPI
Date: Fri, 11 May 2012 15:35:29 +0000 [thread overview]
Message-ID: <1336750529.2874.69.camel@bwh-desktop.uk.solarflarecom.com> (raw)
In-Reply-To: <4FACD007.1070308@renesas.com>
On Fri, 2012-05-11 at 17:38 +0900, Shimoda, Yoshihiro wrote:
> This patch modifies the driver to use NAPI.
[...]
> +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);
If and only if you return a value less than the budget then you *must*
call napi_complete(). You can't add these extra conditions.
> + /* 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);
> +
[...]
You will also need to call napi_disable() and napi_enable() in the
set_ringparam implementation.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
WARNING: multiple messages have this Message-ID (diff)
From: Ben Hutchings <bhutchings@solarflare.com>
To: "Shimoda, Yoshihiro" <yoshihiro.shimoda.uh@renesas.com>
Cc: netdev <netdev@vger.kernel.org>, SH-Linux <linux-sh@vger.kernel.org>
Subject: Re: [PATCH v2 5/5] net: sh_eth: use NAPI
Date: Fri, 11 May 2012 16:35:29 +0100 [thread overview]
Message-ID: <1336750529.2874.69.camel@bwh-desktop.uk.solarflarecom.com> (raw)
In-Reply-To: <4FACD007.1070308@renesas.com>
On Fri, 2012-05-11 at 17:38 +0900, Shimoda, Yoshihiro wrote:
> This patch modifies the driver to use NAPI.
[...]
> +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);
If and only if you return a value less than the budget then you *must*
call napi_complete(). You can't add these extra conditions.
> + /* 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);
> +
[...]
You will also need to call napi_disable() and napi_enable() in the
set_ringparam implementation.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
next prev parent reply other threads:[~2012-05-11 15:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-11 8:38 [PATCH v2 5/5] net: sh_eth: use NAPI Shimoda, Yoshihiro
2012-05-11 8:38 ` Shimoda, Yoshihiro
2012-05-11 15:35 ` Ben Hutchings [this message]
2012-05-11 15:35 ` Ben Hutchings
2012-05-14 6:13 ` Shimoda, Yoshihiro
2012-05-14 6:13 ` Shimoda, Yoshihiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336750529.2874.69.camel@bwh-desktop.uk.solarflarecom.com \
--to=bhutchings@solarflare.com \
--cc=linux-sh@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.