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 E620DA0093 for ; Tue, 19 May 2020 15:16:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CED871D982; Tue, 19 May 2020 15:16:33 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id EBAF61D96D for ; Tue, 19 May 2020 15:16:32 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id h4so3013400wmb.4 for ; Tue, 19 May 2020 06:16:32 -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=AYY6eLshgzgN5fjAFjIUj5y+AddlzxhPcwE0uEfiajY=; b=HYkeDf4X81a9x1oAceTQvjoGBcmthhxZjp1eB5bOttfYkRUeC9kKLTCUorLXVxQr+g br6hwcR6cwxhz11vFT1hwSmlYG3LDXmkcxRckM2i/2Os0RL14uUsGXt8nbdI50aS9o0A RCT+hlzOkc8d3pMNKKifTWBxHOobCVx85byPmM6Y0JOlgUvA8FvehD40VOx+7gye2mA2 PcaGrGhwK2i0fh32ApKAK2gOyF1vBJAM3A8s+r8Mqfjg60OHMvY5tu4yP7NFCLLKSxMe UwbrnnG2lI+jvS4GpTbTtZIdX6PVdIk8+2kKT36eX7GWd8CQGJb13XWlr+B1zbmMPLJw ea4Q== 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=AYY6eLshgzgN5fjAFjIUj5y+AddlzxhPcwE0uEfiajY=; b=cJgmxuljpTOOD4nTYGbwNm6iaGhacmWY9XbdrC+winfV2r+hLApKGDxrdOp/YkQIi8 3n4JwJI5awUNlPEYpt/EEAXKyGh0DAN29a5vwH2fYllmXrx+Vax8vIaan+tPzaEg/tXZ ULt7YOBhuiCL/1jUj8AEPxgjZWGl3SWSI3oX1ZLPH7W3LjnlI9QItIvmP7c4kaRxDySM p5Hbe9rSK3Sf6L1d8FxuK9QVKtlAlmQsAuLPLo7xT8ytU8Vymw6lr8PmBSFBCZDaP5H/ GcaoXBEVtuwENhMiXxAQxuOqV7jVIR2oPHyPaS5LMhbQqzxaFjVMvd0V4xh/5/VRa/ed 1oQA== X-Gm-Message-State: AOAM533KQrgUtlcj5TzmjmZwJOSks4tEYYIPQIw9vmBthQQN5fU3iTXh MH+0LoDC1oC+FmDWmsXiWNJojVS2beRaATTT X-Google-Smtp-Source: ABdhPJwTf7MSw/uvrZ6oAjA5f8SynMfQLMU86qsStdw4zngYCWnvTTApB4/AyTh1GBuxxzZCqFz0hA== X-Received: by 2002:a7b:c939:: with SMTP id h25mr5474961wml.9.1589894191105; Tue, 19 May 2020 06:16:31 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z12sm15458042wrq.7.2020.05.19.06.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:16:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: dpdk stable Date: Tue, 19 May 2020 14:05:39 +0100 Message-Id: <20200519130549.112823-204-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 number of TQM ring"' 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 8ec53ab74558cd9d3eda676296555e40758c00bf Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 12 May 2020 15:14:30 +0100 Subject: [PATCH] Revert "net/bnxt: fix number of TQM ring" This reverts commit 6b4e89fc3db1a002ddef107a8a4028e47a8bc9e5. --- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 5 +++-- drivers/net/bnxt/bnxt_hwrm.c | 31 ++++++++++++------------------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 334eb036dc..0ef0282d2a 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -359,6 +359,7 @@ struct bnxt_coal { #define BNXT_MAX_TC 8 #define BNXT_MAX_QUEUE 8 #define BNXT_MAX_TC_Q (BNXT_MAX_TC + 1) +#define BNXT_MAX_Q (bp->max_q + 1) #define BNXT_PAGE_SHFT 12 #define BNXT_PAGE_SIZE (1 << BNXT_PAGE_SHFT) #define MAX_CTX_PAGES (BNXT_PAGE_SIZE / 8) @@ -417,7 +418,6 @@ struct bnxt_ctx_mem_info { uint16_t tim_entry_size; uint32_t tim_max_entries; uint8_t tqm_entries_multiple; - uint8_t tqm_fp_rings_count; uint32_t flags; #define BNXT_CTX_FLAG_INITED 0x01 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 30d82d1d36..4547dd1420 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4402,7 +4402,7 @@ static void bnxt_free_ctx_mem(struct bnxt *bp) rte_memzone_free(bp->ctx->vnic_mem.ring_mem.pg_tbl_mz); rte_memzone_free(bp->ctx->stat_mem.ring_mem.pg_tbl_mz); - for (i = 0; i < bp->ctx->tqm_fp_rings_count + 1; i++) { + for (i = 0; i < BNXT_MAX_Q; i++) { if (bp->ctx->tqm_mem[i]) rte_memzone_free(bp->ctx->tqm_mem[i]->ring_mem.mz); } @@ -4483,8 +4483,9 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp) entries = bnxt_roundup(entries, ctx->tqm_entries_multiple); 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++) { + for (i = 0, ena = 0; i < BNXT_MAX_Q; i++) { ctx_pg = ctx->tqm_mem[i]; + /* use min tqm entries for now. */ 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); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index af3560befa..7de5b88f0c 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -4546,7 +4546,7 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) struct bnxt_ctx_pg_info *ctx_pg; struct bnxt_ctx_mem_info *ctx; int total_alloc_len; - int rc, i, tqm_rings; + int rc, i; if (!BNXT_CHIP_THOR(bp) || bp->hwrm_spec_code < HWRM_VERSION_1_9_2 || @@ -4566,6 +4566,17 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) goto ctx_err; } + ctx_pg = rte_malloc("bnxt_ctx_pg_mem", + sizeof(*ctx_pg) * BNXT_MAX_Q, + RTE_CACHE_LINE_SIZE); + if (!ctx_pg) { + rc = -ENOMEM; + goto ctx_err; + } + for (i = 0; i < BNXT_MAX_Q; i++, ctx_pg++) + ctx->tqm_mem[i] = ctx_pg; + + bp->ctx = ctx; ctx->qp_max_entries = rte_le_to_cpu_32(resp->qp_max_entries); ctx->qp_min_qp1_entries = rte_le_to_cpu_16(resp->qp_min_qp1_entries); @@ -4601,24 +4612,6 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) ctx->mrav_entry_size = rte_le_to_cpu_16(resp->mrav_entry_size); ctx->tim_entry_size = rte_le_to_cpu_16(resp->tim_entry_size); ctx->tim_max_entries = rte_le_to_cpu_32(resp->tim_max_entries); - ctx->tqm_fp_rings_count = resp->tqm_fp_rings_count; - - if (!ctx->tqm_fp_rings_count) - ctx->tqm_fp_rings_count = bp->max_q; - - tqm_rings = ctx->tqm_fp_rings_count + 1; - - ctx_pg = rte_malloc("bnxt_ctx_pg_mem", - sizeof(*ctx_pg) * tqm_rings, - RTE_CACHE_LINE_SIZE); - if (!ctx_pg) { - rc = -ENOMEM; - goto ctx_err; - } - for (i = 0; i < tqm_rings; i++, ctx_pg++) - ctx->tqm_mem[i] = ctx_pg; - - bp->ctx = ctx; ctx_err: HWRM_UNLOCK(); return rc; -- 2.20.1