From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ED0D5A0C47 for ; Mon, 26 Jul 2021 15:55:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3AB040DDA; Mon, 26 Jul 2021 15:55:21 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id CC98140DDA for ; Mon, 26 Jul 2021 15:55:20 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id z7so11138462wrn.11 for ; Mon, 26 Jul 2021 06:55:20 -0700 (PDT) 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=Ob00RRhZTJOTQZ8TwhAz4hxESoNv0/Y/yvz2HIEKMH4=; b=dd9/6uBCLaIyNhulS0XFFajzg0E7WqzBFO18vwyra87hH1TT/vnQa6sjz4zNPdkXML sn3LUKcc/sFaXRemUhQ7IiVCwWymxZ4CDjAC2BxIikPK4V0fIg1utYRUezbYATKaiK0S MEOJ4uEIJqGK4VBj2gBmcXKXcnRkj/1lKedDsl03fakdDqV1mPsFOjmLVL5sH4+/GlbF yyrp0YL5rVwSUkfkqlWKSmLx/vlC4NCAv1Co2VuCts8GiMkM0kHE0P6kaKuFAidfkuAr ayUo5hxMWg8z/gMR8hDHjx8xx4/lp4V1hLDa+bPVczEgk+JHJWeuY3LQqla/bzp2tgBu RelQ== 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=Ob00RRhZTJOTQZ8TwhAz4hxESoNv0/Y/yvz2HIEKMH4=; b=HPjc+Jzo4/Tv6rORjw1evYMwCQcJgTvyymt0Pb4kIlPplovh75mv6j4wv/05Wpnh1b P83UMQ9NlNQBCsNhKwDfPxqyA3UymBdANE032XP4Ox//apGiO25PSC4Tjo21sk+EjbQ4 BLhXX05BqJQCckd4Yaq89T7AzR4GDZE7Zv/s1WYcdR7C6XELTfm4cvqFcmlh+LQu0lqP h7AlMOBNubWv0heAxxPmlRSVDh9Vxnsdeu+ZW9Eev5ShhM3NG1A57JChq0zRQW78al5o YviQ70K3//ojS4j2Xf5/2ID1N5w/isjwnwukA8azl+W9qs+IWYADUX2Kl2s106uhrfmG 4BLw== X-Gm-Message-State: AOAM531t9+OMhZvemrp6jz6cXjcRoFsLv7R0Th5yMdbHZDyydsREtQgG 3lZoQ1jEAAjvzjOyVdJ90yQ= X-Google-Smtp-Source: ABdhPJxK5LLtd2ytpw1eF6iCIjQclxycrJMF1aWundzkq+6l6vEezAPz33jDrCYXuSbsSTrNVpiVSA== X-Received: by 2002:adf:f908:: with SMTP id b8mr19891007wrr.302.1627307720658; Mon, 26 Jul 2021 06:55:20 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id p3sm6654103wmp.25.2021.07.26.06.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:55:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Lance Richardson , dpdk stable Date: Mon, 26 Jul 2021 14:52:59 +0100 Message-Id: <20210726135322.149850-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: remove workaround for default VNIC' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3e8a6d6b1d99144324854938d0813c21ab185562 Thanks. Luca Boccassi --- >From 3e8a6d6b1d99144324854938d0813c21ab185562 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Sun, 18 Jul 2021 11:00:59 +0530 Subject: [PATCH] net/bnxt: remove workaround for default VNIC [ upstream commit 609960ca7b0c7c7295f1641c6a8feac7af871024 ] On older Wh+ firmware versions, HWRM_FUNC_QCFG returns zero for the parent default vnic. Commit "3fb93bc7c349" added a temporary Wh+-specific workaround in the PMD. This has been fixed in latest firmware and hence removing the workaround. Fixes: 3fb93bc7c349 ("net/bnxt: initialize parent PF information") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_hwrm.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 4d24c9c561..39778e38ef 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -3266,16 +3266,6 @@ int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp) bp->parent->fid = rte_le_to_cpu_16(resp->fid); bp->parent->port_id = rte_le_to_cpu_16(resp->port_id); - /* FIXME: Temporary workaround - remove when firmware issue is fixed. */ - if (bp->parent->vnic == 0) { - PMD_DRV_LOG(DEBUG, "parent VNIC unavailable.\n"); - /* Use hard-coded values appropriate for current Wh+ fw. */ - if (bp->parent->fid == 2) - bp->parent->vnic = 0x100; - else - bp->parent->vnic = 1; - } - HWRM_UNLOCK(); return 0; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:17.767000307 +0100 +++ 0036-net-bnxt-remove-workaround-for-default-VNIC.patch 2021-07-26 13:53:15.893293547 +0100 @@ -1 +1 @@ -From 609960ca7b0c7c7295f1641c6a8feac7af871024 Mon Sep 17 00:00:00 2001 +From 3e8a6d6b1d99144324854938d0813c21ab185562 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 609960ca7b0c7c7295f1641c6a8feac7af871024 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index e6c46d46de..73deb41f81 100644 +index 4d24c9c561..39778e38ef 100644 @@ -26 +27 @@ -@@ -3390,16 +3390,6 @@ int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp) +@@ -3266,16 +3266,6 @@ int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp)