From: Amir Vadai <amirv@mellanox•com>
To: Tom Herbert <therbert@google•com>
Cc: <davem@davemloft•net>, <yevgenyp@mellanox•com>, <netdev@vger•kernel.org>
Subject: Re: [PATCH v2] mlx4_en: Fix BQL reset TX queue call point
Date: Thu, 7 Feb 2013 08:52:35 +0200 [thread overview]
Message-ID: <51134F33.1030007@mellanox.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1302060955490.26438@pokey.mtv.corp.google.com>
On 06/02/2013 19:58, Tom Herbert wrote:
> Fix issue in Mellanox driver related to BQL. netdev_tx_reset_queue
> was not being called in certain situations where the device was
> being start and stopped. Moved netdev_tx_reset_queue from the reset
> device path to mlx4_en_free_tx_buf which is where the rings are
> cleaned in a reset (specifically from device being stopped).
>
> Signed-off-by: Tom Herbert <therbert@google•com>
> ---
> drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 ---
> drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 ++
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> index ac1c14f..94042f6 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> @@ -1323,15 +1323,12 @@ static void mlx4_en_restart(struct work_struct *work)
> watchdog_task);
> struct mlx4_en_dev *mdev = priv->mdev;
> struct net_device *dev = priv->dev;
> - int i;
>
> en_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port);
>
> mutex_lock(&mdev->state_lock);
> if (priv->port_up) {
> mlx4_en_stop_port(dev, 1);
> - for (i = 0; i < priv->tx_ring_num; i++)
> - netdev_tx_reset_queue(priv->tx_ring[i].tx_queue);
> if (mlx4_en_start_port(dev))
> en_err(priv, "Failed restarting port %d\n", priv->port);
> }
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> index 30724d8..e06fce7 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> @@ -294,6 +294,8 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
> cnt++;
> }
>
> + netdev_tx_reset_queue(ring->tx_queue);
> +
> if (cnt)
> en_dbg(DRV, priv, "Freed %d uncompleted tx descriptors\n", cnt);
>
>
Acked-By: Amir Vadai <amirv@mellanox•com>
next prev parent reply other threads:[~2013-02-07 6:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-06 17:58 [PATCH v2] mlx4_en: Fix BQL reset TX queue call point Tom Herbert
2013-02-06 21:11 ` David Miller
2013-02-07 6:52 ` Amir Vadai [this message]
2013-02-08 4:34 ` David Miller
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=51134F33.1030007@mellanox.com \
--to=amirv@mellanox$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=therbert@google$(echo .)com \
--cc=yevgenyp@mellanox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox