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 AE922A0093 for ; Tue, 19 May 2020 15:16:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A17D21D95F; Tue, 19 May 2020 15:16:31 +0200 (CEST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by dpdk.org (Postfix) with ESMTP id 4FBF01D96D for ; Tue, 19 May 2020 15:16:30 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id v12so15812712wrp.12 for ; Tue, 19 May 2020 06:16:30 -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=RPvDACpsKlB2jXBdCcBe0yoRsTge2b039YdQ9qytAm4=; b=dST/qfyPADLlOFbIQxgpxjo4ppCVytkXXRm+HPUE5UO72g7R+KkPG7aD6w802dQR6s iD3SNGn2w7LwTebqfBEkCOqvWVR0Fyex0A1rSuQA+6q7ImZJdbyaqYjyl6qnePXEe2C3 T8/MWbYO3ltGJDuYbvQHer5k6hMI6rOawbLTKBgMsDTsZkwftcVfcpQCxXorlhwkONPB 9cOy8fHXIn+CRY3PXC9uBag1rR3UIQwqdzDySkXpA0gWRWh5ARHJwbBYYu4mtKC0iYAi ae5zZCBT1RHbxclhr7mrUVYkjqOEEdfuRZnFhFWXdnnp+WItGlKQ0LvHR4QG1YegQmwr 7PFw== 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=RPvDACpsKlB2jXBdCcBe0yoRsTge2b039YdQ9qytAm4=; b=LuOlaM86jSyzsFUl/ZY6jB8OhS8MmBbcFW5LLzZ2t2IRU9O+FbkZbny3t0XgG8Qr+K k80efFR+5KZ6yyZsTZYWzHyuWTK0ryBLlZCEt7gpjmK4nw5L6eL9VN+fzqQGraN2Qh+h OB7+7JqUjcWTZEMYg1U1XjpQC8XmSGEwCM9g5c0UjK/8CfThP5REL1YrK26hP6WDnIEa DGvfIihwrQZfhoNnDrGAQiVnSg+7SBOB9CezRIRTSkHhF+PcHQ12Y+x1xnNwFsxOSIli aqGg22EvOadwT0xJk0JQkXBkXWGH9pvMsUQMjYfgSYVBgIfWgeXf+018gONpy7QxlZ/q FZnA== X-Gm-Message-State: AOAM533zvaw5KrTDn68kvB7j9b/ygtxsitO56p5EaRkAFp97ff08OAsb ++zp5Z93f7FU/YsiVGLAdOg= X-Google-Smtp-Source: ABdhPJzCCm4fQay0SD1IZF8WeBKSD73hFIe33wU8Wpo/uAMPmo9d2Jqq0vilBqUnpoTnXuYJe22yrA== X-Received: by 2002:a5d:4911:: with SMTP id x17mr25381781wrq.160.1589894190036; Tue, 19 May 2020 06:16:30 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i74sm20998557wri.49.2020.05.19.06.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:16:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: dpdk stable Date: Tue, 19 May 2020 14:05:38 +0100 Message-Id: <20200519130549.112823-203-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'Revert "net/bnxt: fix TQM ring context memory size"' has been queued to stable release 19.11.3 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 stable release 19.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 05/21/20. 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. Thanks. Luca Boccassi --- >From ee4518a2de30bd5b4c7533676805132862ce8578 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 12 May 2020 15:14:29 +0100 Subject: [PATCH] Revert "net/bnxt: fix TQM ring context memory size" This reverts commit a120aef7b2bebb2811ce18b27318b15289a539e9. --- drivers/net/bnxt/bnxt_ethdev.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index c1e5dfa936..30d82d1d36 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4430,7 +4430,6 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp) struct bnxt_ctx_pg_info *ctx_pg; struct bnxt_ctx_mem_info *ctx; uint32_t mem_size, ena, entries; - uint32_t entries_sp, min; int i, rc; rc = bnxt_hwrm_func_backing_store_qcaps(bp); @@ -4478,20 +4477,15 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp) if (rc) return rc; - min = ctx->tqm_min_entries_per_ring; - - entries_sp = ctx->qp_max_l2_entries + - ctx->vnic_max_vnic_entries + - 2 * ctx->qp_min_qp1_entries + min; - entries_sp = bnxt_roundup(entries_sp, ctx->tqm_entries_multiple); - - entries = ctx->qp_max_l2_entries + ctx->qp_min_qp1_entries; + entries = ctx->qp_max_l2_entries + + ctx->vnic_max_vnic_entries + + ctx->tqm_min_entries_per_ring; entries = bnxt_roundup(entries, ctx->tqm_entries_multiple); - entries = clamp_t(uint32_t, entries, min, + entries = clamp_t(uint32_t, entries, ctx->tqm_min_entries_per_ring, ctx->tqm_max_entries_per_ring); for (i = 0, ena = 0; i < ctx->tqm_fp_rings_count + 1; i++) { ctx_pg = ctx->tqm_mem[i]; - ctx_pg->entries = i ? entries : entries_sp; + ctx_pg->entries = entries; mem_size = ctx->tqm_entry_size * ctx_pg->entries; rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "tqm_mem", i); if (rc) -- 2.20.1