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 9F3AC45628; Tue, 16 Jul 2024 14:04:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4583F43357; Tue, 16 Jul 2024 14:02:43 +0200 (CEST) Received: from egress-ip11a.ess.de.barracuda.com (egress-ip11a.ess.de.barracuda.com [18.184.203.234]) by mails.dpdk.org (Postfix) with ESMTP id 731194332E for ; Tue, 16 Jul 2024 14:02:37 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2112.outbound.protection.outlook.com [104.47.18.112]) by mx-outbound8-202.eu-central-1a.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Jul 2024 12:02:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oefvtINHF1td3/TyNlOU4o6P01JZD2wY5c5JSNP5E1dvS/u2YH/rXLAmCUdF296U8FckZzzeeSBh908D7jMlnuevFlF9D5yiIave90jGXQ2rIcXnGXY6GYcKy8837dMEL4Uiu1JJyghf3xV5Am3ZL/C8f3KjRjVmDoncZz9xZUWdAMB724KEbaPf7tlcJrErAcRH8sbFLqaCh4aF042Kz+7BXHYtWl9S8kYjBOoUDc8U+nr9Pl7ig8oooc9Zk9DaL4aDpC3L4/c66Ds9Wo741e5rt9MQWQoYLGzKjACFxVG1Aj9ZM/LJizUzoLqg4Lm0AEPWiLbe9RUzAxvUkRRGeQ== 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=NOs9ga6AYi0xfKzepA6S5qENPDlwjNV3o8bwuV3F8Wk=; b=fsnS3Pu+sM49Mnd/t5xu0ZHT9UdF+seLzwSiGZgtXObwD8Kn+LqF6SqUpn0Pqi61H+aVTMaEi5Bi1Yu4rAFKftmgmeA6y0/NbJWUeEEttmS/wggFnzsrJf3Ze4VKYrANlByDXR6XC1aApBQbJJjRDubPOVwJZVJi8xJQ4r3/3j0AzlSgHEcqGDe3tS4owELsm9K99kVHS2oDnh4SqfIg0eBoKLcS0ORM97IappalkYo2pFiUZjUSYPkbO4lDrefopUH46w9nRWS1JgpDCJiyhCK7KLBVAqIrStVfV+BgwVRcpfcxzCXKDeSTg0Gt9Mvi21cnbX6SMsIOFAueI+/nUg== 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=NOs9ga6AYi0xfKzepA6S5qENPDlwjNV3o8bwuV3F8Wk=; b=czrAzHDtApfGFaEHk6pTS0Tta+NuLeHRfEhwYEVH4h614M78QxEOVDOMTbcrO3BZUrwtCfEI4C12Z5YYDZx2xl2Im5G5uyGp2XN2WzAcyzrfNMXumuVE5aBjWKjse6G0Gs5dHSxMnoTOGWxIz4dgF+0ePxK320adNABYtOk8sW4= Received: from DU7P195CA0019.EURP195.PROD.OUTLOOK.COM (2603:10a6:10:54d::32) by DU0P190MB1860.EURP190.PROD.OUTLOOK.COM (2603:10a6:10:3a4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.28; Tue, 16 Jul 2024 12:02:34 +0000 Received: from DU6PEPF0000A7DD.eurprd02.prod.outlook.com (2603:10a6:10:54d:cafe::35) by DU7P195CA0019.outlook.office365.com (2603:10a6:10:54d::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29 via Frontend Transport; Tue, 16 Jul 2024 12:02:34 +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 DU6PEPF0000A7DD.mail.protection.outlook.com (10.167.8.37) with Microsoft SMTP Server id 15.20.7784.11 via Frontend Transport; Tue, 16 Jul 2024 12:02:33 +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 v9 16/21] net/ntnic: add link 100G module ops Date: Tue, 16 Jul 2024 14:02:05 +0200 Message-ID: <20240716120216.3032484-16-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240716120216.3032484-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240716120216.3032484-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU6PEPF0000A7DD:EE_|DU0P190MB1860:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 98e24525-fc2c-41eb-230c-08dca58f2d8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Jdgs5c8odfL9b3TyN7pSGPUJ1OG5PTShuPZag26dqHMbNV+0x+9vMeNO0d9H?= =?us-ascii?Q?zNoEg/WO21oedQ8Y66qwwu4PbiN7dPAMYRtPb4wl88BJKzy25YmSLni4AZsY?= =?us-ascii?Q?uUDd64cMeJfGjUgKgv4JMG13ECXqDnkC6qOykJfpZR3mQXrc0dWJkM5MHl5w?= =?us-ascii?Q?BEeFcuJAHVHcgvW1tpcgzcKTeCqwRPxLHJPjFHkwT4j6bm8Bz7URLPBZGsI4?= =?us-ascii?Q?lpUwn/r6ldKKWvzXd6gM0cevvjj6QyAZkK3ynVpIi9UQ2s2qJ5WGE/UxsaBc?= =?us-ascii?Q?Dk8PfH4UUrWd64tLQXf2sAOo/WZOtI5L4rhwNblE0eYf331IPpFZZr0qJRwS?= =?us-ascii?Q?MIkM0PeKV+NH6m/LL4P0D0AnS/VNef5TJ5pibbgbfkVtcXoe/hDX7MOoiJqW?= =?us-ascii?Q?hD/u1JWflkvUGP2XRghWPjLQ3OdXp8xqd2c7obTFmlKYuq3gyM+J5qpeeXUB?= =?us-ascii?Q?sJtR3+5AmUGsuZxBc2rfMQv7JkSWFpT+WpGL/2spiXNTq7QkM5+wxa91ztAV?= =?us-ascii?Q?mQmZ3JifkdmLhnO2vIWcpx8C5UkCj5lpaw5VPA47uWDGjsDaILX7ARTQsrR4?= =?us-ascii?Q?oS9rPk22np+FHu9YnFtc8WMxgegn2tY4QFPbbWVfuLptwC2kWsf1TuSQCwDH?= =?us-ascii?Q?Kjx23s8E6KGhad2CwHi5MC337X3cG2Qc6TNKdKxkykquKH2JuejageMxgUog?= =?us-ascii?Q?31UwkI3aZh4489fCmkAIy//NhxHkjplYd2f7ByvNA0Qj7cug5og1TD9eJV8O?= =?us-ascii?Q?02JhkJLZfz7lBHZWzuBy5UV2VnR7ru+4B2PSIKS5qE+IePbAmVMC7UvhDmac?= =?us-ascii?Q?VOXZzd7MSmLahw3Ven04whiJbkSqBSJlaxtb7DGkr1x65RFKXLQv7EzWuAMe?= =?us-ascii?Q?lfL8V/vViwq5IMAC7xRpuWiZTxk9U5mT3F1lHu73zsrVwznZpdpTyHTrTiRV?= =?us-ascii?Q?F5U149bcoDsPuNYL0tl6+p3PXWoSa1htBLpGvhYX1gBsoORA+Gb02zGr0pT7?= =?us-ascii?Q?1IaQ9SuXZThVyc3ceSmXkx8A2S2Jm3lBwc7in/aXvzef+HvjS8SzKTIIMe+l?= =?us-ascii?Q?YvddYCxgyHOvC8LODnlvOeD9F7sIdRqhknTBj0QbgLCg4aPnAjT2NoGTMDVv?= =?us-ascii?Q?6N6CSM5d3KPLJ2QijyhjkMlWuPipV7/5m+HBRVN7LlXZ0Jz1AdxsBwEpmEgh?= =?us-ascii?Q?VR5/9JT9ydhiN27cdYSoqYX1hTMaq2jHH6XLrk02YaSOtw0EaqCFHAqArJ8K?= =?us-ascii?Q?iR0y7MdvTLh28X1DRrtu+yHRdx/0es/+U6A1gwDXtqVuhIBjCSnjkuwA9BYO?= =?us-ascii?Q?C3H+5ryA3Ut7ktb/5/1UfIpVJw89bq+tE0CnBEAmZ4O4GwADsRzF3OqsSHwU?= =?us-ascii?Q?L6WH8JVX0cUNZ1qNLljT1t+IUfz7+CDHrY6VpAEerqiO4qTzTGmul1ylnEsP?= =?us-ascii?Q?2tfGV7jCL6qsUB/BbWaVUv4RAyOTKUzZ?= 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)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IpnR0OH8EVD47bn5K3eMzzvhfwUbEd+8QcMmFupS/E7E/DiOBgwLwwzS9C2yJovtYMRAMntkAGx2uR4lS6tEjn1zRuM0Q3A1x/EoKrMQcSWFbNHhJkEIT0lgyM5wIzvPvDCFUaCu/J8yMIwKoa+4k4PerBo9GsCcqqbj9BAHCijYbPHafGiGj82kX2V8pagy17mrncw2Q82pZwDjSixw2QUzv5TGSNu74nm1ZjLfTibnizco8CKLFqRjFNGRteQYhwT7UFoFsAqkbFkcX9BnJXhwvTAdiJqRTV6m9HcoevM2+4d8IZqmdU19LeP1/TRihKEHMXfB03wm1/Jcp2xZMHXchCJd0IcY+NKxuAkhR3ZFee5YdUjUiq/tIpxxOpKaNCCv02SCB+UdINTeQj8bmL12iyeh2PeMQZ5OgtRovMnd3spcyS5dyH6sBNqfsBJP2dxYoviFy3miAQ4Bz9uaFjfOUmM2eJupbBdm0bNAACRKrUT4uD9cGC3k7Lsi8Bftukuy7FaVBMYcL7QGIgsporvEcO7jwkz7t9Mv7nsuo/HZ0R/exOpqiIcBzpxFuLmBkSyZ7xRKnevunGd5XcK/8A/kJuOFGk2jVh0lNzghZ58j2thPEG7AsVvGWrneISstTpS0zIlvBiIEEzPUQXx8aCzjPd9fxi6xo0jHv98VF+o= X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2024 12:02:33.9304 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98e24525-fc2c-41eb-230c-08dca58f2d8d 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: DU6PEPF0000A7DD.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P190MB1860 X-BESS-ID: 1721131356-302250-12641-24285-1 X-BESS-VER: 2019.1_20240702.1505 X-BESS-Apparent-Source-IP: 104.47.18.112 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKViZmJqZAVgZQ0CzRwjDVzMjUJC 3V2MwgNTnZ0CIpzSLV3NQk2SDZ0tJSqTYWAGSpAAtBAAAA X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257662 [from cloudscan16-75.eu-central-1b.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS113687 scores of KILL_LEVEL=7.0 tests=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 As the ntnic can support different speeds, an abstraction layer for 100G speed is needed. Signed-off-by: Serhii Iliushyk --- drivers/net/ntnic/adapter/nt4ga_adapter.c | 12 ++++- .../link_mgmt/link_100g/nt4ga_link_100g.c | 49 +++++++++++++++++++ drivers/net/ntnic/meson.build | 1 + drivers/net/ntnic/ntnic_mod_reg.c | 14 ++++++ drivers/net/ntnic/ntnic_mod_reg.h | 8 +++ 5 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c diff --git a/drivers/net/ntnic/adapter/nt4ga_adapter.c b/drivers/net/ntnic/adapter/nt4ga_adapter.c index be98938cc3..43bb566e33 100644 --- a/drivers/net/ntnic/adapter/nt4ga_adapter.c +++ b/drivers/net/ntnic/adapter/nt4ga_adapter.c @@ -125,6 +125,7 @@ static int nt4ga_adapter_init(struct adapter_info_s *p_adapter_info) { int i; + const struct link_ops_s *link_ops = NULL; assert(fpga_info->n_fpga_prod_id > 0); for (i = 0; i < NUM_ADAPTER_PORTS_MAX; i++) { @@ -135,8 +136,15 @@ static int nt4ga_adapter_init(struct adapter_info_s *p_adapter_info) switch (fpga_info->n_fpga_prod_id) { /* NT200A01: 2x100G (Xilinx) */ case 9563: /* NT200A02 (Cap) */ - NT_LOG(ERR, NTNIC, "NT200A02 100G link module uninitialized\n"); - res = -1; + link_ops = get_100g_link_ops(); + + if (link_ops == NULL) { + NT_LOG(ERR, NTNIC, "NT200A02 100G link module uninitialized\n"); + res = -1; + break; + } + + res = link_ops->link_init(p_adapter_info, p_fpga); break; default: diff --git a/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c b/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c new file mode 100644 index 0000000000..36c4bf031f --- /dev/null +++ b/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c @@ -0,0 +1,49 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#include /* memcmp, memset */ + +#include "nt_util.h" +#include "ntlog.h" +#include "ntnic_mod_reg.h" + +/* + * Initialize all ports + * The driver calls this function during initialization (of the driver). + */ +static int nt4ga_link_100g_ports_init(struct adapter_info_s *p_adapter_info, nthw_fpga_t *fpga) +{ + (void)fpga; + const int adapter_no = p_adapter_info->adapter_no; + int res = 0; + + NT_LOG(DBG, NTNIC, "%s: Initializing ports\n", p_adapter_info->mp_adapter_id_str); + + /* + * Initialize global variables + */ + assert(adapter_no >= 0 && adapter_no < NUM_ADAPTER_MAX); + + if (res == 0 && !p_adapter_info->nt4ga_link.variables_initialized) { + if (res == 0) { + p_adapter_info->nt4ga_link.speed_capa = NT_LINK_SPEED_100G; + p_adapter_info->nt4ga_link.variables_initialized = true; + } + } + + return res; +} + +/* + * Init 100G link ops variables + */ +static struct link_ops_s link_100g_ops = { + .link_init = nt4ga_link_100g_ports_init, +}; + +void link_100g_init(void) +{ + register_100g_link_ops(&link_100g_ops); +} diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build index 001c75963e..32f955969f 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/link_100g/nt4ga_link_100g.c', 'link_mgmt/nt4ga_link.c', 'nthw/supported/nthw_fpga_9563_055_039_0000.c', 'nthw/supported/nthw_fpga_instances.c', diff --git a/drivers/net/ntnic/ntnic_mod_reg.c b/drivers/net/ntnic/ntnic_mod_reg.c index b79929c696..40e22c60fa 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 struct link_ops_s *link_100g_ops; + +void register_100g_link_ops(struct link_ops_s *ops) +{ + link_100g_ops = ops; +} + +const struct link_ops_s *get_100g_link_ops(void) +{ + if (link_100g_ops == NULL) + link_100g_init(); + return link_100g_ops; +} + static const struct port_ops *port_ops; void register_port_ops(const struct port_ops *ops) diff --git a/drivers/net/ntnic/ntnic_mod_reg.h b/drivers/net/ntnic/ntnic_mod_reg.h index 8d1971a9c4..68629412b7 100644 --- a/drivers/net/ntnic/ntnic_mod_reg.h +++ b/drivers/net/ntnic/ntnic_mod_reg.h @@ -13,6 +13,14 @@ #include "nt4ga_adapter.h" #include "ntnic_nthw_fpga_rst_nt200a0x.h" +struct link_ops_s { + int (*link_init)(struct adapter_info_s *p_adapter_info, nthw_fpga_t *p_fpga); +}; + +void register_100g_link_ops(struct link_ops_s *ops); +const struct link_ops_s *get_100g_link_ops(void); +void link_100g_init(void); + struct port_ops { /* * port:s link mode -- 2.45.0