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 9D6A6A04F5 for ; Wed, 11 Dec 2019 22:28:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 774291BE83; Wed, 11 Dec 2019 22:28:49 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 4CA111D9E for ; Wed, 11 Dec 2019 22:28:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099727; 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=8EJiVTqk51yOAKMaBWyeR6McUsvjdO2K7WGldCE9/L8=; b=NxkcftaPIaCcy5RhNIGNvBhKmoXRXgC2ScdpkPuBG17JrICDERQUL2aiXSQpjncU3+Gz/z Bp+tKTNosueriu8xhRQE92JKTjSOLSI8NfAl7MjKuyJ/PpmSpQASviwiR1+Jcx1yvhr16o zzycu5ysqeKGgnYK0CCo26R6PkTohC8= 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-173-pdGBLwGdPde4vi_JVsOEPg-1; Wed, 11 Dec 2019 16:28: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 5B967DBED; Wed, 11 Dec 2019 21:28:43 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F7C310013A1; Wed, 11 Dec 2019 21:28:42 +0000 (UTC) From: Kevin Traynor To: Ajit Khaparde Cc: Somnath Kotur , dpdk stable Date: Wed, 11 Dec 2019 21:26:33 +0000 Message-Id: <20191211212702.27851-41-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: pdGBLwGdPde4vi_JVsOEPg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bnxt: fix resource qcaps with older FW' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/19. 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/65bcaa3d86eb230bb9= b9f53762db52d5e847d00b Thanks. Kevin. --- >From 65bcaa3d86eb230bb9b9f53762db52d5e847d00b Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Mon, 18 Nov 2019 14:23:45 -0800 Subject: [PATCH] net/bnxt: fix resource qcaps with older FW [ upstream commit 89a0deb866dc42ead92b79e6e7159622e1ab8490 ] On some old versions of FW, bnxt_hwrm_func_resc_qcaps can return an error. This is because the command was not implemented completely in FW till the subsequent version. Ignore the error and continue with the driver initialization. Fixes: edafb57ba4a1 ("net/bnxt: fix VF resource allocation") Signed-off-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_hwrm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 614cd47c5..1f26fb499 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -612,5 +612,10 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp) =09} =20 -=09return rc; +=09/* On older FW, +=09 * bnxt_hwrm_func_resc_qcaps can fail and cause init failure. +=09 * But the error can be ignored. Return success. +=09 */ + +=09return 0; } =20 @@ -765,5 +770,5 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp) =09rc =3D bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB)= ; =20 -=09HWRM_CHECK_RESULT(); +=09HWRM_CHECK_RESULT_SILENT(); =20 =09if (BNXT_VF(bp)) { --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:15.961935588 +0000 +++ 0041-net-bnxt-fix-resource-qcaps-with-older-FW.patch=092019-12-11 21:24= :12.690650742 +0000 @@ -1 +1 @@ -From 89a0deb866dc42ead92b79e6e7159622e1ab8490 Mon Sep 17 00:00:00 2001 +From 65bcaa3d86eb230bb9b9f53762db52d5e847d00b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 89a0deb866dc42ead92b79e6e7159622e1ab8490 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 2cba007ea..1d3732eee 100644 +index 614cd47c5..1f26fb499 100644 @@ -24 +25 @@ -@@ -693,5 +693,10 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp) +@@ -612,5 +612,10 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp) @@ -36 +37 @@ -@@ -902,5 +907,5 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp) +@@ -765,5 +770,5 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)