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 434A2A051C for ; Tue, 11 Feb 2020 12:25:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A0702B9C; Tue, 11 Feb 2020 12:25:11 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id EA89E1BFAD for ; Tue, 11 Feb 2020 12:25:09 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id z7so11819316wrl.13 for ; Tue, 11 Feb 2020 03:25:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cXNiwCCavJrpGBo+3iguz2QCxVr6C8H7T1jsScqMgZ8=; b=RNcRjruRreZno6ifEu+lBep+KlAArGClAt8M+O/t1drsgBWFzNV4bXBKhzzruLQO+f KPx4L2T4pcIehVlnwXELxeyIe3ztBskOMYKj4DeO5QyAbxA5MGdUhcaL+yUBHwurJuw2 WSe4tWXzz7tV56KDN/NqQXRU0o0HchJnoEWRqMYEAt+/g5bcKtjpA9/Wvuln6LzXO7wa /RWfoR9LXfIXeOWPegFwLjFO1VndrHF9aZOAx9V8wFvhBfXoBANu42mOmbQt/ScSiuoD kzUoxd0b41PNTMgU3GY4FjwV71KOBbauwnbslzhVxcK6Gpku1aJVyL0Xsdd6BcHVW8YQ +mtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cXNiwCCavJrpGBo+3iguz2QCxVr6C8H7T1jsScqMgZ8=; b=sudau24J0pcUoWRSFQ3udlR4UVwmo4Rm3uykMwMt9tpX+qoQHJiTUe4zgBt5g83Sw0 ALdmD6mnD14xYH5u+1EtCFKtvR4Atx7pQ6M5NhIKkX9A23p7RSuMK8GTt3ISsP1uW3Ol VSjNR6jCDxVZfIBb6iUtq5oAsvel9swCj7puprfQVXPV3YlQymcTHf56DUR9K8h5jzlb o1JLYiBF1SRKgaAah4uwigN+xKT2GWzyFpicmdleBUmJdjxtItukkwGAEb04k2pIhyEe S/Rj+i32EOkFkcGgHMB3UeD3sLqaFg4O5lsoIu2yRBSod2OsZTTyb4ZLAsoJsIxXngWY sbDA== X-Gm-Message-State: APjAAAXr+O23m5L8/ILOSSFLOa7L1KfRME5PX0pvVGxQtQIVMGoXL1sQ Yr3fW39S+NNiJfhtul25Y6w= X-Google-Smtp-Source: APXvYqypUci8HrcZUuLqrpw6i7ZnW41onturi1wdmGoIwWaOIQpnecpVpFVbkIooVOkvipngY2RXNQ== X-Received: by 2002:adf:ec83:: with SMTP id z3mr7818369wrn.133.1581420309678; Tue, 11 Feb 2020 03:25:09 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e17sm4524855wrn.62.2020.02.11.03.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:25:09 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Tue, 11 Feb 2020 11:19:51 +0000 Message-Id: <20200211112216.3929-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf/base: fix adminq return' has been queued to stable release 19.11.1 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 stable release 19.11.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 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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From daa69f04b2fdf0bf94faa32474109ec977e934c3 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/iavf/base/iavf_adminq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c index a8b989aea9..a9fc63992d 100644 --- a/drivers/net/iavf/base/iavf_adminq.c +++ b/drivers/net/iavf/base/iavf_adminq.c @@ -822,6 +822,8 @@ enum iavf_status_code iavf_asq_send_command(struct iavf_hw *hw, cmd_completed = true; if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_OK) status = IAVF_SUCCESS; + else if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_EBUSY) + status = IAVF_ERR_NOT_READY; else status = IAVF_ERR_ADMIN_QUEUE_ERROR; hw->aq.asq_last_status = (enum iavf_admin_queue_err)retval; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:40.671359158 +0000 +++ 0045-net-iavf-base-fix-adminq-return.patch 2020-02-11 11:17:38.392001197 +0000 @@ -1,13 +1,14 @@ -From 013d5e879fe357176e0ade1cb6561917a7d46864 Mon Sep 17 00:00:00 2001 +From daa69f04b2fdf0bf94faa32474109ec977e934c3 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") -Cc: stable@dpdk.org Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c -index 0a5b2b281b..c1668d2287 100644 +index a8b989aea9..a9fc63992d 100644 --- a/drivers/net/iavf/base/iavf_adminq.c +++ b/drivers/net/iavf/base/iavf_adminq.c -@@ -803,6 +803,8 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw, +@@ -822,6 +822,8 @@ enum iavf_status_code iavf_asq_send_command(struct iavf_hw *hw, cmd_completed = true; if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_OK) status = IAVF_SUCCESS;