From patchwork Fri Oct 22 15:45:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francis Kelly X-Patchwork-Id: 102674 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 382D8A0C43; Fri, 22 Oct 2021 17:48:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A05164117E; Fri, 22 Oct 2021 17:48:08 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2059.outbound.protection.outlook.com [40.107.220.59]) by mails.dpdk.org (Postfix) with ESMTP id 4A27F41149 for ; Fri, 22 Oct 2021 17:48:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hBXprhEoLQ5+Vm242+uTFkN20LibgJKIurMEFJSyel5RLeIBEVOOmo5C0jerIBX7rDf8hFcqNjeeGGnhXMqvDpU7SjxjiNYP9+NsKbMAuVq4H1lfQZ8E1dz8dtwsjTslFRbrHcqjiPiETrODbEzfdRynmseDqB3qXmS5zyM9VqacpeiHr9IsrjK09FRgA9XVbEFi8MK3e+bcWOJq0l085K2b6JVWFRjsu6AuYZ7quBVMsP/7aIlrNkb0dp5sLk0gFCqqfA9NmsrQOeEB5gfKmBGyes9wUVyNynuX/GpDCyeg+7dREjIwTQNS08KLklMd8sP+IzvXJ3GoW3PzSWJuDQ== 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=D5UNEUeWD2fk0QdMb1S2C3aZI8VNeE1wWHFoYnibClc=; b=Ay+YgT8j2gq4jDKIO8Dcb8kEYcgelx8LwOFA+ogAOJzXwCrtQwB+pbz1h3CgDbWgqqeV15QGv+LPtWaRNLMU/Tc1ZV6f+s3OiPhmpNI9eRusmMYhP3Zvkycd+EaoLMG2FAVj0otJ/Hl6G67FV7YkUVPdWZVRT/hpluzUrDZu7dcxNYTLqIEelrezu0qGrTQZHrqlo2XKLrFkJ6MOM7mEhx652ib02SMqCsl+oa3rXBuUJf3JarjqVcgNibc2ESzgZOXEwl2lLezT3GuocJz7hpiB+4TI7jXAWA0WPiH4DnDJna/R+zBgwJHUFmWtMKwtBfT9gcl+nfTtcF5F1VjhVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=gmail.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=D5UNEUeWD2fk0QdMb1S2C3aZI8VNeE1wWHFoYnibClc=; b=Vpync+FUNeQQGI1yIGdFLOvPEgc6rHWoE9lhfyjMCNvUq1GV1RKGq0JDTyghiwvZBAT61hh2IWwpo2ejeQ44Aop00C4hhJb4PGDfTUUuquGLjxFp1cCXp94T+VNlTT7cTArVC/8eberTd6n1puADE/s2Qq2TVKmYIESViN3YcNw1xsMhUzUT7ERNFGb9FfFV0HwYR8h0dgRMQ866MDcBFQG09YnGIViaj72GjkVBvp0RvMMEJODedcNBAXf1je1Es/lzwDZOR3RsteGqhUodE6CxuZU02TT/49K8pEEvgkDKjp1vJXndoP9Tyqx3ybZjKhkqGGSuQp7U+W5qLiNrQg== Received: from DM6PR11CA0038.namprd11.prod.outlook.com (2603:10b6:5:14c::15) by DM6PR12MB4156.namprd12.prod.outlook.com (2603:10b6:5:218::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15; Fri, 22 Oct 2021 15:48:05 +0000 Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:5:14c:cafe::82) by DM6PR11CA0038.outlook.office365.com (2603:10b6:5:14c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 15:48:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; 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 DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 15:48:04 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 22 Oct 2021 15:47:59 +0000 From: Francis Kelly To: , Ori Kam CC: , , , Ady Agbarih Date: Fri, 22 Oct 2021 15:45:56 +0000 Message-ID: <20211022154600.2180938-6-fkelly@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022154600.2180938-1-fkelly@nvidia.com> References: <20211022154600.2180938-1-fkelly@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2a3a8992-1a20-4241-72e3-08d995735649 X-MS-TrafficTypeDiagnostic: DM6PR12MB4156: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:514; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zqp6uy6o7hoTORPUPKm6tavMm60oZF+BDw2YjkYtAgaGUjxBIqnNUjBsz71xRAIe+OoFCKAJ5VnKsUvzarEDxXCM8dUUK1Rv0VMpj3X5ROse7rxdc/g3F0HLSotjJ4Zuv27760TFLiH6JYG/ft4xn00wQvcMCxvB6lqEo+d/NRdmsuA+xj/d9a0FNfU2tuyL9v/PV8wfT2WxTXwcoyQD8wSm/mxKxAoeos1gbrbDKnxUy+5REEiyeTt3kANMakAw4RQPaENsoraz8KhFeH54uE8msT1Atr0uggjIejbMyPg6rc4WEXZY03vJYFTbccceJmaIdE6hptfHov2MNVYY1s72EH8ml12wkEqPOdK1ZYiUUUDUOQTaof28PD1ZoQqd48jTVo7CxO3QIZztOvAyuls8sn+bld76IzGT1XiLk7jl4ZYYOfE8NJ4Wk8Su9uGbj1CkQc/tXssUcci2BObDLu73Kpw+ZXRVl3LfjeCauB43btT6Jq45cXiGpmEvVf0/N3w567auqtTXHbOJJwbvch29bRxRWQx4JZoumH2AuT5ILrIYArz2Ic7de0Zh3XKxvhu8up6Je8yo+RWEogH3P0mQqYtPZSyQpuHpNEhfApO9DFTewHCSD7kwwZg+BXN56xZlO0XplJz+HYauTdzACJ2/H6URdunCe+pXNQh6YZWFRpy7geAB8skRPddh257vA4h5tTE6htQ4jBZUNT0VfA== 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)(7696005)(7636003)(26005)(356005)(6666004)(6636002)(5660300002)(36860700001)(83380400001)(8676002)(36756003)(2906002)(86362001)(1076003)(110136005)(55016002)(82310400003)(336012)(70586007)(70206006)(54906003)(47076005)(2616005)(508600001)(8936002)(4326008)(6286002)(426003)(16526019)(36906005)(186003)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2021 15:48:04.9908 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a3a8992-1a20-4241-72e3-08d995735649 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4156 Subject: [dpdk-dev] [PATCH 06/10] regex/mlx5: remove start/stop engine API 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" From: Ady Agbarih Remove the engine start/stop DevX commands, as they have been deprecated and moved to FW. Signed-off-by: Ady Agbarih --- drivers/regex/mlx5/mlx5_regex.c | 5 ---- drivers/regex/mlx5/mlx5_regex.h | 2 -- drivers/regex/mlx5/mlx5_regex_devx.c | 42 ---------------------------- 3 files changed, 49 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c index f9eb3a2fab..d58851d41d 100644 --- a/drivers/regex/mlx5/mlx5_regex.c +++ b/drivers/regex/mlx5/mlx5_regex.c @@ -49,16 +49,11 @@ int mlx5_regex_stop(struct rte_regexdev *dev __rte_unused) { struct mlx5_regex_priv *priv = dev->data->dev_private; - uint32_t i; mlx5_regex_clean_ctrl(dev); rte_free(priv->qps); priv->qps = NULL; - for (i = 0; i < priv->nb_engines; i++) - /* Stop engine. */ - mlx5_devx_regex_database_stop(priv->ctx, i); - return 0; } diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h index 9741421e7a..5c2bda36c9 100644 --- a/drivers/regex/mlx5/mlx5_regex.h +++ b/drivers/regex/mlx5/mlx5_regex.h @@ -101,8 +101,6 @@ int mlx5_regex_rules_db_import(struct rte_regexdev *dev, const char *rule_db, uint32_t rule_db_len); /* mlx5_regex_devx.c */ -int mlx5_devx_regex_database_stop(void *ctx, uint8_t engine); -int mlx5_devx_regex_database_resume(void *ctx, uint8_t engine); int mlx5_devx_regex_rules_program(void *ctx, uint8_t engine, uint32_t rof_mkey, uint32_t rof_size, uint64_t db_mkey_offset); diff --git a/drivers/regex/mlx5/mlx5_regex_devx.c b/drivers/regex/mlx5/mlx5_regex_devx.c index 262f301121..a8aa64c325 100644 --- a/drivers/regex/mlx5/mlx5_regex_devx.c +++ b/drivers/regex/mlx5/mlx5_regex_devx.c @@ -12,48 +12,6 @@ #include "mlx5_regex.h" #include "mlx5_regex_utils.h" -int -mlx5_devx_regex_database_stop(void *ctx, uint8_t engine) -{ - uint32_t out[MLX5_ST_SZ_DW(set_regexp_params_out)] = {0}; - uint32_t in[MLX5_ST_SZ_DW(set_regexp_params_in)] = {0}; - int ret; - - MLX5_SET(set_regexp_params_in, in, opcode, MLX5_CMD_SET_REGEX_PARAMS); - MLX5_SET(set_regexp_params_in, in, engine_id, engine); - MLX5_SET(set_regexp_params_in, in, regexp_params.stop_engine, 1); - MLX5_SET(set_regexp_params_in, in, field_select.stop_engine, 1); - ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, - sizeof(out)); - if (ret) { - DRV_LOG(ERR, "Database stop failed %d", ret); - rte_errno = errno; - return -errno; - } - return 0; -} - -int -mlx5_devx_regex_database_resume(void *ctx, uint8_t engine) -{ - uint32_t out[MLX5_ST_SZ_DW(set_regexp_params_out)] = {0}; - uint32_t in[MLX5_ST_SZ_DW(set_regexp_params_in)] = {0}; - int ret; - - MLX5_SET(set_regexp_params_in, in, opcode, MLX5_CMD_SET_REGEX_PARAMS); - MLX5_SET(set_regexp_params_in, in, engine_id, engine); - MLX5_SET(set_regexp_params_in, in, regexp_params.stop_engine, 0); - MLX5_SET(set_regexp_params_in, in, field_select.stop_engine, 1); - ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, - sizeof(out)); - if (ret) { - DRV_LOG(ERR, "Database start failed %d", ret); - rte_errno = errno; - return -errno; - } - return 0; -} - int mlx5_devx_regex_rules_program(void *ctx, uint8_t engine, uint32_t rof_mkey, uint32_t rof_size, uint64_t rof_mkey_va)