From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752131AbbE0JnL (ORCPT <rfc822;w@1wt.eu>);
	Wed, 27 May 2015 05:43:11 -0400
Received: from mail-wg0-f41.google.com ([74.125.82.41]:34215 "EHLO
	mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750851AbbE0JnJ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 27 May 2015 05:43:09 -0400
Message-ID: <556591A8.6050602@dev.mellanox.co.il>
Date: Wed, 27 May 2015 12:43:04 +0300
From: Yishai Hadas <yishaih@dev.mellanox.co.il>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
MIME-Version: 1.0
To: Benjamin Poirier <bpoirier@suse.de>
CC: Amir Vadai <amirv@mellanox.com>, Ido Shamay <idos@mellanox.com>,
        Yishai Hadas <yishaih@mellanox.com>,
        Or Gerlitz <ogerlitz@mellanox.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mlx4_core: Fix fallback from MSI-X to INTx
References: <1432336346-20290-1-git-send-email-bpoirier@suse.de>
In-Reply-To: <1432336346-20290-1-git-send-email-bpoirier@suse.de>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 5/23/2015 2:12 AM, Benjamin Poirier wrote:
> The test in mlx4_load_one() to remove MLX4_FLAG_MSI_X expects mlx4_NOP() to
> fail with -EBUSY. It is also necessary to avoid the reset since the device
> is not fully reinitialized before calling mlx4_start_hca() a second time.
>
> Note that this will also affect mlx4_test_interrupts(), the only other user
> of MLX4_CMD_NOP.
>
> Fixes: f5aef5a ("net/mlx4_core: Activate reset flow upon fatal command cases")
> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
> ---
>   drivers/net/ethernet/mellanox/mlx4/cmd.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
> index 4f7dc04..529ef05 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
> @@ -714,8 +714,13 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
>   					 msecs_to_jiffies(timeout))) {
>   		mlx4_warn(dev, "command 0x%x timed out (go bit not cleared)\n",
>   			  op);
> -		err = -EIO;
> -		goto out_reset;
> +		if (op == MLX4_CMD_NOP) {
> +			err = -EBUSY;
> +			goto out;
> +		} else {
> +			err = -EIO;
> +			goto out_reset;
> +		}
>   	}
>
>   	err = context->result;
>

It looks fine, a private case that should not trigger the reset flow.