From patchwork Thu Mar 19 12:24:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "De Lara Guarch, Pablo" X-Patchwork-Id: 4073 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 18CA45690; Thu, 19 Mar 2015 13:24:43 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 1A15F568F for ; Thu, 19 Mar 2015 13:24:40 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 19 Mar 2015 05:24:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,429,1422950400"; d="scan'208";a="701007621" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 19 Mar 2015 05:24:39 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t2JCOcB3020235 for ; Thu, 19 Mar 2015 12:24:38 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t2JCOc4A025504 for ; Thu, 19 Mar 2015 12:24:38 GMT Received: (from pdelarax@localhost) by sivswdev02.ir.intel.com with id t2JCOc7w025500 for dev@dpdk.org; Thu, 19 Mar 2015 12:24:38 GMT From: Pablo de Lara To: dev@dpdk.org Date: Thu, 19 Mar 2015 12:24:38 +0000 Message-Id: <1426767878-25468-1-git-send-email-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] ixgbe: fix compilation issue when RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC is disabled X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC is disabled in the config file, RTE_PMD_IXGBE_RX_MAX_BURST macro and ixgbe_recv_pkts_bulk_alloc function are not declared, and some parts of the ixgbe code were still trying to use them. This patch fixes the problem by including previous conditionals that were removed in 01fa1d6 ("ixgbe: unify Rx setup"). Signed-off-by: Pablo de Lara --- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c index 8bede22..011e97c 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c @@ -2075,7 +2075,7 @@ check_rx_burst_bulk_alloc_preconditions(__rte_unused struct ixgbe_rx_queue *rxq) /* Reset dynamic ixgbe_rx_queue fields back to defaults */ static void -ixgbe_reset_rx_queue(struct ixgbe_hw *hw, struct ixgbe_rx_queue *rxq) +ixgbe_reset_rx_queue(struct ixgbe_hw *hw __rte_unused, struct ixgbe_rx_queue *rxq) { static const union ixgbe_adv_rx_desc zeroed_desc = { .read = { .pkt_addr = 0}}; @@ -2092,9 +2092,11 @@ ixgbe_reset_rx_queue(struct ixgbe_hw *hw, struct ixgbe_rx_queue *rxq) * constraints here to see if we need to zero out memory after the end * of the H/W descriptor ring. */ +#ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC if (hw->rx_bulk_alloc_allowed) /* zero out extra memory */ len += RTE_PMD_IXGBE_RX_MAX_BURST; +#endif /* * Zero out HW ring memory. Zero out extra memory at the end of @@ -2238,8 +2240,10 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, * function does not access an invalid memory region. */ len = nb_desc; +#ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC if (hw->rx_bulk_alloc_allowed) len += RTE_PMD_IXGBE_RX_MAX_BURST; +#endif rxq->sw_ring = rte_zmalloc_socket("rxq->sw_ring", sizeof(struct ixgbe_rx_entry) * len, @@ -3544,14 +3548,19 @@ void ixgbe_set_rx_function(struct rte_eth_dev *dev) "burst size no less than 32."); dev->rx_pkt_burst = ixgbe_recv_pkts_vec; - } else if (hw->rx_bulk_alloc_allowed) { + + } +#ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC + else if (hw->rx_bulk_alloc_allowed) { PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions are " "satisfied. Rx Burst Bulk Alloc function " "will be used on port=%d.", dev->data->port_id); dev->rx_pkt_burst = ixgbe_recv_pkts_bulk_alloc; - } else { + } +#endif + else { PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions are not " "satisfied, or Scattered Rx is requested, " "or RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC "