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 BF0D545614; Fri, 12 Jul 2024 17:49:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D6BA242F03; Fri, 12 Jul 2024 17:48:07 +0200 (CEST) Received: from egress-ip42b.ess.de.barracuda.com (egress-ip42b.ess.de.barracuda.com [18.185.115.246]) by mails.dpdk.org (Postfix) with ESMTP id 6B84742FFB for ; Fri, 12 Jul 2024 17:48:04 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2107.outbound.protection.outlook.com [104.47.18.107]) by mx-outbound45-239.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 12 Jul 2024 15:48:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T68tdHDOKmcuikdt6aEIzkXnjn0qOwZYF1+hTHyC8YSSBkEfbrfXsOAaEeCCbqQVlnrRVdwIq5hZyFQ07MQWwK13d3968hbL8jpBVkt0z6OEj5T7APYkZTbsuRnGmKH8n5n/d4jl9ectyX6xjMlh0IPKXvQeikOUE/P2nPb3gLy2rMjElUARknwdD9uFRhhPE+mplrmUs5RMNCWaZShp0csz8/d1C+7h0V5QrI4l+GPGQH+ml/ksicDW8jSJwtefxSTWd113H5Oi6FjncLWrfVQy7tUr2mzaCGFxlvWgY+nbLj7k2Y86DCXf+qHdDaFWnQ+sBVsQJW2wPLYlVDHv4A== 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=8UrDgMXMhvsHuqZeLsPD9eGmEa9nuY+P+BIjOoxCg4s=; b=QmEaecOdsxXoBg0z1yuYgD5ZIzPn2fCnXImgRj20F/61/4m234Crq5vOwnRVphOwu49ZdmqWvtZVM+PYgTDUJIq3y3/AT2ZQBVBnjcpbnvJBa4Vskucq8F7fea/N89NfWpW8SBOf3KJUt0N6AeL6u1us5AQK+e0vdCClGEVY70XAk+l31V6aBCXPCxZTqCkGGpsaiJiOMJXg/aGc4LecYJ/jkOlCpwEZf0yGrqihBPcB+J/CQy1XfZA+d4t4S/VQJXo19i/RWHrEmqF+NlHjw2ABeFzOq7eDlNJlKEaJ463CPUiyEh9/E5ytUfctKhnj5Uc6VT7Q8tGCFr34xq7F3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 178.72.21.4) smtp.rcpttodomain=dpdk.org smtp.mailfrom=napatech.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=napatech.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=napatech.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8UrDgMXMhvsHuqZeLsPD9eGmEa9nuY+P+BIjOoxCg4s=; b=h/lljsfRAy5SM+ErC0py4yH4CzeYJ9pr2ZQcE1xSGJeTyYWFXjO9vubxwPFWkotEozZLyzcYqc4NI+LV+Ov7/k6M2gHjEe9bib/xrld5I+0RlkDvjY/RoRbaclRXoHBGF7IRkWP4AiK6fDYN7KsqjctM7smsMqN9H2WgVrSIWPI= Received: from DU7PR01CA0016.eurprd01.prod.exchangelabs.com (2603:10a6:10:50f::11) by VI2P190MB2123.EURP190.PROD.OUTLOOK.COM (2603:10a6:800:22d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 15:47:59 +0000 Received: from DU2PEPF00028D0C.eurprd03.prod.outlook.com (2603:10a6:10:50f:cafe::7f) by DU7PR01CA0016.outlook.office365.com (2603:10a6:10:50f::11) 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 15:47:58 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 178.72.21.4) smtp.mailfrom=napatech.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=napatech.com; Received-SPF: Fail (protection.outlook.com: domain of napatech.com does not designate 178.72.21.4 as permitted sender) receiver=protection.outlook.com; client-ip=178.72.21.4; helo=localhost.localdomain; Received: from localhost.localdomain (178.72.21.4) by DU2PEPF00028D0C.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 15:47:58 +0000 From: Serhii Iliushyk To: dev@dpdk.org Cc: mko-plv@napatech.com, sil-plv@napatech.com, ckm@napatech.com, andrew.rybchenko@oktetlabs.ru, ferruh.yigit@amd.com Subject: [PATCH v8 15/21] net/ntnic: add link management skeleton Date: Fri, 12 Jul 2024 17:47:25 +0200 Message-ID: <20240712154737.1339646-15-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240712154737.1339646-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240712154737.1339646-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D0C:EE_|VI2P190MB2123:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 4e7d0cdd-0c03-4079-d6df-08dca28a0122 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qHThlUmabSFmMq0IiNe1pwhElMaSMGGFrTCrPALxRnfw393tnMigjEecm03w?= =?us-ascii?Q?OC1Ad1YUhMLCFrL+ykhQ08MMWmaKWX4BGJYuNuTp8T/KEZEiYKDII/EADJn0?= =?us-ascii?Q?UCfQZ7Ha6fr9b2V3K8hxZWmQ2hNR909X0moKVhiVJWyZbd28lTg/xZFoEzdH?= =?us-ascii?Q?NJHDj90zGU4QWcwKj1PfrFZPkvI4Wx4b+aXtGpepkZOsHlH4U5SLnsFGetd5?= =?us-ascii?Q?OPta4LxKwYc6L3un21Snckg4/6NsYM39wIbezuKgCNib9wgbSjPc1SNzbPgI?= =?us-ascii?Q?JpknFT00Txb4zdHQd1sWD+HzvjnJ//0bHAL3Bh33hjK8PhKM3cyPP1Y4colu?= =?us-ascii?Q?qwFoCmTgIXodF1QkrKqBMl+OM8e+wpWJZC6BjhPQUs28+vWxjf9Z50pExIn5?= =?us-ascii?Q?VgNoT8Wtn7her9tsjv8nB2+XRN+bJ2CkX+i6X3fsDrsbmL7OIyF3hYyGdMRF?= =?us-ascii?Q?yZqRHpGB1PSKf/+PulP/0FgPtXgj2D1n2ijVmpTcsobyDvQFOwB+iGTFZeze?= =?us-ascii?Q?nZoV0qyxqMR34g4WzMtZkKL9pYDj3OEBRDZ14tnMnHss0JKyKfIlAzkWjfng?= =?us-ascii?Q?KPbAn+U2ZeSAVAhRLhObR/gMfvh2ZSXZDSYGT9/nxad6DToKA5Nuyzrq3fgl?= =?us-ascii?Q?PdOACOIW2XWTxDLN5mkMRJnO+vXEH6qLfwthBZoVoYVUwUd5jpYEHZ6RyAu5?= =?us-ascii?Q?eHqMORsj2d9c9LZ4bVoMx7wN/qxesfN/jWuwKOeBlJ5TGNwXngJJHhWkkmJo?= =?us-ascii?Q?LptqKnWGYEHvomlPhz10YF1If607HVWi4qsqqmgM9zywVSOplN9lPVjVawKq?= =?us-ascii?Q?tvancKwr3VHvWrukj0EGyiSaG4MEULQVbn8Mj6Vq4XmAFWo/H+Dj+UjYKiQ6?= =?us-ascii?Q?wIkFgJVpFqKdUt0dyuzib4J5yak2A6DmnPXVnIrWS/GUAP3f/fWNrEyLoGcm?= =?us-ascii?Q?wjgmmV5Ey/Cn+sWhkNeBXmTpYCJw5S/mAVMBdqG8Ce/hW1h2Ol03FvM2MYDa?= =?us-ascii?Q?7urHReNkznL5VCuNr7ghBT+MqiZgjLv/FOpVfWxINRkfnp+uCCJrIO4+F0Q0?= =?us-ascii?Q?OL6ocIzwjqRq9cLJxDvzBZKf7kKHMy5uYT/XnOKlRWwJ7dZQJv4MKnuuf5WI?= =?us-ascii?Q?T3ONaYFNfEJsfBR+6qIZfZXs+BsKt4SrshVQnmiu7BBa5cQ1A8NmqmDuEDuR?= =?us-ascii?Q?XOxsx4IDz/XdwBA9SdjvQHt7kTfSz/TaedPfTVpzcCki1uFlPCJqTxnHZ70f?= =?us-ascii?Q?98/GxPiBzi4D/dBj10SzF/WPNSNCblSY3VvJOoMCwVZc/HyeZav1x92Gx2WB?= =?us-ascii?Q?VAJAK77l5pBiVy8r6ku1b+7z6s4qgaEvY031w12++05MgJQg5pcOMIW9slJ+?= =?us-ascii?Q?0my+6dGw3wjM027NqOeSTLzg96AvzxfBIVHu0XTJ/i6gAOU2rDeJPQubdoHF?= =?us-ascii?Q?dUkmXW3WXBcb5RQ+70MYyjvpA0gDPWjw?= X-Forefront-Antispam-Report: CIP:178.72.21.4; CTRY:DK; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:localhost.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(376014)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Uli2vUDCKdi0kfN4ZLukLN4h2doe00tzwKBkyo43BMz0lo71vqIaW0FMYpSh41449bsYRmDA56sullKhUJfOybzbYgb85NUfH6fcJmDZRT01mhPV6De7d/8sITbFzrTq2mXsPFIo4qy+9bZrrNdkYnS8qarfzF4xaE0GCTwvXqedn2Ffgx2unYo4Ng5+BQQsnW2QrDG6WQICisKcDaY7mouKJu+Kc/uhbWfqxDnvTnoSowAV6PexeDnwKVcdSHKIBwZyPl/6eBw3vsddtoSR62nJWmRqe1Jy6u3H6OC/Yeh4bCC50+R4i5lmC+F6//gdxybv82bzuCs2VsKKdloWhg2GsRppDR59ZwsKUlmP5qgLRk9zlg2BDFXz7z9BHFBogLMQYR3dd8I78ybt5zgEid2x+hyAPDByIzdbi7J/mAcD63HDPhzROL/OWdZ6P/A98dVsX33ZHolLERSoUAKs7cQdG9rWT9T8C3JYNlVmOwGfMN27TpdjboXXDQkCOMleep+/u7Gp+4vSkGm48Owv/WPWyxYpTV61C5GahgPgFlU757nGQT+JyHHzxq1h7Udfd0LPu/hbT/1TCoTFSOruzZADK830Wzr+o7rLGQJ/jPdEVyeRc56tVWW3l3S/UfzfOZKcjggJUV177rm34MUYug== X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 15:47:58.5202 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e7d0cdd-0c03-4079-d6df-08dca28a0122 X-MS-Exchange-CrossTenant-Id: c4540d0b-728a-4233-9da5-9ea30c7ec3ed X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=c4540d0b-728a-4233-9da5-9ea30c7ec3ed; Ip=[178.72.21.4]; Helo=[localhost.localdomain] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF00028D0C.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2P190MB2123 X-BESS-ID: 1720799282-311759-12664-32385-1 X-BESS-VER: 2019.1_20240702.1505 X-BESS-Apparent-Source-IP: 104.47.18.107 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVsaGhubmQGYGUNTMMtnEwszSwN DSNNXC0DLZIs3S3NIgNdXUwjIxxSwxUak2FgB2SSIRQgAAAA== X-BESS-Outbound-Spam-Score: 0.50 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257575 [from cloudscan13-118.eu-central-1a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.50 BSF_RULE7568M META: Custom Rule 7568M 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.50 using account:ESS113687 scores of KILL_LEVEL=7.0 tests=BSF_RULE7568M, BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add functionality to read and control the link-state of the ntnic. Note that must functions are not implemented yet. Adds the following eth_dev_ops: - dev_set_link_up - dev_set_link_down - link_update - mac_addr_add - mac_addr_set - set_mc_addr_list - promiscuous_enable Signed-off-by: Serhii Iliushyk --- v5 * Fix Typo/Spelling v6 * if_index was replaced with n_intf_no * MAC addr assignment approach was reworked v7 * Add relate features to documentation - INI and RST files --- doc/guides/nics/features/ntnic.ini | 3 + doc/guides/nics/ntnic.rst | 5 + drivers/net/ntnic/adapter/nt4ga_adapter.c | 6 + drivers/net/ntnic/include/nt4ga_adapter.h | 5 +- drivers/net/ntnic/include/nt4ga_link.h | 84 +++++++ drivers/net/ntnic/include/ntos_drv.h | 15 ++ drivers/net/ntnic/link_mgmt/nt4ga_link.c | 176 ++++++++++++++ drivers/net/ntnic/meson.build | 1 + drivers/net/ntnic/ntnic_ethdev.c | 283 +++++++++++++++++++++- drivers/net/ntnic/ntnic_mod_reg.c | 14 ++ drivers/net/ntnic/ntnic_mod_reg.h | 50 +++- drivers/net/ntnic/ntutil/nt_util.c | 131 ++++++++++ drivers/net/ntnic/ntutil/nt_util.h | 11 + 13 files changed, 780 insertions(+), 4 deletions(-) create mode 100644 drivers/net/ntnic/include/nt4ga_link.h create mode 100644 drivers/net/ntnic/link_mgmt/nt4ga_link.c diff --git a/doc/guides/nics/features/ntnic.ini b/doc/guides/nics/features/ntnic.ini index 03f4d5aac8..0a74817fcf 100644 --- a/doc/guides/nics/features/ntnic.ini +++ b/doc/guides/nics/features/ntnic.ini @@ -5,5 +5,8 @@ ; [Features] FW version = Y +Speed capabilities = Y +Unicast MAC filter = Y +Multicast MAC filter = Y Linux = Y x86-64 = Y diff --git a/doc/guides/nics/ntnic.rst b/doc/guides/nics/ntnic.rst index 43caf3151d..25c74730fe 100644 --- a/doc/guides/nics/ntnic.rst +++ b/doc/guides/nics/ntnic.rst @@ -33,6 +33,11 @@ Features -------- - FW version +- Speed capabilities +- Link status (Link update only) +- Unicast MAC filter +- Multicast MAC filter +- Promiscuous mode (Enable only. The device always run promiscuous mode) Limitations ~~~~~~~~~~~ diff --git a/drivers/net/ntnic/adapter/nt4ga_adapter.c b/drivers/net/ntnic/adapter/nt4ga_adapter.c index bdad2b1e21..e29fda7fbb 100644 --- a/drivers/net/ntnic/adapter/nt4ga_adapter.c +++ b/drivers/net/ntnic/adapter/nt4ga_adapter.c @@ -124,8 +124,14 @@ static int nt4ga_adapter_init(struct adapter_info_s *p_adapter_info) assert(n_phy_ports >= 1); { + int i; assert(fpga_info->n_fpga_prod_id > 0); + for (i = 0; i < NUM_ADAPTER_PORTS_MAX; i++) { + /* Disable all ports. Must be enabled later */ + p_adapter_info->nt4ga_link.port_action[i].port_disable = true; + } + switch (fpga_info->n_fpga_prod_id) { /* NT200A01: 2x100G (Xilinx) */ case 9563: /* NT200A02 (Cap) */ diff --git a/drivers/net/ntnic/include/nt4ga_adapter.h b/drivers/net/ntnic/include/nt4ga_adapter.h index 2c72583caf..ed14936b38 100644 --- a/drivers/net/ntnic/include/nt4ga_adapter.h +++ b/drivers/net/ntnic/include/nt4ga_adapter.h @@ -6,7 +6,8 @@ #ifndef _NT4GA_ADAPTER_H_ #define _NT4GA_ADAPTER_H_ -#include "ntos_drv.h" +#include "nt4ga_link.h" + typedef struct hw_info_s { /* pciids */ uint16_t pci_vendor_id; @@ -23,6 +24,8 @@ typedef struct hw_info_s { } hw_info_t; typedef struct adapter_info_s { + struct nt4ga_link_s nt4ga_link; + struct hw_info_s hw_info; struct fpga_info_s fpga_info; diff --git a/drivers/net/ntnic/include/nt4ga_link.h b/drivers/net/ntnic/include/nt4ga_link.h new file mode 100644 index 0000000000..849261ce3a --- /dev/null +++ b/drivers/net/ntnic/include/nt4ga_link.h @@ -0,0 +1,84 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#ifndef NT4GA_LINK_H_ +#define NT4GA_LINK_H_ + +#include "ntos_drv.h" + +enum nt_link_state_e { + NT_LINK_STATE_UNKNOWN = 0, /* The link state has not been read yet */ + NT_LINK_STATE_DOWN = 1, /* The link state is DOWN */ + NT_LINK_STATE_UP = 2, /* The link state is UP */ + NT_LINK_STATE_ERROR = 3 /* The link state could not be read */ +}; + +typedef enum nt_link_state_e nt_link_state_t, *nt_link_state_p; + +enum nt_link_duplex_e { + NT_LINK_DUPLEX_UNKNOWN = 0, + NT_LINK_DUPLEX_HALF = 0x01, /* Half duplex */ + NT_LINK_DUPLEX_FULL = 0x02, /* Full duplex */ +}; + +typedef enum nt_link_duplex_e nt_link_duplex_t; + +enum nt_link_loopback_e { + NT_LINK_LOOPBACK_OFF = 0, + NT_LINK_LOOPBACK_HOST = 0x01, /* Host loopback mode */ + NT_LINK_LOOPBACK_LINE = 0x02, /* Line loopback mode */ +}; + +enum nt_link_auto_neg_e { + NT_LINK_AUTONEG_NA = 0, + NT_LINK_AUTONEG_MANUAL = 0x01, + NT_LINK_AUTONEG_OFF = NT_LINK_AUTONEG_MANUAL, /* Auto negotiation OFF */ + NT_LINK_AUTONEG_AUTO = 0x02, + NT_LINK_AUTONEG_ON = NT_LINK_AUTONEG_AUTO, /* Auto negotiation ON */ +}; + +typedef struct link_state_s { + bool link_disabled; + bool link_up; + enum nt_link_state_e link_state; + enum nt_link_state_e link_state_latched; +} link_state_t; + +enum nt_link_speed_e { + NT_LINK_SPEED_UNKNOWN = 0, + NT_LINK_SPEED_10M = 0x01, /* 10 Mbps */ + NT_LINK_SPEED_100M = 0x02, /* 100 Mbps */ + NT_LINK_SPEED_1G = 0x04,/* 1 Gbps (Autoneg only) */ + NT_LINK_SPEED_10G = 0x08, /* 10 Gbps (Autoneg only) */ + NT_LINK_SPEED_40G = 0x10, /* 40 Gbps (Autoneg only) */ + NT_LINK_SPEED_100G = 0x20, /* 100 Gbps (Autoneg only) */ + NT_LINK_SPEED_50G = 0x40, /* 50 Gbps (Autoneg only) */ + NT_LINK_SPEED_25G = 0x80, /* 25 Gbps (Autoneg only) */ + NT_LINK_SPEED_END /* always keep this entry as the last in enum */ +}; +typedef enum nt_link_speed_e nt_link_speed_t; + +typedef struct link_info_s { + enum nt_link_speed_e link_speed; + enum nt_link_duplex_e link_duplex; + enum nt_link_auto_neg_e link_auto_neg; +} link_info_t; + +typedef struct port_action_s { + bool port_disable; + enum nt_link_speed_e port_speed; + enum nt_link_duplex_e port_duplex; + uint32_t port_lpbk_mode; +} port_action_t; + +typedef struct nt4ga_link_s { + link_state_t link_state[NUM_ADAPTER_PORTS_MAX]; + link_info_t link_info[NUM_ADAPTER_PORTS_MAX]; + port_action_t port_action[NUM_ADAPTER_PORTS_MAX]; + uint32_t speed_capa; + bool variables_initialized; +} nt4ga_link_t; + +#endif /* NT4GA_LINK_H_ */ diff --git a/drivers/net/ntnic/include/ntos_drv.h b/drivers/net/ntnic/include/ntos_drv.h index e3d8ffb91c..43fac61257 100644 --- a/drivers/net/ntnic/include/ntos_drv.h +++ b/drivers/net/ntnic/include/ntos_drv.h @@ -25,9 +25,24 @@ struct pmd_internals { const struct rte_pci_device *pci_dev; char name[20]; int n_intf_no; + int lpbk_mode; + uint8_t ts_multiplier; + uint16_t min_tx_pkt_size; + uint16_t max_tx_pkt_size; + unsigned int nb_rx_queues; + unsigned int nb_tx_queues; uint32_t port; uint32_t port_id; + /* Offset of the VF from the PF */ + uint8_t vf_offset; + nt_meta_port_type_t type; + /* if a virtual port type - the vhid */ + int vhid; struct drv_s *p_drv; + /* Ethernet (MAC) addresses. Element number zero denotes default address. */ + struct rte_ether_addr eth_addrs[NUM_MAC_ADDRS_PER_PORT]; + /* Multicast ethernet (MAC) addresses. */ + struct rte_ether_addr mc_addrs[NUM_MULTICAST_ADDRS_PER_PORT]; struct pmd_internals *next; }; diff --git a/drivers/net/ntnic/link_mgmt/nt4ga_link.c b/drivers/net/ntnic/link_mgmt/nt4ga_link.c new file mode 100644 index 0000000000..ad23046aae --- /dev/null +++ b/drivers/net/ntnic/link_mgmt/nt4ga_link.c @@ -0,0 +1,176 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#include +#include +#include +#include + +#include "ntlog.h" +#include "ntnic_mod_reg.h" + +#include "nt4ga_link.h" + +/* + * port: speed capabilities + * This is actually an adapter capability mapped onto every port + */ +static uint32_t nt4ga_port_get_link_speed_capabilities(struct adapter_info_s *p, int port) +{ + (void)p; + (void)port; + nt4ga_link_t *const p_link = &p->nt4ga_link; + const uint32_t nt_link_speed_capa = p_link->speed_capa; + return nt_link_speed_capa; +} + +/* + * port: link mode + */ +static void nt4ga_port_set_adm_state(struct adapter_info_s *p, int port, bool adm_state) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + p_link->port_action[port].port_disable = !adm_state; +} + +static bool nt4ga_port_get_adm_state(struct adapter_info_s *p, int port) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + const bool adm_state = !p_link->port_action[port].port_disable; + return adm_state; +} + +/* + * port: link status + */ +static void nt4ga_port_set_link_status(struct adapter_info_s *p, int port, bool link_status) +{ + /* Setting link state/status is (currently) the same as controlling the port adm state */ + nt4ga_port_set_adm_state(p, port, link_status); +} + +static bool nt4ga_port_get_link_status(struct adapter_info_s *p, int port) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + bool status = p_link->link_state[port].link_up; + return status; +} + +/* + * port: link speed + */ +static void nt4ga_port_set_link_speed(struct adapter_info_s *p, int port, nt_link_speed_t speed) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + p_link->port_action[port].port_speed = speed; + p_link->link_info[port].link_speed = speed; +} + +static nt_link_speed_t nt4ga_port_get_link_speed(struct adapter_info_s *p, int port) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + nt_link_speed_t speed = p_link->link_info[port].link_speed; + return speed; +} + +/* + * port: link autoneg + * Currently not fully supported by link code + */ +static void nt4ga_port_set_link_autoneg(struct adapter_info_s *p, int port, bool autoneg) +{ + (void)p; + (void)port; + (void)autoneg; + nt4ga_link_t *const p_link = &p->nt4ga_link; + (void)p_link; +} + +static bool nt4ga_port_get_link_autoneg(struct adapter_info_s *p, int port) +{ + (void)p; + (void)port; + nt4ga_link_t *const p_link = &p->nt4ga_link; + (void)p_link; + return true; +} + +/* + * port: link duplex + * Currently not fully supported by link code + */ +static void nt4ga_port_set_link_duplex(struct adapter_info_s *p, int port, nt_link_duplex_t duplex) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + p_link->port_action[port].port_duplex = duplex; +} + +static nt_link_duplex_t nt4ga_port_get_link_duplex(struct adapter_info_s *p, int port) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + nt_link_duplex_t duplex = p_link->link_info[port].link_duplex; + return duplex; +} + +/* + * port: loopback mode + */ +static void nt4ga_port_set_loopback_mode(struct adapter_info_s *p, int port, uint32_t mode) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + p_link->port_action[port].port_lpbk_mode = mode; +} + +static uint32_t nt4ga_port_get_loopback_mode(struct adapter_info_s *p, int port) +{ + nt4ga_link_t *const p_link = &p->nt4ga_link; + return p_link->port_action[port].port_lpbk_mode; +} + + +static const struct port_ops ops = { + /* + * port:s link mode + */ + .set_adm_state = nt4ga_port_set_adm_state, + .get_adm_state = nt4ga_port_get_adm_state, + + /* + * port:s link status + */ + .set_link_status = nt4ga_port_set_link_status, + .get_link_status = nt4ga_port_get_link_status, + + /* + * port: link autoneg + */ + .set_link_autoneg = nt4ga_port_set_link_autoneg, + .get_link_autoneg = nt4ga_port_get_link_autoneg, + + /* + * port: link speed + */ + .set_link_speed = nt4ga_port_set_link_speed, + .get_link_speed = nt4ga_port_get_link_speed, + + /* + * port: link duplex + */ + .set_link_duplex = nt4ga_port_set_link_duplex, + .get_link_duplex = nt4ga_port_get_link_duplex, + + /* + * port: loopback mode + */ + .set_loopback_mode = nt4ga_port_set_loopback_mode, + .get_loopback_mode = nt4ga_port_get_loopback_mode, + + .get_link_speed_capabilities = nt4ga_port_get_link_speed_capabilities, +}; + +void port_init(void) +{ + register_port_ops(&ops); +} diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build index 987768cb92..001c75963e 100644 --- a/drivers/net/ntnic/meson.build +++ b/drivers/net/ntnic/meson.build @@ -22,6 +22,7 @@ includes = [ # all sources sources = files( 'adapter/nt4ga_adapter.c', + 'link_mgmt/nt4ga_link.c', 'nthw/supported/nthw_fpga_9563_055_039_0000.c', 'nthw/supported/nthw_fpga_instances.c', 'nthw/supported/nthw_fpga_mod_str_map.c', diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 488c88c782..c53f0dd108 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -23,6 +23,9 @@ #include "ntnic_mod_reg.h" #include "nt_util.h" +#define HW_MAX_PKT_LEN (10000) +#define MAX_MTU (HW_MAX_PKT_LEN - RTE_ETHER_HDR_LEN - RTE_ETHER_CRC_LEN) + #define EXCEPTION_PATH_HID 0 static const struct rte_pci_id nthw_pci_id_map[] = { @@ -90,13 +93,134 @@ get_pdrv_from_pci(struct rte_pci_addr addr) return p_drv; } +static int +eth_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete __rte_unused) +{ + const struct port_ops *port_ops = get_port_ops(); + + if (port_ops == NULL) { + NT_LOG(ERR, NTNIC, "Link management module uninitialized\n"); + return -1; + } + + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + + const int n_intf_no = internals->n_intf_no; + struct adapter_info_s *p_adapter_info = &internals->p_drv->ntdrv.adapter_info; + + if (eth_dev->data->dev_started) { + const bool port_link_status = port_ops->get_link_status(p_adapter_info, n_intf_no); + eth_dev->data->dev_link.link_status = + port_link_status ? RTE_ETH_LINK_UP : RTE_ETH_LINK_DOWN; + + nt_link_speed_t port_link_speed = + port_ops->get_link_speed(p_adapter_info, n_intf_no); + eth_dev->data->dev_link.link_speed = + nt_link_speed_to_eth_speed_num(port_link_speed); + + nt_link_duplex_t nt_link_duplex = + port_ops->get_link_duplex(p_adapter_info, n_intf_no); + eth_dev->data->dev_link.link_duplex = nt_link_duplex_to_eth_duplex(nt_link_duplex); + + } else { + eth_dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; + eth_dev->data->dev_link.link_speed = RTE_ETH_SPEED_NUM_NONE; + eth_dev->data->dev_link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; + } + + return 0; +} + static int eth_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *dev_info) { + const struct port_ops *port_ops = get_port_ops(); + + if (port_ops == NULL) { + NT_LOG(ERR, NTNIC, "Link management module uninitialized\n"); + return -1; + } + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + const int n_intf_no = internals->n_intf_no; + struct adapter_info_s *p_adapter_info = &internals->p_drv->ntdrv.adapter_info; + dev_info->if_index = internals->n_intf_no; dev_info->driver_name = internals->name; + dev_info->max_mac_addrs = NUM_MAC_ADDRS_PER_PORT; + dev_info->max_rx_pktlen = HW_MAX_PKT_LEN; + dev_info->max_mtu = MAX_MTU; + + if (internals->p_drv) { + dev_info->max_rx_queues = internals->nb_rx_queues; + dev_info->max_tx_queues = internals->nb_tx_queues; + + dev_info->min_rx_bufsize = 64; + + const uint32_t nt_port_speed_capa = + port_ops->get_link_speed_capabilities(p_adapter_info, n_intf_no); + dev_info->speed_capa = nt_link_speed_capa_to_eth_speed_capa(nt_port_speed_capa); + } + + return 0; +} + +static int +eth_mac_addr_add(struct rte_eth_dev *eth_dev, + struct rte_ether_addr *mac_addr, + uint32_t index, + uint32_t vmdq __rte_unused) +{ + struct rte_ether_addr *const eth_addrs = eth_dev->data->mac_addrs; + + assert(index < NUM_MAC_ADDRS_PER_PORT); + + if (index >= NUM_MAC_ADDRS_PER_PORT) { + const struct pmd_internals *const internals = + (struct pmd_internals *)eth_dev->data->dev_private; + NT_LOG_DBGX(DEBUG, NTNIC, "Port %i: illegal index %u (>= %u)\n", + internals->n_intf_no, index, NUM_MAC_ADDRS_PER_PORT); + return -1; + } + + eth_addrs[index] = *mac_addr; + + return 0; +} + +static int +eth_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) +{ + struct rte_ether_addr *const eth_addrs = dev->data->mac_addrs; + + eth_addrs[0U] = *mac_addr; + + return 0; +} + +static int +eth_set_mc_addr_list(struct rte_eth_dev *eth_dev, + struct rte_ether_addr *mc_addr_set, + uint32_t nb_mc_addr) +{ + struct pmd_internals *const internals = (struct pmd_internals *)eth_dev->data->dev_private; + struct rte_ether_addr *const mc_addrs = internals->mc_addrs; + size_t i; + + if (nb_mc_addr >= NUM_MULTICAST_ADDRS_PER_PORT) { + NT_LOG_DBGX(DEBUG, NTNIC, + "Port %i: too many multicast addresses %u (>= %u)\n", + internals->n_intf_no, nb_mc_addr, NUM_MULTICAST_ADDRS_PER_PORT); + return -1; + } + + for (i = 0U; i < NUM_MULTICAST_ADDRS_PER_PORT; i++) + if (i < nb_mc_addr) + mc_addrs[i] = mc_addr_set[i]; + + else + (void)memset(&mc_addrs[i], 0, sizeof(mc_addrs[i])); return 0; } @@ -114,10 +238,59 @@ eth_dev_configure(struct rte_eth_dev *eth_dev) static int eth_dev_start(struct rte_eth_dev *eth_dev) { + const struct port_ops *port_ops = get_port_ops(); + + if (port_ops == NULL) { + NT_LOG(ERR, NTNIC, "Link management module uninitialized\n"); + return -1; + } + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + const int n_intf_no = internals->n_intf_no; + struct adapter_info_s *p_adapter_info = &internals->p_drv->ntdrv.adapter_info; + NT_LOG_DBGX(DEBUG, NTNIC, "Port %u\n", internals->n_intf_no); + if (internals->type == PORT_TYPE_VIRTUAL || internals->type == PORT_TYPE_OVERRIDE) { + eth_dev->data->dev_link.link_status = RTE_ETH_LINK_UP; + + } else { + /* Enable the port */ + port_ops->set_adm_state(p_adapter_info, internals->n_intf_no, true); + + /* + * wait for link on port + * If application starts sending too soon before FPGA port is ready, garbage is + * produced + */ + int loop = 0; + + while (port_ops->get_link_status(p_adapter_info, n_intf_no) == RTE_ETH_LINK_DOWN) { + /* break out after 5 sec */ + if (++loop >= 50) { + NT_LOG_DBGX(DEBUG, NTNIC, + "TIMEOUT No link on port %i (5sec timeout)\n", + internals->n_intf_no); + break; + } + + nt_os_wait_usec(100 * 1000); + } + + if (internals->lpbk_mode) { + if (internals->lpbk_mode & 1 << 0) { + port_ops->set_loopback_mode(p_adapter_info, n_intf_no, + NT_LINK_LOOPBACK_HOST); + } + + if (internals->lpbk_mode & 1 << 1) { + port_ops->set_loopback_mode(p_adapter_info, n_intf_no, + NT_LINK_LOOPBACK_LINE); + } + } + } + return 0; } @@ -126,13 +299,65 @@ eth_dev_stop(struct rte_eth_dev *eth_dev) { struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; - NT_LOG_DBGX(DEBUG, NTNIC, "Port %u, %u\n", - internals->n_intf_no, internals->n_intf_no); + NT_LOG_DBGX(DEBUG, NTNIC, "Port %u, type %u\n", + internals->n_intf_no, internals->type); eth_dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; return 0; } +static int +eth_dev_set_link_up(struct rte_eth_dev *eth_dev) +{ + const struct port_ops *port_ops = get_port_ops(); + + if (port_ops == NULL) { + NT_LOG(ERR, NTNIC, "Link management module uninitialized\n"); + return -1; + } + + struct pmd_internals *const internals = (struct pmd_internals *)eth_dev->data->dev_private; + + struct adapter_info_s *p_adapter_info = &internals->p_drv->ntdrv.adapter_info; + const int port = internals->n_intf_no; + + if (internals->type == PORT_TYPE_VIRTUAL || internals->type == PORT_TYPE_OVERRIDE) + return 0; + + assert(port >= 0 && port < NUM_ADAPTER_PORTS_MAX); + assert(port == internals->n_intf_no); + + port_ops->set_adm_state(p_adapter_info, port, true); + + return 0; +} + +static int +eth_dev_set_link_down(struct rte_eth_dev *eth_dev) +{ + const struct port_ops *port_ops = get_port_ops(); + + if (port_ops == NULL) { + NT_LOG(ERR, NTNIC, "Link management module uninitialized\n"); + return -1; + } + + struct pmd_internals *const internals = (struct pmd_internals *)eth_dev->data->dev_private; + + struct adapter_info_s *p_adapter_info = &internals->p_drv->ntdrv.adapter_info; + const int port = internals->n_intf_no; + + if (internals->type == PORT_TYPE_VIRTUAL || internals->type == PORT_TYPE_OVERRIDE) + return 0; + + assert(port >= 0 && port < NUM_ADAPTER_PORTS_MAX); + assert(port == internals->n_intf_no); + + port_ops->set_link_status(p_adapter_info, port, false); + + return 0; +} + static void drv_deinit(struct drv_s *p_drv) { @@ -184,6 +409,9 @@ eth_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version, size_t fw_size { struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + if (internals->type == PORT_TYPE_VIRTUAL || internals->type == PORT_TYPE_OVERRIDE) + return 0; + fpga_info_t *fpga_info = &internals->p_drv->ntdrv.adapter_info.fpga_info; const int length = snprintf(fw_version, fw_size, "%03d-%04d-%02d-%02d", fpga_info->n_fpga_type_id, fpga_info->n_fpga_prod_id, @@ -199,19 +427,39 @@ eth_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version, size_t fw_size } } +static int +promiscuous_enable(struct rte_eth_dev __rte_unused(*dev)) +{ + NT_LOG(DBG, NTHW, "The device always run promiscuous mode."); + return 0; +} + static struct eth_dev_ops nthw_eth_dev_ops = { .dev_configure = eth_dev_configure, .dev_start = eth_dev_start, .dev_stop = eth_dev_stop, + .dev_set_link_up = eth_dev_set_link_up, + .dev_set_link_down = eth_dev_set_link_down, .dev_close = eth_dev_close, + .link_update = eth_link_update, .dev_infos_get = eth_dev_infos_get, .fw_version_get = eth_fw_version_get, + .mac_addr_add = eth_mac_addr_add, + .mac_addr_set = eth_mac_addr_set, + .set_mc_addr_list = eth_set_mc_addr_list, + .promiscuous_enable = promiscuous_enable, }; static int nthw_pci_dev_init(struct rte_pci_device *pci_dev) { nt_vfio_init(); + const struct port_ops *port_ops = get_port_ops(); + + if (port_ops == NULL) { + NT_LOG(ERR, NTNIC, "Link management module uninitialized\n"); + return -1; + } const struct adapter_ops *adapter_ops = get_adapter_ops(); @@ -229,6 +477,8 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) uint32_t nb_rx_queues = 1; uint32_t nb_tx_queues = 1; int n_phy_ports; + struct port_link_speed pls_mbps[NUM_ADAPTER_PORTS_MAX] = { 0 }; + int num_port_speeds = 0; NT_LOG_DBGX(DEBUG, NTNIC, "Dev %s PF #%i Init : %02x:%02x:%i\n", pci_dev->name, pci_dev->addr.function, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); @@ -291,6 +541,12 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) p_nt_drv->b_shutdown = false; p_nt_drv->adapter_info.pb_shutdown = &p_nt_drv->b_shutdown; + for (int i = 0; i < num_port_speeds; ++i) { + struct adapter_info_s *p_adapter_info = &p_nt_drv->adapter_info; + nt_link_speed_t link_speed = convert_link_speed(pls_mbps[i].link_speed); + port_ops->set_link_speed(p_adapter_info, i, link_speed); + } + /* store context */ store_pdrv(p_drv); @@ -355,6 +611,13 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) internals->pci_dev = pci_dev; internals->n_intf_no = n_intf_no; + internals->min_tx_pkt_size = 64; + internals->max_tx_pkt_size = 10000; + internals->type = PORT_TYPE_PHYSICAL; + internals->vhid = -1; + internals->nb_rx_queues = nb_rx_queues; + internals->nb_tx_queues = nb_tx_queues; + /* Setup queue_ids */ if (nb_rx_queues > 1) { @@ -369,6 +632,18 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) 0 /*port*/, nb_tx_queues); } + /* Set MAC address (but only if the MAC address is permitted) */ + if (n_intf_no < fpga_info->nthw_hw_info.vpd_info.mn_mac_addr_count) { + const uint64_t mac = + fpga_info->nthw_hw_info.vpd_info.mn_mac_addr_value + n_intf_no; + internals->eth_addrs[0].addr_bytes[0] = (mac >> 40) & 0xFFu; + internals->eth_addrs[0].addr_bytes[1] = (mac >> 32) & 0xFFu; + internals->eth_addrs[0].addr_bytes[2] = (mac >> 24) & 0xFFu; + internals->eth_addrs[0].addr_bytes[3] = (mac >> 16) & 0xFFu; + internals->eth_addrs[0].addr_bytes[4] = (mac >> 8) & 0xFFu; + internals->eth_addrs[0].addr_bytes[5] = (mac >> 0) & 0xFFu; + } + eth_dev = rte_eth_dev_allocate(name); if (!eth_dev) { @@ -383,6 +658,10 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) /* connect structs */ internals->p_drv = p_drv; eth_dev->data->dev_private = internals; + eth_dev->data->mac_addrs = rte_malloc(NULL, + NUM_MAC_ADDRS_PER_PORT * sizeof(struct rte_ether_addr), 0); + rte_memcpy(ð_dev->data->mac_addrs[0], + &internals->eth_addrs[0], RTE_ETHER_ADDR_LEN); internals->port_id = eth_dev->data->port_id; diff --git a/drivers/net/ntnic/ntnic_mod_reg.c b/drivers/net/ntnic/ntnic_mod_reg.c index 3f03299a83..b79929c696 100644 --- a/drivers/net/ntnic/ntnic_mod_reg.c +++ b/drivers/net/ntnic/ntnic_mod_reg.c @@ -5,6 +5,20 @@ #include "ntnic_mod_reg.h" +static const struct port_ops *port_ops; + +void register_port_ops(const struct port_ops *ops) +{ + port_ops = ops; +} + +const struct port_ops *get_port_ops(void) +{ + if (port_ops == NULL) + port_init(); + return port_ops; +} + static const struct adapter_ops *adapter_ops; void register_adapter_ops(const struct adapter_ops *ops) diff --git a/drivers/net/ntnic/ntnic_mod_reg.h b/drivers/net/ntnic/ntnic_mod_reg.h index 45f5632981..8d1971a9c4 100644 --- a/drivers/net/ntnic/ntnic_mod_reg.h +++ b/drivers/net/ntnic/ntnic_mod_reg.h @@ -12,7 +12,55 @@ #include "nthw_drv.h" #include "nt4ga_adapter.h" #include "ntnic_nthw_fpga_rst_nt200a0x.h" -#include "ntos_drv.h" + +struct port_ops { + /* + * port:s link mode + */ + void (*set_adm_state)(struct adapter_info_s *p, int port, bool adm_state); + bool (*get_adm_state)(struct adapter_info_s *p, int port); + + /* + * port:s link status + */ + void (*set_link_status)(struct adapter_info_s *p, int port, bool status); + bool (*get_link_status)(struct adapter_info_s *p, int port); + + /* + * port: link autoneg + */ + void (*set_link_autoneg)(struct adapter_info_s *p, int port, bool autoneg); + bool (*get_link_autoneg)(struct adapter_info_s *p, int port); + + /* + * port: link speed + */ + void (*set_link_speed)(struct adapter_info_s *p, int port, nt_link_speed_t speed); + nt_link_speed_t (*get_link_speed)(struct adapter_info_s *p, int port); + + /* + * port: link duplex + */ + void (*set_link_duplex)(struct adapter_info_s *p, int port, nt_link_duplex_t duplex); + nt_link_duplex_t (*get_link_duplex)(struct adapter_info_s *p, int port); + + /* + * port: loopback mode + */ + void (*set_loopback_mode)(struct adapter_info_s *p, int port, uint32_t mode); + uint32_t (*get_loopback_mode)(struct adapter_info_s *p, int port); + + uint32_t (*get_link_speed_capabilities)(struct adapter_info_s *p, int port); + + /* + * port: tx power + */ + int (*tx_power)(struct adapter_info_s *p, int port, bool disable); +}; + +void register_port_ops(const struct port_ops *ops); +const struct port_ops *get_port_ops(void); +void port_init(void); struct adapter_ops { int (*init)(struct adapter_info_s *p_adapter_info); diff --git a/drivers/net/ntnic/ntutil/nt_util.c b/drivers/net/ntnic/ntutil/nt_util.c index 53c39ef112..9904e3df3b 100644 --- a/drivers/net/ntnic/ntutil/nt_util.c +++ b/drivers/net/ntnic/ntutil/nt_util.c @@ -96,3 +96,134 @@ void nt_dma_free(struct nt_dma_s *vfio_addr) rte_free((void *)(vfio_addr->addr)); rte_free(vfio_addr); } + +/* NOTE: please note the difference between RTE_ETH_SPEED_NUM_xxx and RTE_ETH_LINK_SPEED_xxx */ +int nt_link_speed_to_eth_speed_num(enum nt_link_speed_e nt_link_speed) +{ + int eth_speed_num = RTE_ETH_SPEED_NUM_NONE; + + switch (nt_link_speed) { + case NT_LINK_SPEED_10M: + eth_speed_num = RTE_ETH_SPEED_NUM_10M; + break; + + case NT_LINK_SPEED_100M: + eth_speed_num = RTE_ETH_SPEED_NUM_100M; + break; + + case NT_LINK_SPEED_1G: + eth_speed_num = RTE_ETH_SPEED_NUM_1G; + break; + + case NT_LINK_SPEED_10G: + eth_speed_num = RTE_ETH_SPEED_NUM_10G; + break; + + case NT_LINK_SPEED_25G: + eth_speed_num = RTE_ETH_SPEED_NUM_25G; + break; + + case NT_LINK_SPEED_40G: + eth_speed_num = RTE_ETH_SPEED_NUM_40G; + break; + + case NT_LINK_SPEED_50G: + eth_speed_num = RTE_ETH_SPEED_NUM_50G; + break; + + case NT_LINK_SPEED_100G: + eth_speed_num = RTE_ETH_SPEED_NUM_100G; + break; + + default: + eth_speed_num = RTE_ETH_SPEED_NUM_NONE; + break; + } + + return eth_speed_num; +} + +uint32_t nt_link_speed_capa_to_eth_speed_capa(int nt_link_speed_capa) +{ + uint32_t eth_speed_capa = 0; + + if (nt_link_speed_capa & NT_LINK_SPEED_10M) + eth_speed_capa |= RTE_ETH_LINK_SPEED_10M; + + if (nt_link_speed_capa & NT_LINK_SPEED_100M) + eth_speed_capa |= RTE_ETH_LINK_SPEED_100M; + + if (nt_link_speed_capa & NT_LINK_SPEED_1G) + eth_speed_capa |= RTE_ETH_LINK_SPEED_1G; + + if (nt_link_speed_capa & NT_LINK_SPEED_10G) + eth_speed_capa |= RTE_ETH_LINK_SPEED_10G; + + if (nt_link_speed_capa & NT_LINK_SPEED_25G) + eth_speed_capa |= RTE_ETH_LINK_SPEED_25G; + + if (nt_link_speed_capa & NT_LINK_SPEED_40G) + eth_speed_capa |= RTE_ETH_LINK_SPEED_40G; + + if (nt_link_speed_capa & NT_LINK_SPEED_50G) + eth_speed_capa |= RTE_ETH_LINK_SPEED_50G; + + if (nt_link_speed_capa & NT_LINK_SPEED_100G) + eth_speed_capa |= RTE_ETH_LINK_SPEED_100G; + + return eth_speed_capa; +} + +/* Converts link speed provided in Mbps to NT specific definitions.*/ +nt_link_speed_t convert_link_speed(int link_speed_mbps) +{ + switch (link_speed_mbps) { + case 10: + return NT_LINK_SPEED_10M; + + case 100: + return NT_LINK_SPEED_100M; + + case 1000: + return NT_LINK_SPEED_1G; + + case 10000: + return NT_LINK_SPEED_10G; + + case 40000: + return NT_LINK_SPEED_40G; + + case 100000: + return NT_LINK_SPEED_100G; + + case 50000: + return NT_LINK_SPEED_50G; + + case 25000: + return NT_LINK_SPEED_25G; + + default: + return NT_LINK_SPEED_UNKNOWN; + } +} + +int nt_link_duplex_to_eth_duplex(enum nt_link_duplex_e nt_link_duplex) +{ + int eth_link_duplex = 0; + + switch (nt_link_duplex) { + case NT_LINK_DUPLEX_FULL: + eth_link_duplex = RTE_ETH_LINK_FULL_DUPLEX; + break; + + case NT_LINK_DUPLEX_HALF: + eth_link_duplex = RTE_ETH_LINK_HALF_DUPLEX; + break; + + case NT_LINK_DUPLEX_UNKNOWN: /* fall-through */ + default: + break; + } + + return eth_link_duplex; +} diff --git a/drivers/net/ntnic/ntutil/nt_util.h b/drivers/net/ntnic/ntutil/nt_util.h index 6dfd7428e1..ea91181a06 100644 --- a/drivers/net/ntnic/ntutil/nt_util.h +++ b/drivers/net/ntnic/ntutil/nt_util.h @@ -7,6 +7,7 @@ #define NTOSS_SYSTEM_NT_UTIL_H #include +#include "nt4ga_link.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(arr) RTE_DIM(arr) @@ -30,6 +31,11 @@ struct nt_dma_s { uint64_t size; }; +struct port_link_speed { + int port_id; + int link_speed; +}; + struct nt_dma_s *nt_dma_alloc(uint64_t size, uint64_t align, int numa); void nt_dma_free(struct nt_dma_s *vfio_addr); @@ -40,4 +46,9 @@ struct nt_util_vfio_impl { void nt_util_vfio_init(struct nt_util_vfio_impl *impl); +int nt_link_speed_to_eth_speed_num(enum nt_link_speed_e nt_link_speed); +uint32_t nt_link_speed_capa_to_eth_speed_capa(int nt_link_speed_capa); +nt_link_speed_t convert_link_speed(int link_speed_mbps); +int nt_link_duplex_to_eth_duplex(enum nt_link_duplex_e nt_link_duplex); + #endif /* NTOSS_SYSTEM_NT_UTIL_H */ -- 2.45.0