From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 93BCCA0542 for ; Fri, 7 Feb 2020 16:14:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6CE9A1C197; Fri, 7 Feb 2020 16:14:01 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id AE2361C11E for ; Fri, 7 Feb 2020 16:14:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xwgD5B9r1Lkuxqg47GL93XISFQjgK0IZk+aLVxuTHNg=; b=SFv+QNLon7iD+D0E0E3s+FBua/3MLlMnXjKMYX/AGB3LnZrz3rZ93cNyB5Eq/MISQH4ZEm Y0tu/+5sCmOd9mPo6IePGgX4revSKsbjpW3MtcunZQ7lRz0Nlj3IKkcAXUC0FwbDHwvM0N VzSY5zeDkeaVNttG73CDg9dW1/fORMk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-246-9iNcNPvbMYiu2q-Oeu3ojg-1; Fri, 07 Feb 2020 10:13:44 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4637818AB2C6; Fri, 7 Feb 2020 15:13:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 074E610016DA; Fri, 7 Feb 2020 15:13:41 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Fri, 7 Feb 2020 15:12:32 +0000 Message-Id: <20200207151248.29804-20-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 9iNcNPvbMYiu2q-Oeu3ojg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/iavf/base: fix adminq return' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/cf69b94980b721dbbc= 3ccc828584a322a23adcc5 Thanks. Kevin. --- >From cf69b94980b721dbbc3ccc828584a322a23adcc5 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 3 Dec 2019 15:03:16 +0800 Subject: [PATCH] net/iavf/base: fix adminq return [ upstream commit 013d5e879fe357176e0ade1cb6561917a7d46864 ] When send a adminq, if get IAVF_AQ_RC_BUSY, we should return IAVF_ERR_NOT_READY. Fixes: e5b2a9e957e7 ("net/avf/base: add base code for avf PMD") Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/avf/base/avf_adminq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_a= dminq.c index 71f18b3477..2dc98797f7 100644 --- a/drivers/net/avf/base/avf_adminq.c +++ b/drivers/net/avf/base/avf_adminq.c @@ -852,4 +852,6 @@ enum avf_status_code avf_asq_send_command(struct avf_hw= *hw, =09=09if ((enum avf_admin_queue_err)retval =3D=3D AVF_AQ_RC_OK) =09=09=09status =3D AVF_SUCCESS; +=09=09else if ((enum avf_admin_queue_err)retval =3D=3D AVF_AQ_RC_EBUSY) +=09=09=09status =3D AVF_ERR_NOT_READY; =09=09else =09=09=09status =3D AVF_ERR_ADMIN_QUEUE_ERROR; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:18.567052647 +0000 +++ 0020-net-iavf-base-fix-adminq-return.patch=092020-02-07 15:08:17.528062= 764 +0000 @@ -1 +1 @@ -From 013d5e879fe357176e0ade1cb6561917a7d46864 Mon Sep 17 00:00:00 2001 +From cf69b94980b721dbbc3ccc828584a322a23adcc5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 013d5e879fe357176e0ade1cb6561917a7d46864 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/net/iavf/base/iavf_adminq.c | 2 ++ + drivers/net/avf/base/avf_adminq.c | 2 ++ @@ -19,9 +20,9 @@ -diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/i= avf_adminq.c -index 0a5b2b281b..c1668d2287 100644 ---- a/drivers/net/iavf/base/iavf_adminq.c -+++ b/drivers/net/iavf/base/iavf_adminq.c -@@ -804,4 +804,6 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw = *hw, - =09=09if ((enum iavf_admin_queue_err)retval =3D=3D IAVF_AQ_RC_OK) - =09=09=09status =3D IAVF_SUCCESS; -+=09=09else if ((enum iavf_admin_queue_err)retval =3D=3D IAVF_AQ_RC_EBUSY) -+=09=09=09status =3D IAVF_ERR_NOT_READY; +diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_= adminq.c +index 71f18b3477..2dc98797f7 100644 +--- a/drivers/net/avf/base/avf_adminq.c ++++ b/drivers/net/avf/base/avf_adminq.c +@@ -852,4 +852,6 @@ enum avf_status_code avf_asq_send_command(struct avf_h= w *hw, + =09=09if ((enum avf_admin_queue_err)retval =3D=3D AVF_AQ_RC_OK) + =09=09=09status =3D AVF_SUCCESS; ++=09=09else if ((enum avf_admin_queue_err)retval =3D=3D AVF_AQ_RC_EBUSY) ++=09=09=09status =3D AVF_ERR_NOT_READY; @@ -29 +30 @@ - =09=09=09status =3D IAVF_ERR_ADMIN_QUEUE_ERROR; + =09=09=09status =3D AVF_ERR_ADMIN_QUEUE_ERROR;