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 59E39455F3; Thu, 11 Jul 2024 14:07:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0617E42E57; Thu, 11 Jul 2024 14:07:52 +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 6574E4065B for ; Thu, 11 Jul 2024 14:07:48 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2106.outbound.protection.outlook.com [104.47.18.106]) by mx-outbound41-230.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 11 Jul 2024 12:07:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cS3wwgNsRgDVmpp5tFWyLN3+kthn6u0XXkcftSgNTM2PuFCywN6NXJJHhg1pQeKEe93kC+xPdErzum6QvHOySEi5ILFTSmbtH7VEOfNOXYWJ/PJxQ9QaNvIdRj/oTKfjivskTdpCBGJP11BLwrcJprYHGztbOwWnanhLiDvqYJ1FJOujvU8LdjQyQ/2fA8vEC4G75N7/ks5vZEvIVkH7mgG3J2LWeRpajNYvvr5pF3x52PjLR/qs7tnfoIYJnf/fHCKRQe3rO9BEPldWhDND7MDzm5A8RM9osY81DHyN/g7mOxZko3o4egmlDfSMWo4awEHcmQAKHBDtAYUm5E8/VQ== 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=e/86QTzf6jKZcK3h5e5aX71s4pRjsED1PrT285DBxQ4=; b=FV3bZTh2G3Rmt2678yVbAB659n0hCHrMZSTbpodSJhb7cl/H1CKgYexU7soG1ciA+/uZgSTuMr0r4/+tiib2I1ctxEzGPD4Ys7ILtFq24bXKHQt4v5/40zKAd62R+jtiYZ55ogDlYC7yHwrXHuu3KyT+6QUqOkK0iwdLQjOdlClqT8kpEeCkhVwDa6S3gIVF34gxoiMRjQZKA1BMBluGQV4jB0W8fRDKEzvMgHDUHWZP9gvsXAKcjNyK+joj6i1jYL+2ZUfWlmhNGeAo2gVfDa2wctvJrfK6dbfnlmeUs2Ef5LgOZfCJQUEHf/ycowq5RULTrvgVXPO+8BkK0DG5Nw== 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=e/86QTzf6jKZcK3h5e5aX71s4pRjsED1PrT285DBxQ4=; b=bY6R/Dbrb9f1CTXj87W21qXvtv3XwP+fRS7+KfguuiFzlQXT+F/A3r9/jdMpdE0tVGecJYL+IRyU/DAG16Ng+666EY+KwYd3p4lrX1COShHvkjtQ/IfTNcZxC3OmnvXUcw8JiTvm2O3bmy+khTkYlFn/Rg6D0bXxSMfG+ytNCmQ= Received: from AS9PR04CA0096.eurprd04.prod.outlook.com (2603:10a6:20b:50e::26) by AM9P190MB1233.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:270::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 12:07:45 +0000 Received: from AMS0EPF0000019F.eurprd05.prod.outlook.com (2603:10a6:20b:50e:cafe::ce) by AS9PR04CA0096.outlook.office365.com (2603:10a6:20b:50e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22 via Frontend Transport; Thu, 11 Jul 2024 12:07:45 +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 AMS0EPF0000019F.mail.protection.outlook.com (10.167.16.251) with Microsoft SMTP Server id 15.20.7762.17 via Frontend Transport; Thu, 11 Jul 2024 12:07:45 +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 v6 03/21] net/ntnic: add minimal initialization for PCI device Date: Thu, 11 Jul 2024 14:07:14 +0200 Message-ID: <20240711120737.698176-3-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240711120737.698176-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240711120737.698176-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF0000019F:EE_|AM9P190MB1233:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 5ba1f462-0676-401b-5dfb-08dca1a21338 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3qXg1XPQjwhnDkQxSH3iIMNY3K0W+4fDill6fRbn0IEyOvRDjy6BsbOl08Eo?= =?us-ascii?Q?zKptj6Zev2GBbq7b4xBLmkKe8NJl6bL8QnJhmdCJFUkzYEQdAEALWnWJ+xMs?= =?us-ascii?Q?PevpjMxcD2S7aFf6go1SJkSMbdY2bmv5yrq+1DN9UXcUq6PTqB05ISKUsmIy?= =?us-ascii?Q?aFJGBQClRJC35V5jA5grhiI2JHJ+ffYpkG53pJR4JAGNvIMMB/gzcHfmv582?= =?us-ascii?Q?c1QFco8STKDopvyNLz1uaJ9y691jQjRjTVMVhbMK6e93A9q7W6lQXZa0gKd/?= =?us-ascii?Q?7PHcpdfXzZLQuofGKGtjd/jRAscGdBD4qUsPnyoIm59RUWOU7yVrm/KuOnMj?= =?us-ascii?Q?t0Za15Y5JVMPlI2Is46VQYe44ug0NwlhFAdkEchIh4xt+NLXr9vcJQXp04W1?= =?us-ascii?Q?z1r3PKz9MkjzGCgEeD+TYF3K7Asbw1yVVOjtYXEZ+BIy+JNwZIVWOBAwlTQV?= =?us-ascii?Q?Ngc4i6fz4sTQAeE8t38+cYx51uYkhIGC6bAiD9ahVU4/CPp4MwpfmMC7C7H6?= =?us-ascii?Q?AhLPLVT/2f2FfeUghINVcx8KFXGSv5vNlH50TnGwyYhi46XTdt5q36RBoCp8?= =?us-ascii?Q?ymsTTJZhan6/OhEmxv0QlWD5yLpWtyYsbsm//4+Vy9iKd9oyRvnUtNBxY18k?= =?us-ascii?Q?lbzDJk4DfPCMN9Mam9TuYtSj1TkzIKj3nVT+FIJy8g3CKEkHSpMV+KYhWnVv?= =?us-ascii?Q?So/1vgv0r8Y0Sv3CGMl5yNvw9Wt5phi98Rf4ES0MMZ2DpS0IjUqyM++dBXzo?= =?us-ascii?Q?bE1mNOn6pdQti7FaKOm0kVyX4WIdcntNrz+lavw2bXF+VdkvsrosdHlN1r8v?= =?us-ascii?Q?hO9bwmE/CXpy8nfVbiYg8yjDSO0aMxT+tMTimcXHPL1FjVEN+lOXUMdiQ4w3?= =?us-ascii?Q?v9MMQ7gsDSxkWkWSNCXNUvKAYJ8DagNYD8ty5JZcrbvkDfo1qr3plWdoULqP?= =?us-ascii?Q?qG46Wk9UVZrrWxGbb9WIq8vHUV380M70xDd0bB5Ffs+2MbbFakAjArhLm3fK?= =?us-ascii?Q?8faajb14H+GbVZbfOlJAt20/v7PA/DLs3YGHCAesc2Ye7tZn343ddD3bJRUb?= =?us-ascii?Q?Ae+VtZxNU88+LPQtPwS4nYIEch7fxbI6auQqxKI3df9K8XXYin5TOr/GPpwk?= =?us-ascii?Q?XlwAOW9ka+sY9ANkfXF/9GTe7T9N/clJ1GedI8R7DpwEyUjBhxDv5ftxu2KY?= =?us-ascii?Q?NpUBG7FDK2GdAJBTCW6XtTQ2dU3bY5HtctXBbMDzrK23eVk2h2LWA0aRqEnh?= =?us-ascii?Q?d3cMZPeoh2BmfebZzGqLWO5O+vH/M7Wchfq62lWiq/A/qimb5GCV23J+CeiV?= =?us-ascii?Q?F9s9NpALZgqNPnWwIKlgvmDDsDh3V1PutJVgwQd6a0e2/9XVbFkGkhSioOME?= =?us-ascii?Q?Wqpz7LkqKqKn6v5iKLEY9OB/4tgVUd4GTTXIFd5Co5sQMnES/HYMjuLXvc/v?= =?us-ascii?Q?FkudSRniZxiWXw4Al/OjGNVJxyTBtN8F?= 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)(376014)(82310400026); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Q5B0voYaEOf5YpLPLfRijp2yb3iTLEtyQWKEhtCXrfM2wNBKXOAY/77oTnZA0cEfqVVFHEa/SsBRe6O3e6/W9eJ7iNeEuKJzYptBTh8NNvKY8wm5auUUNmvC/aRMVbRVL+thK7Xm4HdE/dfrKKeSNeFJEaYktLQW9xp+URXtQgoahDIs297fThvQ9EAqk/67IOqaCkAbF6mvtxKaqWxRo3Eyn5CvGhIDdJVdTpOeb3NCSk7PdBuwdNDBEkn8Sl0M5Sg8fb5DUH194+9duikNg8cAtaL/w0U35rBTtM3upxAM90AWs6MUraFb6cFEIzx8lpWUlb4fMyQtz5ZoEpA3zZ4Ro0nQgguEAsiMN4gKHB3Rp+RrLkVM5+PTQGLtSseWUP3/RNm1KQz4bqVml/Z8gPM3fQF54o3+W11cpw4bvaVPfCrK6wB4oViwairRcbPjGBu9b+j7ori6bgaq4Kb6pDwuqCLsbMiY8ioloWhRFNNCkSY5XC/nLi/ahJ7k7Mr5peuEOtpFUfXiGKK1kJaQGgr+yLiCcTRhq2zAnBPgmbSTD82GdXCuiLWjAT2Yb1/pf1/2YgW1bJH+8ox/gk5mKY9P5X7S/MhgLoNnDWf3jB8WgzWDeRgPD+Kmyffbp+xtjfSKK5/96xCXnb4E0mkM0dQQlsCwr/SUHkK0AHrp/Oo= X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 12:07:45.7440 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ba1f462-0676-401b-5dfb-08dca1a21338 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: AMS0EPF0000019F.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P190MB1233 X-BESS-ID: 1720699667-310726-12661-23584-1 X-BESS-VER: 2019.1_20240702.1505 X-BESS-Apparent-Source-IP: 104.47.18.106 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVqYGBgZAVgZQ0MLExMAgycLMwt QoOc3QwswoxdIyLdUyyTzJyNIixcJAqTYWAE4IN/xBAAAA X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257551 [from cloudscan17-213.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 add implementation for probe/init and remove/deinit of the PCI device Signed-off-by: Serhii Iliushyk --- v6 * Add driver deinitialization * Add API rte_eth_dev_probing_finish * Add correct API for finishing probing the device * Remove duplicated calling 'rte_eth_copy_pci_info()' via 'eth_dev_pci_specific_init() * Remove unnecessary comments * Remove duplicatet initialization of the numa_node --- drivers/net/ntnic/ntnic_ethdev.c | 109 +++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 5 deletions(-) diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 68df9be2ff..a744f78adb 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -3,6 +3,7 @@ * Copyright(c) 2023 Napatech A/S */ +#include #include #include #include @@ -16,29 +17,127 @@ static const struct rte_pci_id nthw_pci_id_map[] = { }; static int -nthw_pci_dev_init(struct rte_pci_device *pci_dev __rte_unused) +nthw_pci_dev_init(struct rte_pci_device *pci_dev) { + uint32_t n_port_mask = -1; /* All ports enabled by default */ + int n_phy_ports; + 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); + + n_phy_ports = 0; + + for (int n_intf_no = 0; n_intf_no < n_phy_ports; n_intf_no++) { + struct rte_eth_dev *eth_dev = NULL; + char name[32]; + + if ((1 << n_intf_no) & ~n_port_mask) + continue; + + snprintf(name, sizeof(name), "ntnic%d", n_intf_no); + + eth_dev = rte_eth_dev_allocate(name); + + if (!eth_dev) { + NT_LOG_DBGX(ERR, NTNIC, "%s: %s: error=%d\n", + (pci_dev->name[0] ? pci_dev->name : "NA"), name, -1); + return -1; + } + + NT_LOG_DBGX(DEBUG, NTNIC, "eth_dev %p, port_id %u, if_index %u\n", + eth_dev, eth_dev->data->port_id, n_intf_no); + + + struct rte_eth_link pmd_link; + pmd_link.link_speed = RTE_ETH_SPEED_NUM_NONE; + pmd_link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; + pmd_link.link_status = RTE_ETH_LINK_DOWN; + pmd_link.link_autoneg = RTE_ETH_LINK_AUTONEG; + + eth_dev->device = &pci_dev->device; + eth_dev->data->dev_link = pmd_link; + eth_dev->dev_ops = NULL; + + eth_dev_pci_specific_init(eth_dev, pci_dev); + rte_eth_dev_probing_finish(eth_dev); + } + return 0; } static int nthw_pci_dev_deinit(struct rte_eth_dev *eth_dev __rte_unused) { - return 0; + NT_LOG_DBGX(DEBUG, NTNIC, "PCI device deinitialization\n"); + + int i; + char name[32]; + + struct pmd_internals *internals = eth_dev->data->dev_private; + ntdrv_4ga_t *p_ntdrv = &internals->p_drv->ntdrv; + fpga_info_t *fpga_info = &p_ntdrv->adapter_info.fpga_info; + const int n_phy_ports = fpga_info->n_phy_ports; + for (i = 0; i < n_phy_ports; i++) { + sprintf(name, "ntnic%d", i); + eth_dev = rte_eth_dev_allocated(name); + if (eth_dev == NULL) + continue; /* port already released */ + rte_eth_dev_release_port(eth_dev); + } + return 0; } static int nthw_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_pci_device *pci_dev) { - int ret; - ret = nthw_pci_dev_init(pci_dev); - return ret; + int res; + + NT_LOG_DBGX(DEBUG, NTNIC, "pcidev: name: '%s'\n", pci_dev->name); + NT_LOG_DBGX(DEBUG, NTNIC, "devargs: name: '%s'\n", pci_dev->device.name); + + if (pci_dev->device.devargs) { + NT_LOG_DBGX(DEBUG, NTNIC, "devargs: args: '%s'\n", + (pci_dev->device.devargs->args ? pci_dev->device.devargs->args : "NULL")); + NT_LOG_DBGX(DEBUG, NTNIC, "devargs: data: '%s'\n", + (pci_dev->device.devargs->data ? pci_dev->device.devargs->data : "NULL")); + } + + const int n_rte_vfio_no_io_mmu_enabled = rte_vfio_noiommu_is_enabled(); + NT_LOG(DBG, NTNIC, "vfio_no_iommu_enabled=%d\n", n_rte_vfio_no_io_mmu_enabled); + + if (n_rte_vfio_no_io_mmu_enabled) { + NT_LOG(ERR, NTNIC, "vfio_no_iommu_enabled=%d: this PMD needs VFIO IOMMU\n", + n_rte_vfio_no_io_mmu_enabled); + return -1; + } + + const enum rte_iova_mode n_rte_io_va_mode = rte_eal_iova_mode(); + NT_LOG(DBG, NTNIC, "iova mode=%d\n", n_rte_io_va_mode); + + NT_LOG(DBG, NTNIC, + "busid=" PCI_PRI_FMT + " pciid=%04x:%04x_%04x:%04x locstr=%s @ numanode=%d: drv=%s drvalias=%s\n", + pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, + pci_dev->addr.function, pci_dev->id.vendor_id, pci_dev->id.device_id, + pci_dev->id.subsystem_vendor_id, pci_dev->id.subsystem_device_id, + pci_dev->name[0] ? pci_dev->name : "NA", + pci_dev->device.numa_node, + pci_dev->driver->driver.name ? pci_dev->driver->driver.name : "NA", + pci_dev->driver->driver.alias ? pci_dev->driver->driver.alias : "NA"); + + + res = nthw_pci_dev_init(pci_dev); + + NT_LOG_DBGX(DEBUG, NTNIC, "leave: res=%d\n", res); + return res; } static int nthw_pci_remove(struct rte_pci_device *pci_dev) { + NT_LOG_DBGX(DEBUG, NTNIC); + return rte_eth_dev_pci_generic_remove(pci_dev, nthw_pci_dev_deinit); } -- 2.45.0