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 52CA843E57 for ; Sat, 13 Apr 2024 14:53:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E211406B8; Sat, 13 Apr 2024 14:53:26 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2079.outbound.protection.outlook.com [40.107.92.79]) by mails.dpdk.org (Postfix) with ESMTP id 601634068E for ; Sat, 13 Apr 2024 14:53:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mJ7CPxNBOGfgHzn7TF7bYW9nt04JRpj/1WfLm0CVZcxpRs+SLsLGje91GK+gVPjeT+0xaJzBhrTm8B3VxaOidqeQcx1WuG5m59+Qx3UnphBNcbRnlVdR2pg9+9aQG2l+iOhBpz3VGLesre7GW3r/m7JAoIowCd6/7U8aonGZK1h11VEgMqWonlJy2pp8BDtlFzGgRS9EnrhuSFAj7pylApLBPekM/43VEwvSsphEQPwqNSxE77Rqc+sqCbkVNkg5xQFa+n6opGkrvT4xcTVIkbvuGpcFWC0sLo4aG/sy8GCQdVTizQqY6QgZ1jCRr2iLpxsHT12HUdoQ+2le9xINSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sUQo8Gn2o9qPPudWzK29deN4DODhYBB1Zv10l3j7Mao=; b=KhBd/U92olhYa+08LDPQgh5Sj14W+jIBBYxUisu1vqgjtNSi1Chl6BmK8FX92/PiUd7cySLPvsz4WW7z9IgXIxef41JVZMQvrbA69kPMfd5c4s13HMoL0Zk4fSPWhkvgptZ4QC7YGgvJcfKFNNYctk5EaRJITw7rhVuDwosckdihWbwa+v5ssAVFEY0eA/lHFoUM4gijhh8UJ/yYnvs8/dfvcTFHMenTK+vTNuwQC4GW8ctHpVn6hZPUgE8pELFIkbWu3MBtvRqCXsDKrM9HaB5jlJcG/ifHyGWtXiKecrVNFsMmTq+OvPeChXcRMGW7W7SBre/Eg6H26nprASR30A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sUQo8Gn2o9qPPudWzK29deN4DODhYBB1Zv10l3j7Mao=; b=XBR21PqG7LbWzOUt++PCnFk5+xyO4Y4RVdgpOv6JpsXC26Uo6RHAfPdob3IE7kXjgx7T0ntZH5AYqYmrQNIZvNHFAPKT/dTZVJcMeyR9sNuqxMMouJ7wav8AY4fTGy3gXE3K5bRh8O5P7BnEa5l0epQwZQDIX2q40B6TvsNt+ZZXwYjtCbP9WocJ+xRKzPCPXNAZTpJXfkQFlKICXiyIrS9yVSbPH64QXzSaHRR0eKSLiGWGot4B8Yb9bY9gLQR/Pa/CjbbHLZ/9j4S5+a+2t9U8j2GlmVqvkJQfmqPvWmyjW95Q+3y2EAFqt7AQDXOv3LUWKe23ID+9lfmZUKf/Rg== Received: from DS7PR03CA0124.namprd03.prod.outlook.com (2603:10b6:5:3b4::9) by MW4PR12MB6851.namprd12.prod.outlook.com (2603:10b6:303:20b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:53:19 +0000 Received: from DS3PEPF0000C37C.namprd04.prod.outlook.com (2603:10b6:5:3b4:cafe::2) by DS7PR03CA0124.outlook.office365.com (2603:10b6:5:3b4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.28 via Frontend Transport; Sat, 13 Apr 2024 12:53:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF0000C37C.mail.protection.outlook.com (10.167.23.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:53:18 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:53:08 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 05:53:07 -0700 From: Xueming Li To: Nithin Dabilpuram CC: dpdk stable Subject: patch 'common/cnxk: fix Tx MTU configuration' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:33 +0800 Message-ID: <20240413125005.725659-33-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C37C:EE_|MW4PR12MB6851:EE_ X-MS-Office365-Filtering-Correlation-Id: cd173a99-53b1-4092-2d1e-08dc5bb8b199 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kJD/QtH0YD3r/IKJdu1bWU+yykO/7/AooMcNwI0V0P1EosrSVIVJRGi2lerI5Aj4GBC4pgDnKmOAq5DZibxyapGf8+jcnukNlC3AohzEK8CcYdzq5OjWjSWVOzJdG7oh0iLMrxgzZ2ghjiUvDy/v6naqhS9H4uTbjjt+LebSty3MISrXuZiaONi7Mx4WwaUL3I2f4RjmgWnVPbU0zuu94xiPueBw/foPYk8/SUkvT4bqnchCwDlMlWwoSuNa6WuXKByMAzvaQsuEzoZ2mp8kDbLFWfI9TOW7TiNTzqx5y/hFWzWu35EuMuX6eZzKJeY56+4UaUBK6LF/i6kGpW+pQRI+QvowccosBVPOp5NpFm1bKTwn3ryV9MGvJ9hQvatrdFCrsfS9kWGD8y7tHkFhfC2Cmd5pD4CEntLSFYhZNqyfS449IXohsjT0bE5IxVXkNajNuuKR0a9X6DVnfhlJas+N5ovoa4BeRZq+oDFrtdmglkDlzVg4HfWDNzbc7l1vZsE+msMBKLGON3Lu7pNk+YUZpk3p9VAHj4BEkxrGa+nk6ZUaXvhbCuTTkPIoIXP/siVc+EYeADkM21bK0TgR35ywLrjW629vuNki+uOMLswKhfpGFCMRQv2VCGqOrxp1oKAZvWOrf+BeTyQV+cj6Facc57RbSlgNwIZ/WaHyNGPjkKYXS5PZKag2nzHpou/gPu96BFdCUZYbqRsdW+PXijqL7LniCGZ1mVstUKH9wMDw08HP2eKRo2eYZLjJpQdu X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(376005)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:53:18.9921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd173a99-53b1-4092-2d1e-08dc5bb8b199 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C37C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6851 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=3e73021b35d56bd1f17648047fa2abd439d653bf Thanks. Xueming Li --- >From 3e73021b35d56bd1f17648047fa2abd439d653bf 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 Cc: Xueming Li [ 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 f64933a1d9..afbc3eb901 100644 --- a/drivers/common/cnxk/roc_nix.c +++ b/drivers/common/cnxk/roc_nix.c @@ -482,7 +482,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); nix->dmac_flt_idx = -1; /* Register error and ras interrupts */ diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h index acdd1c4cbc..250d710c07 100644 --- a/drivers/common/cnxk/roc_nix.h +++ b/drivers/common/cnxk/roc_nix.h @@ -267,8 +267,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 ec72c32826..2fdad8b4b6 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -610,19 +610,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.120148366 +0800 +++ 0033-common-cnxk-fix-Tx-MTU-configuration.patch 2024-04-13 20:43:04.947753997 +0800 @@ -1 +1 @@ -From cc9f534f60815d858b946062cb1d9701c91b9b58 Mon Sep 17 00:00:00 2001 +From 3e73021b35d56bd1f17648047fa2abd439d653bf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cc9f534f60815d858b946062cb1d9701c91b9b58 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 97c0ae3e25..90ccb260fb 100644 +index f64933a1d9..afbc3eb901 100644 @@ -25 +27 @@ -@@ -484,7 +484,7 @@ skip_dev_init: +@@ -482,7 +482,7 @@ skip_dev_init: @@ -35 +37 @@ -index 2a198de458..4db71544f0 100644 +index acdd1c4cbc..250d710c07 100644 @@ -48 +50 @@ -index e816884d47..4962f3bced 100644 +index ec72c32826..2fdad8b4b6 100644