From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2131E1B490 for ; Fri, 4 Jan 2019 14:26:25 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D36687638; Fri, 4 Jan 2019 13:26:24 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64D7B5C1A1; Fri, 4 Jan 2019 13:26:23 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Shreyansh Jain , dpdk stable Date: Fri, 4 Jan 2019 13:23:49 +0000 Message-Id: <20190104132455.15170-7-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 04 Jan 2019 13:26:24 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/dpaa: do nothing if bus not present' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:26:25 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/11/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >>From 485f48f8cc5a179dc2bb8c2dc86a16b43f50129d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Dec 2018 14:02:30 -0800 Subject: [PATCH] bus/dpaa: do nothing if bus not present [ upstream commit f18e18e0ccf7d3cb08042ad77074e1cbd070555d ] The DPAA bus support code put out messages like: dpaax: read_memory_node(): Unable to glob device-tree memory node: (/proc/device-tree/memory[@0-9]*/reg)(3) dpaax: PA->VA translation not available; dpaax: Expect performance impact. These are unnecessary and likely to confuse the end user. Fix this by doing nothing if bus is empty. Fixes: 5a7dbb934d75 ("dpaa: enable dpaax library") Signed-off-by: Stephen Hemminger Acked-by: Shreyansh Jain --- drivers/bus/dpaa/dpaa_bus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 203f60dc1..204a50b1e 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -543,4 +543,8 @@ rte_dpaa_bus_probe(void) int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; + /* If DPAA bus is not present nothing needs to be done */ + if (TAILQ_EMPTY(&rte_dpaa_bus.device_list)) + return 0; + svr_file = fopen(DPAA_SOC_ID_FILE, "r"); if (svr_file) { @@ -587,6 +591,5 @@ rte_dpaa_bus_probe(void) * been detected. */ - if (!TAILQ_EMPTY(&rte_dpaa_bus.device_list)) - rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME); + rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME); return 0; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:07.624988453 +0000 +++ 0007-bus-dpaa-do-nothing-if-bus-not-present.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,8 +1,10 @@ -From f18e18e0ccf7d3cb08042ad77074e1cbd070555d Mon Sep 17 00:00:00 2001 +From 485f48f8cc5a179dc2bb8c2dc86a16b43f50129d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Dec 2018 14:02:30 -0800 Subject: [PATCH] bus/dpaa: do nothing if bus not present +[ upstream commit f18e18e0ccf7d3cb08042ad77074e1cbd070555d ] + The DPAA bus support code put out messages like: dpaax: read_memory_node(): Unable to glob device-tree memory node: (/proc/device-tree/memory[@0-9]*/reg)(3) @@ -13,7 +15,6 @@ Fix this by doing nothing if bus is empty. Fixes: 5a7dbb934d75 ("dpaa: enable dpaax library") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Shreyansh Jain