From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00078.outbound.protection.outlook.com [40.107.0.78]) by dpdk.org (Postfix) with ESMTP id 8BC821B9C3; Fri, 11 Jan 2019 12:58:10 +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=YJcHH/nE8hWVGOQKcAERiUFmBEGnR8T5HeifVsnO2w3d4RHa7FdPOeXg4oX/mOjBR6OIAXOvB/1r5ORbIO51sCM+r3rVbgiXg0//rP1vR1WwRxC5avB5C1JdU8LhkZT4xLHfl08155Fz9BqXkNybCaVDzOEifyzD8X8bl1I8D4M= Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (20.177.56.80) by VI1PR04MB6173.eurprd04.prod.outlook.com (20.179.27.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.11; Fri, 11 Jan 2019 11:58:09 +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 11:58:09 +0000 From: Shreyansh Jain To: "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , Shreyansh Jain , "stable@dpdk.org" Thread-Topic: [PATCH v2 06/20] bus/fslmc: fix parse method for bus devices Thread-Index: AQHUqaTrwfXXDIZnJkuhbNqbklR/5w== Date: Fri, 11 Jan 2019 11:58:09 +0000 Message-ID: <20190111115712.6482-7-shreyansh.jain@nxp.com> References: <20181227062233.30781-1-hemant.agrawal@nxp.com> <20190111115712.6482-1-shreyansh.jain@nxp.com> In-Reply-To: <20190111115712.6482-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: TY2PR01CA0030.jpnprd01.prod.outlook.com (2603:1096:404:ce::18) 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; VI1PR04MB6173; 6:ZHhqghhkeipSOfqqgladRVKRk942rKg/+aBpwynqmeZRX+zEC+iUh0Ows+6bWToU9ffnsweEvx2+opO/yH+EFf1+uAtDGkodWteQLlYAjCt8DV4PcTCPc1Twq6YffGaSa1nExM2vKHxKLN8GgUKht/jwNEIX9mZzGLwNUgCPssy06TZ6w4ciaUxTQA2uawl+UlHkVAwqC5z7QB+mBiuTX1G8gHBKLhzvgF8zghBwRpKIWUPE/Atzoy3IFtKZymp5NFSQV4itCzgW4XAzzHn7pWI1hI+oC1DMvjlJArsFyiaFkBVknKn19vQ307WVBCnU5hF7D7XultaKN8nd3VD4DYa2Xb2GOQh16gh8KGUbRXHgPZQy7IPdu05mTDlhgCw5ivOvg0ik8TtieLg+LCIY7wmCzDBngraJjB44lPSbWBll/RXW3uO0aVIPz1UGmKBEnIov0HflSGCnUmYqKjokFg==; 5:HxOJj6qlCwzoXKK3Foq+eFDMXNmeU66DFadopykMlYpmjPw9kyE1d0Ne3JDxJxzKM2hANFYr4jlEq44dhA7iHzWhiRoGK2kXcjNsuJBPtJLsp2o/PZpHdoP9enI0Xlly0jVMnvM2l8X7+/GkGj97Xygzkck+L7c34WwuvjvS/VSelaS7lrsGw5OtgbFVzwnJMC1NvBscWGCBXvMHJHt9oA==; 7:8BsIexbg4gIex3xuXQUXwfZb7+On7eyqcD1nd3yDCV6tIKpuTqIWBkDgW8bQd1LI0501VxXWCRlNVpjOShxmYjrSui9FL5Fd+q32iZmumJF4GJZMPlub1XYSJP7bljkXchbctEA1uHr3wHGaxzIhjQ== x-ms-office365-filtering-correlation-id: 6dadff50-58f9-414d-d57e-08d677bc0da1 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:VI1PR04MB6173; x-ms-traffictypediagnostic: VI1PR04MB6173: x-microsoft-antispam-prvs: x-forefront-prvs: 09144DB0F7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(136003)(39860400002)(396003)(199004)(189003)(6512007)(25786009)(1076003)(26005)(68736007)(3846002)(66066001)(6116002)(11346002)(6916009)(6486002)(486006)(54906003)(5660300001)(6436002)(2906002)(53936002)(36756003)(44832011)(316002)(14454004)(256004)(106356001)(446003)(105586002)(97736004)(102836004)(476003)(2351001)(2616005)(6506007)(50226002)(386003)(99286004)(86362001)(478600001)(52116002)(76176011)(55236004)(71200400001)(71190400001)(78486014)(81166006)(186003)(2501003)(8676002)(1730700003)(8936002)(4326008)(5640700003)(81156014)(7736002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB6173; 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: Lhn6OAQs/JBgs+T77XiHy35bNWXvK1NCWS39VhovQOm+Gbr9PTBdlQoOp+JBPNHZfKWbDvbTJtsX3hn7xpLmG0BYb7uBTG0UYo2vFKiRosuftdWjb1hc0k5NM5AU2hx242Kb9zCjY6I0do4carNgKT6bpwObR83RKgaBPQb1eInEoVxsNFRJbSrjWjjPXxQyIfSq512F4NtetwFNRwuHX8lbCaWMfoojq5NMFkrU+/k4TGUZg22XhM44BKEqH36u1wMkyjOicdb/0ltx4tkr/SRy/9KqhUn8PPCtPNn5Ei5D9vTeXJUctcMA5/0+6bC0mJjds/sVuwXkedq5EshHZ7aisn0QWuSzFA1QMuPPo31FINCFZBBzgVg1SWoYitoQdyPCymiszqAFA3eCCarMudpDWis7qBW25ZqQO9LJMNQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dadff50-58f9-414d-d57e-08d677bc0da1 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2019 11:58:05.8791 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6173 Subject: [dpdk-dev] [PATCH v2 06/20] 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: , X-List-Received-Date: Fri, 11 Jan 2019 11:58:10 -0000 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=3Dval dpio.2,key=3Dval when user passed: -b fslmc:dpni.1,key=3Dval 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 * */ =20 @@ -227,20 +227,16 @@ static int rte_fslmc_parse(const char *name, void *addr) { uint16_t dev_id; - char *t_ptr; - char *sep =3D strchr(name, ':'); + char *t_ptr =3D NULL, *dname =3D NULL; =20 - 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. + */ =20 - if (!sep) { - DPAA2_BUS_ERR("Incorrect device name observed"); + dname =3D strdup(name); + if (!dname) return -EINVAL; - } - - t_ptr =3D (char *)(sep + 1); + t_ptr =3D dname; =20 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; } =20 t_ptr =3D strchr(name, '.'); if (!t_ptr) { DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr); - return -EINVAL; + goto err_out; } =20 t_ptr =3D (char *)(t_ptr + 1); if (sscanf(t_ptr, "%hu", &dev_id) <=3D 0) { DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr); - return -EINVAL; + goto err_out; } + free(dname); =20 if (addr) - strcpy(addr, (char *)(sep + 1)); + strcpy(addr, name); + return 0; +err_out: + free(dname); + return -EINVAL; } =20 static int --=20 2.17.1