[dpdk-stable] patch 'net/sfc/base: fix error code usage in common code' has been queued to stable release 17.05.1

[Andrew Rybchenko]

Hi,

On 06/20/2017 02:35 PM, Yuanhan Liu wrote:
> Hi,
>
> FYI, your patch has been queued to stable release 17.05.1
>
> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> It will be pushed if I get no objections before 06/22/17. So please
> shout if anyone has objections.

We have found out that the patch itself introduces the regression which
is fixed in

commit 0c27441ee0923bd221fc021b917ed03b02a94ad3
Author: Andy Moreton <amoreton at solarflare.com>
Date:   Thu May 25 13:58:30 2017 +0100

     net/sfc/base: let caller know that queue is already flushed

     Tx/Rx queue may be already flushed due to Tx/Rx error on the queue or
     MC reboot. Caller needs to know that the queue is already flushed to
     avoid waiting for flush done event.

     Signed-off-by: Andy Moreton <amoreton at solarflare.com>
     Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>

which is not marked as a fix to be included in stable.
So, please, either skip both patches (this one and 0c27441ee09
mentioned above)  or, if it is possible, include both into the stable.
Ideally squashed into one, if so, changeset description should be:

     net/sfc/base: let caller know that queue is already flushed

     MCDI results returned in req.emr_rc have already been translated
     from MC_CMD_ERR_* to errno names, so using an MC_CMD_ERR_* value
     is incorrect.

     Tx/Rx queue may be already flushed due to Tx/Rx error on the queue or
     MC reboot. Caller needs to know that the queue is already flushed to
     avoid waiting for flush done event.

     Signed-off-by: Andy Moreton <amoreton at solarflare.com>
     Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>

Thanks,
Andrew.

> Thanks.
>
> 	--yliu
>
> ---
>  From f2c835cd8aa6351ff8cd4667e910192b96dd2be6 Mon Sep 17 00:00:00 2001
> From: Andy Moreton <amoreton at solarflare.com>
> Date: Sat, 27 May 2017 08:55:30 +0100
> Subject: [PATCH] net/sfc/base: fix error code usage in common code
>
> [ upstream commit 7236d2bfe0acc48330e3c2a3dfac4ada9a792cd8 ]
>
> MCDI results returned in req.emr_rc have already been translated
> from MC_CMD_ERR_* to errno names, so using an MC_CMD_ERR_* value
> is incorrect.
>
> Fixes: e7cd430c864f ("net/sfc/base: import SFN7xxx family support")
>
> Signed-off-by: Andy Moreton <amoreton at solarflare.com>
> Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
> ---
>   drivers/net/sfc/base/ef10_rx.c | 2 +-
>   drivers/net/sfc/base/ef10_tx.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c
> index b65faed..9d6756c 100644
> --- a/drivers/net/sfc/base/ef10_rx.c
> +++ b/drivers/net/sfc/base/ef10_rx.c
> @@ -137,7 +137,7 @@ efx_mcdi_fini_rxq(
>   
>   	efx_mcdi_execute_quiet(enp, &req);
>   
> -	if ((req.emr_rc != 0) && (req.emr_rc != MC_CMD_ERR_EALREADY)) {
> +	if ((req.emr_rc != 0) && (req.emr_rc != EALREADY)) {
>   		rc = req.emr_rc;
>   		goto fail1;
>   	}
> diff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c
> index 0f8e9b1..dfa9e0b 100644
> --- a/drivers/net/sfc/base/ef10_tx.c
> +++ b/drivers/net/sfc/base/ef10_tx.c
> @@ -148,7 +148,7 @@ efx_mcdi_fini_txq(
>   
>   	efx_mcdi_execute_quiet(enp, &req);
>   
> -	if ((req.emr_rc != 0) && (req.emr_rc != MC_CMD_ERR_EALREADY)) {
> +	if ((req.emr_rc != 0) && (req.emr_rc != EALREADY)) {
>   		rc = req.emr_rc;
>   		goto fail1;
>   	}