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 3183145610 for ; Fri, 12 Jul 2024 12:50:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28AF642ECA; Fri, 12 Jul 2024 12:50:02 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2078.outbound.protection.outlook.com [40.107.96.78]) by mails.dpdk.org (Postfix) with ESMTP id 7D57640261 for ; Fri, 12 Jul 2024 12:50:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d5jG0MngSI79rlfamm62Z0iDyTLXFtRlb1JOVAVsb2B07yM4gutPmR9qgQh6/GvbOuYLuvxEg4bjoA/81SR0kN2L27LLyOtjh1EFZ1aGoKZLnXlmTg9o8wexY9rwBR9qdXNCSaL0dy0SEGluNDIogBMP4mGhwMtmTVMV2y9ApLAAppUhi1n+ZP3qWI/DG7Bs3z0vEEPkFiPb+o83Jw6PdaaX8uT1lsUxjQeOsKG97plZlaPaH0JgexBRXCbkiD1Bz3GM9jqetCjETi4jJtRYFPh1EgQF4yXBWBJAj6QZkWO1mJ0O4N2hWhYll9SDBvGmkVuOmOgjxG3F95oYjTyicA== 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=fwGox14iwiqdl7CNT8pClU0C8MEDmmF4QPZI5BAUqxY=; b=xfxpBYjLrbMRycVL0YmlgzXVZG1ioldo+FzUCrgn/5D8xLvLt9KxRcY+siTFsEQTKyA/Bh8Y1l/Nvk02f6xy6nKCnMFV3MlVmuajFdrPNuLxoJIAVdJc8eGa4exi6zmrvCEzAlZB4ODeIE5pGSbT017CXsTZkqJTqUN3la02a9GKlnoqKmiR5GvEPxyuHNple+urXhMH/kNAXhY31caRgu2jP1vrOnhg29hgl8tKmrHQqoATzZVSuu+qYPyzMzPw2om5DQ/6Ib3hPlLvcsyxZlHB4T7TZVz+dNo3QoYA24GP8NLnz5+jFuLeZ46U1FYT61xsvGkXp+obrWkdkW2LCQ== 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=fwGox14iwiqdl7CNT8pClU0C8MEDmmF4QPZI5BAUqxY=; b=rcmjGBFuu+36SrNOxpaC7SPegi03rrJ7Ti9Ngxx8Hv0MPtnAsiUz++PXQ/+I32/4T0YhKa+Tvh2mBKNz8fVdahmJOyIJfB3yIEe524jn02EYsPcgPSdeU9Fss8U7ksbaiRw7Z1BwXdoBexHJSogfUS0cOIIpdK3ZZDPKmBKOm3f5VhpmsUougPTtg2lLGC9G1bBm0XIdEt00+oI3eko8xmtYLtZPtwuX7s6j9eYc5sWqiNS731Mx1s0ghL6US+PcDsioHWpXKwYcgjIuo3B1ooRcVGAcrST2GyadbFX0Ejonn8XdsksmA6Ygu19oJLUqoEGJ/kSEPZS4vsNKkCLulg== Received: from DM6PR04CA0012.namprd04.prod.outlook.com (2603:10b6:5:334::17) by PH7PR12MB7281.namprd12.prod.outlook.com (2603:10b6:510:208::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.20; Fri, 12 Jul 2024 10:49:57 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:334:cafe::89) by DM6PR04CA0012.outlook.office365.com (2603:10b6:5:334::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.24 via Frontend Transport; Fri, 12 Jul 2024 10:49:57 +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 DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) 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:56 +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:44 -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:42 -0700 From: Xueming Li To: Venkat Kumar Ande CC: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: fix linkup in PHY status' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:27 +0800 Message-ID: <20240712104528.308638-42-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: DS1PEPF00017096:EE_|PH7PR12MB7281:EE_ X-MS-Office365-Filtering-Correlation-Id: d7ce11a8-253e-4104-9e7b-08dca2605ed7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tQLZczNFDnfvgCFf5aKsuIaNmFncdzEYYBcoslTU4McTysGPTnfidJdChLNE?= =?us-ascii?Q?Q+5/+/VqH6ShNKPE2gswZV8LcX236XysI+FEzTbjGiQrWYAz12QY5f1gzrI1?= =?us-ascii?Q?sJUjdC8O/QvSIjZzP1WIDQHOpV90VZf+ax8Xl+7veRgLQs9wtZJOX2RgOqtr?= =?us-ascii?Q?ifjw0a3GcjDELjdDeNBWPfyN/zz/P75KwVzNCQ6xL2a6+i9jbF5jw5eFtHeq?= =?us-ascii?Q?CMqNcLXJ4QL+chqzAyXpVpxrTWgYcNDFUkWSVRIt7mPqDljnoC+HOIOX5l6x?= =?us-ascii?Q?qlt+k0lBcM16GaSckHZVWcOZhNmROLbd0B/bHylSOqRp67iuRAq37i1l4mX2?= =?us-ascii?Q?QviTY42yjMza3RzuHQO74gTFEK00HbchPQ9jhWzgR8fB1oSy8RM+96Q047MT?= =?us-ascii?Q?LRapRuCxOlkmTuDOXgPrzwzaw52H7wMi8P9U5Xj+xomcpO1i9HELidJ5x3eJ?= =?us-ascii?Q?pQLygMM+ceWvUTulkuAm6GKpH9Jsu0hpeIe8yv0DEuFEzV2x50YCRyuEEi5e?= =?us-ascii?Q?0O7O1E4ywyeCtnpz5PyGXR3uEDXDuYndtCro6dG9N0+7u4Vq2B8uXkhCoaxt?= =?us-ascii?Q?kn/RqS6RiyBIELF03gbFO7tL8l6UIhEspPZONondd2jGAWvdT5HX6+7D0uvP?= =?us-ascii?Q?TAL134UaahfMmIIwfionZa8OxsmnKMKYVJlokHdPU+5doPeC244ZrW8P6zfL?= =?us-ascii?Q?1bwlGMz1xbzKI80iWpU3b8zMokzBdrDThNo/UYiJBMFtvTHu9nbDsk6fLJ4V?= =?us-ascii?Q?B9xzNW6Uqq2MYL9wCo2wWInPLfVZw5GLSmrzMkiZqm0rPrcVEqGGc8FR2xCv?= =?us-ascii?Q?AoLdYmhB/H5L6GqAZPt2HTxii1LV7iT0ntjHQCRd/3oO5c9RyT16BYyDkued?= =?us-ascii?Q?KF/H5l615huJX+szdXd5XmlgEW8oFbJxBS/mRU1FlnIb7e3nnhn5GCRl9zV9?= =?us-ascii?Q?q6Q8dyLPHUaV3MNMmn1+Nx1n3DQMhgqg0fTO/rXksaKkEK+3tKpJwhcLOToV?= =?us-ascii?Q?U/ZitFC3K6lfnAAshhNOR56tcHFHPxACYBiUaPdvXmPXwh4U+mbM5dggsH28?= =?us-ascii?Q?8pDpTedDMAxLOLzEWvW2XhR96k4nY239bTOYjbHwTeaaHWoUiGVylV6Zq5QO?= =?us-ascii?Q?/GjYDLL6QlSZ3MXIUMMjYxBxkgJGo5HV5DmpaGWrWArDlfbMKPAl58sF1nT2?= =?us-ascii?Q?Z1891SxJybG9vUK41DTeoS+a4mUefRSxxWI/VkigDI4FZNBfjUvPSJdxaEq5?= =?us-ascii?Q?UMJ9PXXcwKveetMd5hUAS7MKdyGiv2Bbi4LMweMgCX94i1q7QAr/W/6KNRnB?= =?us-ascii?Q?DCVZtLjTvM2dGmJSE8if72knjOgNRUiCD7sD+Pl+L02hvnjI1qLGFUS5paUe?= =?us-ascii?Q?Vl+tVdUhlXsPB1K3luvRZU0rRPRiA1iGKs/dHVLpsR0xYLUjF/L9vOx959CD?= =?us-ascii?Q?4T8ecD98EI63mK1IRUHgUuop9lrXoaA5?= 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)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:49:56.9954 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7ce11a8-253e-4104-9e7b-08dca2605ed7 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: DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7281 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=4047efd490a76a59d4f803e354eef2a06d33700e Thanks. Xueming Li --- >From 4047efd490a76a59d4f803e354eef2a06d33700e Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:45 +0530 Subject: [PATCH] net/axgbe: fix linkup in PHY status Cc: Xueming Li [ upstream commit 50362d0e1f386563a026b314bd0a7eedcd188910 ] In the event of a change in axgbe mode, the current auto-negotiation needs to be reset and the AN cycle needs to be re-triggered. However, the current code ignores the return value of axgbe_set_mode(), leading to false information as the link is declared without checking the status register. Fix this by propagating the mode switch status information to axgbe_phy_status(). Fixes: 102b6ec3d5c3 ("net/axgbe: support auto-negotiation for 1Gbps") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- drivers/net/axgbe/axgbe_mdio.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index e1a737cf62..d95a52659e 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -200,13 +200,14 @@ static void axgbe_switch_mode(struct axgbe_port *pdata) axgbe_change_mode(pdata, pdata->phy_if.phy_impl.switch_mode(pdata)); } -static void axgbe_set_mode(struct axgbe_port *pdata, +static bool axgbe_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode) { if (mode == axgbe_cur_mode(pdata)) - return; + return false; axgbe_change_mode(pdata, mode); + return true; } static bool axgbe_use_mode(struct axgbe_port *pdata, @@ -1007,7 +1008,7 @@ static enum axgbe_mode axgbe_phy_status_aneg(struct axgbe_port *pdata) return pdata->phy_if.phy_impl.an_outcome(pdata); } -static void axgbe_phy_status_result(struct axgbe_port *pdata) +static bool axgbe_phy_status_result(struct axgbe_port *pdata) { enum axgbe_mode mode; @@ -1041,7 +1042,10 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) pdata->phy.duplex = DUPLEX_FULL; - axgbe_set_mode(pdata, mode); + if (axgbe_set_mode(pdata, mode)) + return true; + else + return false; } static int autoneg_time_out(unsigned long autoneg_start_time) @@ -1108,7 +1112,10 @@ static void axgbe_phy_status(struct axgbe_port *pdata) return; } } - axgbe_phy_status_result(pdata); + + if (axgbe_phy_status_result(pdata)) + return; + if (rte_bit_relaxed_get32(AXGBE_LINK_INIT, &pdata->dev_state)) rte_bit_relaxed_clear32(AXGBE_LINK_INIT, &pdata->dev_state); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.997488400 +0800 +++ 0041-net-axgbe-fix-linkup-in-PHY-status.patch 2024-07-12 18:40:14.016594238 +0800 @@ -1 +1 @@ -From 50362d0e1f386563a026b314bd0a7eedcd188910 Mon Sep 17 00:00:00 2001 +From 4047efd490a76a59d4f803e354eef2a06d33700e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 50362d0e1f386563a026b314bd0a7eedcd188910 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org