From patchwork Fri Apr 19 19:53:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 139555 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4193643EB5; Fri, 19 Apr 2024 21:54:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB1A740DC9; Fri, 19 Apr 2024 21:53:53 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2069.outbound.protection.outlook.com [40.107.236.69]) by mails.dpdk.org (Postfix) with ESMTP id BBF9F40A76 for ; Fri, 19 Apr 2024 21:53:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=idh4Afm35NDFByE0tNH1gduNq9CDiUaji/XuqC7ES+PHqu1RMyaSo2sLl8BrjTN5GDxtWCJh51wyntdr/7qhi8t6HGJ8pFPEAtbVS60h3Z6s37Ak9ANmDaHh8MD8f80I0XwEjkGODmNQt9uFe2uPWfIioGj/7PktaZyDQWhKCw0AdFLxYqVUX8f3xhFLz4Oa+2RM+zafO7QwVTFTCoTGIwAyOgEBp1vqfuzsfogyXwsgwrYUGWjrnhLwpae6qjOf8T5iy+O9TKBAfW89n+K0cgDu0OSbD3gJKZmI9Ev8k8RLA5qz8cGVz/3oLv54dj4Sow7bondfwo12nFodscSgKA== 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=CthakoryKoOj3SofxeB8KAIrAn9O8nOp5irZmWMxFys=; b=ZIUcmeQ24LTsjLztgwFxocU9eRGU/2q/mKc/zVMYXUpl4eZC2RLNCY2q/nRF7A9upCBrBTUE9lunGmZLdXTlg2RDDDXhhVa0/B2/Mw2f8msOHWnhpMQ+a4ln0yoFk3cRKfz3a6/OJjWEAQFXc8+HYG/k7qk5327YQoaGI5sBbZkaBSj6WNpY1sfgEAYr2BV01jajLCed0WAl6Rt6jI7HppO0qNR2jfvBWGNlIjQNR4Rjp3TW2GV3K++ShT6q41tSPuH79lJ+Y+308YbmXpd2Fhk1O32xFO3XgbEsOG7qfYwxpjJIdUKRbsjNImInT1RvXmjVvcr6OzaczYBvbiQHAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CthakoryKoOj3SofxeB8KAIrAn9O8nOp5irZmWMxFys=; b=GpeU4FDMC4H60bJhJopDkQ/2MHz3h6fC735e/Jk2jrUhfVxkdFSDdaq7/ub2fLw3rp64ft0pgNU2TxvKRM+291rZVsd7vl3HemVH7TCGfju7DsavHVLJfvJX6uY7LItFBCQmexvPH+VUpu6WyUEhPfMho3o0pz4n+0xxaONSQ5I= Received: from SA0PR12CA0004.namprd12.prod.outlook.com (2603:10b6:806:6f::9) by MN6PR12MB8566.namprd12.prod.outlook.com (2603:10b6:208:47c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Fri, 19 Apr 2024 19:53:48 +0000 Received: from SA2PEPF00001506.namprd04.prod.outlook.com (2603:10b6:806:6f:cafe::40) by SA0PR12CA0004.outlook.office365.com (2603:10b6:806:6f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.34 via Frontend Transport; Fri, 19 Apr 2024 19:53:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF00001506.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Fri, 19 Apr 2024 19:53:47 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 19 Apr 2024 14:53:46 -0500 From: Andrew Boyer To: CC: Akhil Goyal , Andrew Boyer Subject: [PATCH 3/6] common/ionic: add crypto vdev support Date: Fri, 19 Apr 2024 12:53:07 -0700 Message-ID: <20240419195310.21432-4-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240419195310.21432-1-andrew.boyer@amd.com> References: <20240419195310.21432-1-andrew.boyer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00001506:EE_|MN6PR12MB8566:EE_ X-MS-Office365-Filtering-Correlation-Id: e5f17b39-7072-4860-c11f-08dc60aa6d6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gtYNk3Ow+fjMdHL2DmlYfHzjxUqPc6vi5fqILscseT9hx/3iKRncqP4ahBSZGWO+mWn0ld+/uq+PFDUUAataW1uCXEEmPbYzkbSWe8Qy3XZC6VpIi58p7Z/MIc9ifsjYaqtT/NZFERnqWNIkmRY6lVSeV+f9XmkVBjsiGtRn6u123KoWzOC045wwCanYOim6zw6mdjKd+JOctROJa/JlRZswJiozbNbPPAsbJVZ/E8+/I7o0GpiEwWg30NFLBOGOD/5yCo5p3WRhuCazN3WoHFb9Y2cd3CH+mfBFf0ZuDTPF7jvMN7NbC8+ZMzlJbvTa5JzQgbXP6NclnWri7j/6btqNq/IbH6NnnT7XBVZeTbm3qQIuiw9gwE9cgtf5tOyC18CcJMYJqOmCXnwG8RLW1JD4YPqUT9MJI5B7A5BL3fow5Gpxkgiax28hMj0Qgl+ePZphgr4bSE8qV/AwTjDHmimV9kF24BfdFHSGWjM/CF96ipwPZ2MYmimrP+PkFiAyzBrxIxMIkuad9cIT44DtkdAMtz8nXAsvWntph/mVtYqA4exDjOgbywW+/FPLfzZLuQLsbDxG50Vw9Wlx/Vm+ZibWrfyKrAQEev20oCRFb3J1P/9emkckOVm2AqJ+a9+hlQ0l1FCTGdn1k9jmfZDFAaFB3AfsVXtvsfPj0ctLCM4eh/NRHEspP/rq5PL6X2vwVMSbvGC/uWOqURrMcmw9c4LW/nf9/H1DxsBNiHzYslfPOTxWamBlp8y+F82yulxM X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 19:53:47.5471 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5f17b39-7072-4860-c11f-08dc60aa6d6b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00001506.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8566 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 This adds support for cryptodevs to the common ionic library. Signed-off-by: Andrew Boyer --- drivers/common/ionic/ionic_common.h | 2 ++ drivers/common/ionic/ionic_common_uio.c | 48 ++++++++++++++++++++++++- drivers/common/ionic/version.map | 1 + 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/common/ionic/ionic_common.h b/drivers/common/ionic/ionic_common.h index eb4850e24c..c4a15fdf2b 100644 --- a/drivers/common/ionic/ionic_common.h +++ b/drivers/common/ionic/ionic_common.h @@ -32,6 +32,8 @@ struct ionic_dev_bar { __rte_internal void ionic_uio_scan_mnet_devices(void); +__rte_internal +void ionic_uio_scan_mcrypt_devices(void); __rte_internal void ionic_uio_get_rsrc(const char *name, int idx, struct ionic_dev_bar *bar); diff --git a/drivers/common/ionic/ionic_common_uio.c b/drivers/common/ionic/ionic_common_uio.c index e5c73faf96..c647b22eaf 100644 --- a/drivers/common/ionic/ionic_common_uio.c +++ b/drivers/common/ionic/ionic_common_uio.c @@ -23,10 +23,12 @@ #define IONIC_MDEV_UNK "mdev_unknown" #define IONIC_MNIC "cpu_mnic" +#define IONIC_MCRYPT "cpu_mcrypt" #define IONIC_MAX_NAME_LEN 20 #define IONIC_MAX_MNETS 5 -#define IONIC_MAX_DEVICES (IONIC_MAX_MNETS) +#define IONIC_MAX_MCPTS 1 +#define IONIC_MAX_DEVICES (IONIC_MAX_MNETS + IONIC_MAX_MCPTS) #define IONIC_MAX_U16_IDX 0xFFFF #define IONIC_UIO_MAX_TRIES 32 @@ -49,6 +51,7 @@ struct ionic_map_tbl ionic_mdev_map[IONIC_MAX_DEVICES] = { { "net_ionic2", 2, IONIC_MAX_U16_IDX, IONIC_MDEV_UNK }, { "net_ionic3", 3, IONIC_MAX_U16_IDX, IONIC_MDEV_UNK }, { "net_ionic4", 4, IONIC_MAX_U16_IDX, IONIC_MDEV_UNK }, + { "crypto_ionic0", 5, IONIC_MAX_U16_IDX, IONIC_MDEV_UNK }, }; struct uio_name { @@ -143,6 +146,49 @@ ionic_uio_scan_mnet_devices(void) } } +void +ionic_uio_scan_mcrypt_devices(void) +{ + struct ionic_map_tbl *map; + char devname[IONIC_MAX_NAME_LEN]; + struct uio_name name_cache[IONIC_MAX_DEVICES]; + bool done; + int mdev_idx = 0; + int uio_idx; + int i; + static bool scan_done; + + if (scan_done) + return; + + scan_done = true; + + uio_fill_name_cache(name_cache, IONIC_MCRYPT); + + for (i = IONIC_MAX_MNETS; i < IONIC_MAX_DEVICES; i++) { + done = false; + + while (!done) { + if (mdev_idx > IONIC_MAX_MDEV_SCAN) + break; + + /* Look for a matching mcrypt */ + snprintf(devname, IONIC_MAX_NAME_LEN, + IONIC_MCRYPT "%d", mdev_idx); + uio_idx = uio_get_idx_for_devname(name_cache, devname); + if (uio_idx >= 0) { + map = &ionic_mdev_map[i]; + map->uio_idx = (uint16_t)uio_idx; + strlcpy(map->mdev_name, devname, + IONIC_MAX_NAME_LEN); + done = true; + } + + mdev_idx++; + } + } +} + static int uio_get_multi_dev_uionum(const char *name) { diff --git a/drivers/common/ionic/version.map b/drivers/common/ionic/version.map index 484330c437..db532d4ffc 100644 --- a/drivers/common/ionic/version.map +++ b/drivers/common/ionic/version.map @@ -2,6 +2,7 @@ INTERNAL { global: ionic_uio_scan_mnet_devices; + ionic_uio_scan_mcrypt_devices; ionic_uio_get_rsrc; ionic_uio_rel_rsrc;