From patchwork Mon Jul 19 02:54:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xueming(Steven) Li" X-Patchwork-Id: 96034 X-Patchwork-Delegate: thomas@monjalon.net 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 C2450A0C45; Mon, 19 Jul 2021 04:56:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9BE0D4118F; Mon, 19 Jul 2021 04:55:53 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2048.outbound.protection.outlook.com [40.107.220.48]) by mails.dpdk.org (Postfix) with ESMTP id 03BAA4067A for ; Mon, 19 Jul 2021 04:55:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BtBVxMXsM+WfN9ZMaya8WTsumFxwWill7IrLFO3Sn1UcmuvA+Aml1qoA7u822Dv5ziUVae+DtbZyT0M0EZzenGTboC4/liqry2ll+sYmDtbOhxdng39vVNQUhSp52M8DQ2Jk3du962Usai/8KJ+qs5VqoIY4pdBgC1r6e1a5xbaHKkv/312+7y9by8TBfqkffsz/1gMO9rbcM3+rLdc4hsYgVr5denFgw/hHPg4w71D9btR3O0+G4gIXcKanKzDFQRGKsnhk620eA90OtHXlkvlyIXMn9PBMuRRImEMmdQAek/DLwx2WKS/bRRreKnMf0cd4QsMTamBnHH/9gKvOQQ== 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-SenderADCheck; bh=srrU3wVlzdJ2zt+Jgy1MbW7rVmmCEl+uIlCWxdbXPnY=; b=YDmXsdl9PCLjoi3F6z6pLZKZ3XcZQf4sju9jupoDcqATBRUEiE/YWC/xokqQHKdoFe4O/gk/bCxpzTAzu49GuXZLRUinvhdJowzsCORC8TLB14kTNPPJWa2s5hgXYJB/IY5Q0LaAm9sL/L7rqls5AYnJnSut2zM1K/3xfq/vlgPfXz6utuZZxA47TLjQhpwLMlmwkJCNXJNAMqvFLozoSSHvh3MGYWlaUeMDv6xPungZ05u3/GTfm7qwzNW38duNC7Jh8uM77Ppjc4ZLpRbT3dwuG905sDEOOOeOQzvp4XgvEYupUK4Lfgx8YFBZOBw439v4qP5hqKDZqnmDq6fWRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=srrU3wVlzdJ2zt+Jgy1MbW7rVmmCEl+uIlCWxdbXPnY=; b=kqu15Zr+kaGgCVssVlqJ2GE0rhfQ5z6Bte//XkDWy5n+07Aady2Yb3+lLuyg9/nP2SwZ1Wd/HJemPEqu1tbt4kj0P8MCpjXs9vfYBJL84YfYxO5dRGORwomDwjD8JSsoSP/D+JIkus8WZ2cRQYB7YNLG6+Gq7sGCeCxvbAR7AfZ7JPJ0FN7SNxEjWrd9QJAykwsFlHqW0O/8/4hm2m8uXFocY43Hc+16TUVwT1hv+7csELTa/EcapLxmBHJofe0QjoPK6BnFa3uPYkwSIwVs2fFSbMBu5NLgiLSwWpuXxeoBStPrl4KZudIBSTIbKJk3h844DNpv8Shi7M8AtErjog== Received: from MWHPR1601CA0019.namprd16.prod.outlook.com (2603:10b6:300:da::29) by MN2PR12MB3648.namprd12.prod.outlook.com (2603:10b6:208:c1::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.26; Mon, 19 Jul 2021 02:55:50 +0000 Received: from CO1NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:300:da::4) by MWHPR1601CA0019.outlook.office365.com (2603:10b6:300:da::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Mon, 19 Jul 2021 02:55:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT021.mail.protection.outlook.com (10.13.175.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4331.21 via Frontend Transport; Mon, 19 Jul 2021 02:55:50 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 19 Jul 2021 02:55:48 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: , , Ori Kam Date: Mon, 19 Jul 2021 10:54:05 +0800 Message-ID: <20210719025410.15483-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210713131437.30170-2-xuemingl@nvidia.com> References: <20210713131437.30170-2-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c598c876-3378-455d-8156-08d94a60b767 X-MS-TrafficTypeDiagnostic: MN2PR12MB3648: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Re5YxIqk21oxvx5ItHhFBrL1MzzhTomExOQQTAwykrj5FctE+5Pr3/zHGe6rMOb0srFsQJAVeBSlDcYiQA0yD3d8bZDvQ/JLXTSjRiIElWH3b1e46mCQ8iDqI/X7LsewtB/jmYsU/M0kvfZY9zeIyNn0/mxX92LrRWGldWQowFaDorJ3e78emmByip4qKPjArbheCO7NjpFXNMrN6dZuni/pzLOVDW0w7EbzUuKZJQwQrYQiAqENgZGe5EDB71K4EUI2DR/AbCh92YO8DOseQu2st+riKReXLbmtUXQwUlbkL3YSy7k7sxzCdYMUub2n9eGu9Tyr9T4bGTv9S64mUps1qzVxoh7NWb4BSO4rL8B9XE9EX/gRpZHBXK0z2zN67+qbAN6eZZ1uED+NNV3Y+OeXwXgf9XNphiBiTzb5Alao+8O7cTqBbVPaQKi9t6BsJ5h0Y09b6jIzk9c7KZXLnXTfNuZW0/xbtMqr2SWNbo7G38cXMa2rNQPsuucNYAlwwajMGrH1VA63JgJpGo/T6M/nYzDLMGpBWJJ5i2ejGYx45QqE2Fi02N1IgPiSLA7yOlQwfTTEtQXNUP8q3M4RBnjYVrZ3A+tjvnPhzNLWZ4f5iWLQT1lXyYs7ccywrJw7OOv55YZbuuMCV1jJYpSDeZRSwFyr/9TO2ojSDoqToUQ8pthhJiTEH+CEKxWpEE2CWWXgDkMdXag6ujCTr0wXXw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6636002)(4326008)(26005)(316002)(36756003)(2616005)(426003)(1076003)(6862004)(37006003)(36906005)(83380400001)(5660300002)(54906003)(36860700001)(55016002)(336012)(82310400003)(86362001)(508600001)(7696005)(8936002)(356005)(7636003)(8676002)(107886003)(6286002)(70206006)(186003)(47076005)(70586007)(6666004)(16526019)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2021 02:55:50.2286 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c598c876-3378-455d-8156-08d94a60b767 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3648 Subject: [dpdk-dev] [PATCH v3 10/15] regex/mlx5: migrate to common driver 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 Sender: "dev" To support auxiliary bus, upgrades driver to use mlx5 common driver structure. Signed-off-by: Xueming Li --- drivers/regex/mlx5/mlx5_regex.c | 49 ++++++++++++--------------------- drivers/regex/mlx5/mlx5_regex.h | 1 - 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c index dcb2ced88e..9d93eaa934 100644 --- a/drivers/regex/mlx5/mlx5_regex.c +++ b/drivers/regex/mlx5/mlx5_regex.c @@ -9,8 +9,8 @@ #include #include #include +#include -#include #include #include #include @@ -76,15 +76,13 @@ mlx5_regex_engines_status(struct ibv_context *ctx, int num_engines) } static void -mlx5_regex_get_name(char *name, struct rte_pci_device *pci_dev __rte_unused) +mlx5_regex_get_name(char *name, struct rte_device *dev) { - sprintf(name, "mlx5_regex_%02x:%02x.%02x", pci_dev->addr.bus, - pci_dev->addr.devid, pci_dev->addr.function); + sprintf(name, "mlx5_regex_%s", dev->name); } static int -mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, - struct rte_pci_device *pci_dev) +mlx5_regex_dev_probe(struct rte_device *rte_dev) { struct ibv_device *ibv; struct mlx5_regex_priv *priv = NULL; @@ -94,16 +92,10 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, int ret; uint32_t val; - ibv = mlx5_os_get_ibv_device(&pci_dev->addr); - if (!ibv) { - DRV_LOG(ERR, "No matching IB device for PCI slot " - PCI_PRI_FMT ".", pci_dev->addr.domain, - pci_dev->addr.bus, pci_dev->addr.devid, - pci_dev->addr.function); + ibv = mlx5_os_get_ibv_dev(rte_dev); + if (ibv == NULL) return -rte_errno; - } - DRV_LOG(INFO, "PCI information matches for device \"%s\".", - ibv->name); + DRV_LOG(INFO, "Probe device \"%s\".", ibv->name); ctx = mlx5_glue->dv_open_device(ibv); if (!ctx) { DRV_LOG(ERR, "Failed to open IB device \"%s\".", ibv->name); @@ -146,7 +138,7 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, priv->is_bf2 = 1; /* Default RXP programming mode to Shared. */ priv->prog_mode = MLX5_RXP_SHARED_PROG_MODE; - mlx5_regex_get_name(name, pci_dev); + mlx5_regex_get_name(name, rte_dev); priv->regexdev = rte_regexdev_register(name); if (priv->regexdev == NULL) { DRV_LOG(ERR, "Failed to register RegEx device."); @@ -180,7 +172,7 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, priv->regexdev->enqueue = mlx5_regexdev_enqueue_gga; #endif priv->regexdev->dequeue = mlx5_regexdev_dequeue; - priv->regexdev->device = (struct rte_device *)pci_dev; + priv->regexdev->device = rte_dev; priv->regexdev->data->dev_private = priv; priv->regexdev->state = RTE_REGEXDEV_READY; priv->mr_scache.reg_mr_cb = mlx5_common_verbs_reg_mr; @@ -213,13 +205,13 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, } static int -mlx5_regex_pci_remove(struct rte_pci_device *pci_dev) +mlx5_regex_dev_remove(struct rte_device *rte_dev) { char name[RTE_REGEXDEV_NAME_MAX_LEN]; struct rte_regexdev *dev; struct mlx5_regex_priv *priv = NULL; - mlx5_regex_get_name(name, pci_dev); + mlx5_regex_get_name(name, rte_dev); dev = rte_regexdev_get_device_by_name(name); if (!dev) return 0; @@ -254,24 +246,19 @@ static const struct rte_pci_id mlx5_regex_pci_id_map[] = { } }; -static struct mlx5_pci_driver mlx5_regex_driver = { - .driver_class = MLX5_CLASS_REGEX, - .pci_driver = { - .driver = { - .name = RTE_STR(MLX5_REGEX_DRIVER_NAME), - }, - .id_table = mlx5_regex_pci_id_map, - .probe = mlx5_regex_pci_probe, - .remove = mlx5_regex_pci_remove, - .drv_flags = 0, - }, +static struct mlx5_class_driver mlx5_regex_driver = { + .drv_class = MLX5_CLASS_REGEX, + .name = RTE_STR(MLX5_REGEX_DRIVER_NAME), + .id_table = mlx5_regex_pci_id_map, + .probe = mlx5_regex_dev_probe, + .remove = mlx5_regex_dev_remove, }; RTE_INIT(rte_mlx5_regex_init) { mlx5_common_init(); if (mlx5_glue) - mlx5_pci_driver_register(&mlx5_regex_driver); + mlx5_class_driver_register(&mlx5_regex_driver); } RTE_LOG_REGISTER_DEFAULT(mlx5_regex_logtype, NOTICE) diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h index 51a2101e53..45200bf937 100644 --- a/drivers/regex/mlx5/mlx5_regex.h +++ b/drivers/regex/mlx5/mlx5_regex.h @@ -59,7 +59,6 @@ struct mlx5_regex_db { struct mlx5_regex_priv { TAILQ_ENTRY(mlx5_regex_priv) next; struct ibv_context *ctx; /* Device context. */ - struct rte_pci_device *pci_dev; struct rte_regexdev *regexdev; /* Pointer to the RegEx dev. */ uint16_t nb_queues; /* Number of queues. */ struct mlx5_regex_qp *qps; /* Pointer to the qp array. */