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 2B20AA0C41 for ; Tue, 30 Nov 2021 17:38:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 246DE410F7; Tue, 30 Nov 2021 17:38:41 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 9161D411ED for ; Tue, 30 Nov 2021 17:38:39 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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-1.canonical.com (Postfix) with ESMTPS id 4FD1A40009 for ; Tue, 30 Nov 2021 16:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290319; bh=YEf7BrRa9hukq3+4H2A7TAorWLIZzEnLDRSKsHjppHg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ePWPaYEsBkVPikRCdiWh8Baki7Q35qu2zn/utZqOF5JFbVgodkgRHloPBgt6qzkpI c3hchAGVhwSYCjunDq1Du4xeqMw4ouxQpbjIUlnb94W3ze+aRx22iZ4qOHmJ8aFy6O M+7WOBIa7Pv3hOUo2b0L3tlxT66VLkreA2Qrk+xSPDkCaqNKraVJvyrRF9sBfQUmuF Wq490xcQrxgbTaDkuMzj+zLJmcDJtkHHJtUzyE84OqPQq+vVLsejabGH4GClb+0Dqt mVOdDfMmbnxQrP+Sm/njIivbTWDJkFhApROeLygHLB6+5kwk6XuqLHVm5b501Oxb4O NhQBeDWYVp+sA== Received: by mail-ed1-f69.google.com with SMTP id p4-20020aa7d304000000b003e7ef120a37so17398746edq.16 for ; Tue, 30 Nov 2021 08:38:39 -0800 (PST) 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=YEf7BrRa9hukq3+4H2A7TAorWLIZzEnLDRSKsHjppHg=; b=FLuz3hlVABxt6v6XMbS2BVc4Zvf9Bmfmsr5mKmFQxCTHYIbXqrZby2VBddU1Y/2JJl zFFWj/EypQaLmKJaYqWnvlSS6R3TFM8MJ0ygD/qHqogEAQSpjDh4rfGBQQhTYeuIqTHK X7eD0T0DUk76RKf10gqnYBx6k2z51AUModiQpvKxo9lxgOEapzwmMXUpm3hdnmJ6xgVg rFyy9718ocy3VShE62Lpmlqq550AqFrvxpkGaZt2dKWZaPR1w8x4bE3WeAFUQNwDqUmD b9MQSpNY7ZYEc7Dn9+stn2Kqgf2it1L9UaxAfT1tQfxPjCJcychxQ3FJ6biQ922M1pdR AKuQ== X-Gm-Message-State: AOAM5328KKxg/TxAMN0qCe3sUrVLXFp769x+g5UPdSUh880s8X/oD/Ta 1kjE5Ms/CI0KUcOuLN8sXKHkUMaFPs4iEwy7vJ8CXjL2WaIQOrUqx1T7FsGiD89xQ8v7Ft4Tvnk R6DSmwtLxNg350Bsdp5d8jTOL X-Received: by 2002:a17:906:6851:: with SMTP id a17mr229567ejs.338.1638290318457; Tue, 30 Nov 2021 08:38:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoWuTUoEv8yBk325dsMt7ahDxagc4b96dHrTkXGfkyCKlXWurbM1z0jcX8pu6bEZTKfoth9g== X-Received: by 2002:a17:906:6851:: with SMTP id a17mr229547ejs.338.1638290318272; Tue, 30 Nov 2021 08:38:38 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id hd15sm9784708ejc.69.2021.11.30.08.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:38:37 -0800 (PST) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Ajit Khaparde , Lance Richardson , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix function driver register/unregister' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:13 +0100 Message-Id: <20211130163605.2460997-49-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/9d661128f4efb27c28647153e16627c4bcc6ac84 Thanks. Christian Ehrhardt --- >From 9d661128f4efb27c28647153e16627c4bcc6ac84 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 22 Sep 2021 14:00:44 +0530 Subject: [PATCH] net/bnxt: fix function driver register/unregister [ upstream commit 61ad5c1ac9de245e7d20a67375d56682c70bebde ] 1. Fix to use correct fields in the request structure of HWRM_FUNC_DRV_RGTR. 2. Remove the "flags" argument to bnxt_hwrm_func_driver_unregister() as it is not needed. Fixes: beb3087f5056 ("net/bnxt: add driver register/unregister") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 9 ++++----- drivers/net/bnxt/bnxt_hwrm.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 6f0796b3c0..2a58496d71 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -5213,7 +5213,7 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev) bnxt_free_int(bp); bnxt_free_mem(bp, reconfig_dev); bnxt_hwrm_func_buf_unrgtr(bp); - rc = bnxt_hwrm_func_driver_unregister(bp, 0); + rc = bnxt_hwrm_func_driver_unregister(bp); bp->flags &= ~BNXT_FLAG_REGISTERED; bnxt_free_ctx_mem(bp); if (!reconfig_dev) { diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 6e7e3117b9..89f30e1b48 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -836,9 +836,9 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp) HWRM_PREP(req, FUNC_DRV_RGTR, BNXT_USE_CHIMP_MB); req.enables = rte_cpu_to_le_32(HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_VER | HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_ASYNC_EVENT_FWD); - req.ver_maj = RTE_VER_YEAR; - req.ver_min = RTE_VER_MONTH; - req.ver_upd = RTE_VER_MINOR; + req.ver_maj_8b = RTE_VER_YEAR; + req.ver_min_8b = RTE_VER_MONTH; + req.ver_upd_8b = RTE_VER_MINOR; if (BNXT_PF(bp)) { req.enables |= rte_cpu_to_le_32( @@ -1131,7 +1131,7 @@ error: return rc; } -int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags) +int bnxt_hwrm_func_driver_unregister(struct bnxt *bp) { int rc; struct hwrm_func_drv_unrgtr_input req = {.req_type = 0 }; @@ -1141,7 +1141,6 @@ int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags) return 0; HWRM_PREP(req, FUNC_DRV_UNRGTR, BNXT_USE_CHIMP_MB); - req.flags = flags; rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h index 2fb0d97d98..815e61d9b9 100644 --- a/drivers/net/bnxt/bnxt_hwrm.h +++ b/drivers/net/bnxt/bnxt_hwrm.h @@ -90,7 +90,7 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp); int bnxt_hwrm_func_qcaps(struct bnxt *bp); void bnxt_free_vf_info(struct bnxt *bp); int bnxt_hwrm_func_reset(struct bnxt *bp); -int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags); +int bnxt_hwrm_func_driver_unregister(struct bnxt *bp); int bnxt_hwrm_func_qstats(struct bnxt *bp, uint16_t fid, struct rte_eth_stats *stats); int bnxt_hwrm_func_qstats_tx_drop(struct bnxt *bp, uint16_t fid, -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:08.922536426 +0100 +++ 0049-net-bnxt-fix-function-driver-register-unregister.patch 2021-11-30 16:50:05.682872738 +0100 @@ -1 +1 @@ -From 61ad5c1ac9de245e7d20a67375d56682c70bebde Mon Sep 17 00:00:00 2001 +From 9d661128f4efb27c28647153e16627c4bcc6ac84 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 61ad5c1ac9de245e7d20a67375d56682c70bebde ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 097dd10de9..dc7dee1d2a 100644 +index 6f0796b3c0..2a58496d71 100644 @@ -28,4 +29,4 @@ -@@ -6156,7 +6156,7 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev) - bp->pf->vf_req_buf = NULL; - } - +@@ -5213,7 +5213,7 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev) + bnxt_free_int(bp); + bnxt_free_mem(bp, reconfig_dev); + bnxt_hwrm_func_buf_unrgtr(bp); @@ -38 +39 @@ -index 585cdeded8..d4d8581af1 100644 +index 6e7e3117b9..89f30e1b48 100644 @@ -41,2 +42,2 @@ -@@ -1059,9 +1059,9 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp) - HWRM_PREP(&req, HWRM_FUNC_DRV_RGTR, BNXT_USE_CHIMP_MB); +@@ -836,9 +836,9 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp) + HWRM_PREP(req, FUNC_DRV_RGTR, BNXT_USE_CHIMP_MB); @@ -54 +55 @@ -@@ -1370,7 +1370,7 @@ error: +@@ -1131,7 +1131,7 @@ error: @@ -63 +64 @@ -@@ -1380,7 +1380,6 @@ int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags) +@@ -1141,7 +1141,6 @@ int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags) @@ -66 +67 @@ - HWRM_PREP(&req, HWRM_FUNC_DRV_UNRGTR, BNXT_USE_CHIMP_MB); + HWRM_PREP(req, FUNC_DRV_UNRGTR, BNXT_USE_CHIMP_MB); @@ -72 +73 @@ -index b311ff59c0..6dc23b93ac 100644 +index 2fb0d97d98..815e61d9b9 100644 @@ -75,2 +76 @@ -@@ -145,7 +145,7 @@ int bnxt_hwrm_func_buf_unrgtr(struct bnxt *bp); - int bnxt_hwrm_func_driver_register(struct bnxt *bp); +@@ -90,7 +90,7 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp); @@ -77,0 +78 @@ + void bnxt_free_vf_info(struct bnxt *bp); @@ -82,2 +83,2 @@ - struct rte_eth_stats *stats, - struct hwrm_func_qstats_output *func_qstats); + struct rte_eth_stats *stats); + int bnxt_hwrm_func_qstats_tx_drop(struct bnxt *bp, uint16_t fid,