From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mta.qwilt.com (mta.qwilt.com [52.9.191.255]) by dpdk.org (Postfix) with ESMTP id BFD9B2BD5 for ; Tue, 24 Apr 2018 08:42:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mta.qwilt.com (Postfix) with ESMTP id 280FC80C4BE; Tue, 24 Apr 2018 06:42:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at qwilt.com Received: from mta.qwilt.com ([127.0.0.1]) by localhost (mta.qwilt.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xWgD5TRnqtEW; Tue, 24 Apr 2018 06:42:19 +0000 (UTC) Received: from rd01.it.qwilt.com.qwilt.com (80.179.204.39.cable.012.net.il [80.179.204.39]) by mta.qwilt.com (Postfix) with ESMTPSA id 45E1980C4C9; Tue, 24 Apr 2018 06:42:17 +0000 (UTC) From: Arnon Warshavsky 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 Cc: dev@dpdk.org, arnon@qwilt.com Date: Tue, 24 Apr 2018 09:41:55 +0300 Message-Id: <1524552123-31378-4-git-send-email-arnon@qwilt.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1524552123-31378-1-git-send-email-arnon@qwilt.com> References: <1524552123-31378-1-git-send-email-arnon@qwilt.com> Subject: [dpdk-dev] [PATCH v6 03/11] e1000: replace rte_panic instances in e1000 driver 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: , X-List-Received-Date: Tue, 24 Apr 2018 06:42:21 -0000 replace panic calls with log and return value. Local function to this file, changing from void to int is non-abi-breaking Signed-off-by: Arnon Warshavsky --- v6: - replaced rte_log with pmd log macro drivers/net/e1000/e1000_ethdev.h | 2 +- drivers/net/e1000/igb_ethdev.c | 4 +++- drivers/net/e1000/igb_pf.c | 15 +++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h index 6354b89..2e527de 100644 --- a/drivers/net/e1000/e1000_ethdev.h +++ b/drivers/net/e1000/e1000_ethdev.h @@ -411,7 +411,7 @@ int eth_igb_rss_hash_conf_get(struct rte_eth_dev *dev, /* * misc function prototypes */ -void igb_pf_host_init(struct rte_eth_dev *eth_dev); +int igb_pf_host_init(struct rte_eth_dev *eth_dev); void igb_pf_mbx_process(struct rte_eth_dev *eth_dev); diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 9b808a9..67a32a2 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -833,7 +833,9 @@ static int igb_flex_filter_uninit(struct rte_eth_dev *eth_dev) } /* initialize PF if max_vfs not zero */ - igb_pf_host_init(eth_dev); + error = igb_pf_host_init(eth_dev); + if (error != 0) + goto err_late; ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT); /* Set PF Reset Done bit so PF/VF Mail Ops can work */ diff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c index b9f2e53..6e511a9 100644 --- a/drivers/net/e1000/igb_pf.c +++ b/drivers/net/e1000/igb_pf.c @@ -63,7 +63,7 @@ int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num) return 0; } -void igb_pf_host_init(struct rte_eth_dev *eth_dev) +int igb_pf_host_init(struct rte_eth_dev *eth_dev) { struct e1000_vf_info **vfinfo = E1000_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private); @@ -74,7 +74,7 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev) RTE_ETH_DEV_SRIOV(eth_dev).active = 0; if (0 == (vf_num = dev_num_vf(eth_dev))) - return; + return 0; if (hw->mac.type == e1000_i350) nb_queue = 1; @@ -82,11 +82,14 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev) /* per datasheet, it should be 2, but 1 seems correct */ nb_queue = 1; else - return; + return 0; *vfinfo = rte_zmalloc("vf_info", sizeof(struct e1000_vf_info) * vf_num, 0); - if (*vfinfo == NULL) - rte_panic("Cannot allocate memory for private VF data\n"); + if (*vfinfo == NULL) { + PMD_DRV_LOG(CRIT, "%s(): Cannot allocate memory for private VF data\n", + __func__); + return -ENOMEM; + } RTE_ETH_DEV_SRIOV(eth_dev).active = ETH_8_POOLS; RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = nb_queue; @@ -98,7 +101,7 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev) /* set mb interrupt mask */ igb_mb_intr_setup(eth_dev); - return; + return 0; } void igb_pf_host_uninit(struct rte_eth_dev *dev) -- 1.8.3.1