From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnon Warshavsky Subject: [PATCH v7 01/11] crypto/dpaa: replace rte_panic instances in crypto/dpaa driver Date: Wed, 25 Apr 2018 01:16:43 +0300 Message-ID: <1524608213-2080-2-git-send-email-arnon@qwilt.com> References: <1524608213-2080-1-git-send-email-arnon@qwilt.com> Cc: dev@dpdk.org, arnon@qwilt.com To: thomas@monjalon.net, anatoly.burakov@intel.com, wenzhuo.lu@intel.com, declan.doherty@intel.com, jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, ferruh.yigit@intel.com Return-path: Received: from mta.qwilt.com (mta.qwilt.com [52.9.191.255]) by dpdk.org (Postfix) with ESMTP id 13E7249E2 for ; Wed, 25 Apr 2018 00:17:03 +0200 (CEST) In-Reply-To: <1524608213-2080-1-git-send-email-arnon@qwilt.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" replace panic calls with log and return value. Signed-off-by: Arnon Warshavsky --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 +++++--- drivers/crypto/dpaa_sec/dpaa_sec.c | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 58cbce8..a78f3a2 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -2883,9 +2883,11 @@ struct rte_security_ops dpaa2_sec_security_ops = { RTE_CACHE_LINE_SIZE, rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); + if (cryptodev->data->dev_private == NULL) { + DPAA_SEC_ERR("%s() Cannot allocate memzone for private device data", + __func__); + return -ENOMEM; + } } dpaa2_dev->cryptodev = cryptodev; diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index e456fd5..a4670bf 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2352,7 +2352,7 @@ struct rte_security_ops dpaa_sec_security_ops = { } } - RTE_LOG(INFO, PMD, "%s cryptodev init\n", cryptodev->data->name); + DPAA_SEC_INFO("%s cryptodev init\n", cryptodev->data->name); return 0; init_error: @@ -2384,9 +2384,11 @@ struct rte_security_ops dpaa_sec_security_ops = { RTE_CACHE_LINE_SIZE, rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); + if (cryptodev->data->dev_private == NULL) { + DPAA_SEC_ERR("%s() Cannot allocate memzone for private device data", + __func__); + return -ENOMEM; + } } dpaa_dev->crypto_dev = cryptodev; -- 1.8.3.1