From patchwork Tue Mar 12 17:11:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 51138 X-Patchwork-Delegate: thomas@monjalon.net 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 6F55D4C9D; Tue, 12 Mar 2019 18:12:01 +0100 (CET) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 8C9F04C95 for ; Tue, 12 Mar 2019 18:11:59 +0100 (CET) Received: by mail-pg1-f196.google.com with SMTP id r124so2320308pgr.3 for ; Tue, 12 Mar 2019 10:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mBTyTaNWVbiRafHHpq1IyodLa0Nco6adQb1sIPxzgvc=; b=rT9Awi3a2vooS9z8axrf09JRiaSRQsvTlerpM0vC0iGe+iH7i4+UnXaf2FjPeZPb/T Yly+4BSQH8NhtTmjWxMFOGyy9jwt4gcurX6sWRWS2QwJRoTHMi8Km+k2u9RKeD4+LGbx gKEimpz3LJWtBvP0tG2SPQ9IWVg0udxb+UWAfBF3NiDz6fFnDZuR3Pqs6MF3GtN9RpWC yvGklk6z4fI7OJOBcK64bOWN88bKWBEZ0p8s1kHrdEgkNmm+uZO//g+Sseg2/PzH9UvQ ofRKdPjNPak915sMpSG7jgzMxlG8WjD2hPYbCUKC7yetxgxIX665n9w1ITASE/xyiYfM lL/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mBTyTaNWVbiRafHHpq1IyodLa0Nco6adQb1sIPxzgvc=; b=fXCX32a5VwPNXOkiVLteBqDAZwlK3iGjSZBz5WK1h5vFn097zUxkJnmNzQluJVh2oo 42yyJUN2hO7Zp3umhRtpmmv67t9pPZYMURazLaNxf2rcfyWNmT3NvWy970w4B1u2hQBr upl6+zaNbNDqmsrJlVROPf0PIUGWXrg/RDyiU/eyiPubUZX7LUFrEYs7u7OonG+gy7v6 oUl7u5tY4TmBxHKtgITnBdfCP+VYIoKD1C3HtlgiqYN3V2lE2+Z2XS/3UQ9kPVNmNbsa og5fcOZ6BnEb4fSh827GaeL778ZKlcePkUAZLCl/EJIlgeCSMrJYV0sTmbSZuhxrE/r9 zAzg== X-Gm-Message-State: APjAAAXLm3MA7qXMbCkpaw1R5wp0buebowvmtYds1TfWt9kDU5aJf5S7 tby1DHPAWFNVZMehNRzhX6DGEg== X-Google-Smtp-Source: APXvYqww7wbJ8pKi5i6ZS/gUTDSrCYAMXTxmOr0YI4OoKTO0LY47lIGBOZzSQvFyR9q3pqA3DYAU5g== X-Received: by 2002:a17:902:1105:: with SMTP id d5mr41343636pla.27.1552410718662; Tue, 12 Mar 2019 10:11:58 -0700 (PDT) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id a66sm25246593pfj.153.2019.03.12.10.11.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 10:11:57 -0700 (PDT) From: Stephen Hemminger To: hemant.agrawal@nxp.com, shreyansh.jain@nxp.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 12 Mar 2019 10:11:51 -0700 Message-Id: <20190312171152.28637-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190312171152.28637-1-stephen@networkplumber.org> References: <20190312171152.28637-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 1/2] bus/fslmc: don't log error for other 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" When fslmc is built as part of a general distribution, the bus code will log errors when other devices are present. This could confuse users it is not an error. Fixes: 50245be05d1a ("bus/fslmc: support device blacklisting") Signed-off-by: Stephen Hemminger Acked-by: Ilya Maximets --- drivers/bus/fslmc/fslmc_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 44c0827ced0b..a2525780cd08 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -249,7 +249,7 @@ rte_fslmc_parse(const char *name, void *addr) strncmp("dpmcp", t_ptr, 5) && strncmp("dpdmai", t_ptr, 6) && strncmp("dpdmux", t_ptr, 6)) { - DPAA2_BUS_ERR("Unknown or unsupported device"); + DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)", name); goto err_out; } From patchwork Tue Mar 12 17:11:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 51139 X-Patchwork-Delegate: thomas@monjalon.net 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 BB8CF4CAB; Tue, 12 Mar 2019 18:12:02 +0100 (CET) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id 302A14C99 for ; Tue, 12 Mar 2019 18:12:01 +0100 (CET) Received: by mail-pf1-f194.google.com with SMTP id a3so2265688pff.11 for ; Tue, 12 Mar 2019 10:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4WbF4IlsAiN2XTrgtStKuRV3mtpQWNnd0gVRKkatbYM=; b=RlffI/H06/6NpIOa6LiT478PTwLSqURQIwl8JyPKYCjTK28G3O/1NQRMjRg7WdJAOc fcKIlihQFI8ju2A9z6c7jAAbn6T0Ukz8r7YTUq4MhLkZio8kzW48KMmzngLzC1tkpkxL qp11GYmEuKm4jotrZbIFmMXOkPex0usL0/XawcDYZAHTWOSA4eTFyACldaRA0XdTgb96 ohoAveJN4dCNirS8oYOT/MLLH1777855IRy/Zr3miz4wphsO2Loz/vYHtMXW0Ap+cD5D E221DFSyXVhIiihZW5Df8GBwuzsN/1JV2BzYEaz0AhBNIH6fRWt+pu6M2EmQUPUJrkxe IzhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4WbF4IlsAiN2XTrgtStKuRV3mtpQWNnd0gVRKkatbYM=; b=reYw7+fW96uiETYB4rZnDL5pP3ryNVSOgzZh62DxX9XEAS1yTTE2AqQLBdNeScO8xk vv8grI65aQMkqYH4OM6eKVvKwoKTEXLwLDClrs9J9AENMzcfoVHpaPsJ9pLJecq9d48b u9wyC3F6LO7o7Ofppf9AOJjfouKB4W6FzpnXNJsYPb5J3tBWMJVsNyFiL2JQ4Ki7iRRQ cucv534/Xs0bDbhczo6NTQMLSK4O/RDVEesZmmXGCggIAXF8mTg1ryTxDlTnP9Jrpj11 JOaZtVVq45BmRPt135shZZwKMaub8y7qeEs0Ife/6qGa2gae7HvfkmVVazmn7+y3AWmT sWxg== X-Gm-Message-State: APjAAAWiWFUQf8C3ooPbfnr5ga6NKrgAxBDDf1GTBUH38iNruQ3PIfbA wbsF4APS07MU++FV1iSWyhq+BuAk4H0iXA== X-Google-Smtp-Source: APXvYqxuIWvofjImwJJ2S3szuPpzHg/BJiPXuFykwrLz0th6kwABjYWa2f0w9zNOABVLhktghwUFCg== X-Received: by 2002:a17:902:9f94:: with SMTP id g20mr41456187plq.0.1552410720339; Tue, 12 Mar 2019 10:12:00 -0700 (PDT) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id a66sm25246593pfj.153.2019.03.12.10.11.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 10:11:58 -0700 (PDT) From: Stephen Hemminger To: hemant.agrawal@nxp.com, shreyansh.jain@nxp.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 12 Mar 2019 10:11:52 -0700 Message-Id: <20190312171152.28637-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190312171152.28637-1-stephen@networkplumber.org> References: <20190312171152.28637-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 2/2] bus/fslmc: remove unneeded strdup 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" The fslmc bus code was duplicating the device name and doing extra initialization. The code can be simplified to just use the device name directly. Compile tested only; do not have this hardware. Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/bus/fslmc/fslmc_bus.c | 38 +++++++++++------------------------ 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index a2525780cd08..eaa39a2093e0 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -229,49 +229,35 @@ static int rte_fslmc_parse(const char *name, void *addr) { uint16_t dev_id; - char *t_ptr = NULL, *dname = NULL; + char *t_ptr; /* 'name' is expected to contain name of device, for example, dpio.1, * dpni.2, etc. */ - - dname = strdup(name); - if (!dname) - return -EINVAL; - t_ptr = dname; - - if (strncmp("dpni", t_ptr, 4) && - strncmp("dpseci", t_ptr, 6) && - strncmp("dpcon", t_ptr, 5) && - strncmp("dpbp", t_ptr, 4) && - strncmp("dpio", t_ptr, 4) && - strncmp("dpci", t_ptr, 4) && - strncmp("dpmcp", t_ptr, 5) && - strncmp("dpdmai", t_ptr, 6) && - strncmp("dpdmux", t_ptr, 6)) { + if (strncmp("dpni", name, 4) && + strncmp("dpseci", name, 6) && + strncmp("dpcon", name, 5) && + strncmp("dpbp", name, 4) && + strncmp("dpio", name, 4) && + strncmp("dpci", name, 4) && + strncmp("dpmcp", name, 5) && + strncmp("dpdmai", name, 6) && + strncmp("dpdmux", name, 6)) { DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)", name); goto err_out; } t_ptr = strchr(name, '.'); - if (!t_ptr) { - DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr); - 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); + if (!t_ptr || sscanf(t_ptr + 1, "%hu", &dev_id) != 1) { + DPAA2_BUS_ERR("Missing device id in device name (%s)", name); goto err_out; } - free(dname); if (addr) strcpy(addr, name); return 0; err_out: - free(dname); return -EINVAL; }