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 C6825A0540 for ; Thu, 7 Jul 2022 09:57:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C20EF427F0; Thu, 7 Jul 2022 09:57:36 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 560F3410D3 for ; Thu, 7 Jul 2022 09:57:35 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 12C2E4001E for ; Thu, 7 Jul 2022 07:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180655; bh=Wr7v3ZSp96EnqU5hNpKf4kuDaIKP2tcXYZMUBDX99ro=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lREDZZmcZMEd+osX8vGDycWsm6QAoF52K3NbFWvaUdr0rKfrQC3Ov1wwFnN3yp5UM BC9HoS8w09felGqjx/L9qwpyh95gLPKbKCBbnoV3G35xaGQgbHC/CmdlI6R1b3XOqO YbG7K1zybAR+5IWGIBvFCcnvSYjnGtND7655uMOgZfwkv7lnpJC+BD0U7yKejpfk/B dR6xozbfK2MgdN+Z+MzNC8JMAn6SwdFNSNGc43C5zk5mDA7SLF0RUm6IE7GOgzKEcW eJRI25OZ4YSc91GP0Ru/141UrsinzAtokCUmQAsgeVqJtTgzhL0phaQGD7WMH0KeTv 2eTXBq5Swk6ig== Received: by mail-ed1-f72.google.com with SMTP id b7-20020a056402350700b00435bd1c4523so13365758edd.5 for ; Thu, 07 Jul 2022 00:57:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Wr7v3ZSp96EnqU5hNpKf4kuDaIKP2tcXYZMUBDX99ro=; b=GVD+jZYL14IUmGvg4VXv5vzktoG+omSiaQ/ltr9T48k73KbrdG/EpVTW+qIQKul81n YRvBR+FfLwSeuiGE5hl6SpZLBs8cepQqoUjC6L+F1k/fbbnS119VWRehqIQEv/Pry9kZ OC8wAeabmRxuvZcaVM5gEZlOZFimWPmK6xNxz4Z2zJ6s8Q+Fa4EX/GhdQm41H3pe0JXJ OMpoH/+4Rodt2MlpgvfHrrEobAtviC5EbqsTHDFxcO4N2t/2YjZ046I0iylPURh4vjlX 0eV/stAZNPrmhHChqlLZ9a5qSaTTNya6XGE4MKyrH8/xMHh8rcRWqEC7qbou4197aQz5 QPFA== X-Gm-Message-State: AJIora9FioCr2xyP4j1xEK9DVCQbvJA8v+P83G6cYEvGrELYiGeWCtuw IlsgQpFfwOPxacquUBA8eOrT7/esjmnyXEXPZU0xWJgjC/LlpxdDnwDIz7XCCJrAzyteyKrdCFR RVau80pZIYESEES3fEdLY8Omn X-Received: by 2002:a17:907:1c9d:b0:726:3666:2ea4 with SMTP id nb29-20020a1709071c9d00b0072636662ea4mr43600109ejc.547.1657180654558; Thu, 07 Jul 2022 00:57:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u0wDzcutErLSjqxoubuUWKngDvgO8YlhHTV7w91q1v6SVSuniOiR9AbbuTKf7Jqhc0UgkcHg== X-Received: by 2002:a17:907:1c9d:b0:726:3666:2ea4 with SMTP id nb29-20020a1709071c9d00b0072636662ea4mr43600093ejc.547.1657180654367; Thu, 07 Jul 2022 00:57:34 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id g15-20020a056402320f00b0043a85d7d15esm3756357eda.12.2022.07.07.00.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:57:33 -0700 (PDT) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix compatibility with some old firmwares' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:38 +0200 Message-Id: <20220707075522.194223-43-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.13 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/09/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/4a9b088ed44643a9ad5682bc1f76f8b622ddde0d Thanks. Christian Ehrhardt --- >From 4a9b088ed44643a9ad5682bc1f76f8b622ddde0d Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 18 Mar 2022 16:03:31 +0100 Subject: [PATCH] net/bnxt: fix compatibility with some old firmwares [ upstream commit a43d0129579034af06314b6603d92a866d809eeb ] This reverts commit 3972281f47b2cc0cf844698885f0e6b4228c0975. Reported by Red Hat QE: with older firmware versions (at least versions 20.6.112.0 and 20.6.143.0), initialisation never succeeds following this change. Revert it for now, waiting for a more complete fix. Fixes: 3972281f47b2 ("net/bnxt: fix device readiness check") Signed-off-by: David Marchand Acked-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 90434d15b4..4ae1682920 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1038,11 +1038,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) else HWRM_CHECK_RESULT(); - if (resp->flags & HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY) { - rc = -EAGAIN; - goto error; - } - PMD_DRV_LOG(INFO, "%d.%d.%d:%d.%d.%d.%d\n", resp->hwrm_intf_maj_8b, resp->hwrm_intf_min_8b, resp->hwrm_intf_upd_8b, resp->hwrm_fw_maj_8b, @@ -5221,10 +5216,6 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp) rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); HWRM_CHECK_RESULT_SILENT(); - - if (resp->flags & HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY) - rc = -EAGAIN; - HWRM_UNLOCK(); return rc; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.003426482 +0200 +++ 0043-net-bnxt-fix-compatibility-with-some-old-firmwares.patch 2022-07-07 09:54:10.917824320 +0200 @@ -1 +1 @@ -From a43d0129579034af06314b6603d92a866d809eeb Mon Sep 17 00:00:00 2001 +From 4a9b088ed44643a9ad5682bc1f76f8b622ddde0d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a43d0129579034af06314b6603d92a866d809eeb ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 6e4753c508..9eb8b8d56d 100644 +index 90434d15b4..4ae1682920 100644 @@ -26 +27 @@ -@@ -1249,11 +1249,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) +@@ -1038,11 +1038,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) @@ -38 +39 @@ -@@ -6154,10 +6149,6 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp) +@@ -5221,10 +5216,6 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp)