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 2303543CAD for ; Thu, 14 Mar 2024 01:11:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D0F442E64; Thu, 14 Mar 2024 01:11:29 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 1237642E62 for ; Thu, 14 Mar 2024 01:11:28 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-33e672e10cfso194682f8f.0 for ; Wed, 13 Mar 2024 17:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375088; x=1710979888; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/YPbdEXFQWyhcfzZB254CBN8GxlhUoOHNPbu+KRS3Gk=; b=fwMnSLs6o6+wRQkFz3tlxCc9kxHgU0hbfSp2/exEXts0guW0Nb2YkMcVHKFefz00GF WXeWkrdBFGvHgJY6hWCDfaIWZi2uQvo7K5AQdvwKgAusPlU/hapIDkhAc2ngpQJROJgN dQ6MYx6UGUh7kyWr+ypZScISMMuLmdSiNGyDc4VDjfReIWdtngF8FCVtyc70Au6iQdVV 1PGAzks9OwXSm+r1BBbaFQYYyUNHQPsNbMrW6Wmzpfnil6dvnyOZY9VY2pqmPX4bl7U8 M7ZFYFaf4BqJlpU4BsQpNvMARD+Ti5QM+ze7+Oyr6CZSAtJ3v6DtZxNlPlSy1bK5Mur2 ejkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375088; x=1710979888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/YPbdEXFQWyhcfzZB254CBN8GxlhUoOHNPbu+KRS3Gk=; b=mZTi38klCo9+6LrnIpmCTzi+yp5Scy91GikDt55uoqDWFH3ZwDFTVWzjWTsWkL3TtL eHe4sP6Ik76ohq4tnAhaWRPzv+oIz9V0Nx9lzZW1ko4+9wtBZWEjNwAEfXc+8KDIVA1z oP8uVtNDNcqTXN0lVmIJ+A1JBPtjtY/vNM0F52PA1w+5nJO+4SZy7p9CAlmt1++E7bLo KLBMTcNDrL+HM49yxbeiIcZ53OWQnwXfeG8BmL188NvacgiZaj1lvhrCbdCIJnrUHHOq gSkvPjivOtYliHz+jzzQJRJmynuyDjgvSQbKk4/GX4sFk0AUe5F3WrB8VZRuHkn1SYJu 6N2g== X-Gm-Message-State: AOJu0YztL4BCK+xDFR+J8hLcU68O1qnusopIFPGlya2mKhnFkwx8Oj7o moePJrL5MLcA3ZGYZjfWOjklAy9eEaLoRpaAFj8CXtF22SxLC9YigEpQDTlZ X-Google-Smtp-Source: AGHT+IGw3yPNr4DkPvo7ymie0+KfEjJ8CTcBJlAGkVcd2i6Y4/F9t0OywUb1wA/N5+0qOXt+d1iQjg== X-Received: by 2002:adf:b34d:0:b0:33d:5e4d:51c0 with SMTP id k13-20020adfb34d000000b0033d5e4d51c0mr88641wrd.25.1710375087568; Wed, 13 Mar 2024 17:11:27 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id l9-20020a5d5609000000b0033e7eba040dsm281392wrv.97.2024.03.13.17.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Nithin Dabilpuram Cc: dpdk stable Subject: patch 'common/cnxk: fix Tx MTU configuration' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:25 +0000 Message-Id: <20240314000957.2810803-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.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 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/24. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/edf3fc5d23dbf1be447fe71d5c5274977ceb19a1 Thanks. Luca Boccassi --- >From edf3fc5d23dbf1be447fe71d5c5274977ceb19a1 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Mon, 26 Feb 2024 19:05:29 +0530 Subject: [PATCH] common/cnxk: fix Tx MTU configuration [ upstream commit cc9f534f60815d858b946062cb1d9701c91b9b58 ] Skip setting Tx MTU separately as now the Tx credit configuration is based on max MTU possible for that link. Also, initialize MTU with max value for that port. Fixes: 8589ec212e80 ("net/cnxk: support MTU set") Signed-off-by: Nithin Dabilpuram --- drivers/common/cnxk/roc_nix.c | 2 +- drivers/common/cnxk/roc_nix.h | 2 -- drivers/net/cnxk/cnxk_ethdev_ops.c | 12 +----------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/common/cnxk/roc_nix.c b/drivers/common/cnxk/roc_nix.c index 2a320cc291..b5c87e8056 100644 --- a/drivers/common/cnxk/roc_nix.c +++ b/drivers/common/cnxk/roc_nix.c @@ -426,7 +426,7 @@ skip_dev_init: sdp_lbk_id_update(pci_dev, nix); nix->pci_dev = pci_dev; nix->reta_sz = reta_sz; - nix->mtu = ROC_NIX_DEFAULT_HW_FRS; + nix->mtu = roc_nix_max_pkt_len(roc_nix); /* Always start with full FC for LBK */ if (nix->lbk_link) { diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h index 6654a2df78..1125fff020 100644 --- a/drivers/common/cnxk/roc_nix.h +++ b/drivers/common/cnxk/roc_nix.h @@ -236,8 +236,6 @@ struct roc_nix_eeprom_info { #define ROC_NIX_RSS_KEY_LEN 48 /* 352 Bits */ #define ROC_NIX_RSS_MCAM_IDX_DEFAULT (-1) -#define ROC_NIX_DEFAULT_HW_FRS 1514 - #define ROC_NIX_VWQE_MAX_SIZE_LOG2 11 #define ROC_NIX_VWQE_MIN_SIZE_LOG2 2 diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index 8008f5e4f3..c13ef26c5d 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -574,19 +574,9 @@ skip_buffsz_check: frame_size -= RTE_ETHER_CRC_LEN; - /* Update mtu on Tx */ - rc = roc_nix_mac_mtu_set(nix, frame_size); - if (rc) { - plt_err("Failed to set MTU, rc=%d", rc); - goto exit; - } - - /* Sync same frame size on Rx */ + /* Set frame size on Rx */ rc = roc_nix_mac_max_rx_len_set(nix, frame_size); if (rc) { - /* Rollback to older mtu */ - roc_nix_mac_mtu_set(nix, - old_frame_size - RTE_ETHER_CRC_LEN); plt_err("Failed to max Rx frame length, rc=%d", rc); goto exit; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.060850014 +0000 +++ 0029-common-cnxk-fix-Tx-MTU-configuration.patch 2024-03-14 00:09:20.613615221 +0000 @@ -1 +1 @@ -From cc9f534f60815d858b946062cb1d9701c91b9b58 Mon Sep 17 00:00:00 2001 +From edf3fc5d23dbf1be447fe71d5c5274977ceb19a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cc9f534f60815d858b946062cb1d9701c91b9b58 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 97c0ae3e25..90ccb260fb 100644 +index 2a320cc291..b5c87e8056 100644 @@ -25 +26 @@ -@@ -484,7 +484,7 @@ skip_dev_init: +@@ -426,7 +426,7 @@ skip_dev_init: @@ -31 +31,0 @@ - nix->dmac_flt_idx = -1; @@ -33 +33,2 @@ - /* Register error and ras interrupts */ + /* Always start with full FC for LBK */ + if (nix->lbk_link) { @@ -35 +36 @@ -index 2a198de458..4db71544f0 100644 +index 6654a2df78..1125fff020 100644 @@ -38 +39 @@ -@@ -267,8 +267,6 @@ struct roc_nix_eeprom_info { +@@ -236,8 +236,6 @@ struct roc_nix_eeprom_info { @@ -48 +49 @@ -index e816884d47..4962f3bced 100644 +index 8008f5e4f3..c13ef26c5d 100644 @@ -51 +52 @@ -@@ -610,19 +610,9 @@ skip_buffsz_check: +@@ -574,19 +574,9 @@ skip_buffsz_check: