From patchwork Fri Mar 31 16:18:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bodong Wang X-Patchwork-Id: 1763847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=KTWeONqg; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pp57v0lh2z1yZ8 for ; Sat, 1 Apr 2023 03:18:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1piHSf-000681-R9; Fri, 31 Mar 2023 16:18:45 +0000 Received: from mail-mw2nam10on2067.outbound.protection.outlook.com ([40.107.94.67] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1piHSZ-000649-BC for kernel-team@lists.ubuntu.com; Fri, 31 Mar 2023 16:18:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=an0b0PhgCPnhdhf2iN8lK4MV7/QXNwX5ehwBoJ36tISwYIBAO49mgbGfgwt4ElPoc8OAKKUCwXJ7yvYvrl53J0cYNDXTA5uohhIQ+BGvMfgSJ/ppAbOmfVWAqgqBLIpbX7J4ty8+fZCItS2Y8BSGIhyfD6LP0L48JrKyI5k7YAlPQRKbK9ihD4Tdt8vT7VYRnMcKtqC27fhx2raPbLRJ8ijFxVeiS2L9i/FQFzvZP8DeB3KvH30nBhpb91TzwS8eYtwMxl7GaMo2P/D+wQnBLCE1c/9SH8dNJZcO3xnHCJN51mY04ZaXP59QEZZPy2NU1K+xtgf6Za1CNIVyvaYpMg== 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=Uv/vkM2tOEloFdKyFvyKZdJ4a4pL9PwFSD32a2Hbw4A=; b=WAhLz9YCWNkSM/Qk96Yb74/WUzCdBSCUDheCUxrRNVVCy8LObThfV/Qv5SE8127fN5V7ngKPVo8HpdLc31bjwdCXR5R6SW+GRtLMRD5IigrT24sHD5U0qPbdZKBO8tQnNiPAKlUv6UUIALaIhzZPuxnlCgy+fcq5sIc3+eOQB6lgISySfiHX9iu1ZIW10vbi439zyNrvHWU2vm0ida0HNvQRiIaDE/oa5FwQ3AtsQjNcFBNX2Oq+rnKjslDvwK027g2aG2/e/yVVaf59hAYEaXF+8SpPr0AXNJ9xrDQDWXA5w6nbZZHSjGngDxxguxsnJ2Y0000+0Tk6rEhWY7ri5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=lists.ubuntu.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 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=Uv/vkM2tOEloFdKyFvyKZdJ4a4pL9PwFSD32a2Hbw4A=; b=KTWeONqgDX9WX30yTwawVU+mBg3OqpF7BelFMce6uVUgNApc+gNZQWBq/LvLhj2UVezNHR7+BuvYlP8H2Wvi7Zvswm1QJayelOzyhV7itIa/kC4O0QyXhh2QAT0jaKtmRTFZ5Dbdhjqmc8PIZQLFotz/rFQjI5BVwiPPL7orjy8EbvjKbUMLlzZZq6KMZcov987QW2/jD68kDKzweEgF+1pnJ+8GES6ZE+cXbBk8OdlfF8XXSLOoJqe+ktZy0HC+F+DiPHt+HYR26UbpW+ocnYLAIMQL7+fSKbzhFqTJ4yI5jSPDIDdjRncZy8X2zAaKkeq7fLeFNzBRMqHvxvnANA== Received: from DM6PR08CA0007.namprd08.prod.outlook.com (2603:10b6:5:80::20) by SJ0PR12MB6853.namprd12.prod.outlook.com (2603:10b6:a03:47b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.33; Fri, 31 Mar 2023 16:18:36 +0000 Received: from DM6NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:5:80:cafe::b4) by DM6PR08CA0007.outlook.office365.com (2603:10b6:5:80::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.20 via Frontend Transport; Fri, 31 Mar 2023 16:18:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT065.mail.protection.outlook.com (10.13.172.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.16 via Frontend Transport; Fri, 31 Mar 2023 16:18:36 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Fri, 31 Mar 2023 09:18:24 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.986.37; Fri, 31 Mar 2023 09:18:23 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.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.986.37 via Frontend Transport; Fri, 31 Mar 2023 09:18:23 -0700 Received: from sw-mtx-061.mtx.labs.mlnx (sw-mtx-061.mtx.labs.mlnx [10.9.153.25]) by mtl123.mtl.labs.mlnx (8.14.4/8.14.4) with ESMTP id 32VGIIKw019735; Fri, 31 Mar 2023 19:18:20 +0300 From: Bodong Wang To: Subject: [SRU][F:linux-bluefield][PATCH 2/3] bonding: 3ad: add support for 400G speed Date: Fri, 31 Mar 2023 19:18:16 +0300 Message-ID: <20230331161817.1752794-3-bodong@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230331161817.1752794-1-bodong@nvidia.com> References: <20230331161817.1752794-1-bodong@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT065:EE_|SJ0PR12MB6853:EE_ X-MS-Office365-Filtering-Correlation-Id: 26bc6d00-b767-463c-0c77-08db32039496 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DtC0o5YB45ldULnEJrOTSiV91rozLrLOjLSQi6lXG8FF8FaX3xm6M3SKYpwV1sUWRzFtuIt+1SHbq/HjZK76IdEx/OPQFLzYGUjLcn0abZWW+3RgR7aFgWd5ttCb/tfTrP0GV8js4znk7Fo322m2mA7MFNPMjQ+PyuwjfCZW8gOb3osH60FCYXwC4vbeCIeT9y/ecw+9sdNTv1dzAYT3fIZNWK07Fdx0NDqC5bzSPnV6ZQhM/WZ8yAscFqDMEdSKD9aZl+0WnedBfQ/0tz9dX9RgrQhFmVanREsMMBXzIG/CNtAvePVnSnZ7XgcPO+XQreZRNs2ozB8L/+3NXM6K9PbfPoyI9c1Df2OTBmfAIt4p4he/MXKKxconHn0HG80447qSEh9xeZ/ONOBNQbNQaIqvkeXHVK2gDJEbOorlPl1lkaGR2bVeuz1twtZ4+1sUFynpD9gbboXM2JUcO7LyI7BILDo3MaQxs25OYwobavKwsoe/9AqZ3VZjtDJBeSqKXvlGkMgECSENO8T3EHXy26UlBbbi8BbN9tbeAUmjssVsXD43Z0jm9grqnGpE/OIGrofa8/Rbwa/bijIpLecm/pO4EKPdd/0kR0rRBA6tkC+Vh/KAAwU5U7HBfy/yhGiW4Q7acmKmBKh57+X8ePi2vBGYbm9RkM7MnLfGGjpDkGL6NUxd/6XSP0Xf6zrzfrSXLQD405Wo2XKp+vEoj+Nzq/7slXokqYa49j2kfOKkTrjh1q4K9nmTCltNVVi5Cs/z8NZ3uie5Yh3lnOGVih9jg5MZ0gTT4NJND6tnybnxYespiLprvcyk3Fqf5Vm5NzcFRjXhoKPwtbh917joU91gJQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(396003)(136003)(376002)(451199021)(46966006)(40470700004)(36840700001)(70586007)(5660300002)(83380400001)(70206006)(356005)(2906002)(54906003)(6916009)(8676002)(4326008)(7636003)(36860700001)(41300700001)(8936002)(316002)(2616005)(82740400003)(478600001)(336012)(34020700004)(40460700003)(47076005)(40480700001)(966005)(86362001)(1076003)(82310400005)(186003)(107886003)(6666004)(26005)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 16:18:36.0490 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26bc6d00-b767-463c-0c77-08db32039496 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6853 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vlad@nvidia.com, bodong@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Nikolay Aleksandrov BugLink: https://bugs.launchpad.net/bugs/2013758 In order to be able to use 3ad mode with 400G devices we need to extend the supported speeds. Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller (cherry picked from commit 138e3b3cc0bbbd795e3b3f2ab607597e2f0b80f9) Signed-off-by: Bodong Wang --- drivers/net/bonding/bond_3ad.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 8382c4b20d62..0eb807a1383e 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -84,6 +84,7 @@ enum ad_link_speed_type { AD_LINK_SPEED_56000MBPS, AD_LINK_SPEED_100000MBPS, AD_LINK_SPEED_200000MBPS, + AD_LINK_SPEED_400000MBPS, }; /* compare MAC addresses */ @@ -257,6 +258,7 @@ static inline int __check_agg_selection_timer(struct port *port) * %AD_LINK_SPEED_56000MBPS * %AD_LINK_SPEED_100000MBPS * %AD_LINK_SPEED_200000MBPS + * %AD_LINK_SPEED_400000MBPS */ static u16 __get_link_speed(struct port *port) { @@ -328,6 +330,10 @@ static u16 __get_link_speed(struct port *port) speed = AD_LINK_SPEED_200000MBPS; break; + case SPEED_400000: + speed = AD_LINK_SPEED_400000MBPS; + break; + default: /* unknown speed value from ethtool. shouldn't happen */ if (slave->speed != SPEED_UNKNOWN) @@ -752,6 +758,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) case AD_LINK_SPEED_200000MBPS: bandwidth = nports * 200000; break; + case AD_LINK_SPEED_400000MBPS: + bandwidth = nports * 400000; + break; default: bandwidth = 0; /* to silence the compiler */ }