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 3884C42BF1; Mon, 5 Jun 2023 15:27:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20E2B41141; Mon, 5 Jun 2023 15:27:31 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 86F3F410DD for ; Mon, 5 Jun 2023 15:27:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MqRkhR61mRR8YrfmBVo0riLYASZHwRtTZhL9hOrkx1z5sqmFf9rXzYp8KR8TZgKV43VZ93aFuEPmzW6OR+d/qZE0bIA1tZ9NGUtWYfGnao8ItfzjgzUusd+pLOYfdpw7vcaz+oDk1YA8kKjOP0EnyYjkfXhTGtU3kign60aaZxOSITLouCUyEqHRUfxE6wxvQtyqOiBa0U+/ZkDO1ropdHHBbMpyktMbpwUsCXZqQHYWpLGZlIdWEMK1JU1ma2HaRhDMJp4xX/P1UQNTobh5WqGWL/5dchaPdeHz8nw6UnVs9LlDiouNzI7LWfqoQ2dO6NuHJGNHwaj3uc64AYECDg== 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=vTh3e8Q+q6lC4KK14DFBJIXIpmSnGUBVIJtjDr2TlzM=; b=NLTfM3DC4c3C2pTvarxTlAvf9SXWdpLm/avTbm5tFKWSsEkHk0NEyTPHf96qGa+3VlCfT+ZrUS2JZFPaOvWb3uRE0rJ2qrdWovWaTKz2gf5OLBsWzVUd5ruvFz8gQCefMXsWyweH4uIiSj4RCsbJD7HG7hQNiTALpRtHJon42EM9UYQbQgJG9t+caXggNatubhoo0IIJOtsczYJf575TAy3b38CNUrqwTSN29g7r41ugRvvX8uDS/2gxCUfKuPGPZMiIV9LMBC1nIt6xr01eg/t98j+WAKk4QotwhQwtB2LI6EFSsYoTg3vN76xJTAqR4455jjLaXSIstmsYxDv95Q== 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 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=vTh3e8Q+q6lC4KK14DFBJIXIpmSnGUBVIJtjDr2TlzM=; b=m2+th11fahVVSRS/CYQlD4qF3tINZ8yEXXN+uCuajOEA7TruLuQu2k0dIUlG9mWRy8YJ45o4Jh6xjvHx9Xxq6efcNwnCl0Ri/7RxSHw03mrQD7rtuaPWukhJEKFCoqJwB/jpSz4LXQNXSbopA2yyQ2R2GJq38MN1Jcd7D1dXRh8= Received: from BYAPR07CA0100.namprd07.prod.outlook.com (2603:10b6:a03:12b::41) by CH2PR12MB4278.namprd12.prod.outlook.com (2603:10b6:610:ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32; Mon, 5 Jun 2023 13:27:24 +0000 Received: from DM6NAM11FT112.eop-nam11.prod.protection.outlook.com (2603:10b6:a03:12b:cafe::80) by BYAPR07CA0100.outlook.office365.com (2603:10b6:a03:12b::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33 via Frontend Transport; Mon, 5 Jun 2023 13:27:24 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by DM6NAM11FT112.mail.protection.outlook.com (10.13.173.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6455.33 via Frontend Transport; Mon, 5 Jun 2023 13:27:23 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 5 Jun 2023 08:27:23 -0500 Received: from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Mon, 5 Jun 2023 08:27:20 -0500 From: Nipun Gupta To: , , , , , CC: , , , Nipun Gupta Subject: [PATCH v6 4/4] bus/cdx: support plug unplug and dev iterator Date: Mon, 5 Jun 2023 18:56:24 +0530 Message-ID: <20230605132624.8626-5-nipun.gupta@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230605132624.8626-1-nipun.gupta@amd.com> References: <20230124140746.594066-1-nipun.gupta@amd.com> <20230605132624.8626-1-nipun.gupta@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT112:EE_|CH2PR12MB4278:EE_ X-MS-Office365-Filtering-Correlation-Id: d693ab1f-abec-4935-daa0-08db65c89923 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RV7jpDW44diV1y/REHYN4YfPc8h7y67KLo02DyKhLIr5nfnrJRaRWzkZuqdk+F5cfGR0LK6cIT5b3KtO1p6dWyQ9lSB9mqkz/foi5KnSfcacdXPL2PZb+h2V9wMX/Gksk+eWZnLwROI7HbgFkglxuiF2JYTy1zhYzsKXrtSbVsOpROI4lsOwyFXnB+uz+BFeY5CNwlN2oGUIREmDBESw7e+a2HnObECDQzxteLDfFxp/twUTTq6Lyfr2jHN249qZAKgXcVAsN/ODeWyugsuBUwXRRoNlg2RT/C1/2N1neP8WMqczsXJiIk2TuWsOBRQlj4avH54VSsACxfBDSQoed4QIaFzziWVGHVGsLf1e0WmN2Jf9ztBLPbSW3ORbSNXfnmi8vbwcaP/kBU+DLzd809mgAyB5AQ7DmS2CsFfv3EL21W2H+h1VX5VhwThxQByntYo4XQeS/eevuhpbaA+nfyNasPHqLCa1TGNpbBj/fZ3e3M3ZEuSHUotnh2pem6rLfAkfRuS1RH/4DkkRlAMspn+s2Xt6mJhnw5gVaS+PaUAR7a/YsYZ00qIfCbUsbtzoRbW4jHYrnkXy+i4CfyDfE1pA6UnladclKu1chmBAYUEEsT0AooF1LnKG3xtmk/K2Oy/gMNd1BFi33EnBmBER/eKw2yCZiT2kPMwisjv8szrFfPVveyJlPuxkw341xrWrVFTp2kgJg9w1MKqXKim0xrTPr0S8dViYNHw9nP2JaXDJTjOdkUk2iWSaiFsb0ulVZF/ZciVqOJRIY1MDh+YEaA== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(396003)(376002)(136003)(39860400002)(346002)(451199021)(40470700004)(36840700001)(46966006)(44832011)(8676002)(8936002)(5660300002)(2906002)(316002)(70586007)(70206006)(4326008)(110136005)(41300700001)(54906003)(426003)(26005)(1076003)(336012)(186003)(36756003)(2616005)(36860700001)(47076005)(81166007)(356005)(478600001)(82310400005)(40460700003)(82740400003)(40480700001)(86362001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2023 13:27:23.9404 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d693ab1f-abec-4935-daa0-08db65c89923 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT112.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4278 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 change adds support for plugging and unplugging CDX devices on AMD CDX bus. Also, CDX dev iterator support has been added for the CDX bus. Signed-off-by: Nipun Gupta Acked-by: Ferruh Yigit --- drivers/bus/cdx/bus_cdx_driver.h | 1 + drivers/bus/cdx/cdx.c | 122 +++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/drivers/bus/cdx/bus_cdx_driver.h b/drivers/bus/cdx/bus_cdx_driver.h index 5745429fa7..288cadf31b 100644 --- a/drivers/bus/cdx/bus_cdx_driver.h +++ b/drivers/bus/cdx/bus_cdx_driver.h @@ -52,6 +52,7 @@ struct rte_cdx_id { struct rte_cdx_device { RTE_TAILQ_ENTRY(rte_cdx_device) next; /**< Next probed CDX device. */ struct rte_device device; /**< Inherit core device */ + struct rte_cdx_driver *driver; /**< CDX driver used in probing */ char name[RTE_DEV_NAME_MAX_LEN]; /**< Device name */ struct rte_cdx_id id; /**< CDX ID. */ struct rte_mem_resource mem_resource[CDX_MAX_RESOURCE]; diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c index e5e6a665c3..2165486bc3 100644 --- a/drivers/bus/cdx/cdx.c +++ b/drivers/bus/cdx/cdx.c @@ -71,6 +71,7 @@ #include #include #include +#include #include #include @@ -92,6 +93,15 @@ struct rte_cdx_bus rte_cdx_bus; +enum cdx_params { + RTE_CDX_PARAM_NAME, +}; + +static const char * const cdx_params_keys[] = { + [RTE_CDX_PARAM_NAME] = "name", + NULL, +}; + /* Add a device to CDX bus */ static void cdx_add_device(struct rte_cdx_device *cdx_dev) @@ -385,6 +395,7 @@ cdx_probe_one_driver(struct rte_cdx_driver *dr, } else { dev->device.driver = &dr->driver; } + dev->driver = dr; return ret; @@ -499,6 +510,71 @@ cdx_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, return NULL; } +/* Remove a device from CDX bus */ +static void +cdx_remove_device(struct rte_cdx_device *cdx_dev) +{ + TAILQ_REMOVE(&rte_cdx_bus.device_list, cdx_dev, next); +} + +/* + * If vendor/device ID match, call the remove() function of the + * driver. + */ +static int +cdx_detach_dev(struct rte_cdx_device *dev) +{ + struct rte_cdx_driver *dr; + int ret = 0; + + if (dev == NULL) + return -EINVAL; + + dr = dev->driver; + + CDX_BUS_DEBUG("detach device %s using driver: %s", + dev->device.name, dr->driver.name); + + if (dr->remove) { + ret = dr->remove(dev); + if (ret < 0) + return ret; + } + + /* clear driver structure */ + dev->driver = NULL; + dev->device.driver = NULL; + + rte_cdx_unmap_device(dev); + + rte_intr_instance_free(dev->intr_handle); + dev->intr_handle = NULL; + + return 0; +} + +static int +cdx_plug(struct rte_device *dev) +{ + return cdx_probe_all_drivers(RTE_DEV_TO_CDX_DEV(dev)); +} + +static int +cdx_unplug(struct rte_device *dev) +{ + struct rte_cdx_device *cdx_dev; + int ret; + + cdx_dev = RTE_DEV_TO_CDX_DEV(dev); + ret = cdx_detach_dev(cdx_dev); + if (ret == 0) { + cdx_remove_device(cdx_dev); + rte_devargs_remove(dev->devargs); + free(cdx_dev); + } + return ret; +} + static int cdx_dma_map(struct rte_device *dev, void *addr, uint64_t iova, size_t len) { @@ -526,15 +602,61 @@ cdx_get_iommu_class(void) return RTE_IOVA_VA; } +static int +cdx_dev_match(const struct rte_device *dev, + const void *_kvlist) +{ + const struct rte_kvargs *kvlist = _kvlist; + const char *key = cdx_params_keys[RTE_CDX_PARAM_NAME]; + const char *name; + + /* no kvlist arg, all devices match */ + if (kvlist == NULL) + return 0; + + /* if key is present in kvlist and does not match, filter device */ + name = rte_kvargs_get(kvlist, key); + if (name != NULL && strcmp(name, dev->name)) + return -1; + + return 0; +} + +static void * +cdx_dev_iterate(const void *start, + const char *str, + const struct rte_dev_iterator *it __rte_unused) +{ + rte_bus_find_device_t find_device; + struct rte_kvargs *kvargs = NULL; + struct rte_device *dev; + + if (str != NULL) { + kvargs = rte_kvargs_parse(str, cdx_params_keys); + if (kvargs == NULL) { + CDX_BUS_ERR("cannot parse argument list %s", str); + rte_errno = EINVAL; + return NULL; + } + } + find_device = rte_cdx_bus.bus.find_device; + dev = find_device(start, cdx_dev_match, kvargs); + rte_kvargs_free(kvargs); + return dev; +} + struct rte_cdx_bus rte_cdx_bus = { .bus = { .scan = cdx_scan, .probe = cdx_probe, .find_device = cdx_find_device, + .plug = cdx_plug, + .unplug = cdx_unplug, .parse = cdx_parse, .dma_map = cdx_dma_map, .dma_unmap = cdx_dma_unmap, .get_iommu_class = cdx_get_iommu_class, + .dev_iterate = cdx_dev_iterate, }, .device_list = TAILQ_HEAD_INITIALIZER(rte_cdx_bus.device_list), .driver_list = TAILQ_HEAD_INITIALIZER(rte_cdx_bus.driver_list), -- 2.17.1