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 2CC62A04DB for ; Tue, 1 Dec 2020 04:25:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CC56FC9A8; Tue, 1 Dec 2020 04:25:34 +0100 (CET) Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.221.30]) by dpdk.org (Postfix) with ESMTP id A8468C954 for ; Tue, 1 Dec 2020 04:25:31 +0100 (CET) Received: from dhcp-10-123-153-22.dhcp.broadcom.net (bgccx-dev-host-lnx2.bec.broadcom.net [10.123.153.22]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 7358F7DC2 for ; Mon, 30 Nov 2020 19:25:29 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 7358F7DC2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1606793129; bh=dqhrMy8R1AuaIATIQsh/nPQoclcYFvRAw9FaRhwM7/A=; h=From:To:Subject:Date:In-Reply-To:References:From; b=BS1/owYbA9gMbCTEIyYQJa0xNzAgpZSDjObia74th07RgTtRSI55tjm0frbyUkxhM hGgy28AeQ4Z+QgbEv33FqL/9TX3N8aOmHeis8Av5A5ghAZFNC2pUbFdR5KvjIpfatk wOVqefaAxicAGEJxIuXK97c5SQsQ8rxL/COZwcts= From: Kalesh A P To: stable@dpdk.org Date: Tue, 1 Dec 2020 09:09:29 +0530 Message-Id: <20201201033930.17869-5-kalesh-anakkur.purayil@broadcom.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20201201033930.17869-1-kalesh-anakkur.purayil@broadcom.com> References: <20201201033930.17869-1-kalesh-anakkur.purayil@broadcom.com> Subject: [dpdk-stable] [PATCH 18.11 4/5] net/bnxt: fix drop enable in get Rx queue info 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" From: Kalesh AP [ upstream commit bd881e8d2a075b2dd69362176e2f8c76c88187ec ] Return correct value for rx_drop_en. Add per-queue field to track rx_drop_en configuration. Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information") Signed-off-by: Lance Richardson Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 5 ++--- drivers/net/bnxt/bnxt_rxq.c | 5 +++++ drivers/net/bnxt/bnxt_rxq.h | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index a8123d8..7fd2e3b 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -445,8 +445,7 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, .wthresh = 0, }, .rx_free_thresh = 32, - /* If no descriptors available, pkts are dropped by default */ - .rx_drop_en = 1, + .rx_drop_en = BNXT_DEFAULT_RX_DROP_EN, }; dev_info->default_txconf = (struct rte_eth_txconf) { @@ -1569,7 +1568,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->nb_desc = rxq->nb_rx_desc; qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; - qinfo->conf.rx_drop_en = 0; + qinfo->conf.rx_drop_en = rxq->drop_en; qinfo->conf.rx_deferred_start = rxq->rx_deferred_start; qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads; } diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index d1664db..7d896dd 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -323,6 +323,11 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq->nb_rx_desc = nb_desc; rxq->rx_free_thresh = rx_conf->rx_free_thresh; + if (rx_conf->rx_drop_en != BNXT_DEFAULT_RX_DROP_EN) + PMD_DRV_LOG(NOTICE, + "Per-queue config of drop-en is not supported.\n"); + rxq->drop_en = BNXT_DEFAULT_RX_DROP_EN; + PMD_DRV_LOG(DEBUG, "RX Buf MTU %d\n", eth_dev->data->mtu); rc = bnxt_init_rx_ring_struct(rxq, socket_id); diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h index 00570b8..0eb350e 100644 --- a/drivers/net/bnxt/bnxt_rxq.h +++ b/drivers/net/bnxt/bnxt_rxq.h @@ -6,6 +6,9 @@ #ifndef _BNXT_RQX_H_ #define _BNXT_RQX_H_ +/* Drop by default when receive desc is not available. */ +#define BNXT_DEFAULT_RX_DROP_EN 1 + struct bnxt; struct bnxt_rx_ring_info; struct bnxt_cp_ring_info; @@ -27,6 +30,7 @@ struct bnxt_rx_queue { uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */ uint8_t rx_deferred_start; /* not in global dev start */ uint8_t rx_started; /* RX queue is started */ + uint8_t drop_en; /* Drop when rx desc not available. */ struct bnxt *bp; int index; -- 2.10.1