From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9211FA0524;
Sun, 26 Jul 2020 16:57:57 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id E41D01C12D;
Sun, 26 Jul 2020 16:56:11 +0200 (CEST)
Received: from EUR04-VI1-obe.outbound.protection.outlook.com
(mail-eopbgr80085.outbound.protection.outlook.com [40.107.8.85])
by dpdk.org (Postfix) with ESMTP id 632F41C0D6
for <dev@dpdk.org>; Sun, 26 Jul 2020 16:56:05 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=UoFVpaOt3drip29kSb54KOn+j9dP33PIXYZdKdFqhXuEjsypMyfD1M329RROoHJkZY5WMx3G/bzo9neXbLygCsmdMPriw4OeqQY5T1uHPIagONGWoAuKVirQdYv7L4Vdir7qXJpFAC1YhFogXHzDVnRTkom5b94va5JcIkUSh12JxLc5B9z6EZkZg2CgOvjcetXX7eTxJ3hI81Ouo1xCpdAycj9JEaBtdnZbj8vhfBtxAJ6+UzqSytzCzSUuHtp+6heiqjrXUVGhKqf5NFkL0F9wLZEgpKUx99fx77kvraw+VRx2ZokcBm6Eh5AlFW0ekayDENR7PnN9QMkA1FdnUw==
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=7RRTCf2cFt1yYGpc94tcUcshT/4Ysfkpd/B2GqYUzMc=;
b=Zub8uwGi8OzpiAWnwN2azmtvt1ZwG0U9E194+LfB8q2MPeHS1LZizHIYn5JeCpWZOMIUWsY9I9jmwm4SCX/vjRk2z4stecU8FGFs5e+fY29W0ikMVVR+/4DcCtirBZ000za9BYKdv4yDensaPvq/9nPKMwPO3e+stGS4A5Mf/WDcRPrB8lMtO7bP7JgAizcUiVEiMrYOPPfsTCsKNLDDshzALTLsqGNqVnMxKSbHM/M2nhQTprXan7Z7GKGf5QTfRuib4FLgZ4dNIClLMIf5GbyhFz0dETHx/ciDEU3lu2PCGxyAyNuoGs7iDIW9ITILGKBWWC4O5oCja+05vG1mwQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com;
dkim=pass header.d=mellanox.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=7RRTCf2cFt1yYGpc94tcUcshT/4Ysfkpd/B2GqYUzMc=;
b=ZlNWDCnh67eqbD3+YmaSQUHkHNVKohCD4PfeUCuyOBfyEu0hQlJzydFgmJE5cOII1DNSk1MG+YSaFa8pa14a/ltWhaNsL7B9WV7gBJVhCTM2/MbGFm7JUFAne7Ol7qxCoRtMsQAFyPojv8cXz38ABO4lM5fPrs+xNPYvpC4gHCY=
Authentication-Results: dpdk.org; dkim=none (message not signed)
header.d=none;dpdk.org; dmarc=none action=none header.from=mellanox.com;
Received: from AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32)
by AM0PR05MB6225.eurprd05.prod.outlook.com (2603:10a6:208:117::15)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.27; Sun, 26 Jul
2020 14:56:04 +0000
Received: from AM0PR05MB4866.eurprd05.prod.outlook.com
([fe80::eccf:72b3:bacb:f09d]) by AM0PR05MB4866.eurprd05.prod.outlook.com
([fe80::eccf:72b3:bacb:f09d%5]) with mapi id 15.20.3216.031; Sun, 26 Jul 2020
14:56:04 +0000
From: Parav Pandit <parav@mellanox.com>
To: dev@dpdk.org, grive@u256.net, ferruh.yigit@intel.com, thomas@monjalon.net
Cc: rasland@mellanox.com, orika@mellanox.com, matan@mellanox.com,
joyce.kong@arm.com, Parav Pandit <parav@mellanox.com>
Date: Sun, 26 Jul 2020 17:55:24 +0300
Message-Id: <20200726145524.149355-11-parav@mellanox.com>
X-Mailer: git-send-email 2.26.2
In-Reply-To: <20200726145524.149355-1-parav@mellanox.com>
References: <20200610171728.89-2-parav@mellanox.com>
<20200726145524.149355-1-parav@mellanox.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: DM5PR04CA0045.namprd04.prod.outlook.com
(2603:10b6:3:12b::31) To AM0PR05MB4866.eurprd05.prod.outlook.com
(2603:10a6:208:c0::32)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from sw-mtx-036.mtx.labs.mlnx (208.176.44.194) by
DM5PR04CA0045.namprd04.prod.outlook.com (2603:10b6:3:12b::31) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.3216.23 via Frontend Transport; Sun, 26 Jul 2020 14:56:02 +0000
X-Mailer: git-send-email 2.26.2
X-Originating-IP: [208.176.44.194]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 05ec88f3-8016-4b75-f1bb-08d8317404dc
X-MS-TrafficTypeDiagnostic: AM0PR05MB6225:
X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd,ExtAddr
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM0PR05MB62252E523E981C968DA8900AD1750@AM0PR05MB6225.eurprd05.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:7219;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: iur0fFbeTlpcMtTWmjuYp0h5WIOcMO9uLj83g03+iULhYWsM9kfavxNycMAfRtbxfoTfCYDV5V2u5Q45nnXNe/U2bANtsZZFQdn5yS+05yn6aH6160R4wan1ty7QmLcpkygbZtHHj9RqY3YMSKhH1u70/dDEwvj8zt3Ft5/rTtUK6uPi5PDvpfPS5oEUr29ZKVOiZ26Hmag9R388Xj6PJN5g247laCx5bUHVR72EzXsPgsvWLksHg9gY7gUKqkJGzJlypY1Ca325Z6RjpYOIhOH73mT7zUUIXEvGH5VlzfjpnyonQKWasNyFjDGGTzMD
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:AM0PR05MB4866.eurprd05.prod.outlook.com; PTR:; CAT:NONE;
SFTY:;
SFS:(4636009)(366004)(396003)(346002)(39860400002)(136003)(376002)(6486002)(66476007)(8936002)(66556008)(6512007)(2616005)(956004)(186003)(66946007)(26005)(16526019)(8676002)(1076003)(6666004)(316002)(83380400001)(6506007)(107886003)(4326008)(36756003)(478600001)(2906002)(86362001)(52116002)(5660300002);
DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: gq2mSbSRzkp2PwfirJqPh3ZIcyVQo2iGG36W9+czi2PgW9ntgm+7mniBFZ4Kc7XiWNCYFj0IRAS2b75vp6Aom29T/26z5FpJU0Xx5w7YySKCo9MRFsW7pohmWHnqGzCAjU7Bzc55q3HBfkDnfSgA0xhRJyUk7T45X1EhYZZVBnEyShWclDjsUOabumojeviBt+49nJbW4hgv5jUzzsYY70XMVyyFpqO3ghWX0cWYBnLjtvNRYGqR2OdgS8ZIu/Iie/FK4Ydcl8nDJjlPFGpz4hpRgOboKKSUoBsA7sEAcm79sCZujkEWADfCEZ+/2tMbSwiH+LZ2+beV7NZlJmImfkCx4eXv0BTZRbrLTBmoIA0DBWCrBbkdhvRMAjpWs31tbuy40QNiC/5rrqAn5qVTKaC0YQ1xuecvJKgBu5s0yb0AUv8fCg5M/PyJjbA/RPtOVJg/A5fai9e50DL5RrYR9NBTzEDmykv78IlUhlexWfv0Zbb5rPS252iBQKsaMME9
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 05ec88f3-8016-4b75-f1bb-08d8317404dc
X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2020 14:56:04.3039 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: sVWJyC4o5pPJ1My5z7RPRZd/SnF7FUb13zYHVOAWZPZARHQ7/gP32iRlG9IpmgwtrBpe5E83Pp71yzQVrcopDA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB6225
Subject: [dpdk-dev] [PATCH v11 10/10] common/mlx5: remove class check from
class drivers
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Now that mlx5_pci PMD checks for enabled classes and performs
probe(), remove() of associated classes, individual class driver
does not need to check if other driver is enabled.
Signed-off-by: Parav Pandit <parav@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
drivers/common/mlx5/mlx5_common.c | 37 -------------------
drivers/common/mlx5/mlx5_common.h | 2 -
.../common/mlx5/rte_common_mlx5_version.map | 3 +-
drivers/net/mlx5/linux/mlx5_os.c | 5 ---
drivers/vdpa/mlx5/mlx5_vdpa.c | 5 ---
5 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index fd818ef24..06f0a6400 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -20,43 +20,6 @@ int mlx5_common_logtype;
uint8_t haswell_broadwell_cpu;
-static int
-mlx5_class_check_handler(__rte_unused const char *key, const char *value,
- void *opaque)
-{
- enum mlx5_class *ret = opaque;
-
- if (strcmp(value, "vdpa") == 0) {
- *ret = MLX5_CLASS_VDPA;
- } else if (strcmp(value, "net") == 0) {
- *ret = MLX5_CLASS_NET;
- } else {
- DRV_LOG(ERR, "Invalid mlx5 class %s. Maybe typo in device"
- " class argument setting?", value);
- *ret = MLX5_CLASS_INVALID;
- }
- return 0;
-}
-
-enum mlx5_class
-mlx5_class_get(struct rte_devargs *devargs)
-{
- struct rte_kvargs *kvlist;
- const char *key = MLX5_CLASS_ARG_NAME;
- enum mlx5_class ret = MLX5_CLASS_NET;
-
- if (devargs == NULL)
- return ret;
- kvlist = rte_kvargs_parse(devargs->args, NULL);
- if (kvlist == NULL)
- return ret;
- if (rte_kvargs_count(kvlist, key))
- rte_kvargs_process(kvlist, key, mlx5_class_check_handler, &ret);
- rte_kvargs_free(kvlist);
- return ret;
-}
-
-
/* In case this is an x86_64 intel processor to check if
* we should use relaxed ordering.
*/
diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
index 864e82ff0..2cdb226f3 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -247,8 +247,6 @@ struct mlx5_klm {
LIST_HEAD(mlx5_dbr_page_list, mlx5_devx_dbr_page);
-__rte_internal
-enum mlx5_class mlx5_class_get(struct rte_devargs *devargs);
__rte_internal
void mlx5_translate_port_name(const char *port_name_in,
struct mlx5_switch_info *port_info_out);
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map
index 73cf72548..7729d0dd0 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -1,9 +1,8 @@
INTERNAL {
global:
- mlx5_class_get;
-
mlx5_common_init;
+
mlx5_common_verbs_reg_mr;
mlx5_common_verbs_dereg_mr;
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 97d7b0e7b..fc339affa 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1524,11 +1524,6 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
unsigned int dev_config_vf;
int ret;
- if (mlx5_class_get(pci_dev->device.devargs) != MLX5_CLASS_NET) {
- DRV_LOG(DEBUG, "Skip probing - should be probed by other mlx5"
- " driver.");
- return 1;
- }
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
mlx5_pmd_socket_init();
ret = mlx5_init_once();
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index ffe2f00ac..c0b87bcc0 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -680,11 +680,6 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct mlx5_hca_attr attr;
int ret;
- if (mlx5_class_get(pci_dev->device.devargs) != MLX5_CLASS_VDPA) {
- DRV_LOG(DEBUG, "Skip probing - should be probed by other mlx5"
- " driver.");
- return 1;
- }
ibv = mlx5_vdpa_get_ib_device_match(&pci_dev->addr);
if (!ibv) {
DRV_LOG(ERR, "No matching IB device for PCI slot "
--
2.26.2