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 65EACA0C3F for ; Sat, 12 Jun 2021 01:17:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FE504003F; Sat, 12 Jun 2021 01:17:55 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2040.outbound.protection.outlook.com [40.107.92.40]) by mails.dpdk.org (Postfix) with ESMTP id 5673A4003F for ; Sat, 12 Jun 2021 01:17:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hXVhjXkR0wXyUCTIhNLrXCg6d7bh5gGJr9p3vYY2opI/1WnBKRcF/cIuwgW9FevRsfP40wwhGz5b9wIkZQe7fkQbPX60XRvwXP+D237HeVwb1YdSI/vnaoC0sKcBKa9bDPk4ij9AuQRJnpbSP0fSZ4yonf7dVZRdvkUnYA2qt3gHmzY+yGhebfn9zaprnrimXCyKp89yMEoxXQzs51WQWjk9XasJUoQn6CdhQa6qRc75S5Fi3zQAo6FWne5pGkP8oCVI7fRtn6NmdgNiON9UoUcESGKiEqlratceaUEufWaw3x2B6WJct1/BFxTG8BslznHShk95UsecG7eg/CmW5A== 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-SenderADCheck; bh=FZodbqLRyPIANEQjXwRwlc+LMUpQEloYc8WE9Tm37IM=; b=j9vnGeGwTzr0B+YG5UPKDlLieXGpeKuK6G1kcRaTlTo1/1nnqhqntTfHxx4KtgzP0kIzXdrd8t8qzgG9WOf87H/Yo3sfscU7xgO/KiAaEBaubrviyupk2eDg+SQci9XBxfX7/EfVOhFRa2Xm/ZhpehHilPe4rTnM4tN8jJl1EPw2Xb3sDCnyGKFwP+SsQWYvia0Mhrhp+tGoiWxvOqihkrZpQzUaABjfn39vOxRpOvBvwOT32hYrfyY8ZWyaJ1YcHc1RfcIBjGlXMmluS8oGSIc0FY79e4kOAKcuXZqRDBSTf6JJtn5qhZaIVipfTQ82YyyTDYjI5c47kE0RF0KM/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=FZodbqLRyPIANEQjXwRwlc+LMUpQEloYc8WE9Tm37IM=; b=QBIlwpr96PMNGCOFA62ECMkSUuNLggh49AEXuWYbwgG7SVwa6UVgZW75FK6WkmO1bXcgB814yCx3ZdiWk/VSBgVt5dvtEA73Slva7WAhSts18GeEso0qtfFrYn5N8ufGTI+Z2JT75jFriNWtoPR3SOi9wwF7tFoASzuB2Ry96Yl8TtQvRWkpZK5E+3QPp84hTyN2LKbupSIHWS30G587QiIig0Dec84LJLIwXEtMaXMg84R1KktYfTBb1zwDdV/YuZ/xVA5413hcYsCgigSwBrB1iZp1gRr9rt4c4DQkGPfUq+eF4Z3v0txPYPkpi/S0SveL3285gq0+9Y0u5EoX4g== Received: from BN9PR03CA0634.namprd03.prod.outlook.com (2603:10b6:408:13b::9) by SN6PR12MB2782.namprd12.prod.outlook.com (2603:10b6:805:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20; Fri, 11 Jun 2021 23:17:52 +0000 Received: from BN8NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::7f) by BN9PR03CA0634.outlook.office365.com (2603:10b6:408:13b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:17:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT065.mail.protection.outlook.com (10.13.177.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:17:52 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:17:49 +0000 From: Xueming Li To: Alvin Zhang CC: Luca Boccassi , Junfeng Guo , dpdk stable Date: Sat, 12 Jun 2021 07:03:50 +0800 Message-ID: <20210611230433.8208-136-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00756f13-1670-4508-31d3-08d92d2f2303 X-MS-TrafficTypeDiagnostic: SN6PR12MB2782: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HfqHBnAKReskg+XrxwZg9vVVIhGjubkabpqkqanzpePfNfYY85NdNJDP/NLCND343T0er/bIbYqunj7sAQ9o4TMcsQcsRWsuzW31avkxURUj7HfKC58Yd6CG8UEsDk+jq3nFMHN1givgvnJqlfCVID2J151LZC6AHxcTzjA1+o3rhVEX/DiJDVrDE9D4O4zDO7SsB5cZyjMj/pWVdSqTjDzNYYBAkPkapvqFkBTxtmpdVyKIZhmqg0QemQrN6MoLhgokSckQEmJ1XWIH/9B+1CW7I9zSUIeDiNjmFod72g5Pps2LVu4akMV8LELm24bfQJZszSbHW66kicbW9aKh1elHG5fLMTQXaQMmiRhREbnYa3Kse4DyG2KO3iE3u2CIXQqYnEH7syUWduhFCZyXrX6VPu9VgHsfki4zLy1VNnawac+zF4GGBdYz99XI8f8evDYmlLUxao4CjIBRU1bmIfpEXg5qzOr2k8iQORKvv+UxnNyCw7rGiwTqbBVoBx6MSb3uw6RNCDPQTaYJ021z14wnaL5PauV+N1XZPJvCSb8u+vfHBYDntQb0KyDheqdsXmS8E0peNGW9FXcN+BjbrolLPz7IndIuYuhy3dJ0D66LEBLn4zlsJZ0dIK9X4wcZoXn5MuTWLJRibzZ12CdgZG+RveUW7hZWLFxDoJ3HYPEObM0e+jbDS1hMHFta3C4vC67WVzTAdAe+4XTlQdf4BJmqkwPkwJcvXEzKEGK4So3SF5jCwD7BcV/Se8djucUTtEfk3BfaTWEFGj+WPKjwrQW3Z3Xf1D+rZ5Evfrg6HZLFnWORz/nKCRpy3RS8A0Lr X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(39860400002)(396003)(36840700001)(46966006)(26005)(356005)(47076005)(36860700001)(54906003)(7636003)(36906005)(82310400003)(966005)(478600001)(4326008)(7696005)(53546011)(426003)(36756003)(336012)(55016002)(83380400001)(6666004)(86362001)(6286002)(70586007)(5660300002)(2616005)(316002)(70206006)(186003)(8676002)(8936002)(82740400003)(1076003)(16526019)(6916009)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:17:52.1901 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00756f13-1670-4508-31d3-08d92d2f2303 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2782 Subject: [dpdk-stable] patch 'net/igc: fix speed configuration' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 06/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/a83980d0798724945c4c3dda009bd6c93069e3ea Thanks. Xueming Li --- >From a83980d0798724945c4c3dda009bd6c93069e3ea Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Wed, 12 May 2021 16:28:26 +0800 Subject: [PATCH] net/igc: fix speed configuration Cc: Luca Boccassi [ upstream commit a4d5f9f9c21ba8e28de82b5107ed1b5166cefe83 ] Fixed speed mode is not supported currently, this patch removes configurations for this mode and adds fault handling for ETH_LINK_SPEED_FIXED. Fixes: 4f09bc55ac3d ("net/igc: implement device base operations") Signed-off-by: Alvin Zhang Acked-by: Junfeng Guo --- drivers/net/igc/igc_ethdev.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index 44b35d07ae..673996314b 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -989,15 +989,20 @@ eth_igc_start(struct rte_eth_dev *dev) hw->mac.autoneg = 1; } else { int num_speeds = 0; - bool autoneg = (*speeds & ETH_LINK_SPEED_FIXED) == 0; - /* Reset */ + if (*speeds & ETH_LINK_SPEED_FIXED) { + PMD_DRV_LOG(ERR, + "Force speed mode currently not supported"); + igc_dev_clear_queues(dev); + return -EINVAL; + } + hw->phy.autoneg_advertised = 0; + hw->mac.autoneg = 1; if (*speeds & ~(ETH_LINK_SPEED_10M_HD | ETH_LINK_SPEED_10M | ETH_LINK_SPEED_100M_HD | ETH_LINK_SPEED_100M | - ETH_LINK_SPEED_1G | ETH_LINK_SPEED_2_5G | - ETH_LINK_SPEED_FIXED)) { + ETH_LINK_SPEED_1G | ETH_LINK_SPEED_2_5G)) { num_speeds = -1; goto error_invalid_config; } @@ -1025,19 +1030,8 @@ eth_igc_start(struct rte_eth_dev *dev) hw->phy.autoneg_advertised |= ADVERTISE_2500_FULL; num_speeds++; } - if (num_speeds == 0 || (!autoneg && num_speeds > 1)) + if (num_speeds == 0) goto error_invalid_config; - - /* Set/reset the mac.autoneg based on the link speed, - * fixed or not - */ - if (!autoneg) { - hw->mac.autoneg = 0; - hw->mac.forced_speed_duplex = - hw->phy.autoneg_advertised; - } else { - hw->mac.autoneg = 1; - } } igc_setup_link(hw); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:54:00.065331000 +0800 +++ 0136-net-igc-fix-speed-configuration.patch 2021-06-12 06:53:56.580000000 +0800 @@ -1 +1 @@ -From a4d5f9f9c21ba8e28de82b5107ed1b5166cefe83 Mon Sep 17 00:00:00 2001 +From a83980d0798724945c4c3dda009bd6c93069e3ea Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit a4d5f9f9c21ba8e28de82b5107ed1b5166cefe83 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index b1c58fb3de..224a095483 100644 +index 44b35d07ae..673996314b 100644