From patchwork Fri Jan 11 12:24:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 49705 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 095771BBD6; Fri, 11 Jan 2019 13:24:27 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140077.outbound.protection.outlook.com [40.107.14.77]) by dpdk.org (Postfix) with ESMTP id B52441BB91; Fri, 11 Jan 2019 13:24:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+ZJ2I8r7mZ145Jwol/tMQbxFziT/GjI7ilmd2DfX60A=; b=vxwGYeV6j6aV8/z64zDttCyaxBKP/sf9LeAjvM+X4pNpawv2lfoxXW72qI1tVRRvcNn9PXG6PKHuKBahlRoTcJud8SkxXYfAa+A8XKVBJPePLiuIGEWQTJZpOs4OfmyvmWKaoTI8qyzbmizXTwubPf4XCRxE/VkoY2tkCTD/1SU= Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (20.177.56.80) by VI1PR04MB5694.eurprd04.prod.outlook.com (20.178.126.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.14; Fri, 11 Jan 2019 12:24:23 +0000 Received: from VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::b1eb:7e7e:7b90:7b4]) by VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::b1eb:7e7e:7b90:7b4%4]) with mapi id 15.20.1516.016; Fri, 11 Jan 2019 12:24:23 +0000 From: Shreyansh Jain To: "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , Shreyansh Jain , "stable@dpdk.org" Thread-Topic: [PATCH v3 06/19] bus/fslmc: fix parse method for bus devices Thread-Index: AQHUqaiVCxm+8RBsT0iIAKEMvnEJsQ== Date: Fri, 11 Jan 2019 12:24:23 +0000 Message-ID: <20190111122305.7133-7-shreyansh.jain@nxp.com> References: <20190111115712.6482-1-shreyansh.jain@nxp.com> <20190111122305.7133-1-shreyansh.jain@nxp.com> In-Reply-To: <20190111122305.7133-1-shreyansh.jain@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [14.143.254.130] x-mailer: git-send-email 2.17.1 x-clientproxiedby: TY2PR01CA0017.jpnprd01.prod.outlook.com (2603:1096:404:a::29) To VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB5694; 6:wNXZEvUSxv+Ee3fXCaOcyz54sK6vpda2K6rWz9Ct6y6O+fJVSMk5/yW1tJo1AkWMfFqZHdA0dsssw2BPoTgcOw3Yv/zDjZqk0rp7IWzjHRTveuZVbfbbFcb9BqwKULHDKVzdEVH+lfrIquSJScLrZyWLlMJ/GLM2Ianq+BnAO767GswDru/KDJIqA755TmFauExpy9jM4W9IpgoAwi3q7bO64orVBse7ZS0/lxEJpiajIQjlNUoHAEKUs3ZT9nZ3m0I0DEpOH8RpYZKKVQ0XTv9pKK1+ghq+WbCbvYNCoAn+0Z8IeW/c5oxw/pwqlpb65XUf22CQaRAyQTjLqCjxSsDX5p/UJloL6Ztmv/S+clGVSiYmfGfAZUTEviXjeoFTMMNKf1l21hAEA0D20x8L4xTMmjQpjf5LvaP4PFWXI+4GDifEfj9DvruwCXS+LYcquKECPDP7NsxYF5BINu/cJw==; 5:2s8N6IYxrwDzVZcGveSDYdKKw7Gi2KnNtZYwtQbItB7upKwj+7qDXQ+71ibj0tFLj0BcNv844FmJ4liDMYIq5UPdN4cY8og9TespbmGHGMgbc4VsAw5o16OSu1HtWwcTSQ3zRIxnXCVHpWF534ip1bHhnSxKGKZ3aVVIpAO8ADyndcor0TWRAIpuDUxHf0RKBf34+fn1Z0+UB1uZQSclaA==; 7:mMLefJjVjMt6SMdRnKDgHeAJZnFFDbsMxY4K+CqCCiKUpsnT5tKaYAmUNNGB35FA26152tUfwCZSgkPMzGhmyzITabLLADBNXmLQmWv3C+YetOQhFg+itXVwqBQT4ogPUR/63LC9B61twTpDJwwJvA== x-ms-office365-filtering-correlation-id: 6e939399-41c1-44dd-9ded-08d677bfb808 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB5694; x-ms-traffictypediagnostic: VI1PR04MB5694: x-microsoft-antispam-prvs: x-forefront-prvs: 09144DB0F7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(366004)(136003)(39860400002)(346002)(396003)(199004)(189003)(446003)(71190400001)(26005)(8676002)(186003)(11346002)(14454004)(54906003)(476003)(2616005)(102836004)(386003)(7736002)(55236004)(6506007)(105586002)(99286004)(305945005)(478600001)(256004)(1076003)(50226002)(36756003)(68736007)(2906002)(53936002)(5640700003)(6512007)(6916009)(76176011)(66066001)(106356001)(6486002)(25786009)(6436002)(78486014)(97736004)(486006)(52116002)(316002)(86362001)(6116002)(3846002)(81166006)(1730700003)(81156014)(8936002)(2351001)(44832011)(2501003)(71200400001)(5660300001)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5694; H:VI1PR04MB4688.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ra1SzGe8uBmCCB5ZIrRlyxV/VSZxhfPMG8wcKI0SoQqYOqoo1d/GAhePm2guBJr6VRi5RcVHmU4VInOv8qkT/mhXWIRZFRK1dJjy76cJktHjF6VMLkc92DP+6uxLwJCq2CBWaMth40v43j8doG1EmV0ytgUppnT09ylR7D6bHHp5CdyZRXAOEdjDrkf8aL1vutAd0xtakXVgIefG8ortbvmJzSlRoBDnTyDJ2X1LW1UXZ6RZf9UVkbyp0PTUv3zPvllAKwHHK6iYm0QNomk+HfJy9ojJRCFw45CL+43HHWALcE19XrnKtOGSpI8sLUtDbHyHeUC8HRpL4LM/H10AQey3sK5qWivTpROvVYeBgdnms6T3qTLardkyYnaEIA7v8b7jVcXpN+v+26GH44DHFo+miPsrM8qUepSe0QkBxIw= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e939399-41c1-44dd-9ded-08d677bfb808 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2019 12:24:20.2056 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5694 Subject: [dpdk-dev] [PATCH v3 06/19] bus/fslmc: fix parse method for bus devices X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Current code expects that bus->parse() would get a string containing the name of the bus. That is incorrect. bus->parse() is expected to have strings like: dpni.1,key=val dpio.2,key=val when user passed: -b fslmc:dpni.1,key=val This commit fixes this behavior. Fixes: 50245be05d1a ("bus/fslmc: support device blacklisting") Cc: stable@dpdk.org Signed-off-by: Shreyansh Jain --- drivers/bus/fslmc/fslmc_bus.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 89af9385a..565e0148f 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * - * Copyright 2016 NXP + * Copyright 2016,2018 NXP * */ @@ -227,20 +227,16 @@ static int rte_fslmc_parse(const char *name, void *addr) { uint16_t dev_id; - char *t_ptr; - char *sep = strchr(name, ':'); + char *t_ptr = NULL, *dname = NULL; - if (strncmp(name, RTE_STR(FSLMC_BUS_NAME), - strlen(RTE_STR(FSLMC_BUS_NAME)))) { - return -EINVAL; - } + /* 'name' is expected to contain name of device, for example, dpio.1, + * dpni.2, etc. + */ - if (!sep) { - DPAA2_BUS_ERR("Incorrect device name observed"); + dname = strdup(name); + if (!dname) return -EINVAL; - } - - t_ptr = (char *)(sep + 1); + t_ptr = dname; if (strncmp("dpni", t_ptr, 4) && strncmp("dpseci", t_ptr, 6) && @@ -251,24 +247,29 @@ rte_fslmc_parse(const char *name, void *addr) strncmp("dpmcp", t_ptr, 5) && strncmp("dpdmai", t_ptr, 6)) { DPAA2_BUS_ERR("Unknown or unsupported device"); - return -EINVAL; + goto err_out; } t_ptr = strchr(name, '.'); if (!t_ptr) { DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr); - return -EINVAL; + goto err_out; } t_ptr = (char *)(t_ptr + 1); if (sscanf(t_ptr, "%hu", &dev_id) <= 0) { DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr); - return -EINVAL; + goto err_out; } + free(dname); if (addr) - strcpy(addr, (char *)(sep + 1)); + strcpy(addr, name); + return 0; +err_out: + free(dname); + return -EINVAL; } static int