From patchwork Wed Apr 25 12:56:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 134280 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp831325lji; Wed, 25 Apr 2018 05:59:12 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+tGHgGcOLwMl09DmewEFFGeyi8a0JghjPsF4MGdXIW4GDABzp6EsMACyFASMtIVtIHFmVN X-Received: by 10.28.97.139 with SMTP id v133mr15788239wmb.75.1524661151972; Wed, 25 Apr 2018 05:59:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524661151; cv=none; d=google.com; s=arc-20160816; b=hLjaSBLOCC3UsjHKL2kvsU3rcMWss6EekOi+lgBr1ActMRr70dsqoe0t+LTrVUjeMc 36VlGguBcyNqYCDXzfqINnk25oiOpgHQzrzLNHQWzN2wR+qAW1KYenn/O37tHpPAQwsF DCP9OtCZbaMqJLqeZQYzpCxUcjnteLb0AwoWBc5ZNWt8jsvKtrHTJuoQjCsCF64rYy97 FPqsJKxf/CpVB0bbK2n0eei4eVOKnrPWEJUoRmdXnXyVXbQScmYE4SQwdCY+qaTLQRZa qPIWJAlkPLFE9POoUjfU76/kUlAI3DVTUcVwKRVuxUDrhAIfNE3thfmypPNwU05KhXj2 aM2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:message-id:date:cc:to:from :dkim-signature:arc-authentication-results; bh=UuqzmY5b29VbcdONSWWeZwBbQIEIdGDqbs2355LCeK0=; b=xd54HYWkAQRSDBtk3EvpKgH7S7gHjtckHpPD2IFI046da/c/gkWYD8H3hIsZD9D98f 2AAUe0ss3qXjK72V+5WaxrnzsyoMNCIYcgSjQgMEDEYTtQT1lcG4BCIilkOJTL2Twbl7 PiUYh0RXOpKHhZUDlRPQLZIPAQ0skrLhboG/0eueDznnOxD6lsPmg61Diux1QFwfxv2j cJIN92joDY4VA+yAEbvPnBh3NEuQv9rJiaLd50hs0tpXw4aWbAVpbn8g6ayTE/TCVqSi 5kF40rZYcG7+ZfW+JZ04kqLLvqb7+gSl8Qd6q+kSQ4oV+ISSwIkoeRbgQfa6A6COI5Qv woXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=v/+0m+TJ; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id f18si8668596wmd.171.2018.04.25.05.59.11; Wed, 25 Apr 2018 05:59:11 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=v/+0m+TJ; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 747D96CC1; Wed, 25 Apr 2018 14:59:11 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0053.outbound.protection.outlook.com [104.47.2.53]) by dpdk.org (Postfix) with ESMTP id 063AC5F17 for ; Wed, 25 Apr 2018 14:59:09 +0200 (CEST) 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; bh=UuqzmY5b29VbcdONSWWeZwBbQIEIdGDqbs2355LCeK0=; b=v/+0m+TJTCglKfzRgK/lafEybkQnhZyIbRQptgKiezo4kgH5UMkHREWBI0RrOvahoxK56N8Inyd87N9YAyF5piE8HRaq4p1TtfANO0SjDBfCeBBN52ZY6uBQEVNcomM9IGpA1Ymh4nEK77VdVQZxtxWKppiaeWzKnlF1taQWkkE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Wed, 25 Apr 2018 12:59:05 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, shreyansh.jain@nxp.com Date: Wed, 25 Apr 2018 18:26:58 +0530 Message-Id: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MAXPR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::21) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:mlkRG6dFMPZxgipJsOgo7YVCBiroGWem3noI+WWIDrLDvpkbljMeq4lAEiED+K82kRfP6I+ERpwJxY1tPaXmdV1tON4DyqLJtChFl0MLKKH5z6VxrwtFctvNw6tGq0zDceUcWutQPevfbGB29WJod1ueC/8vVMcUaQddtaSZuSmG47RUfKUZAWkXbDlamqjzGQBjbJO0aqloFEKy4iztXKGdIypctXe79hAKnmem5+yHKfLYNMCQOp1nFcV6weYI; 25:Xd6+rMXEP6wBtUxag6Bl/k7gqybtOncS9lScCjF41CT+f6spqYB5QQgyVsegzOsF73IcTPJTQSmpVo0ZNNU8ey10yq+286M/YLibpCR4z4ZkyKjUvn/H1gg+ZnuZQ9VhFDVsI610WXNeGxNmV6loPh/Lodkx4cJptDW73gvNj1baCgN9HQ5n80trhhRx5ndeGwlCinhlq5bMsk1rRpFXSTPZer98N4s+mkZ6qhOdbXrbY9HfzGGOUS+eaJhvuPPlXFFNgnkPx6P84XmDBwKksfLvbDN8tgV0HxRJ/RjEIbeKMMCo3AbBPlOvc91izbQqcgec76KCUzGgwITDH67PrxcrMBWgSGt+gPioBDJuSX4=; 31:z6TQpYPDww5ms390fy7OWbsZS4xinGnhGqm1CXzUY26sa3o8A2uGIee5qQfoJFmtmsnl7sD2kLxDdG+bRXWey0sRbH+NlFuih1m5np1sgBeLleLHhekT9GqTGM9jYcNtcD9SHk0zOXdikeAKMz5+vxBh1uFRxWWbc1QJ2V4qUjzg/cwFPhi0+N4OopKzGy9ACao1BsM2b3vTVdW3h10BMtwqpqUH6P3Cg7QvWpsBtKo= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:SAQm8fq5MSEhkXls9P7KVvMI0sxjixZBino4MMDmYxKAM5jSPS1P+wrNkfpStiKUi0Drds0uYTQs3mtWk6SX5HIxc1v8X+UYzbg4YWUgv6xIV3Mt/CsOPkp8CcnGSKWB5ihY7izQC3GpEBB6zEvBL9hCOp+6ne3ZA7sjsh5lc1Ph6H+eIVfNLc3Y936G4nGG94v4caHymzP0xH3/yPCHIpQSDuSvVsnlQdLfr++zszrOelKIaPpt7AR1NMv6ckfhUUBQfVbZM+N3XBKnqX82GYTr05n/L5clOuBron21OoFQa059ck7suP3GrFVIMRa61xsnNRHEZJ2DWccbQvSnYni7XfdKnDI4UnyAQWbtXJ2XVaZFDNoZqE0prZUMkaPkzuM9FFTaECVCKuifc7I6wnIfxnojUNwcwpclj6c4rmzjugRLrywqv27it7pfeT50jl08JX+JhISXM7Y1DQkhUoRqjwdrJ21bq2SLjYybQWX0fwGB5xe8cpcCn61JT0Zg; 4:Zir/9gkpBlDJQkl10f3yLeC1GismKyv+gnm3BdyjB1rsBE0nKK1fy70HeruAsCeB76Rb0W4LG6qlRrAgBa7WVINzL5BJW/Ix8GjCjoiGoAs0ZNgaE4DzutVvZFqzRPJ4F8FD3WzOZNDbJH3iUFSGZrTRSA0zwHjbSbVyDUpzy1o3FNXRcJarK4sTNM3MUrx5A2i5v8Z+ZgeBkKLIQrpDoFUkx/0E0npGAjp41CLf1S4jluRTwiQjDSeCoufTaIkUQg5HKBvjKZuxMpY1gsZAlywAefdPMDmma5gQo/WbiDJ1O+QjZhJr6dmkGteRZXFj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(376002)(39860400002)(396003)(366004)(189003)(199004)(3846002)(186003)(26005)(6506007)(956004)(97736004)(2616005)(105586002)(6486002)(5009440100003)(486006)(386003)(52116002)(2351001)(2361001)(51416003)(5660300001)(25786009)(478600001)(2906002)(44832011)(316002)(16586007)(50226002)(47776003)(6666003)(6916009)(36756003)(8936002)(476003)(6512007)(106356001)(6116002)(55236004)(66066001)(53936002)(16526019)(68736007)(4326008)(86362001)(7736002)(81156014)(8676002)(81166006)(50466002)(305945005)(48376002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0765; 23:8IT4vz+T20+4SeuCvNPC8gJviAbIeTsW2sOEdip0E?= NuqcRa+zVrOT3WHY+yNj+qpY9GlbNmYvKMjdQbtZ+lO+kyIXfFn5m/hBEIIgMyB1bpK4CSgr5e8LxGbTCBqNotXPvWE2ekpendz2BuVOWJnd8g2RAN3mxHAIyWQwncjScKCgBuGiLidjBC8VR9RAIsgi01FiBaL3aJGTVOP2VYUV+8DKKgRF7M/TwJjMi3ci0U/kF+2gao9IRQvjvP/Hdkl3jNRif6YuYgXtX9D1OD93ruomE2hkKmikViLlDSGpIK/LUWC2I/th5H6vo/FeUDL3H5KZ8FV04IaTS7D8UEnB9U5hbidBEOtwnWRrSHHAIUbLfT+uUeJN05d46FQ/tDql0RyrCHUzoVQU5slRPnvKs3CS+OgIzV8KtoPaEUQXoZWZ34b4Tw+B7fDBqzpiCNW29U33Wj57/2OvHzb5twLDcQsK/Hnp6oFgYIvliLHs1HqtpdvE0tOuREhrXiNU9ZENe8CmbBXIfZEbpthMxJotuuu7eyNXVnPvLMwrPIpM6AWHYf3/5z1tRv9YNGuFdcG7TZ+ASCalul/qk+ZSxe7+8Lz3Dc9IKpiIJuxTWV4RA/Op3rwrAMpVlQ7nqDHWWIHCRduUa2JjYLHhqeM1iYJoAZABeUWBcgoD/TqEoNnPjizts8+RX2EhgXv1iMc0sQo9kUNLbV/4lMerDJRm4//f/OSzdH8llTC6lcUiHU7gMLN73hRbTwDNx9O0yukYI7NLR/9Xa0ELoerGT7XKNrq4oFBmSJu/LtNT+u3R16fkNnfFG+3f+nVwDhW7q47gHghEXtsOSmffHzO1MhMtK9303+b6Mdeg3cnh7nEfHgJSJT4WlnNa9hB3Z/UF0vVMeBHpCCZ7BGwYxNEVIRwP5m41IkjOmKFBWP/dJGIWzuU9N0p7DaCWooOcm4Eh34JE8oUQ8PzVrArtPaIWAWu+EvCKfc4L5Kv8Bj7uYBN0+573GU6nz71KA3pZQFH9wQ0mfd9vbG+h3+gp3Fi4l40lt47KT7x//RYECNea/0/YbzfDIuI5LbhXA+OmORDPx3bp2+AjVj+wot7rUN7oiPAsbUq7Ty7xCjqxkcobYwZvdhfikzo55pOqcTDFuODTS/agNW81TkkmWmkerp1DooWQ8p3a+8EDo5uAaevvSDs7N5drL6gCmd4rHqXfJ1HfGWBdywq4cZtKEsQ3FHESCDvns19wLFpG7pZxgqifQJ6EzZ6fOE= X-Microsoft-Antispam-Message-Info: 0Q1uNRE/i2IWbPeEfpFR1JNkIL/+6YJ7IK12YXAp15ILmF7mYIF7V02BpcwcaiFut49jwXfOG30eaLcTCabV8ooFU/8g136MZhKr+VpO8LlveQI8tZTDMSLI6FYHr78+3TNgbIbPoTLO4QiBRGx7dIi2n2tsHEy5PRPuAbOKhXfVV7+Xsh5pjsRgnhub5F5x X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:YGO6TwpO7j7LEgktS5h9VAna1l/rx6cz1eEnifRslrTTUrCRtd4wEWVh6TtAoxNYq7ExLI8iNbokYYRqy73j9C8XYO+ZqJLaSPIhGAaimn7NRwlSGkog9FWp7nl8JDIshUz69ClvSLJeAVt1ze7FUp2Oj6rk1hxFASdRTS9yaZjF/KJORM1Eo7q4r8Dn/Sdp813tzmTC1UJxzUm/MStD8HUreeT9U6CMOGVzJ/haKyo5C4bpJxMUslvM/UPQCUm1/rcXdETU03tyR0wvgrlJvxNEnM7/7DJOlWu1Aq2BkNqXL2PB6v+ZDDXOSac63Z57W0pYT6jOSTO/AwKoHeoP6gqNHsGefDuFxF54weBnMAk3I9kcw6Nt3LZYm7fRk+WN4VNJmSu1SGcM/cMdCjazt9oCktoZZxmyIyjJRROvDZbwI7NTCpTeW4/lcIOdmsGADoXzWmyEFNupyhpoZDa+iw==; 5:FRQpTjN73VQ89cMAxwSOihSmDX5d2JQpOsqeSmwbb0w5YvJqVv9MUdc7CNSsnjGedW9O4pRI/yPU9QJmSBmZsAs86YoDFoDrEyZJz6aRPaXL1lDyBm+YJL0o0KwdjnMCupYaP2h88PVYKfSCMPLv7MrCSU3MQ8AWj2cO5DDrHX0=; 24:0OdxFloOHzwR6byH3yVgc7o1ZQ4o5bbZ6xewLpucMkvlkrze7naoA6AgCT0FrXGSNh9g9Hm52KXf2KYbhvybEx6xe1mEicRL0yB/vz069P0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:LHqPJYzEM1U9t3MwSeGXwal4oApWbgfXhMlXq9R9u9BZexitoQzghh4RY2EVVmTQcLpSN3fIgKBG+9IC4jt5gDdw1n/anXRCc/KhTAuRnqQdIGhkGMAuk4JOBVFufPrDa151+CxxdtGzrdRPtnXa5dYD8FIvshgC04W66vXw9ijL7VIB+piT6QfEUUulM9036kh4i7/IsA55syq02iuV4dQeO5bNXetGlRBzh//VccMnoGsf0XsYKtWUo6+vYNvp X-MS-Office365-Filtering-Correlation-Id: 3785324f-e85b-40af-aa59-08d5aaac5461 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2018 12:59:05.8170 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3785324f-e85b-40af-aa59-08d5aaac5461 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH 1/5] bus/dpaa: support device blacklisting 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" Signed-off-by: Hemant Agrawal --- doc/guides/cryptodevs/dpaa_sec.rst | 13 +++++ doc/guides/nics/dpaa.rst | 10 ++++ drivers/bus/dpaa/dpaa_bus.c | 101 ++++++++++++++++++++++++++++++------- drivers/bus/dpaa/rte_dpaa_bus.h | 2 - 4 files changed, 106 insertions(+), 20 deletions(-) -- 2.7.4 Acked-by: Shreyansh Jain diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index 2964e83..9988ee1 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -78,6 +78,19 @@ Supported DPAA SoCs * LS1046A/LS1026A * LS1043A/LS1023A +Whitelisting & Blacklisting +--------------------------- + +For blacklisting a DPAA device, following commands can be used. + + .. code-block:: console + + -b "dpaa_bus:dpaa-secX" -- ... + e.g. "dpaa_bus:dpaa-sec0" + + or to disable all 4 SEC devices + -b "dpaa_sec:dpaa-sec0" -b "dpaa_sec:dpaa-sec1" -b "dpaa_sec:dpaa-sec2" -b "dpaa_sec:dpaa-sec3" + Limitations ----------- diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 0a13996..620c045 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -162,6 +162,16 @@ Manager. this pool. +Whitelisting & Blacklisting +--------------------------- + +For blacklisting a DPAA device, following commands can be used. + + .. code-block:: console + + -b "dpaa_bus:fmX-macY" -- ... + e.g. "dpaa_bus:fm1-mac4" + Supported DPAA SoCs ------------------- diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index ffc90a7..2b85c9e 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -54,6 +54,8 @@ pthread_key_t dpaa_portal_key; unsigned int dpaa_svr_family; +#define FSL_DPAA_BUS_NAME dpaa_bus + RTE_DEFINE_PER_LCORE(bool, dpaa_io); RTE_DEFINE_PER_LCORE(struct dpaa_portal_dqrr, held_bufs); @@ -129,6 +131,22 @@ dpaa_sec_available(void) static void dpaa_clean_device_list(void); +static struct rte_devargs * +dpaa_devargs_lookup(struct rte_dpaa_device *dev) +{ + struct rte_devargs *devargs; + char dev_name[32]; + + RTE_EAL_DEVARGS_FOREACH("dpaa_bus", devargs) { + devargs->bus->parse(devargs->name, &dev_name); + if (strcmp(dev_name, dev->device.name) == 0) { + DPAA_BUS_INFO("**Devargs matched %s", dev_name); + return devargs; + } + } + return NULL; +} + static int dpaa_create_device_list(void) { @@ -162,6 +180,7 @@ dpaa_create_device_list(void) fman_intf->mac_idx); DPAA_BUS_LOG(DEBUG, "Device added: %s", dev->name); dev->device.name = dev->name; + dev->device.devargs = dpaa_devargs_lookup(dev); dpaa_add_to_device_list(dev); } @@ -198,6 +217,8 @@ dpaa_create_device_list(void) memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN); sprintf(dev->name, "dpaa-sec%d", i); DPAA_BUS_LOG(DEBUG, "Device added: %s", dev->name); + dev->device.name = dev->name; + dev->device.devargs = dpaa_devargs_lookup(dev); dpaa_add_to_device_list(dev); } @@ -357,6 +378,51 @@ dpaa_portal_finish(void *arg) RTE_PER_LCORE(dpaa_io) = false; } +static int +rte_dpaa_bus_parse(const char *name, void *out_name) +{ + int i, j; + int max_fman = 2, max_macs = 16; + char *sep = strchr(name, ':'); + + if (strncmp(name, RTE_STR(FSL_DPAA_BUS_NAME), + strlen(RTE_STR(FSL_DPAA_BUS_NAME)))) { + return -EINVAL; + } + + if (!sep) { + DPAA_BUS_ERR("Incorrect device name observed"); + return -EINVAL; + } + + sep = (char *) (sep + 1); + + for (i = 0; i < max_fman; i++) { + for (j = 0; j < max_macs; j++) { + char fm_name[16]; + snprintf(fm_name, 16, "fm%d-mac%d", i, j); + if (strcmp(fm_name, sep) == 0) { + if (out_name) + strcpy(out_name, sep); + return 0; + } + } + } + + for (i = 0; i < RTE_LIBRTE_DPAA_MAX_CRYPTODEV; i++) { + char sec_name[16]; + + snprintf(sec_name, 16, "dpaa-sec%d", i); + if (strcmp(sec_name, sep) == 0) { + if (out_name) + strcpy(out_name, sep); + return 0; + } + } + + return -EINVAL; +} + #define DPAA_DEV_PATH1 "/sys/devices/platform/soc/soc:fsl,dpaa" #define DPAA_DEV_PATH2 "/sys/devices/platform/fsl,dpaa" @@ -458,22 +524,15 @@ static int rte_dpaa_device_match(struct rte_dpaa_driver *drv, struct rte_dpaa_device *dev) { - int ret = -1; - - BUS_INIT_FUNC_TRACE(); - if (!drv || !dev) { DPAA_BUS_DEBUG("Invalid drv or dev received."); - return ret; + return -1; } - if (drv->drv_type == dev->device_type) { - DPAA_BUS_INFO("Device: %s matches for driver: %s", - dev->name, drv->driver.name); - ret = 0; /* Found a match */ - } + if (drv->drv_type == dev->device_type) + return 0; - return ret; + return -1; } static int @@ -484,8 +543,7 @@ rte_dpaa_bus_probe(void) struct rte_dpaa_driver *drv; FILE *svr_file = NULL; unsigned int svr_ver; - - BUS_INIT_FUNC_TRACE(); + int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; /* For each registered driver, and device, call the driver->probe */ TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) { @@ -494,13 +552,19 @@ rte_dpaa_bus_probe(void) if (ret) continue; - if (!drv->probe) + if (!drv->probe || + (dev->device.devargs && + dev->device.devargs->policy == RTE_DEV_BLACKLISTED)) continue; - ret = drv->probe(drv, dev); - if (ret) - DPAA_BUS_ERR("Unable to probe.\n"); - + if (probe_all || + (dev->device.devargs && + dev->device.devargs->policy == + RTE_DEV_WHITELISTED)) { + ret = drv->probe(drv, dev); + if (ret) + DPAA_BUS_ERR("Unable to probe.\n"); + } break; } } @@ -557,6 +621,7 @@ struct rte_dpaa_bus rte_dpaa_bus = { .bus = { .scan = rte_dpaa_bus_scan, .probe = rte_dpaa_bus_probe, + .parse = rte_dpaa_bus_parse, .find_device = rte_dpaa_find_device, .get_iommu_class = rte_dpaa_get_iommu_class, }, diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index 89aeac2..8f7e18c 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -15,8 +15,6 @@ #include #include -#define FSL_DPAA_BUS_NAME "FSL_DPAA_BUS" - #define DPAA_MEMPOOL_OPS_NAME "dpaa" #define DEV_TO_DPAA_DEVICE(ptr) \ From patchwork Wed Apr 25 12:56:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 134281 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp831541lji; Wed, 25 Apr 2018 05:59:24 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/nV7p4qRaZP5ric5OJ+iAYt7+bNoR50HiqT8OhQLXYH6CXUV6UTrtze7Hrdi3oRKsge6sT X-Received: by 2002:adf:bd01:: with SMTP id j1-v6mr17184024wrh.69.1524661163986; Wed, 25 Apr 2018 05:59:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524661163; cv=none; d=google.com; s=arc-20160816; b=WB8U3PRIR3V6HItZRWBhl+4GSbXzdyx/YfZjAHv2r9iX91VuWzL2erHY25YM5iT8w6 GRvcJLT6ksqGQQKixZd+02VBAwa/39TsCjzP3AbiN8FS18iY9GEl+nmEZ1Z1Fr7qIkhA ZWhl2EklzjU0AOZx6o8vAXZdBJn4GLfCw2FEpZZTXXEYVPQCURS3MfLg2pIel5dVX41U NkO+km9h7xBz8t63tb0newmpk/r30AHfzg5to9VVeURfHbRev8LqWU6XSI9CYG4/SmSV 2dw42BPHvX4yI4IYgvhNObmfTVXl1tefJsmt/hw/6YQpNASAszHShxoLLgxAUOfC7kZL pbKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=SnTk8+iOt+2s7iv6YedZO1mU3V8lqiWEwcECy3padWE=; b=vuLuFpPH8q8s9cfWAS0GvbdhT+KZgpc4WJ+ftS0/szxIBrpOpBmUT4y0E8oZaWxQMc Q4I8Nz494SLUwWu6BRWOfu3D8ahvmsQE9zNW0NpSNuXBWucO2UXpxh3+FnD0F4uDt+7d yD9rPYO1AWdvGQB0iygtJR256wpnVBo+qvgE9RGTFpBhy04cUsYMgbiUTSrwMcs0VymS KNq/CViU45MBjRt2fmivN934RApP8MG1DZxg8VrYBkC1YC8cDhqWqzyLL3fgx+Joa9Pz aqsN198ii6ugUmRACSVpK0O91G8iLYWrCtSMt6ppcJJW3nWREnSiUsyzuu9efHjmnUiQ pi+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=aOMMLJ7C; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id e11si8788307wmi.105.2018.04.25.05.59.23; Wed, 25 Apr 2018 05:59:23 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=aOMMLJ7C; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B54077288; Wed, 25 Apr 2018 14:59:15 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0086.outbound.protection.outlook.com [104.47.2.86]) by dpdk.org (Postfix) with ESMTP id 0AE965F17 for ; Wed, 25 Apr 2018 14:59:11 +0200 (CEST) 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; bh=SnTk8+iOt+2s7iv6YedZO1mU3V8lqiWEwcECy3padWE=; b=aOMMLJ7CoKqmJZqh5j1Z5VtkfmcAMJ5GZ6WMlN+fiVS6EWivipJ1jmDo/g9G+RXlvNRzLViTzg9hWzELTe5d4fvbAHh+LO9t0RbdP9RP4NkGK121jmpm0JEmyEI8iSRZo/3J8P7kj+erc8FD7bjoK1DC5DIGLxoLXmebALR/urA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Wed, 25 Apr 2018 12:59:07 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, shreyansh.jain@nxp.com Date: Wed, 25 Apr 2018 18:26:59 +0530 Message-Id: <1524661022-21484-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> References: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MAXPR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::21) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:2wQdJJ+oO6vKLg9mfy3G2A/v3O7245R53eH0tWkQtbUVQOa6AS2PYf7wEpAZRpEFnhS2xjZ8vlq6y7bmbW5sdO3vn9XzgkVvYd32KTZp268TBwFPYMz36xt/9VT/W6R3pKDmWeZuRN2Iyhh36gC8rUKtkhqhIxTa1Nfn8E3LuG/q69npCDoTpfFmqE5pXv543wVfpPWmFqb/6VjzMrIC93NVnw16zRagvot5QgYuycPY/7kLYEGXa13Ao9L2eoNL; 25:cmOVZCfTxHXccB1e0PjaJ/uLEEWXDIhbzc51VSvOmqkHDwZ2mVDmEiCO+jbRFnFlTGEhW60okeRZkPXqzMn+SGqVSXsE4vo4MnmsIl5e7mFAONZna6KVb5SqlLMzrzagzQuoU55Q0KWkEMNO5v6QdX8vv3PYdaBOfm1a7dABYHSuCsEvAgkF7rGwRwB4/gsSnHJDm8coZRAkeJ0YZWUd2PeBQjxbj4q12t9byoiB2Vn3S35QGA/W7Ee+Bb//mAoHEAylkucdAoZpjNo4/8yAIlJ+8j05jeWHUonEzrDL+7HLAEfrfsrerGWKYYLC35usBMLfwh/VQZDRyfSeyH1Xlzri3bXJ2KHog1HC5Ez6Yak=; 31:CfStKa5W7QzrfxGA/+L52s94wF8aiSK+7yPZ2mMQGzWLbPw1X/9csROfPcMTWUzLU7StbMArnHWlCTNTP76l6YrfmyA4kQv4LCklHmQ5ENVykh974uGsK3jdfJIVNI4l4X+QZG/kKhulUrWT8RQG0namDTYKrDZd9xNnMGKT2wN3mZ9AftkIp1wXLMboPvnN4zvn8glJQEfAlUEOCnLSWlrfAqbCuLTOb2KfUvGUUgs= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:Z3aFVqg34UsXC/Up81puhre9d+JmtKEWNFjCGoPNZKssX7s8WR5WDRiA7pFQetwQ4x4S3aFnj9AHYdNUyAl7nu6+SYeAOHqHlE0he+UAxu97HL3nyf9pEGW48YfRbMLChlBTnrQnEUGbNHPUOob8s09Wb2GScoay3MQJWE8lsxeCgFz1SnA2DNcDgipr6fPKHdC8kM3j09/Kwn1T2RUnHj9BeWJmbkSUi6awZybM+SP9bUU5UuA8N1m6YvGsVTLGrMVp8Zqa5ef4HAIIfxwdIigEDfMS65kIYRgxM2ZDrp7Y/cy2XLwKqNWavDMBbIma4e2sCWy+9kG1lSkYeILyiXHQ/y1RP8cfhMd+/4OVBUrLNWvjmQY9aI7ZxDI9OS2CwzDc3dinZb3hvFQsYX1e97/m4bH2FaeyhN/iQ+dZXLCRWJRR+C1lTFpUbHCw9EvlhAIDHMjUSZ+qsx/JgyMyMH6MOKQ/QuxU1uxtvX0he9NzlxAWr4M1s6mIUT9++kuC; 4:0M+v++22sgoUiCE7tsnUCwMmvsZew+DAyoJPvtr1NvWZ8EyDvLZ9PT2FNhPrpMgNz15MMoXEiiR5O4yXgaf4wI3llhK26o420JqjuWhmwPWSMTDSmGKs6EuI0kxtPx9wBtgkfew1b0AvsnldvXS1SbGRY5thcTaTkN3pF58A3ooI6bOXqOWUlZ71ItYIXF5r/8XGgQWNDCj/SmW977SOIELOybvinYVcPjnyRtHiG18Xn9RKBYoc0jUMmXZXZKe7axm/D8/VORIZVI8SuHo3rw5XRLtTvQmu2eEIZ0XzXBVHXRw6JP+EZNga1ip8Mg7R X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(376002)(39860400002)(396003)(366004)(189003)(199004)(3846002)(186003)(26005)(6506007)(956004)(76176011)(97736004)(2616005)(11346002)(105586002)(446003)(6486002)(5009440100003)(486006)(386003)(52116002)(2351001)(2361001)(51416003)(5660300001)(25786009)(478600001)(2906002)(44832011)(316002)(16586007)(50226002)(47776003)(6666003)(6916009)(36756003)(8936002)(476003)(6512007)(106356001)(6116002)(55236004)(66066001)(53936002)(16526019)(68736007)(4326008)(86362001)(7736002)(81156014)(575784001)(8676002)(81166006)(50466002)(305945005)(48376002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0765; 23:gzkzEgLuiOWhVkX18CNlYK9qfFNkXQGMKGKlKjBDz?= ZUmQ84rgqaWrc7/DdirMLzblzWsjvZtS1mzeZSsQOqIkxXkhu5eyK7jXu/Y1DaXCWeM/26bI0YHod/pADN4wYCC6Tkii1T9mjfZPv95myedLCbf0i+JQ6v9GTacWMTOUr8X6hb1QZ0NUandQqEyTOkICe9TM2Kl0zItrgauShgR2wizwkGzcDs92vXsVU7Gconb6to80odyIm2cuw8XLtwOrXt08v+xZ9pjqBR6tS6kaM6WMUT3N4pv/QLKlOcQcY7BqBa3zKsqyjk9begXlPZspWZBeptK2H4P77R1lrd+wj39My5aBz2ecb8OW2zFdaduCS/UIt0urNckhiudrPv4EX5TQjQhTmCciYEPy6zYJvyAERZAGZ9WFsyG98Ww/tiwfo7MN3g2Ad6fFchOV0e0zdyAZ32zOOG2A8Azw/gEmgn5Evhf32COwpYDLxdIVAmRsLz80e7fuyEm7z5n79zHBay+8enKV4gfFu1IofkpSfaqioZoIrousChtS516B63+N77jVuDhoNrTDbayyTzun3DkdBJClnT8ICC2RpfMBobKzEEzp71+smkXVtZ+jHo+XyQlXu5Dq5KtHKK6PwcIGC/8prj1nx7Cy7g7pFXA7SXpZ1+Pt2mapxxapCyjuLiXSfJyNKpTjXHGLM1nM6el9b4rOMQnJhKYlUbklVRjzldJjna7CGlwPC0WgtM7TwLy9gykEHM+QYvIuUWbaQ8Sm3xjIZuEYZZSd9uP/dFZZlRjp/GQE+XTyi3BrBCI94VQNneCT9d163o4scYTPy/ksYeUZMSqb7OWYus/big7ioL6cTGMqiEk2OAjxZpLapMJ1CX6iaMivKLtzeGfyISE85cLwdmj7b5swGvgsjg8jQQ9M71x6locWpB/1t7AQ/JnjEmHnpo/cvhfmImEyiLwZrSrfLadAWeIsdNuyy+VcNIoMoEjdBTkQzHISAo8v1svgUxPEuC8+2TQhYhe0jzNABsPGpZGMhdW0m8Jqe4yzyKZnlpo1tZpUjyHHuLvogPgpuUYdL7+dh/GVstApDbeN5064DubCEy8hvaVx/sgOgymNLZwYIUPKuG6SyJS9Nik00edekDC6zkhLM3Mz7a2mQ02yQlLzQHjjlsIre9XCsYK1rnQuQyKX9ZCVlDVHs/VBNFju6uwCRileL1mLfIy3BQW5UjatqLtvLpnEWfgp3qqKyhQFKP+37ZV3W7dsXTj9+YQkJQlfzzqAjNiXAXqySM41HgLUDGECtkdZYJKK1zNsvezGfnQjx8pYiiRfKLd0s5meyhlo+ZQX51+We0B X-Microsoft-Antispam-Message-Info: 04I4sRwOgHSwiyBdkTDaEwNsffdnVvxq3/NQ77gg8azTsfr0ze5YeshalLCU+EYSMMRmUfycMBemly0DL3AUJmlPWyIb7xRAiiFC0OULMJIifvYRPyF5A6EJQ/en5sLBzs79U0Nem13W7DnJTnWqwwabFZm+ZESAU+IOI7CceFCJ/atmrFgErMoEb5X0zFFT X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:7xTKW0NYl7bw+qxSESkh2UgL96TGX/UnXvntlWgpMAKorIiWXnkyF3rg1UxPggnD6l38KUgkp89dFA8VoNi2E+lx1gQZ1bSfNH/ngImZmez0u7FfiBx7sovIH5dvaafqVfdTNshCixBQW0+GBDb9oOn/ThFeXDax9PmFkQcIOlmivwjTZsSDLhuSd1KW1sCKHl+0HHg0l1jcJOxLYSq+1badKb+nF/JYkIijLvXoRtyEi/qRM3BPfe0rlCFIwSjzRRNS9FuXd7YzoElAUQa1FEAbf/swewboo3XBJMhP8x6m+o8pR8fOnHzrL167hymstd47yqJQeepx0/s2W5sjmZGR9peru10IgHcQXPpYgN7ebtW738MiGZVZZlytqGiMVlESDznur6xix9BfKmM5oTPQyXdQnS4bLMR1pta3phtsMJr70dAj0Aw4uBwzzVcRirShJu2/M3ju+xukXLI86w==; 5:1ZNH82tJ8Uzo3IaIcu/mKcGpIrRWFXOutjl/BAIwzFkx2A64JHCDtvrfSSD8gSWmyiC4cE3dS4sGXxs0EPS/+YhUuGpVbj9o/o9GFFDXDpEnil9TBqWTLcQQX9ZH85KhYq+B69KYfF/f4G8omBgCqjVTq9sFwaAqej76xLgxFPY=; 24:PTz2t9qU0HWRnijIVzh+twixdwXq//YRxouf1e6LWhaQ59jwDlq++I61mzsnlvlMA+K2iv5xCBTAfARTsFrKokC2gb6BuE/da+kh/3M34Mo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:seqIlQtnu3K/wVZbmncwVtdoW1rodcD+4pYKxWQZQvCmsUDRML450p0AfzeOm4G1qkgi2RBeyZ0L+dbw88sahmxWQlAIUe008a3JR4s40GT+MmpwpUn5J5+h/q8ywfQhwwED1AW5/Jx8A0TnTcfq+e43d9aMNxfDKO0JFns56iZStlATG8YEfRI2OtQwj9Kh7lLgeUIGyYt/S0b+5Sdh1hlBohG7k9Iq7LNjPVZyh9ras+C+GMdXx1S0sWdJ9Kvl X-MS-Office365-Filtering-Correlation-Id: d6b5e20e-7cd8-4a18-c604-08d5aaac5560 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2018 12:59:07.4733 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6b5e20e-7cd8-4a18-c604-08d5aaac5560 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH 2/5] bus/fslmc: support device blacklisting 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" Signed-off-by: Hemant Agrawal --- doc/guides/cryptodevs/dpaa2_sec.rst | 11 ++++ doc/guides/nics/dpaa2.rst | 11 ++++ drivers/bus/fslmc/fslmc_bus.c | 107 ++++++++++++++++++++++++++++++++---- drivers/bus/fslmc/rte_fslmc.h | 4 ++ 4 files changed, 122 insertions(+), 11 deletions(-) -- 2.7.4 diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 5558ea5..0fdd673 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -134,6 +134,17 @@ Supported DPAA2 SoCs * LS2088A/LS2048A * LS1088A/LS1048A +Whitelisting & Blacklisting +--------------------------- + +For blacklisting a DPAA2 SEC device, following commands can be used. + + .. code-block:: console + + -b "fslmc:dpseci.x" -- ... + +Where x is the device object id as configured in resource container. + Limitations ----------- diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index 8e38eff..7d069aa 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -561,6 +561,17 @@ which are lower than logging ``level``. Using ``pmd.dpaa2`` as log matching criteria, all PMD logs can be enabled which are lower than logging ``level``. +Whitelisting & Blacklisting +--------------------------- + +For blacklisting a DPAA2 device, following commands can be used. + + .. code-block:: console + + -b "fslmc:dpni.x" -- ... + +Where x is the device object id as configured in resource container. + Limitations ----------- diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index d0b3261..e7c8cc6 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -23,6 +23,7 @@ int dpaa2_logtype_bus; #define VFIO_IOMMU_GROUP_PATH "/sys/kernel/iommu_groups" +#define FSLMC_BUS_NAME fslmc struct rte_fslmc_bus rte_fslmc_bus; uint8_t dpaa2_virt_mode; @@ -93,6 +94,22 @@ insert_in_device_list(struct rte_dpaa2_device *newdev) TAILQ_INSERT_TAIL(&rte_fslmc_bus.device_list, newdev, next); } +static struct rte_devargs * +fslmc_devargs_lookup(struct rte_dpaa2_device *dev) +{ + struct rte_devargs *devargs; + char dev_name[32]; + + RTE_EAL_DEVARGS_FOREACH("fslmc", devargs) { + devargs->bus->parse(devargs->name, &dev_name); + if (strcmp(dev_name, dev->device.name) == 0) { + DPAA2_BUS_INFO("**Devargs matched %s", dev_name); + return devargs; + } + } + return NULL; +} + static void dump_device_list(void) { @@ -182,6 +199,7 @@ scan_one_fslmc_device(char *dev_name) DPAA2_BUS_ERR("Unable to clone device name. Out of memory"); goto cleanup; } + dev->device.devargs = fslmc_devargs_lookup(dev); /* Add device in the fslmc device list */ insert_in_device_list(dev); @@ -200,6 +218,54 @@ scan_one_fslmc_device(char *dev_name) } static int +rte_fslmc_parse(const char *name, void *addr) +{ + uint16_t dev_id; + char *t_ptr; + char *sep = strchr(name, ':'); + + if (strncmp(name, RTE_STR(FSLMC_BUS_NAME), + strlen(RTE_STR(FSLMC_BUS_NAME)))) { + return -EINVAL; + } + + if (!sep) { + DPAA2_BUS_ERR("Incorrect device name observed"); + return -EINVAL; + } + + t_ptr = (char *)(sep + 1); + + 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)) { + DPAA2_BUS_ERR("Unknown or unsupported device"); + return -EINVAL; + } + + t_ptr = strchr(name, '.'); + if (!t_ptr) { + DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr); + return -EINVAL; + } + + 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; + } + + if (addr) + strcpy(addr, (char *)(sep + 1)); + return 0; +} + +static int rte_fslmc_scan(void) { int ret; @@ -274,6 +340,8 @@ static int rte_fslmc_probe(void) { int ret = 0; + int probe_all; + struct rte_dpaa2_device *dev; struct rte_dpaa2_driver *drv; @@ -303,6 +371,8 @@ rte_fslmc_probe(void) return 0; } + probe_all = rte_fslmc_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; + TAILQ_FOREACH(dev, &rte_fslmc_bus.device_list, next) { TAILQ_FOREACH(drv, &rte_fslmc_bus.driver_list, next) { ret = rte_fslmc_match(drv, dev); @@ -312,9 +382,21 @@ rte_fslmc_probe(void) if (!drv->probe) continue; - ret = drv->probe(drv, dev); - if (ret) - DPAA2_BUS_ERR("Unable to probe"); + if (dev->device.devargs && + dev->device.devargs->policy == RTE_DEV_BLACKLISTED) { + DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping", + dev->device.name); + continue; + } + + if (probe_all || + (dev->device.devargs && + dev->device.devargs->policy == + RTE_DEV_WHITELISTED)) { + ret = drv->probe(drv, dev); + if (ret) + DPAA2_BUS_ERR("Unable to probe"); + } break; } } @@ -329,17 +411,19 @@ static struct rte_device * rte_fslmc_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void *data) { + const struct rte_dpaa2_device *dstart; struct rte_dpaa2_device *dev; - TAILQ_FOREACH(dev, &rte_fslmc_bus.device_list, next) { - if (start != NULL) { - if (&dev->device == start) - start = NULL; /* starting point found */ - continue; - } - + if (start != NULL) { + dstart = RTE_DEV_TO_FSLMC_CONST(start); + dev = TAILQ_NEXT(dstart, next); + } else { + dev = TAILQ_FIRST(&rte_fslmc_bus.device_list); + } + while (dev != NULL) { if (cmp(&dev->device, data) == 0) return &dev->device; + dev = TAILQ_NEXT(dev, next); } return NULL; @@ -422,6 +506,7 @@ struct rte_fslmc_bus rte_fslmc_bus = { .bus = { .scan = rte_fslmc_scan, .probe = rte_fslmc_probe, + .parse = rte_fslmc_parse, .find_device = rte_fslmc_find_device, .get_iommu_class = rte_dpaa2_get_iommu_class, }, @@ -430,7 +515,7 @@ struct rte_fslmc_bus rte_fslmc_bus = { .device_count = {0}, }; -RTE_REGISTER_BUS(fslmc, rte_fslmc_bus.bus); +RTE_REGISTER_BUS(FSLMC_BUS_NAME, rte_fslmc_bus.bus); RTE_INIT(fslmc_init_log); static void diff --git a/drivers/bus/fslmc/rte_fslmc.h b/drivers/bus/fslmc/rte_fslmc.h index 69d0fec..de40e86 100644 --- a/drivers/bus/fslmc/rte_fslmc.h +++ b/drivers/bus/fslmc/rte_fslmc.h @@ -31,6 +31,7 @@ extern "C" { #include #include #include +#include #include @@ -49,6 +50,9 @@ struct rte_dpaa2_driver; TAILQ_HEAD(rte_fslmc_device_list, rte_dpaa2_device); TAILQ_HEAD(rte_fslmc_driver_list, rte_dpaa2_driver); +#define RTE_DEV_TO_FSLMC_CONST(ptr) \ + container_of(ptr, const struct rte_dpaa2_device, device) + extern struct rte_fslmc_bus rte_fslmc_bus; enum rte_dpaa2_dev_type { From patchwork Wed Apr 25 12:57:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 134282 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp831718lji; Wed, 25 Apr 2018 05:59:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp8OVBiK8Wcl4Ayodu6ZbZ4X2b/Nit1UvrRtQeW+dLdtcrKWrVJ+VMY2emMWy0TF5HGWzaZ X-Received: by 10.28.136.199 with SMTP id k190mr15271328wmd.154.1524661175275; Wed, 25 Apr 2018 05:59:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524661175; cv=none; d=google.com; s=arc-20160816; b=P/uKNC0DuBhdPg+0fyc85LVlzQ5XDEQmYON2HHCb6oer5S0yKA3mz6PIY5z6tTmfim /xNlTQ2K0TgpurNgRq21Bhq8wnslG30vkZXRWz03UnBqlCzIUsJoxMO4+JaVjc7o4bE3 ciBN8eoZjxcnmNWQqIqypemuQvZEP23UaNxUHatAIhZp4+LiLz9t/29tdOx7KNHLSGYC Yak/SmwwtLxGNKdck9noHLSf3iunkiRneJB60gLTdU8/hBEKzIUZ2wN+WlYcsQhnyxYI AHbfzASgjAkHhCjNxL3+W4LFL3yLIom1ofkzZqwAQPIaR/sEN304V7jAgiz478f53Y+P 8h5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=2BcRmwKRmzM0FW4YCSTRhJgdezt4oe8KWjzXk/GF5QI=; b=JZmZlDSvk24BBuxYKBFMd870ddzYvRvbU2e+hwRGYQ14entB6zcuP3VWn2an3hdmC6 WovfB1z4kxNZMhuu7CNSRY8z892wGmOaQysHjX0oj88+p3KXn3KWF1ytN8TCgbWPIVrI HJXz70JlMuYs3yHTfz+4qHehgOAXfu69sre7zxKALLcN4iZcEDt+tJAXFtWiBK4nSoUK xK/W0ul2xW4EscFy+qCob7h1YWAM9oPaG03SFbeK+R/PApkss5LbboiMuSY9A+M+VvoW 4HUHtk7c0BW91wXtFbPVi+Dj/gDJC1tsEoWj9QsoBphiQApzbtmmhjYQWdZzLJRAtCAe fyqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=xtznyLF6; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id 61-v6si12811075wrm.183.2018.04.25.05.59.35; Wed, 25 Apr 2018 05:59:35 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=xtznyLF6; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BAD957CA9; Wed, 25 Apr 2018 14:59:17 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0067.outbound.protection.outlook.com [104.47.2.67]) by dpdk.org (Postfix) with ESMTP id 688DE7260 for ; Wed, 25 Apr 2018 14:59:12 +0200 (CEST) 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; bh=2BcRmwKRmzM0FW4YCSTRhJgdezt4oe8KWjzXk/GF5QI=; b=xtznyLF6N6irSQsCj2r4Zb+U/arnywz9IHn1W80TN+isYvs0svAij301TOmceeZQnOSGaaJ8CCxPNxDXZACSQ5F7Cb0RzV3bAvco4EzMsPystEeNaUbbk+jBqzHbHLJ7OqttG1iMwmPB+DMps7sbkLB9rgAt9RMSMZvi6t5Cbuo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Wed, 25 Apr 2018 12:59:09 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, shreyansh.jain@nxp.com Date: Wed, 25 Apr 2018 18:27:00 +0530 Message-Id: <1524661022-21484-3-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> References: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MAXPR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::21) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:dyQ9cj2m1rrcmsRr53qhIQR6vaXv+JACeLNCB7fiQDjVc0XTsQ/KpebfxflbgJ2C1yWIHYf+XQ0ZcKQrfED6uPwlyFu0/yD/5APYnfRs7h1fu+7kdbTllI9FHcKVSgq6aS9nCZnrUkiOvZmkK9UdIzjS8K0Tb6uOaBQ+5aI09T7ZN7aVChnkh+wIufUXokpd8PPIjh+qHa8H7MaOQDI5m2x4X1SMbHNrpGoVRz2Lyk8Tcc0LNC+cDEnJFWY5dxH9; 25:mbz7NdVGK9xdCjPl0Q1Sl0UXKMglSCkJmrRTa/CkpXkfLoSin+fwHhHzy3g2/DCJzYhQIVmHEN/WB9DYYZy5k5VI3i2L5N4MH73b387hVIDIb5cUYI5yzwTotVTmBczLH9O0ljLtHvv9a4ia6AQG9RJhWBv0jWyHCvqWKZ9K+lj3S4D9H4y4LiBzNQ+2t39as1TpQJdibkli+lSPI7vaAEwkAtFNqu8B69zBoD3vHtcGAkQF/NYmE1svcbOvpCSOlqABBug04kqR2nkIw8QeRpnuH4lBP97MukNMnT+WY1PCFvohm2ITHz59UVxQVy3MrtdeTfXsiKc7KfLJGIhoX5juSdMJZfMeTeB+yogFM98=; 31:4ipHUsRg3IVYojGi1OvE9IGV6wsSb670dussHhJRMz0+GPXgrvU/Vwu6P2vfRsXnKZvMNqoj6hhcixBBruSaADGYY5ZUMwkxIE/fwsQ9DHdeoU/j0OiynGE+KengsmKB34MayFpVAWYCVKeFAtgcDXnJ0nB4Sp6fpPvIv1f9F5KVeJ4Srr5UGZooBJcHok+gs8MwALWCT3pwfRh6RcrIED6q+3nSATo1wCWVr9xa59g= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:6/7YRguxYgJQLUKWdpiPDM6W8EC+u1T+yzCF5926MnjA4l/gGAKWVHsLS3s7UuPwkc2yVtS6AnSJ7a55cPVIMgsOs88iICOGoJHmZ86D0KCmEpNZHTc0c+7KcvLJarrolIO64j8gercvabmmG2+X5ebn/N/+aoEUM4JNe4zvUkMRmjA4rJVz0Q21NFZFKNma1F2ao7NxLNDyvcIxaRN2nmtgGKj6EMAa56ho+i3q8+YJR+K0E1qV0OmyzgsfFa9bAM+U0yvdJ88oE1U4ft8dN5LL7DJxfScVyhes5ikOcXMdfHdDPnKSFtfQ8+se8lsVBrsoP2cMaXdAbFFw+TDlWiRPyFEItt4exkqrhRYlx1uNGI9rKkeR6BkO95xerJ3Xa1OzotHLlAIUZRPY0aRvJaKKY148sUn8CaCjWEe+VvqSVT8We9CKEocE6ZqTACduvABGFfAyje+CkU2zFxPjzqLX9liaLA+BjYqaJNwyiZJchTTNoW+mq3iGGisXXX5J; 4:eOhKOViQULWE8OifWJm3o/V3tUYxNuUq90pcO2syGldSAurz3AoOvrbUgfCcrkUuX0GYlez8ZAyMh8LpRa6aWv5NYwE2WgWpzitnsFowjuKH0JSvOvMiqvl2cJhKN4aV01Nbe3oZv5n94awwi1Tem5RdXbulGSK4Op8OhyTp7GxDUou8KQXggZk890AOYDyP05w68vq8fPQPDL4wHqWTq8oaiDfym34msYGpPcR5lPbJOqkQ1g6uLQlI1Wx46d37MNeD6JHOSCKL6mbA1uCup/PbHW9yy2sQ8kWFysQlJl/t2ri8kT6JaejFUEX/nthm64grmyzJ4L+iA/J7vYV79pQwV161Oy+iA1WTWNsi5dM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(376002)(39860400002)(396003)(366004)(189003)(199004)(3846002)(186003)(26005)(6506007)(956004)(76176011)(97736004)(2616005)(11346002)(105586002)(446003)(6486002)(5009440100003)(486006)(386003)(52116002)(2351001)(2361001)(51416003)(5660300001)(25786009)(478600001)(2906002)(44832011)(316002)(16586007)(50226002)(47776003)(6666003)(6916009)(36756003)(8936002)(476003)(6512007)(106356001)(59450400001)(6116002)(55236004)(66066001)(53936002)(16526019)(68736007)(4326008)(86362001)(7736002)(81156014)(8676002)(81166006)(50466002)(305945005)(48376002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0765; 23:d4ThSKzXc+OEGpaAtBe8518wD43SV6jKpGOkl9sBC?= wkX8l5nz7lECtkmy84EKAkHOnW9abRMuoj0jRuKL1EKHtN7fqEE0EQMnL/hWStBkY2SBp/s/QDcuEgUDoWJGn2jKpqS7LU/k68uHoi9RtzoEb/H/qA5K8QwAfj9Yt3QyuEDUjqVEw9briYOCmRoUNlKC+Zlx99c5H01EpMtCXIiwwXMz2X62foX8z/PcDxgRVRMqVNfvidOkkdiV+y06kvRdwDIxHjlYm4E6AlY6OVjl8hdouMwf/WGSdqp2+g1Pzgimw680YrjGiXmi1D/H4qocVHE0rsmcIphgaMkWyE0N4ushtImRrxoNDgm9IrrWDDwJom4Ujg189NO7Jcmwhn8dSpnmj6aQajQpSEddPkt/SCBa67CQhU2tkOi9Tzkk4BYmJyb3Hclf63wkU48gQAWIuRusoQvgAIJKt/iJchiVuyRFm1gB26xruYFV+Ent7/SbI46np4lku6mICeOIyjfPY3tlBdpp1LXu6nSM2pkS5igi3motATV/wgv8Beap8Y3m8VD8ZYSqjjjIRenAEXsT9T439l6b1ze8ogJTpuhwowroszXnc8KQNaRAucGyizVjTwaw8h4T+yrTwCC8WKx52J+kBqwCZ2UPnElZzwdkDH7zwp5m2yTHtBttq94QyWn3CNnAvMGV6RYbikvOubmxfptoSeKGjdyElbIBdTfKrytAIG9MmW01FaaLNm98DZhBeq63LHM5/ptuir2rfv6DpHZiV1WdJX5whwt0+PBvHZN5toI/03g6CYm3Yfdn6m2+O7NqWcaHUFFwXPTixj2N+q3/l+4XY8C1i5AHpnd/BZJi5OLepljyfiIb9Mq6kfHvCNl72DR+yDOHw0haaHJt7noLb3YNCx4hPfIlXfViOl+K/ECqqUKzY/Spl0mQLPmImqr6f+i01mrMA0zWsYaO2SFknQXQgbebAchWj9KL+m1cpkl7rPv71uKuaLwo5FILvvUzoDE5heZTVOujeG8viB0Sf9Mg/SOvNfscQIQPsJFH/7we7VhmTZeyEVBcV3dw3nIe23L/HfxfYbYgwK/OsI5Y/wNedBnjG4oZQexV6XRSvR1RO/7GdOQbFPILnJDk2pCNxJWHrSUI5DV1LT8gZ2T0uBkZgthVFez4GZeCOgstZ+RZM9b5zgRN4C7mvvng3RdkK88xIbJbSrUP/SIsNdIftoa6Q/CYA8b46aIkQ5vaigq+d5lui+6f0XUuLiPgSkpeHjkrYHAI+YMgAMPh/EG2GPquWZDl3qusinGg0MQKzXC82H7frqbkNYCnnPBxsNTh61WoHmSnjp4+GEn X-Microsoft-Antispam-Message-Info: lJqfAhSZkYkHxqJ3yxx9FS2AvKhRirkLdoMlz/ZqnHlE2LvhhYjEtff5fSxMUVDbcNxt26UUdV1HxQ2DsQQc7EOfrZlAmk0juJbxyTYa0EFrOO/OWiCEdiBlNVvz13cw56EsIVuX46j1XtElqcEO5q2rWU6trJaHxYUc4TD1aJNyNk7+pvXsLZ8g/k4fgR9K X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:yH9Q8eLQvQhP3jiI4jXEJLk6jGNU3Qz1lsUX/cQklsJ+4DaeNTGLnGR1DxzI44ChivPrNrq0WtdrJBxKGEl7RabF4Po3sR5nRBaL3QC/hUVN8JozylsaYXTIQIH5lX6e2EzT6/mdyShw8tSIEtTrjzVdJc09Qm2uZU6n3lBS239fyQUjotQ0J++TxAR64xvBxRNjS8BhL5AH/1VZKv4RmhJO/7yKRHXaCxs+yrncvtMMplFC4Z1bisKJRJtfiQra0WesT/PRZ4X+Ph3BRgKdNzds95+94XZGsRgVp+M4Zn+6iYXFOfHVUb/2v4B8PL+oUA9NEL6EUu+OUDn/MrK+pydiqeDYuzB7kpchmRRdSccQxh8iupMePO2+s9l17XIRhMVHEd1nXGYk0dhRIaYU7Uen8su1YtMWBPV/1Z7yhGiQzJxxN2TaZT3rgJH9QgKk1DY6P3OOKcU3qA3RavNIdg==; 5:VExkBRNNpc3UA8FTZsOhZCE1ZEijs4aYP++rcIo8Cc0iUBJgBRCM/D6UYJMPrdbC9rxiLC/C+VpLYsxmf/SNu90BU1BIJbtZbFrytSYCa9B+9eBuYQxZvV2T16DnxRcxpJ/y27JfYJadlA2RrbhYweMsp2nWCzZj4okcGF9Xlu8=; 24:9kWAGzqSV/kQTIl5yaJNMF7GaEE4CYP5T+SWfgWonjvxhvi3+u/Hoy3Bwx8VAtaM9ib6kvHzfXrHLKpCnywxR86gw+WHSwnsZoOaUf3CuYo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:shleKDwTZOOLwfzT7UenuUjQf+dSxtO6ayVm7szLu7J4S1zl1aH3qpZgkNnQ9Zkj1nje+rjUYWW40Drj7at6F+ApmRI4H4aeOb4NF6ggJaI/+FCZ8ExlOZCGESLBn8L1lTFjiEaY9vxvsTI84mcHPj+Hrb7YcnAdfxLB9+d5wwxuIRp2Ag/qZzO/cyd78MIR7wCBhUZY3oviPoR9Ce58AoMroW/w0Gx8hCs9PSeb3Yf95Ap4UTvp/u4jqHwjd0J2 X-MS-Office365-Filtering-Correlation-Id: 2fd2c20c-7164-4140-56d0-08d5aaac5675 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2018 12:59:09.2858 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2fd2c20c-7164-4140-56d0-08d5aaac5675 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH 3/5] bus/fslmc: minor improvements in debug logging 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" Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/fslmc_bus.c | 4 ++-- drivers/bus/fslmc/fslmc_vfio.c | 7 ++----- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 1 - drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index e7c8cc6..d95d392 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -122,9 +122,9 @@ dump_device_list(void) local_log_level = rte_log_get_level(dpaa2_logtype_bus); if (global_log_level == RTE_LOG_DEBUG || local_log_level == RTE_LOG_DEBUG) { - DPAA2_BUS_DEBUG("List of devices scanned on bus:"); + DPAA2_BUS_LOG(DEBUG, "List of devices scanned on bus:"); TAILQ_FOREACH(dev, &rte_fslmc_bus.device_list, next) { - DPAA2_BUS_DEBUG("%s", dev->device.name); + DPAA2_BUS_LOG(DEBUG, "\t\t%s", dev->device.name); } } } diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 675d160..c35c095 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -401,9 +401,6 @@ static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj) goto MC_FAILURE; } - DPAA2_BUS_DEBUG("Region offset = 0x%"PRIx64" , region size = %"PRIu64"", - (uint64_t)reg_info.offset, (uint64_t)reg_info.size); - v_addr = (size_t)mmap(NULL, reg_info.size, PROT_WRITE | PROT_READ, MAP_SHARED, mc_fd, reg_info.offset); @@ -563,8 +560,8 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev) break; } - DPAA2_BUS_DEBUG("Device (%s) abstracted from VFIO", - dev->device.name); + DPAA2_BUS_LOG(DEBUG, "Device (%s) abstracted from VFIO", + dev->device.name); return 0; } diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index a741626..99f70be 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -189,7 +189,6 @@ configure_dpio_qbman_swp(struct dpaa2_dpio_dev *dpio_dev) return -1; } - DPAA2_BUS_DEBUG("Allocated DPIO Portal[%p]", dpio_dev->dpio); dpio_dev->dpio->regs = dpio_dev->mc_portal; if (dpio_open(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->hw_id, &dpio_dev->token)) { diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 54ab9eb..7151d98 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -1894,7 +1894,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) eth_dev->rx_pkt_burst = dpaa2_dev_prefetch_rx; eth_dev->tx_pkt_burst = dpaa2_dev_tx; - DPAA2_PMD_INFO("%s: netdev created", eth_dev->data->name); + RTE_LOG(INFO, PMD, "%s: netdev created\n", eth_dev->data->name); return 0; init_err: dpaa2_dev_uninit(eth_dev); From patchwork Wed Apr 25 12:57:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 134283 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp831947lji; Wed, 25 Apr 2018 05:59:48 -0700 (PDT) X-Google-Smtp-Source: AIpwx49cdmjsYwv5y84Dsd3mCV9YsmqTTtugmx6iXJXKhbMNGs8htatlxDjGWylIVyHDyHEI/OZ+ X-Received: by 2002:adf:80e4:: with SMTP id 91-v6mr23860353wrl.258.1524661187986; Wed, 25 Apr 2018 05:59:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524661187; cv=none; d=google.com; s=arc-20160816; b=xyEQJ+eGTEWnm72XUd3T61lVdssgDzC32rPcqCRF1qrOO2EvqmTf3WfyL5hsLVcO+l mLREq/ZXVbtYM+w9Cs9rqlgycGlQ4rAYvX00uW0nWd9cL5oCyBq2zkGBna/D1q1JojyP ldvzBYta702N0e2g4wltEQS0g226p6gRQpJUHAbUEwT7DEr2k0jZoVgy6KBeffs2dH2V OJssxcHRkscF5egOvlcBGX7q9QvHUw5xXrqu2dGZ5uvYwP8HZNafXve30OF/mlgIxOUF 1HiXcsh2xF9xORKWW2ifOcHv7u4rnOQOd3NbKj00DUyJDK+mgqLRLW7d77yidp9BN/WF 5nqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=2yx2CzfZps9CUhIFDCiOdlosfqwcE1mqKHULGE60x+E=; b=Dj+c1HN50XN1xB79JKEub0R7wqNtJDqV5+KVUsD9HQzv54Wcxsb4L7rOvO3uFjcZ+3 qxqSLczO5XEx1K0dFBtj5+8QOoHCsmrqoxH2JB9UoW8iyxhKDQt3OvgNbVLP3h8bFE+C IYpwV42uAwRLdL/NUs4xjJGYGNNcU6LduFFyJ9AtJHZJQHAhN3VStd+7pC76yX8suGTD vVxNGPVsuFslF+dVT6NcTyi5Jtk6Fwq7gc61el6XQQM3uNm0Eodh8EsihSP/IlWgdBud SAhhkaB9toh4BxKzDFKSkfiyVXZzHyVo7ZuUqTiX7KgYgq2jjTWvw4R9az0ZcpWcU9v0 p4Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=GXPiQFkI; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id q16-v6si1709843wrg.228.2018.04.25.05.59.47; Wed, 25 Apr 2018 05:59:47 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=GXPiQFkI; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C1F587CB9; Wed, 25 Apr 2018 14:59:19 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0043.outbound.protection.outlook.com [104.47.2.43]) by dpdk.org (Postfix) with ESMTP id 7E142726F; Wed, 25 Apr 2018 14:59:14 +0200 (CEST) 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; bh=2yx2CzfZps9CUhIFDCiOdlosfqwcE1mqKHULGE60x+E=; b=GXPiQFkIFx4Y0SCeaT6qnH297CLXRaFDsEV40zvtoETMBt+ucZk7O9RvHl0uFUfICh9zZfDj9jxmN/YjzNoRZd67B0X6iwpO3SotMVrLHJQ2EE1K8pnnb+1pxYPVSIaipOkyBnzLBMRuV8PNKZF6F/kF3uhClirFd852kjG6dNI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Wed, 25 Apr 2018 12:59:10 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, shreyansh.jain@nxp.com, stable@dpdk.org Date: Wed, 25 Apr 2018 18:27:01 +0530 Message-Id: <1524661022-21484-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> References: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MAXPR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::21) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:sM4rBpyWlX2enWcydLsTq50i1MbxGXj+kM+OjRuy5/MNc681L1mG4+rtEa75cXovM1x4n5f4dnVOUulnlEUloNRyveKQiHL1GReuPQYoVWXBn+gsNbBZGhQdV0aVa1xtliP8nD4q622GcosleoaR/sgecba161+Gs+IJ5Pri7lw8Jf1vyityWp65XT9PKoICRK5dwmqUqPmieKS5sTbP6IaUUO40uZRl/4fPx6wbavg6tp9c1mApX+HYvel/wmrR; 25:64KGfpqMyBeKsqUJTyig43E/rs7/bJI7iptKM3BSOfppm6ozE2aIbYjLIrCgfRoMjGa7TAl8ajFs0qx/VDyw86OPsEGxOpGxlxC3tDbwWvARdvXaomX6xRrSURWRHzMKc8bohDL+zYG4sqRixsMhr2gqHwTeKH0q70LeFQfYKQYIkHmVvL0RWBeH0ah1JecIYXJCP8Ojqte5nQZ8UV2qQ+BWq9wuoyveV4MQgsvIvjY2ORm0AhKRs63XiB5n5LS2JVWNcdyINtX6/Ao1wAteX/pHwVRGW9roMwXnqCCU2SDjESZAJCKcZCG4Uc4ogRp0h/paXXX4vBlGGyTgzueEfi4ogOMeYXunwDdHExucdd0=; 31:wn9UQFyDZoUQGcR4xU9347YDEZz3dGPfPuWHylw+yAVHr9X2ojlxiKBzm+U447QFHzI+4vmHXrLIx1JS/ZsuFTai8npmFGFbBpHiLslrsgCPFuy7QScHOERqRv/+G92ITPbiHjdBC3YkqF9EW5AVqmL6MQj0vSY2LjZyyFPhICN/qquybC3nqAHSq4Uej9nkhRVqExRM6oW6pvdtJuE/hNgG4zXbHTWjIFdBLhHAMHs= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:KC5rEN177ZGNgyRrkiQ7YQf1i5dnNQiuOOwZcDSomvBR3x9SXs4Cmxid5tGhWCYaeiCdi/+578HII/ZQjtkjzZ/f9pUwjShVFPi5cAAzq5EfHtv4aPY8HmtNZSNiPluJilCchAPxVQ2R5VOpxkVG+Tvw7IKJ0Y4YZ8/dgxQFwv1uh6eYdZWWPVFamT0pV4jrOKeTAjqFwsR9NxW7x2aWI0qPlD92fRsC5OlvNi/Ph4f5e2FHVkMTP4q3vvILKppuB7q7gjvrmS7H6uyh8yUxDmV2CQK8/r4LW0bX9WDReso5jWyJVKZD92iYmJQmROfM4AyWkFf2FIonapYO8XtwcNNlyvEEYB9HUFSbZ+yFN4m/FpwBz+R62ZxgDKypE2ZYBFNxMe043s02T2EtocwRVHOT5zR3hGPNLqSRVZAbZm2l3qlnLIR0RlocE9e4qRfDCALP77V7WOyahJOaBhWglrIkbEZtSNibz6+VvfPiEhl7+yoS9VsTHe3msrxAADJd; 4:srrp0/T99e3kpDfk/QS0PKgigFpv5YYDIMWWn7ExjwsZ2ALlHbIVs3D1GDizY/T9B9+lQZAPXqBctsj1N5FAzjyBA/d2lUqALedhBUQ2MQtqJQoDQLiZUtVehVZ0DMQzHBYgQTUqU7qdqzPHHpKLC1m9yCV+pc3c7L8D2Vuf75OkWBmeBxhI4qu8RRRbC8j4d0HEAJIBJvSInCf3rSgCxt2ZTshmL/BzPftXxmcddxFIyrtpo1MKEwaR7FeYH/exxaujZ5xP61OljXhaHJxhUTwtxlGaNK0bhZEMAWfgd6A56ttdfWERYdHh56QYq13qgCiaC67NUmzuYQwwos6Z5Ao7QoKQ5TtIJRAhdlVWUfY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(278428928389397)(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(39380400002)(346002)(376002)(39860400002)(396003)(366004)(189003)(199004)(3846002)(186003)(26005)(6506007)(956004)(76176011)(97736004)(2616005)(11346002)(105586002)(446003)(6486002)(5009440100003)(486006)(386003)(52116002)(2351001)(2361001)(51416003)(5660300001)(25786009)(478600001)(2906002)(44832011)(316002)(16586007)(50226002)(47776003)(6666003)(6916009)(36756003)(8936002)(476003)(6512007)(106356001)(6116002)(55236004)(66066001)(53936002)(16526019)(68736007)(4326008)(86362001)(7736002)(81156014)(8676002)(81166006)(50466002)(305945005)(48376002)(110426005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0765; 23:/JvwxyL5YNn+1+pY7PRv/YZeIim52FN/XatJs47kB?= A1Ho/h7KwYbe94nVzewqdc1cZIqNv8w5hXbF2F3F8ea5RjOa+kl8dRs0hO191IxEGy7IOj//2ZflgOyJ4U5SwwcPT1SewrySsTELQKOKccaDEpDVjH3zyFUuZf9ghxsSjWph3t+yanbqz/LvURllwP2EXXlHiVyueSy6ctN+H6sXx3/+rmOMzZY2nXn4Z+PuB5dT7mNOykcJCwfeJMcs3/sriu/umjjsUV0txDQ/CTKT0a5WKMQWRdnoOAnjvUst8uCzNOsz+6uEvc0gRPJV+WDKs4BrWl19aPxkupkJZDs3r3rrah3CZcpEvN/sZuBiQ9KWoSzLIHcU3joWrBmHXAId0OYuoBCqnpTDR6AGbUnkl7WrWfvqmENpliNzZ2k89KYQv4M1mf5/Lg00PPcWVHDtbrW5lY6FqLVj/IGKduFZFr5LYfAATO0uoMLvglu/myocwlo2YxuMP4wodA6ENQPCjtMXP5qGvIrqRYphvDEGt5h41gRp45TIB/2wO4oAswxMG5KZiDsVpyL6V5LPzqr50kNriHUtMV/AUszrfcIdWkdKqCEy6IfXXm6+eqrJonMJxIdX0l46zVcVg6hV1RJebdLM8qg4HXllaczoexCawkl/so+CB4dLtkDSe8ELpR6UX1Ige+SJMEAmKVAZ/tG72phEjCneNqAALtT0XfrR+QcF6caObK1JPgbQbqFFUg+hpODtQev26cS7vaWlnddGkUe8oqFQ5edXRYbCd13uo+qxld6g+AhYcsQsocaIjOB1jS1VJHmGi9sy0vM2K3GCNLcXrtaM61P0lxjqXxnrMJwGjAtibvNMcP8fx1bjKxVMLwc1s76NTasAs76HjWsS2lFtXxRefZXP9/2nhpxAHBpXugY8ppoojVBio4UHLJyRkobSNzNJ28mIUtrwbT6fqdqnmsSknbsvl+Nnx6zs94v4Zdy0ydrmCEk3os6YxOZsB/5bEulqBEFhGxNfYkgyFYukm4AQ+WFoiPqfr3QK41Uw8ucp7XqmjYJ3yq46xBJWzjc2Tqve8sIkYl96mydqUr2dzot9cIlFok1TclByDNK5NWpd1beEWrdpKdCM0VQvdmLzS9S/SYP60p4GQBFlkV4uGWsPWsbLceaPR3WkQzhHSt3eBLAzFUmmnVKaXhUT9ONZsUfVBxV2QjxWLTfKscA1EVzsXoNi9e1Y4YXWNu2BRwLEv1BHSl0WSYF1IhBojUdCtI/28Bh7oXwnvxtZ6OpObtlpdiJGSPwmYiD1sNusOEsoO3v7tFKW93SVul3sNz1ACxdRPDc3dSsJOwEbmTvctTOT7rNYqIhvSZn8p921/82XjcEtOphyQwMuqa8UXjRQdZ2cFwsh9/zuhFBrvNkdjvDZixvOsLxURqbLA== X-Microsoft-Antispam-Message-Info: FpQTLXZjsugXpyzt4DvCAOScYsPK+6pSJxC0WhBpdxbrE6H0M9jnjs/me6Swv82OWQbLBSV1OTqz1X5azPOmev3NnN9Go4f9SmQXoubOMpYSzecmrUQwjT/GQI2LxsERqS261AaY8eFqMjHViSMaemJds3DA1fwfLxM5k3b1cnWn0/IjfGlBL/oPHdrpAxaM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:8D9zPpzkMNpVuIZyOK+KLnsfQvzzSeShzYjoVzno6+SAUeQkjaI7NJNAe95xwzO96HxuEa2eNjPeIMg1Y6lxUwVCaLVz1Z7KPvPBpXuUhCNUxP65Xl6J5BvnyfzHQOfvj6rsPx7mnT0CRKlgaRtIb92nCYS60j09UlQW1LHBp/O9mcb1P3EsqEwgoL1m0FlR5MVhxt0mUUlvT+rkJmSiYdb1ZK5VGqsCrS6lP/DMzcHsimPDonwWyJ85pcR3TkowNOMD3YFRaVadstaDjbF2p1N80H9Stksie0Tp05608M8aoFwtkr0VrKPB0DK1tzR0jkIFKgiSMilwdXv8eVl/adyoVQRQ7LLQvPdrdtjpuIdXWEvjIkWXNKQf3lFozrQbBEGOQu0usVKxqZhAazdAxZZzj/EVqgMdEeWAZfQS4bBgp/4X4y87kNcXouFDVaBjHZfBrYPHUbSrhjKJ2Akgjg==; 5:bhHtQynrEj9RaTmB3qcqrEgLXh9nAbkEhB5wSdf6zIiSqIaiuLIKbaUdRI4nb7JolY2GZZNIgNatqjhg5vmoEUzKIgdEHx1AlIRAvM0ufKVMLvFCnWiYRpiEMgD6EnG185YWCkIue4tIaDyxwk7FpXj0EUOz54jzR2L2SiiROSk=; 24:0+QeevOzHmZK7s2gw3ZDNrbMVb+Ravtmk//xNpxhYw8L665K3TaZYY+ty4DZfvogygdc9WvVXg+cnoaPG01MAteQaJ5En/gxugRXyDtTk3k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:yw97fz5ut3LzsF9Iv1jkC+DPD9PPbKrpw3LZKFd/rcQfVk0SybLvM5HtQNZ6PAklynKgCzUIfIYwwbKadPtKYLrL2uVNdGaqbrYQst8CqOL/RGSrf3j98t8enk2Sz/80kjG8hEtWAN55FSliaSNUQGp4BorMU9kuSHJVtmqtQNSapSVFBZRB7lAEN7iGfF/9S+75YTayS+JP0/SIhtRMEc+V8Q6P6mqkVmRUj8XlsiJU+H3XIZG1Oi0rrlu3OLet X-MS-Office365-Filtering-Correlation-Id: 757f3986-b494-4894-c091-08d5aaac5782 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2018 12:59:10.8483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 757f3986-b494-4894-c091-08d5aaac5782 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH 4/5] net/dpaa: fix the xstats implementation 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" Some of the applications are expecting that if n is 0, it shall return the supported number of stats. e.g. VPP Fixes: b21ed3e2a16d ("net/dpaa: support extended statistics") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index b2740b4..136f716 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -354,12 +354,12 @@ dpaa_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, unsigned int i = 0, num = RTE_DIM(dpaa_xstats_strings); uint64_t values[sizeof(struct dpaa_if_stats) / 8]; - if (xstats == NULL) - return 0; - if (n < num) return num; + if (xstats == NULL) + return 0; + fman_if_stats_get_all(dpaa_intf->fif, values, sizeof(struct dpaa_if_stats) / 8); From patchwork Wed Apr 25 12:57:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 134286 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp832255lji; Wed, 25 Apr 2018 06:00:05 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/+nvZiQxAj/MiBDZWmBog2jzQhXPoO16QxeLhDs5LP1gfdTpuWtwRBsOX2VCweFzt1sz0K X-Received: by 2002:adf:a970:: with SMTP id u103-v6mr22435517wrc.71.1524661205113; Wed, 25 Apr 2018 06:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524661205; cv=none; d=google.com; s=arc-20160816; b=hJx1EnTYA1ExWk8kgYH1eIMmHl7Ksas7KF0jq4ewEIHpjeYHIWeNujmUU7pvImgYsX hhl40pikjnHujQUz3YUrvmfqyeRMMoRcv+f43nYo3PE5cqZcLvkkx5Ro4Unygym5uWuE GN6sWqm7crwNeVqaSsFhrt7HrAjOWRp3rik5yfG4t77hIPQQBRscgFzQ2wB+YpeU1oxS SZnC0VORbHwbASVx3p3Z35vfs9sznI9+uCtqhiRb5s9GkQzN8J1hDqxlMUHV3Yuhb9JG pvorMPzzBV3HwYFiUe7/u3eoKDsm0iJszYDpFTA43KXaYGUYvNKN0dRpTtt54FdOxZbI 2BUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=4D8WfJHc6gzvRxigmP5s6Ws61Y/hT4lmIA9BABc1Q7s=; b=WQ+/ILKKTyqYtiY0cUiEzpu86BkT8YEMLRB7T+WRTFuJjqYtLe/rNsHW3MJCgH67hw luzWMrZnYWgSHqj85X1yTE4EBfEx/UmKks2QqqKjzDamI4lDD4j3qjGHoRQMHp2jR17W eg0qO8/vSlHXjG51Xrt0nFVscJCeaRWqMZkciKHIlHxeLkVC1sFWaEg/ucDUFlS3npM4 b9V0h1pyC8fSuhaNZBEsp6e9I/tLtAES/Opic6ui3DBrHxmhwcgvv+1Bzn6odXZBpBXT EYd4GDNSJp5bWDk1lS0QxoqctUZCSCZ4A2FC0DKXAg8LY7kI0C6epBBhrhBddaznzIxI a0WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=unFI5ncS; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id k7si8345487wmk.118.2018.04.25.06.00.04; Wed, 25 Apr 2018 06:00:05 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=unFI5ncS; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 06C6E7CBE; Wed, 25 Apr 2018 14:59:24 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0045.outbound.protection.outlook.com [104.47.2.45]) by dpdk.org (Postfix) with ESMTP id 120F272FB for ; Wed, 25 Apr 2018 14:59:16 +0200 (CEST) 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; bh=4D8WfJHc6gzvRxigmP5s6Ws61Y/hT4lmIA9BABc1Q7s=; b=unFI5ncSHVhTO0+5vRe3w74+0JwzU6OShGTu4LRjZo4nvcG9BWdssJThJCYrzXudiMuUFhqM7bgbUj8Iu3aKyWH7XB6ldUKz27UeTsHyFhQM6PPvKoc0HN5OqFicmmbrHVA46NSDB2pHp+Dl0EQYrrS5S2aKBwDlhuEu9AHcASE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Wed, 25 Apr 2018 12:59:12 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, shreyansh.jain@nxp.com Date: Wed, 25 Apr 2018 18:27:02 +0530 Message-Id: <1524661022-21484-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> References: <1524661022-21484-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MAXPR0101CA0035.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::21) To DB4PR04MB0765.eurprd04.prod.outlook.com (2a01:111:e400:984d::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB0765; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 3:ls8fFr9lhcNGOTcaX/14KymbbvtnPyO+AaHWj+tAEknMxByMXCOHCksN61ZbYmhbr8O7XIBPH77A490tuvaQBlUBSJLxNsoUtptMcZXQ6XlBScG3xys/8kcRFharLKkYnDkeVvk2UVamN1DVOMDIumSw0FRQCvmllkyNO3UuP8lj/1puULw+DMSBPO7BSgzGLIHeTuD+RvC5xjkyuovTUZu8clSL9wSXYhB1hTYibOqOwX3Tgpm+9OKIGh/uk2gM; 25:lwnduiceFBjn6iRI1aL/biKT0AlWgs5Cs+iCsqCXfH4wLCZsjKYTSdM0UpE7kHAnGGblvslCO69ee7DEbQ4qcRl6YEuQ/XmIbku8p4kAU/DnMSiTMV5i6nYwQ1Co1Ph7nP9dQRG4RG++RUlBqJNVEDrsDY3ipmTEnYnfqiKT4OUy5u5g31QnmWKFTfTdyLkGKSponGSzinMuGkNVLM9lzOvPOjcccuWUx4Xe2HwM6VM2HZ1FMaGv+h4/gJDIayOE1TsUiXFNWY/lv2jo2ULD+XwumMhsQ3wGhWGCLUk8PPRZrs4nzUyT8OdNDia86YLel7g5KCGtoD+INZwAmURGTaC3O1PdpQb76Duplasg52I=; 31:6yQYFRmxztxmd2YLA+rP5+BUZpR3HAQMx8gytJRDuJMcEPpIng+24U/D/yrdhFJw+Uq+WVDjgBRczMCUXtymCc/9rQ895SSFaOiC1aKgHdzLYKkPHsi7hCYlSzt56dRWk7pQJYMeAseTPrYJ77uqnXg8pHoa2l0g4bivkpiY3ICBxVW0zRVNUuFU1nf41fGsQ9Z4URUFdF/fPIJG2rbuak/hQS0m+bko3Wv9NhEZ2ZQ= X-MS-TrafficTypeDiagnostic: DB4PR04MB0765: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 20:Wgp0hPJjqTwwJGlpKaGHDZubl5bPr2L661IbXbGDMTj6BwDHidWFFSatxOmi+JYAW6C34u+5699pgwUcQ7mi92SHj+UofmviyJx8eYVb/g3HreDTtnlTsMJ3QyIiJLHlt095hv3Sj21Yq85ruC3SopDyi4HgwfK2h4ZHv+iYirGXlQnKv7WB5Z6ZLi7GN2H8Vnqbjl21DExvhFTzF+cpfBIX5w/tb4dHS41+b7ih2Yke0ya0op5ILAU+B1DuYboEa7RRELex3/6O3ehz+U4/Z+sLh1w5FKWzHwyM55arFg97g1ZTFEJFkOAkL8sYfDqNp16Utk7xIx0xCYdYxKMbE4/6t8AA6rA5rktH7vIXsZM9ks/urAcvj7VAnqpRlJHSOVkwEjCsyxl9hXaznk4xXE1U6tFYrihglwGy7VqIHCZTprYwAJBXQugkF7UupnvoP9bM8a8cgetZ1rZOcUPOpNYAPsj2ut4NElGSzrRnasywU5cdFPm3bsN/qCsb7RXP; 4:FXOc2+z2HTFkp9yD0wyPtz9Ik+8vUNWwt/0sRrWdpAEz54AT/AT90x1c0Z1so923jux1ycCKG3d7mo8cUdjmvsDM1ZaUsiE1S9Lp+4+WVOsI0avJfj1maKzClEGsY5mvZ3OXB2iX5fDuUXFBKcC08+jU+asL1BgUXzpKUDYH64tDB95OA/mnJiIIHDwnvGQunESKHWhv6VLss9j9y40q7SFAaMrRfgoH3fGcD5Dycxom6pe0sfzV0cFcCb7cg3uhFu0JaSCLHd35Ex4dF7EZxBuf9blfoy8i11+Pa7iGlbXBrx9BDVmfQYkl/wIANpJV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB4PR04MB0765; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0765; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(376002)(39860400002)(396003)(366004)(189003)(199004)(3846002)(186003)(26005)(6506007)(956004)(76176011)(97736004)(2616005)(11346002)(105586002)(446003)(6486002)(5009440100003)(486006)(386003)(52116002)(2351001)(2361001)(51416003)(5660300001)(25786009)(478600001)(2906002)(44832011)(316002)(16586007)(50226002)(47776003)(6666003)(6916009)(36756003)(8936002)(476003)(6512007)(106356001)(59450400001)(6116002)(55236004)(66066001)(53936002)(16526019)(68736007)(4326008)(86362001)(7736002)(81156014)(8676002)(81166006)(50466002)(305945005)(48376002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0765; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0765; 23:3iKLg3RrqXlqNP0EldkiO/DmQga//HfRoKE+B4/Kw?= NO1j6CWlIKN61Bjfsy50Xhc986rQbHfzkaJwtcsJsDEZ4TvjZLl2vooF8xkf5ZdTGJLVgRofH+DLU9Yf+Ih3X5rqaXss6DnHZYLh+btXAZRuQGUEnsmFzWlewPsCSq/Ypj+FWmZIiDNcItqAJJQ+uReS6Z/rXNe7URze9Qop/IiekZkPwsiyYfXhil6ftXT/aQhR76vByhZ9xC41PfMUJo5ux26FTDO6c4H2HZEc2DCr3MGq6JbIoRaw0hnKPwUX2XrUMeveOrREwpXRu5XlhzvQihWAwetdl/Q0kH04jfesdjytQOU1YX1fLFdSSpq9rGDNif4shwJklJU2Zdf0Mt7iumDRpNjXNThlOw5bPclKUFh1ie/id3G30NzV4AHGVTlegsisouRPTnJB+ISJPNV5xnZvZ4s+U8Dl2OTksdMyifX2n18VrQkvL78Nt4yzioJw6RrnfO4qZn9rS1PLYDRLWfOgQirWvK0az80OcxTHAU77//TA0GKC5cbKmu6Ye5iQ2AJdHY9FfvtiA6kTdio/svgEXs1GSPchyDqUndXAQoeBJtrfjjpvUpghOzkMVXyD8kMsfSXKYy8s+oAclbe3hPu3SUETYkYKvXw5N805Wq+CWIK2q/QfCQd4TiI6Atk9SE5Rcd5j0MJGszIT3zqXQDt5LHZmGNzoOl7Iz9yOAhszQ3lXPlqyssmgkeIKhz1hrSSuP2CFn0Q7hEYk3Z5sYAWAHWPtGNH9Fonb6VpKGp3SaGM6HhvwFmF4ROuH1Br8wqvlP0DPjwb3x9hcluZi7xH3dsPDPstp1CGBcjVjbiPFYczsDwX9pJ6M29zfqTcBxDg7JIvoyyncpY9hGe/MjmFTbfZqaeE+uk/P4DbSTgtqu9gryAJgshSLqGP4FtSLx1awTZOQQAbiavAjG+v07yR3BFdTVQaDWlRwvhFMxlqQ2WdlFpRB5fmWqzXbzKPcCeUWAYgysAJhPBUoyJt81q7moblAMNR2dH4oL/YqPLg1fA3DUScBjXLNRFAr83z7Dp18ywBwVBtEVB3M5mzlJz5oJgF5wX+KF899cD618Lt9F3rZDeJIWiFjfgpsZVo6LYZwi8XXOLbPIXtKJ1eLwG390wqDFtqJLJf+XRlMlA2rREC4+p0VZm3RJvb5SDTxkTpkeXs1V3I59EhGhzH6SYsE23JFl/WvVTSY4piFsYPk5wTzTsJR4l7nadOcDHM9SQFRW0RfFW2DJ4pPgR6tjySr4B2uKWLB92mdnVN/LfK3bSdQu4WIwkEfmV6YFpEsBXJsDJ792tjenz6aGtq X-Microsoft-Antispam-Message-Info: cppglMDPiJ+KOkEdspENFTqxBUG3obKBqlq8Hw2pREyIjMrFtouwHAooRGOXpG1e3qdSvLzXcBbqnuzSbY7U97RUX1li+e5WhDUk8MJH1JYr2M2GJUGgwiOgkUOm51WqkY1rF/XslyjYy/cNka00kFgV4dPTGMELjqpGosWmTWBtY2b9Ug9X9Zw+L9S6Uoni X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 6:IQ06DzvAyXGOFcwL81sUn7g1StYldyRCNcD9ekPUSowt80xXyFpr+s+BHsW3OqeFwvGgRFJXmecHuX2foqpAtSEiRdNuiogRMA+C0bjdS0VMnPnejsgQi4VjKlE7UDD5mRatvbcQ5vzZns2brbIsiO88IHyMI99MKX1wYtDMzyqRlouPTH0PrDZsAairkE/blcYIJzChNYNeOQmNJpdrGosCPUS2HcWzd+FsGmhF43jy4WQ0PgxdMnYtKHpJFUvFnLAAtwiyFuh8O4TwwXpqxESs9qc8xhfLSADxZIQgSpMKVjoMKULQ3ckKhQKDq4L1814sFpfs7aV9RMKQ7rjyf+JgNWdDNVlcVBT6pQp3+RhCwGraplINCGe7/6moG+Z7B8gVcyZyLm4TinKLNh6ude/4LmFgpleLK13J4a14JlwMaXQ6PE2xr96Q/a1BR2D/V1l9JUsh0du2H9LMryWz8A==; 5:++pyDnh75ZlAoipthfvJobJGL81/CwA6PS+BZMyA+1S3nSx26GSXRVN3STUlNtTCY8kOPXFNUdVqdz0B/V1lM7W2yUYYQVvJfki1RqD+CNcrygUOXyXh2L/FbtdwrjYDOuHE48YI7beYRDewPkjFRpuvSL34UEsKWGOTGEIesLM=; 24:sGYvvBtqRo9kvvPI+sjpZE34wyFmvB4T9gfSpNkdAGVDXZ7drplHt5Mj8OTU/4uN4hu2bdfS+6QgWS+0BcBEVn+GyL+ORkORP1W31TOgQHo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0765; 7:RuN6P9inPLaGSJx4ZFAeSsQKfhV5YodrSEX3ei3j8dJ1We71TtkSZwbp4x5cDkWTF8dN6kTzlCYSrkUGXJDD+UcYDhDn/IICU5GJyXZm8MApC9kBk/u9ggf4h5xZc7QxYIACshVA20smGQeBdzh9RpK1L6uZ75d68E+KjEbhDciJygvHtmT7u4I6mMifOdZBO6qhnsaUd6rHmHWuzfUQ8yIjdvSmTGOYqQk3n1cViAbtbErQw3zNX75VUFIUi/mf X-MS-Office365-Filtering-Correlation-Id: d22eba93-9a23-4b1d-dad2-08d5aaac58a0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2018 12:59:12.7545 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d22eba93-9a23-4b1d-dad2-08d5aaac58a0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0765 Subject: [dpdk-dev] [PATCH 5/5] bus/dpaa: improve the dynamic logging 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" Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/fman/fman.c | 2 +- drivers/bus/dpaa/dpaa_bus.c | 16 +++++----------- drivers/bus/dpaa/rte_dpaa_logs.h | 11 ++++++----- 3 files changed, 12 insertions(+), 17 deletions(-) -- 2.7.4 diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index be91da4..bdb7004 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -504,7 +504,7 @@ fman_if_init(const struct device_node *dpa_node) /* Parsing of the network interface is complete, add it to the list */ DPAA_BUS_LOG(DEBUG, "Found %s, Tx Channel = %x, FMAN = %x," - "Port ID = %x\n", + "Port ID = %x", dname, __if->__if.tx_channel_id, __if->__if.fman_idx, __if->__if.mac_idx); diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 2b85c9e..2046206 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -178,7 +178,7 @@ dpaa_create_device_list(void) memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN); sprintf(dev->name, "fm%d-mac%d", (fman_intf->fman_idx + 1), fman_intf->mac_idx); - DPAA_BUS_LOG(DEBUG, "Device added: %s", dev->name); + DPAA_BUS_LOG(INFO, "%s netdev added", dev->name); dev->device.name = dev->name; dev->device.devargs = dpaa_devargs_lookup(dev); @@ -216,7 +216,7 @@ dpaa_create_device_list(void) */ memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN); sprintf(dev->name, "dpaa-sec%d", i); - DPAA_BUS_LOG(DEBUG, "Device added: %s", dev->name); + DPAA_BUS_LOG(INFO, "%s cryptodev added", dev->name); dev->device.name = dev->name; dev->device.devargs = dpaa_devargs_lookup(dev); @@ -461,14 +461,11 @@ rte_dpaa_bus_scan(void) return 0; } - DPAA_BUS_LOG(DEBUG, "Bus: Address of netcfg=%p, Ethports=%d", - dpaa_netcfg, dpaa_netcfg->num_ethports); - #ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER dump_netcfg(dpaa_netcfg); #endif - DPAA_BUS_LOG(DEBUG, "Number of devices = %d\n", + DPAA_BUS_LOG(DEBUG, "Number of ethernet devices = %d", dpaa_netcfg->num_ethports); ret = dpaa_create_device_list(); if (ret) { @@ -486,9 +483,6 @@ rte_dpaa_bus_scan(void) return ret; } - DPAA_BUS_LOG(DEBUG, "dpaa_portal_key=%u, ret=%d\n", - (unsigned int)dpaa_portal_key, ret); - return 0; } @@ -644,11 +638,11 @@ dpaa_init_log(void) if (dpaa_logtype_mempool >= 0) rte_log_set_level(dpaa_logtype_mempool, RTE_LOG_NOTICE); - dpaa_logtype_pmd = rte_log_register("pmd.dpaa"); + dpaa_logtype_pmd = rte_log_register("pmd.net.dpaa"); if (dpaa_logtype_pmd >= 0) rte_log_set_level(dpaa_logtype_pmd, RTE_LOG_NOTICE); - dpaa_logtype_eventdev = rte_log_register("eventdev.dpaa"); + dpaa_logtype_eventdev = rte_log_register("pmd.event.dpaa"); if (dpaa_logtype_eventdev >= 0) rte_log_set_level(dpaa_logtype_eventdev, RTE_LOG_NOTICE); } diff --git a/drivers/bus/dpaa/rte_dpaa_logs.h b/drivers/bus/dpaa/rte_dpaa_logs.h index 0fd70bb..e414354 100644 --- a/drivers/bus/dpaa/rte_dpaa_logs.h +++ b/drivers/bus/dpaa/rte_dpaa_logs.h @@ -15,10 +15,7 @@ extern int dpaa_logtype_pmd; extern int dpaa_logtype_eventdev; #define DPAA_BUS_LOG(level, fmt, args...) \ - rte_log(RTE_LOG_ ## level, dpaa_logtype_bus, "%s(): " fmt "\n", \ - __func__, ##args) - -#define BUS_INIT_FUNC_TRACE() DPAA_BUS_LOG(DEBUG, " >>") + rte_log(RTE_LOG_ ## level, dpaa_logtype_bus, "dpaa: " fmt "\n", ##args) #ifdef RTE_LIBRTE_DPAA_DEBUG_BUS #define DPAA_BUS_HWWARN(cond, fmt, args...) \ @@ -31,7 +28,11 @@ extern int dpaa_logtype_eventdev; #endif #define DPAA_BUS_DEBUG(fmt, args...) \ - DPAA_BUS_LOG(DEBUG, fmt, ## args) + rte_log(RTE_LOG_DEBUG, dpaa_logtype_bus, "dpaa: %s(): " fmt "\n", \ + __func__, ##args) + +#define BUS_INIT_FUNC_TRACE() DPAA_BUS_DEBUG(" >>") + #define DPAA_BUS_INFO(fmt, args...) \ DPAA_BUS_LOG(INFO, fmt, ## args) #define DPAA_BUS_ERR(fmt, args...) \