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 D434845610 for ; Fri, 12 Jul 2024 12:49:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC962402E5; Fri, 12 Jul 2024 12:49:36 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2041.outbound.protection.outlook.com [40.107.94.41]) by mails.dpdk.org (Postfix) with ESMTP id 2061A40261 for ; Fri, 12 Jul 2024 12:49:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QRZgk7yCoxbMq1GqQH0hJy6wY/BBro5wcxpitGwrIWAp8z1Sr2npcBCUm+ri3gtP+O9QwErZp5nNhnk0TpBhdao2AL8Spais4VaBBi66OilEJnCdMzm7MDTZIUjKicIh/Whls+Pj1vNUme/5EnTBnTZKbqGgqkOqxBWG+kYmFkgun78/sae6/tSELYOMdKi/OSIgXwwl5/7aNcShbBTCA9AFXWOlmo1NsHNXh2ucNZDO00T4/ivxfuF+IzxNYDi54Bmn1tIWQqGqXwowFF2mHvLvxEXodFSTYhOY2V81qTa3Wv+lv3ZNGY+/ij5oisIdSl8wKeRVftjrj0z6Iy/0yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=DIOTrqj6Qx38/pHy75PlVhS3UGfeSmPHUheSnI26lF0=; b=F+cq2C+C/ZB0+G4KeBOTWrHG9k/5bPHnxTuC/+gwLjeZF+Kylet1fY1NZfZF/ph+SV8yRaVsDP2aIHkFLBvpGGz1dwxR0GbhFdyXZZ+H2dLOZ150e4lrEJMFmmeXkTE2OeE6Ag+q38x4ELfjJh70e+LwghYdfCFr5X4nO/kIZFD1oiidW9D3NH6Iyv7U19YklU5y9MOV5mZcXp4W1KObx8vOvTCTXMyIb5bGbVM4AxjkLLRV+ruxpSdCHyALSR6o/AC2h8ksRoo9KEa0F9rMMb20+bdE3iC3x43tldnwq2xgkS+JeiFLsHGozOvGtWapNRR3hcuIPQOl69e0X8kPhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=amd.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=DIOTrqj6Qx38/pHy75PlVhS3UGfeSmPHUheSnI26lF0=; b=eZDuPay4hamaFs25gLWYoL11fTSN2BGuQG6mZ04CHrOkGYZje9WFFw8Wo0g3uitG4vvtdHvliMlaa6oNq0zmMUM9SBWwwtxVZtVNsgw4t/wA9oWpAUD0BpXSSbUn/9xxP7YMzsCzvPqAZpVKc85wWAMeFQBWs5Oz/N1+1DbwoXXLXwGB08GnLI0jT9sMPAJgLoqFGDrzpLny+EHvJ4x4y0FSgXUz7qWxTg/LpYcLj0A9b0bbegUl907l3+yWqJ9dyZ63yeT8gv7kaM/xc2ApgYXodNv4DMdbJCEvvWOnWjfSoAHI372S2T+X3enOHvj7c6RJYIxkbny+rxjAgUnKaA== Received: from DM6PR11CA0020.namprd11.prod.outlook.com (2603:10b6:5:190::33) by IA0PR12MB8086.namprd12.prod.outlook.com (2603:10b6:208:403::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22; Fri, 12 Jul 2024 10:49:31 +0000 Received: from DS1PEPF0001709B.namprd05.prod.outlook.com (2603:10b6:5:190:cafe::c7) by DM6PR11CA0020.outlook.office365.com (2603:10b6:5:190::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:49:31 +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 DS1PEPF0001709B.mail.protection.outlook.com (10.167.18.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:49:31 +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.1544.4; Fri, 12 Jul 2024 03:49:20 -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.1544.4; Fri, 12 Jul 2024 03:49:18 -0700 From: Xueming Li To: Venkat Kumar Ande CC: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: fix Tx flow on 30H HW' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:25 +0800 Message-ID: <20240712104528.308638-40-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709B:EE_|IA0PR12MB8086:EE_ X-MS-Office365-Filtering-Correlation-Id: 448114ab-3d40-42dd-b4cb-08dca2604fa6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+fvuPhvRz3Lo6rATcbf4KegPFST3/nlzm9z9+G+HWkkYgWR7f5ZfMMwDRjXU?= =?us-ascii?Q?ROiEyWsxkdsiDayi6ABO93G+z+fCM00XbFVwogO+WB/+9334qxSK7+ut+pVJ?= =?us-ascii?Q?cBzKTBFOxnTUAK0+JBwqg10E1pEl1LUZzN4s3Nx1woJOlVWHUfLN+6Yo2F95?= =?us-ascii?Q?fLGz9hL3P90HlalksH3SEjqNiStrnNuCTX7katWCgy281j51jvlHOxfLhMlJ?= =?us-ascii?Q?TpXn2DmROddvXzn26epjox6v3capbtmtdmCMsBl3e2PXTuDY2M+7tAPRD2lN?= =?us-ascii?Q?rgSYU+4NxfOefJ6JtnfkGRRzZvbz0mWMoR7vGo42PC0kU0Lk0KysdW6gKFdw?= =?us-ascii?Q?3joRFUp9VF64ZiFFil9k8wDA8rPbYuEaxoGVszI9VwFZKcVB7VWU3bBpx4WL?= =?us-ascii?Q?ooX+JKeEutRL8ehyNazqggvki4vmqY5xgfi4cfa2xjhRpawrTIEZHDQrnoy0?= =?us-ascii?Q?KwUCtKTu1qqQL2TwlFoLe1zuDapkNtv42yzOlvzZDUw0LEt6RPwHRk6FRKm5?= =?us-ascii?Q?nadGcdfo/dNSCPUSbMsL/mNLQZKF6VH/ilP2UhVvpL3+09o72m5S4hUg7PN2?= =?us-ascii?Q?rWk3Amr5VeZepN2RZTrusE1T8R/6smNk0dQEFHBYn4Dp6AtxgSiSLCEhdJmM?= =?us-ascii?Q?PmylQJ5x0nUmGgS00y0Yxi2vOt6+C1svixp5oXiCaZA/dP4BhQs95MvynxfC?= =?us-ascii?Q?5l1qQUokA6u/yi4lcBo955+oHbdAL9k866qNyfyKFp01qN4cIdDhetlu6BhY?= =?us-ascii?Q?dfzbYTccPBzay5Gso2oSQ2I0TNukwkie/E/Ob4DPM0UeM15QywtOdI0zi3C4?= =?us-ascii?Q?2EttbJuypun+QlJpsWdmzOSeAQyCr+TwFbsaWXr6PfvzZ6QkL74YBimTKa1e?= =?us-ascii?Q?05v3CZQC7nms93q2ff7+0cw8CLBuuC6Djvu0/zrht2iAVgP0itOHKLaHJN6f?= =?us-ascii?Q?0AU6QDmE5hieLwP7MWvHyTih+VRv+n2T5tRmxxMRnzFUE+n22a2IxRSFHNuu?= =?us-ascii?Q?JyynDrggweUh6uJqswPsgwNNV4ickVW/Uj7QT45CB0y7STv36TEeQtiDHpoV?= =?us-ascii?Q?1YVfSNBFfk/Epkoe1Ee55IfckCJCIiuGmhzGAz+rsuDIa6YNnxgyhsILw5Np?= =?us-ascii?Q?qdH2EGoBmwhVbyzIYLMgEbig04oIqpVXlzTHbB/ajNcXuAy12DAymbrcnPhw?= =?us-ascii?Q?dqKY5VicPeiD7GSGoIWp1ZG7yaceLm7xL/9TUdSwIMw93w19RGvycyV8Afk9?= =?us-ascii?Q?kVUwQtvQTHp3b556gZ7VJXQHpLLHOFx3gi1X+jsI1XpIqCoPiwETuvuqi8Y/?= =?us-ascii?Q?p575RJpYNS/EjfB+0vNtpX+cGm9LGewnUiJAf/zLixl+E4zkLXKUvCTsZvdU?= =?us-ascii?Q?LMKiiJ3NSoON/fA9Cmv0GqbplzaFwdf5g1OykaJsfLBDPv6mLN8Zc1DzkJqB?= =?us-ascii?Q?Hc1lMR0ZA2+XkaxxVFEYPXBDkbeNoH7K?= 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:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:49:31.5403 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 448114ab-3d40-42dd-b4cb-08dca2604fa6 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: DS1PEPF0001709B.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8086 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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=ce55cf69f25e11b287f188332420481654d02441 Thanks. Xueming Li --- >From ce55cf69f25e11b287f188332420481654d02441 Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:43 +0530 Subject: [PATCH] net/axgbe: fix Tx flow on 30H HW Cc: Xueming Li [ upstream commit b4b24f3e80f9b1bd2c56e1b56b8b8337748e15e6 ] There is difference in the TX Flow Control registers (TFCR) between the revisions of the hardware. The older revisions of hardware used to have single register per queue. Whereas, the newer revision of hardware (from ver 30H onwards) have one register per priority. Without the fix the user will face problem in TX operation on new 30H HW Fixes: 7c4158a5b592 ("net/axgbe: add DMA programming and start/stop") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- drivers/net/axgbe/axgbe_dev.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 9b0073eea6..5233633a53 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -269,20 +269,28 @@ static int axgbe_set_speed(struct axgbe_port *pdata, int speed) return 0; } +static unsigned int axgbe_get_fc_queue_count(struct axgbe_port *pdata) +{ + unsigned int max_q_count = AXGMAC_MAX_FLOW_CONTROL_QUEUES; + + /* From MAC ver 30H the TFCR is per priority, instead of per queue */ + if (AXGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER) >= 0x30) + return max_q_count; + else + return (RTE_MIN(pdata->tx_q_count, max_q_count)); +} + static int axgbe_disable_tx_flow_control(struct axgbe_port *pdata) { - unsigned int max_q_count, q_count; unsigned int reg, reg_val; - unsigned int i; + unsigned int i, q_count; /* Clear MTL flow control */ for (i = 0; i < pdata->rx_q_count; i++) AXGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, EHFC, 0); /* Clear MAC flow control */ - max_q_count = AXGMAC_MAX_FLOW_CONTROL_QUEUES; - q_count = RTE_MIN(pdata->tx_q_count, - max_q_count); + q_count = axgbe_get_fc_queue_count(pdata); reg = MAC_Q0TFCR; for (i = 0; i < q_count; i++) { reg_val = AXGMAC_IOREAD(pdata, reg); @@ -297,9 +305,8 @@ static int axgbe_disable_tx_flow_control(struct axgbe_port *pdata) static int axgbe_enable_tx_flow_control(struct axgbe_port *pdata) { - unsigned int max_q_count, q_count; unsigned int reg, reg_val; - unsigned int i; + unsigned int i, q_count; /* Set MTL flow control */ for (i = 0; i < pdata->rx_q_count; i++) { @@ -316,9 +323,7 @@ static int axgbe_enable_tx_flow_control(struct axgbe_port *pdata) } /* Set MAC flow control */ - max_q_count = AXGMAC_MAX_FLOW_CONTROL_QUEUES; - q_count = RTE_MIN(pdata->tx_q_count, - max_q_count); + q_count = axgbe_get_fc_queue_count(pdata); reg = MAC_Q0TFCR; for (i = 0; i < q_count; i++) { reg_val = AXGMAC_IOREAD(pdata, reg); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.923797209 +0800 +++ 0039-net-axgbe-fix-Tx-flow-on-30H-HW.patch 2024-07-12 18:40:14.016594238 +0800 @@ -1 +1 @@ -From b4b24f3e80f9b1bd2c56e1b56b8b8337748e15e6 Mon Sep 17 00:00:00 2001 +From ce55cf69f25e11b287f188332420481654d02441 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b4b24f3e80f9b1bd2c56e1b56b8b8337748e15e6 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org