From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by dpdk.org (Postfix) with ESMTP id A0D17AAD8 for ; Fri, 20 Apr 2018 15:14:21 +0200 (CEST) Received: by mail-it0-f67.google.com with SMTP id m134-v6so2499633itb.3 for ; Fri, 20 Apr 2018 06:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qwilt-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=pmrO+/DZCHEi744EYmZV5fW0egJxEtEhp+wf0DOo2DQ=; b=hu8mQunjZBhJln48dr4lp3a9U7eMvVkHsYiupfhoeMt0OXz5667+1Rl/NYn/eeHFj/ PKnhaowF0A/Lkhgj3w302iysn5Ll5/tb31d5m+X7kmuBC/rB2WU1OOwBmbsdVcnpoEm0 WVVB+haio9diZMlD/RPeWfL3ZWw5QE3SA9OcXn9F+6A86FZQYhBI+Etsg1ytU/tmp9WU RuJcpxms3XMsC2Q+VlsY86uXjIve+zJYtRrt2QcyT0pfOMbXBM0N6cTs71bdcY+M5l+s jkyhOlawctIvLPqHRTz+oULabOxhnXAdt8xQ4D1tw6X9NUAxoD8afySf3CP7k4x9if7M 8aaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=pmrO+/DZCHEi744EYmZV5fW0egJxEtEhp+wf0DOo2DQ=; b=GdHGnA1154rXFQDpa9wKTtWHVy2hST0586m3QQBnh7Qs7+u3slL7rp/w0uFZ1Kwi8q qJ8Mtv0Jh8uepAvtjQaizkHMslsN/fQtABSfRoYmosONzuchAySiC4NajJuHOVducbHr CEKT2Jttb96SQNY7EZn6ZGXKm4jkQPM9gqSSfVfWUHCKz7ZLqv7MyKOWKQiOl/egJllB A2dJuIXovafpyXQktTrLjUzVzpT0HYudKrqW2el9Ynbc/H8llghNMb/LIzJxpNa/8k1g pU25/qrnluUGnMv7fgORU0NfrAYyu3tlNgiGXCGCsmKRItTAVm5c5MlKfr135FjD2cuY Dv5g== X-Gm-Message-State: ALQs6tA0mQ36xH7/YbPaeqjq4QjES0ILYIpcNxhDD+1zIu8oeatRw5av YDT/aARPXZ5AK9lkv8QyhQ2hjoZpCNPqTI86op6QjA== X-Google-Smtp-Source: AIpwx48B8OjhnQuUG917WMyGI6dRotoUZ2WHmgJUGa0FUyTbCRgg8blD9F7Uk7Q9pObVI/0xQvezFB6La67LvSalsVc= X-Received: by 2002:a24:24ce:: with SMTP id f197-v6mr3018152ita.25.1524230061007; Fri, 20 Apr 2018 06:14:21 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.142.145 with HTTP; Fri, 20 Apr 2018 06:14:20 -0700 (PDT) In-Reply-To: <6d3e4e56-e46d-7116-5812-000eeff18d77@redhat.com> References: <1524117669-25729-1-git-send-email-arnon@qwilt.com> <1524117669-25729-4-git-send-email-arnon@qwilt.com> <6d3e4e56-e46d-7116-5812-000eeff18d77@redhat.com> From: Arnon Warshavsky Date: Fri, 20 Apr 2018 16:14:20 +0300 Message-ID: To: Kevin Traynor Cc: Thomas Monjalon , "Burakov, Anatoly" , "Lu, Wenzhuo" , "Doherty, Declan" , jerin.jacob@caviumnetworks.com, Bruce Richardson , "Yigit, Ferruh" , dev@dpdk.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v4 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: Fri, 20 Apr 2018 13:14:21 -0000 Same as in the other patches. Will do. Thanks On Thu, Apr 19, 2018 at 8:25 PM, Kevin Traynor wrote: > On 04/19/2018 07:01 AM, Arnon Warshavsky wrote: > > replace panic calls with log and retrun value. > > Local function to this file, > > changing from void to int is non-abi-breaking > > -- > > v4 - keep error message literal string in a singhle line > > > > Signed-off-by: Arnon Warshavsky > > --- > > drivers/net/e1000/e1000_ethdev.h | 2 +- > > drivers/net/e1000/igb_ethdev.c | 3 ++- > > drivers/net/e1000/igb_pf.c | 15 +++++++++------ > > 3 files changed, 12 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..4479616 100644 > > --- a/drivers/net/e1000/igb_ethdev.c > > +++ b/drivers/net/e1000/igb_ethdev.c > > @@ -833,7 +833,8 @@ 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); > > + if (igb_pf_host_init(eth_dev) != 0) > > You don't need "!= 0" > > You need to set "error" here, or else return it from igb_pf_host_init(). > We know -ENOMEM is the only error that can be returned from > igb_pf_host_init() but not sure if should assume that. > > > + 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..ae4b0a4 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) { > > + RTE_LOG(CRIT, PMD, "%s(): Cannot allocate memory for > private VF data\n", > > + __func__); > > + return -1; > > + } > > > > 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) > > > > -- *Arnon Warshavsky* *Qwilt | work: +972-72-2221634 | mobile: +972-50-8583058 | arnon@qwilt.com *