From patchwork Fri Apr 30 20:14:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 92579 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE968A0546; Fri, 30 Apr 2021 22:10:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34A414112E; Fri, 30 Apr 2021 22:10:26 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id A07D74013F for ; Fri, 30 Apr 2021 22:10:23 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id z6-20020a17090a1706b0290155e8a752d8so2324649pjd.4 for ; Fri, 30 Apr 2021 13:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SO52AseYWBvCHVHWz3u69NWIN4MJ8fb0lKORxQ1O+Fg=; b=cEwm66elDwcYdtKUkCos7lQIASwzAaBIY0IeLxbudvOf3lSRmdISsSGlLVpBcijKRp 9PCzVhpF2+FHxinL1cgZCGXg4Ba5vI1sG/Sx9W8k3rfK0lTI9+Jg+xlnEJzM8CsB3ALl u8GTBQj5tQmZBUHv3jEyTAKM4lcyN5Wiq4iRo= 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; bh=SO52AseYWBvCHVHWz3u69NWIN4MJ8fb0lKORxQ1O+Fg=; b=mxm3TD6v6oh/CROtAZ2ODVyYkW1+dbexPopmRWd9fa8DJmdkjKegfXrFPVhWdoL+0y YlYqx4GwsD1HnICFX7WjuxA+CJyr4MSLdf0SXTtpoZ68ajqJl6+0Rxi7MlRCfPBVNfIZ xEwUDLbI2STaWcLe2JgOOy7YT1DsfybqfWcoTHi/1BuVAEWRxDVkASRY6lv3BmhnX8Vv YmVFsQJyecA1vcHTEYE6PX8SzL2Na3ZdzG3svZJ8hNHj/+CcNwAyQA+zX1oVvKohSVNC fXjho3vXF3Y1O+4IOalykr/AJHLhyMrQKcjosS6OD1Du0x56vO5O2v+2FvIULWCXkNxj TQlQ== X-Gm-Message-State: AOAM531fQNmjkDBFsrNHZYbpZvYFyg4xH0IKhs8NM9+i0U1+0btLth+X yCcqzHZDry/kxbFWjqyJ+iFQHSoedt6c5K7qwcwZI+d5Zk5OQM9Gl+crv1gTqciOq0D4Ce4rn3r RMWc42spozviHdzLe9at74wfaylNuHUeJkU3Jm2PcoHRxtawc/wQYQ0gDEkVxkbM= X-Google-Smtp-Source: ABdhPJznt1IE9vhcreYdABFl0qUmmW3lc95M4xrL5gTxBJWKCuwNHd5eVZyKNeQXQbh2BbPysSmTkA== X-Received: by 2002:a17:90b:1646:: with SMTP id il6mr16631544pjb.27.1619813422391; Fri, 30 Apr 2021 13:10:22 -0700 (PDT) Received: from u099.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j12sm3430587pfc.17.2021.04.30.13.10.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 13:10:21 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Ajit Khaparde , stable@dpdk.org Date: Fri, 30 Apr 2021 13:14:10 -0700 Message-Id: <1619813653-5161-2-git-send-email-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> References: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-dev] [PATCH 1/4] net/bnxt: fix mismatched type comparison X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" dev_info.max_mac_addrs is of type uint32_t. But the counter i is of type uint16_t. This mismatch may cause the loop condition may always be true. Change the loop counter variable to uint32_t. Fixes: b02f1573cd07 ("net/bnxt: restore MAC filters during reset recovery") Cc: stable@dpdk.org Signed-off-by: Ajit Khaparde Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index dba5b9f..6dfb33c 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3959,7 +3959,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp) struct rte_ether_addr *addr; uint64_t pool_mask; uint32_t pool = 0; - uint16_t i; + uint32_t i; int rc; if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp)) From patchwork Fri Apr 30 20:14:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 92580 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A63EBA0546; Fri, 30 Apr 2021 22:10:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B7D084113D; Fri, 30 Apr 2021 22:10:27 +0200 (CEST) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mails.dpdk.org (Postfix) with ESMTP id 0DBD94110A for ; Fri, 30 Apr 2021 22:10:25 +0200 (CEST) Received: by mail-pg1-f179.google.com with SMTP id s22so29044775pgk.6 for ; Fri, 30 Apr 2021 13:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SDY4bbAy555dJfNSmTFacJ6z77dmkcIj1YR2xwGY2bo=; b=fCsZSHQA90Jeo4KVBchm54NTJhykCsK18xNfhS9czfXM+BBUW1STNoP4MN0BsVkvmk jDnaVcva4qacQw862wOK4iTmle7cgyj+X9FU3Thv2xNd+OrZA6t613HYI+lEuEJrfdyk Qu/vZ+DO383V+4xJP5kv6ehVkziIS42VUS8Hg= 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; bh=SDY4bbAy555dJfNSmTFacJ6z77dmkcIj1YR2xwGY2bo=; b=d+4fUjKhCBGoJ09RI1ZJbW35TiH8LMe54QyAV2dFRuz42ikvn/E7+2R0NzrNb6Bfmf 4cacJzgG/hE8l1arrjRuLpzHAmtHnvuADG0Ld8RkEGMyERBYoWGnPh1RJykgyoGuXb8w pvzMKOrlRkKN8MX1RpPnhi3x83GUA3ttblVtLFNz/MJC9dVNgXWFCQ49YOj6BMA7UFrN OBr0CI+3FzfD3GmbvM+A4Nrwu5U0Q5zyLV8049haIn6k1CJICcHvHZMTPGz4FivTeQwk lCOER0qJDA7JOUBdxpr7+tTmaYj4zz2QKoMQ3EgYXnxewzYlzUZEQUScgJJZ6K1+sEO8 lkqA== X-Gm-Message-State: AOAM532xsAzCW4InAPCgOzMus/khaSFMxdApZYtTyPXfB8xw6NhZBVlw 3qQXD8+MMk+lzemecVQ53/3iecioDUOWw3tnd0wbeenaYV+wkOkSodqNABi41QSDa51BmYr64Qb QI7MkadRb9oi2ysSyPUxkfBkAfCaZOZ9xEXwGzcqhPNUif+zM+CW+EWfCFrKr1Ns= X-Google-Smtp-Source: ABdhPJyhkszKe+s9CmdBY5ljXRFKjjJH7IrVr7wXgHc0cTpxEN9ayjALAjSe6epWMZXRyOqArijbxw== X-Received: by 2002:a63:6a05:: with SMTP id f5mr6164125pgc.433.1619813423739; Fri, 30 Apr 2021 13:10:23 -0700 (PDT) Received: from u099.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j12sm3430587pfc.17.2021.04.30.13.10.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 13:10:22 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Ajit Khaparde , stable@dpdk.org Date: Fri, 30 Apr 2021 13:14:11 -0700 Message-Id: <1619813653-5161-3-git-send-email-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> References: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-dev] [PATCH 2/4] net/bnxt: fix unchecked return value X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Return value where return value of rte_pci_read_config was not checked. Fix it. Coverity issue: 349919 Fixes: 9d0cbaecc91a ("net/bnxt: support periodic FW health monitoring") Cc: stable@dpdk.org Signed-off-by: Ajit Khaparde Reviewed-by: Kalesh AP Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 6dfb33c..4068271 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4129,13 +4129,17 @@ uint32_t bnxt_read_fw_status_reg(struct bnxt *bp, uint32_t index) struct bnxt_error_recovery_info *info = bp->recovery_info; uint32_t reg = info->status_regs[index]; uint32_t type, offset, val = 0; + int ret = 0; type = BNXT_FW_STATUS_REG_TYPE(reg); offset = BNXT_FW_STATUS_REG_OFF(reg); switch (type) { case BNXT_FW_STATUS_REG_TYPE_CFG: - rte_pci_read_config(bp->pdev, &val, sizeof(val), offset); + ret = rte_pci_read_config(bp->pdev, &val, sizeof(val), offset); + if (ret < 0) + PMD_DRV_LOG(ERR, "Failed to read PCI offset %#x", + offset); break; case BNXT_FW_STATUS_REG_TYPE_GRC: offset = info->mapped_status_regs[index]; From patchwork Fri Apr 30 20:14:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 92581 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 25F6CA0546; Fri, 30 Apr 2021 22:10:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 275B341153; Fri, 30 Apr 2021 22:10:31 +0200 (CEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id 29275410EF for ; Fri, 30 Apr 2021 22:10:27 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id b27so874824pfp.9 for ; Fri, 30 Apr 2021 13:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NcT1Ln05Sidgtiww88Qkq6cH7ZzOVMLsjQrfHfMvmvM=; b=Q9ogYNj7AWwbnuy2je3sMfrphLqgreTDLUveMnP6FJ6IhcnkO+HaM1LVr0ELXU7tcG W86qymdEDG3MwBZas95Ppc06GM4yQvlwvpOASDjqq9Fe24c2XweqIbgkWhqZ3hQz6SWn fQP6jLHdAac7qBlOLne+nnmj9+BwQyXZa4CLo= 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; bh=NcT1Ln05Sidgtiww88Qkq6cH7ZzOVMLsjQrfHfMvmvM=; b=OZHj+5lSbV7DhF77IOmIQZE13uwz8+4uvHK2ujnLCSzWrPzppZhO/wueflloKFs03h hEB/L5kUETBHYs0jL9iyCl/nYY9gxyi5ua4yE+ydAWTcOMw9uY9GmYRYOyijzH4QreFM FyQVhIPkljVezgm7xSxbxzHTyInussmRb1NdeVA/9ymB4dWU4rqammrrQZtzFcsOCx+x p298aYdoUkMUlq8OzPvFBEU8z6lUceySyjFwFjJPHJKi5pvC+6Cl54KKRYZygv79jk7h b8Vg4Bi4tHd7xm1+8inkfKAu9NL8oAljkXIdEDQ2ZSAU5UhgpFriAL3VJeB9pNc6L4ul JhKw== X-Gm-Message-State: AOAM530d/IglTuSPT9TQJ06O8q4UHmETpu+k6iFfqfG4dl+fTVLdvVVP JmQdPEkejNQHaB9+ZDlkeaqSlVJd2Tb9GFLkQX0m9W8QtXdQXRoYR6LLen0lPX2frAjBsFOdCUC BeLgGtXHL8i2WMizSWdvqSc77cMlcepNCoHbmWX4gi8k70Jp7Mp9NMYikAGZeF2M= X-Google-Smtp-Source: ABdhPJzl3Ihh24V8kcHGm1qJZcYKp3oJ/4Bpf54yJEnRVLNOBQfqVKBM9J8vkHgaUPtNXyD1NcZz4A== X-Received: by 2002:aa7:9190:0:b029:22d:6789:cc83 with SMTP id x16-20020aa791900000b029022d6789cc83mr6808568pfa.9.1619813425724; Fri, 30 Apr 2021 13:10:25 -0700 (PDT) Received: from u099.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j12sm3430587pfc.17.2021.04.30.13.10.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 13:10:24 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Ajit Khaparde , stable@dpdk.org Date: Fri, 30 Apr 2021 13:14:12 -0700 Message-Id: <1619813653-5161-4-git-send-email-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> References: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-dev] [PATCH 3/4] net/bnxt: fix mismatched comparison X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fix comparison between uint16_t and uint32_t types. Fixes: 6dc83230b43b ("net/bnxt: support port representor data path") Cc: stable@dpdk.org Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 7179c6c..2ef4115 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -1042,7 +1042,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, /* Attempt to alloc Rx buf in case of a previous allocation failure. */ if (alloc_failed) { - uint16_t cnt; + int cnt; rx_raw_prod = RING_NEXT(rx_raw_prod); for (cnt = 0; cnt < nb_rx_pkts + nb_rep_rx_pkts; cnt++) { From patchwork Fri Apr 30 20:14:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 92582 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 764EBA0546; Fri, 30 Apr 2021 22:10:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6627341160; Fri, 30 Apr 2021 22:10:32 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mails.dpdk.org (Postfix) with ESMTP id 8CA6E41150 for ; Fri, 30 Apr 2021 22:10:28 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id v191so7433097pfc.8 for ; Fri, 30 Apr 2021 13:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DNLUxuIm+XTdkVye36dXjRyOs560xx+J7vcr8WA3D80=; b=bOXVWSt7tZRszuMz19mMac3A0OPN2BKuRSEe6WQtjgsThfNFoEp0BNendFkViTHqNk iIjsc59Ko+2KsJE7x0y8QWTzavrRMODeoMICma8CUB8SYkFMz0u0US33I8Grr++8sr3S PDh0FGFtCXnsoTSzyM01CsJ2XisPbuwlioS5Q= 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; bh=DNLUxuIm+XTdkVye36dXjRyOs560xx+J7vcr8WA3D80=; b=GkmjXmV9NDkOZOMkdvauCq/7BAn7ow2NQQOYUKV9Yyj57+Bj/cdS07OMyKg2eouqQz Nqe7Jlb84UhzVO6rfsMZ7mSrzIsIzQ6tWa5mNOQvqaTV7fKKnCuExunwGe5TNa4lKfi0 k/n8SDmvVjgFkRjEw9mh6t64AKa/H0M8ZMw6KgkcHLqANYfduKy1IcOFbg3AlRNgBbe7 deAAt73T0AKJan9OjmHzB0qW/BEi39tz73WzVJR57KcSmRKjbEXG1W8idRyucHCcL8Ro zLOkndtk1MPFw1QIt7gup7C2EPZUXq8qQK8f252/TcMb74cy+Dj1SfgG1rrx3GpPRpLB 48WQ== X-Gm-Message-State: AOAM532fxTQyPLTf8MerhCTlTw4rFRscBXOWh//qip8JuhHge53HzRdX 3C+j96TC1VtPv1+B8/BXK0XFnoyNxHcnoEeX46XyVb3/ht5/MhOwT+6DOX+DgineJ3ZpNbZw/Zp gcmmfo8nc9WRodrUTiDEuViH99h5vIooVg0rqEJKngiASXxjdRR2Xqs2L8UcwtLI= X-Google-Smtp-Source: ABdhPJwu3/LcvQRCwGcFU8Y98eoplhhZrtjV36kZ4xJHl9CqJxBR1SM74FtPXl/jI9pWCCVY1jPKuA== X-Received: by 2002:a63:ff66:: with SMTP id s38mr6083018pgk.154.1619813427278; Fri, 30 Apr 2021 13:10:27 -0700 (PDT) Received: from u099.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j12sm3430587pfc.17.2021.04.30.13.10.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 13:10:26 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Ajit Khaparde Date: Fri, 30 Apr 2021 13:14:13 -0700 Message-Id: <1619813653-5161-5-git-send-email-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> References: <1619813653-5161-1-git-send-email-ajit.khaparde@broadcom.com> X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-dev] [PATCH 4/4] net/bnxt: fix ring count calculation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fix ring count calculation for Thor. VNIC count does not have a direct bearing on the number of rings that can be used. Fixes: fe8dd26f86c78 ("net/bnxt: cap max Rx rings for Thor") Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index bd2dec4..013e291 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -836,7 +836,6 @@ struct bnxt { static inline uint16_t bnxt_max_rings(struct bnxt *bp) { - struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf; uint16_t max_tx_rings = bp->max_tx_rings; uint16_t max_rx_rings = bp->max_rx_rings; uint16_t max_cp_rings = bp->max_cp_rings; @@ -854,17 +853,12 @@ inline uint16_t bnxt_max_rings(struct bnxt *bp) bp->max_stat_ctx / 2U); } - if (BNXT_CHIP_P5(bp)) { - /* RSS table size in Thor is 512. - * Cap max Rx rings to the same value for RSS. - * For non-RSS case cap it to the max VNIC count. - */ - if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) - max_rx_rings = RTE_MIN(max_rx_rings, - BNXT_RSS_TBL_SIZE_P5); - else - max_rx_rings = RTE_MIN(max_rx_rings, bp->max_vnics); - } + /* + * RSS table size in Thor is 512. + * Cap max Rx rings to the same value for RSS. + */ + if (BNXT_CHIP_P5(bp)) + max_rx_rings = RTE_MIN(max_rx_rings, BNXT_RSS_TBL_SIZE_P5); max_tx_rings = RTE_MIN(max_tx_rings, max_rx_rings); if (max_cp_rings > BNXT_NUM_ASYNC_CPR(bp))