From patchwork Mon Mar 2 14:58:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 184077 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2192198ile; Mon, 2 Mar 2020 01:27:27 -0800 (PST) X-Google-Smtp-Source: ADFU+vuSD4V3oyVUIECFoQ4v4yIobmn+pFNhlUNO3ZZZjzTbps9qqE2oXQhRGir2lrM3+sBt27E+ X-Received: by 2002:a17:906:7804:: with SMTP id u4mr2985779ejm.231.1583141247341; Mon, 02 Mar 2020 01:27:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583141247; cv=none; d=google.com; s=arc-20160816; b=PAMlJI3iIWAtfH5C8ZFW1kLmHPYYCIV/5WzxEnGMDiH2iAWdYfQdCFYYDmmJRzVh2x 1T3/mE9gVOZWPnVwa2iXi9Yw/nL9vg7h65/2sAxaOHCqd3K7SGMwL9utodAkGN1jJhgz bAih4qoDK/S4j0gRvT9uaEjvY1qEX3goIkBZqdOwKd8rpZqYJKR4GBIKEdYovrXPwQGN RiFuQ1hnAPJPEf0kwTUgDQF6hTvbKIIfQGvccsxtdtdsQSkkJSwUhAtl9jnQQ2ii/l22 rDuzRmelXz8xnSsV7eP4doTeCG1Bf2b0dHft8il6pV4uMdgaS2CNaEt16CvP24nssBg5 75JQ== 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:references:in-reply-to :message-id:date:cc:to:from; bh=Zzun9V5RN15MMkqrRrwz00rFsKuKWipu9MHL6XMxTwY=; b=ZsCNfuGQDHY5d8tUfBCcWCPjsbATTGzm5HVVG9rtxXxVNyEhp/Q/GkfbaJch0qIxuK aJxaM3VwBbk164n6pmF1Hlk4DaqkqlGytZkwpnoEYSHb5ftoD5oDirv95pLX5FU5qhW5 Rui3Su/3BFKtZ5zsm8wfEZvpv1DxYZK86RNz8OFOymwcJ45hICH9teD2WguO4vTViuIq cPdaBKnQgRg6daqsUomcGOgqTCw8K+ubJLba6dNGvlV2bmpRncz8wwUYpj+4yFMO5wX6 C7qP/BURnqVnlsf6NDoWJ5U1n1GLgMMCCyVz5Fz36Do5OPJ50oIEAbzEClKWZmn6brnd UwjA== ARC-Authentication-Results: i=1; mx.google.com; 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 dn24si1592966edb.163.2020.03.02.01.27.27; Mon, 02 Mar 2020 01:27:27 -0800 (PST) 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; 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 AD5371C07C; Mon, 2 Mar 2020 10:26:42 +0100 (CET) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by dpdk.org (Postfix) with ESMTP id 8736F1C028 for ; Mon, 2 Mar 2020 10:26:38 +0100 (CET) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 6A3941A0FA5; Mon, 2 Mar 2020 10:26:38 +0100 (CET) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id DDA6F1A0FAD; Mon, 2 Mar 2020 10:26:35 +0100 (CET) Received: from bf-netperf1.ap.com (bf-netperf1.ap.freescale.net [10.232.133.63]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 2F64E40299; Mon, 2 Mar 2020 17:26:32 +0800 (SGT) From: Hemant Agrawal To: ferruh.yigit@intel.com Cc: dev@dpdk.org, Nipun Gupta , Hemant Agrawal Date: Mon, 2 Mar 2020 20:28:18 +0530 Message-Id: <20200302145829.27808-6-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200302145829.27808-1-hemant.agrawal@nxp.com> References: <20200302145829.27808-1-hemant.agrawal@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 05/16] bus/fslmc: support handle portal alloc failure 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" Add the error handling on failure. Signed-off-by: Nipun Gupta Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 28 ++++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index e765a382f..1a1453ea3 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -264,6 +264,16 @@ dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev) return 0; } +static void dpaa2_put_qbman_swp(struct dpaa2_dpio_dev *dpio_dev) +{ + if (dpio_dev) { +#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV + dpaa2_dpio_intr_deinit(dpio_dev); +#endif + rte_atomic16_clear(&dpio_dev->ref_count); + } +} + static struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) { struct dpaa2_dpio_dev *dpio_dev = NULL; @@ -274,8 +284,10 @@ static struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) if (dpio_dev && rte_atomic16_test_and_set(&dpio_dev->ref_count)) break; } - if (!dpio_dev) + if (!dpio_dev) { + DPAA2_BUS_ERR("No software portal resource left"); return NULL; + } DPAA2_BUS_DEBUG("New Portal %p (%d) affined thread - %lu", dpio_dev, dpio_dev->index, syscall(SYS_gettid)); @@ -283,21 +295,13 @@ static struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) ret = dpaa2_configure_stashing(dpio_dev); if (ret) { DPAA2_BUS_ERR("dpaa2_configure_stashing failed"); + rte_atomic16_clear(&dpio_dev->ref_count); return NULL; } return dpio_dev; } -static void dpaa2_put_qbman_swp(struct dpaa2_dpio_dev *dpio_dev) -{ -#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV - dpaa2_dpio_intr_deinit(dpio_dev); -#endif - if (dpio_dev) - rte_atomic16_clear(&dpio_dev->ref_count); -} - int dpaa2_affine_qbman_swp(void) { @@ -308,7 +312,7 @@ dpaa2_affine_qbman_swp(void) if (!RTE_PER_LCORE(_dpaa2_io).dpio_dev) { dpio_dev = dpaa2_get_qbman_swp(); if (!dpio_dev) { - DPAA2_BUS_ERR("No software portal resource left"); + DPAA2_BUS_ERR("Error in software portal allocation"); return -1; } RTE_PER_LCORE(_dpaa2_io).dpio_dev = dpio_dev; @@ -330,7 +334,7 @@ dpaa2_affine_qbman_ethrx_swp(void) if (!RTE_PER_LCORE(_dpaa2_io).ethrx_dpio_dev) { dpio_dev = dpaa2_get_qbman_swp(); if (!dpio_dev) { - DPAA2_BUS_ERR("No software portal resource left"); + DPAA2_BUS_ERR("Error in software portal allocation"); return -1; } RTE_PER_LCORE(_dpaa2_io).ethrx_dpio_dev = dpio_dev;