From patchwork Wed Sep 17 13:46:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 411 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 ABF1EB3E0; Wed, 17 Sep 2014 15:41:48 +0200 (CEST) Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by dpdk.org (Postfix) with ESMTP id C371CB3A4 for ; Wed, 17 Sep 2014 15:41:44 +0200 (CEST) Received: by mail-we0-f170.google.com with SMTP id u57so1472045wes.15 for ; Wed, 17 Sep 2014 06:47:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EEgTqWq9Fd+PEcbR434X7lzmnhwKztZLxuF5UVrBpu0=; b=YlPDDb5JX43N8jsqbXVX6y0E0aW0PWs+5mpdvqKYcRn5aSwJLV+B3/kq/QTZVZgqBr 2l4NLZyNMkgNuww5Vk1Ot9WVlyrWy8pD1x3XrQyxeUmCn1ndcnAMSLXkL3tsly2u00fv aQXc3BEaY62tAGI1tVycWADltRRUTJfgLEToqzWtzKzL7cbvzmoEQlfCcTyob99cuGJ/ S70MBqzwFXVmtekD3BrL3TbLco24oFdROEJYTHlS6aITmILUpqfeOEZNBiRmkPV1nLF0 emirO37H9HsjaQx0onG4Ka/WrbKsYagjINmX4XsAmyaY9vCa7vT+rkUUp+AxY6aPv87e kpeQ== X-Gm-Message-State: ALoCoQl83eFIZMaNaPMWngIrKSCSdJR9QkzwnWyMH2Jgiann1BHQYVpaZSCUrj0j8MWJMZygxDct X-Received: by 10.194.57.237 with SMTP id l13mr22174537wjq.102.1410961645956; Wed, 17 Sep 2014 06:47:25 -0700 (PDT) Received: from alcyon.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id fa20sm5712872wic.1.2014.09.17.06.47.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Sep 2014 06:47:25 -0700 (PDT) From: David Marchand To: dev@dpdk.org Date: Wed, 17 Sep 2014 15:46:46 +0200 Message-Id: <1410961612-8571-15-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1410961612-8571-1-git-send-email-david.marchand@6wind.com> References: <1410961612-8571-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v3 14/20] e1000: use the right debug macro 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" - We should not use DEBUGOUT* / DEBUGFUNC macros in non-shared code. These macros come as compat wrappers for shared code. - We should avoid calling RTE_LOG directly as pmd provides a wrapper for logs. Signed-off-by: David Marchand v2 Reviewed-by: Jay Rolette v2 Acked-by: Bruce Richardson --- lib/librte_pmd_e1000/em_rxtx.c | 32 ++++++++++++++++++-------------- lib/librte_pmd_e1000/igb_ethdev.c | 9 +++++---- lib/librte_pmd_e1000/igb_pf.c | 5 +++-- lib/librte_pmd_e1000/igb_rxtx.c | 16 +++++++--------- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c index ba7e3a9..ce0c115 100644 --- a/lib/librte_pmd_e1000/em_rxtx.c +++ b/lib/librte_pmd_e1000/em_rxtx.c @@ -1233,18 +1233,21 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev, DEFAULT_TX_RS_THRESH); if (tx_free_thresh >= (nb_desc - 3)) { - RTE_LOG(ERR, PMD, "tx_free_thresh must be less than the " - "number of TX descriptors minus 3. (tx_free_thresh=%u " - "port=%d queue=%d)\n", (unsigned int)tx_free_thresh, - (int)dev->data->port_id, (int)queue_idx); + PMD_INIT_LOG(ERR, "tx_free_thresh must be less than the " + "number of TX descriptors minus 3. " + "(tx_free_thresh=%u port=%d queue=%d)", + (unsigned int)tx_free_thresh, + (int)dev->data->port_id, (int)queue_idx); return -(EINVAL); } if (tx_rs_thresh > tx_free_thresh) { - RTE_LOG(ERR, PMD, "tx_rs_thresh must be less than or equal to " - "tx_free_thresh. (tx_free_thresh=%u tx_rs_thresh=%u " - "port=%d queue=%d)\n", (unsigned int)tx_free_thresh, - (unsigned int)tx_rs_thresh, (int)dev->data->port_id, - (int)queue_idx); + PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than or equal to " + "tx_free_thresh. (tx_free_thresh=%u " + "tx_rs_thresh=%u port=%d queue=%d)", + (unsigned int)tx_free_thresh, + (unsigned int)tx_rs_thresh, + (int)dev->data->port_id, + (int)queue_idx); return -(EINVAL); } @@ -1255,10 +1258,10 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev, * accumulates WTHRESH descriptors. */ if (tx_conf->tx_thresh.wthresh != 0 && tx_rs_thresh != 1) { - RTE_LOG(ERR, PMD, "TX WTHRESH must be set to 0 if " - "tx_rs_thresh is greater than 1. (tx_rs_thresh=%u " - "port=%d queue=%d)\n", (unsigned int)tx_rs_thresh, - (int)dev->data->port_id, (int)queue_idx); + PMD_INIT_LOG(ERR, "TX WTHRESH must be set to 0 if " + "tx_rs_thresh is greater than 1. (tx_rs_thresh=%u " + "port=%d queue=%d)", (unsigned int)tx_rs_thresh, + (int)dev->data->port_id, (int)queue_idx); return -(EINVAL); } @@ -1388,7 +1391,8 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev, * EM devices don't support drop_en functionality */ if (rx_conf->rx_drop_en) { - RTE_LOG(ERR, PMD, "drop_en functionality not supported by device\n"); + PMD_INIT_LOG(ERR, "drop_en functionality not supported by " + "device"); return (-EINVAL); } diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c index 3187d92..b45eb24 100644 --- a/lib/librte_pmd_e1000/igb_ethdev.c +++ b/lib/librte_pmd_e1000/igb_ethdev.c @@ -400,7 +400,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw) * So force the release of the faulty lock. */ if (e1000_get_hw_semaphore_generic(hw) < 0) { - DEBUGOUT("SMBI lock released"); + PMD_DRV_LOG(DEBUG, "SMBI lock released"); } e1000_put_hw_semaphore_generic(hw); @@ -416,7 +416,8 @@ igb_reset_swfw_lock(struct e1000_hw *hw) if (hw->bus.func > E1000_FUNC_1) mask <<= 2; if (hw->mac.ops.acquire_swfw_sync(hw, mask) < 0) { - DEBUGOUT1("SWFW phy%d lock released", hw->bus.func); + PMD_DRV_LOG(DEBUG, "SWFW phy%d lock released", + hw->bus.func); } hw->mac.ops.release_swfw_sync(hw, mask); @@ -428,7 +429,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw) */ mask = E1000_SWFW_EEP_SM; if (hw->mac.ops.acquire_swfw_sync(hw, mask) < 0) { - DEBUGOUT("SWFW common locks released"); + PMD_DRV_LOG(DEBUG, "SWFW common locks released"); } hw->mac.ops.release_swfw_sync(hw, mask); } @@ -707,7 +708,7 @@ igb_vmdq_vlan_hw_filter_enable(struct rte_eth_dev *dev) static int rte_igbvf_pmd_init(const char *name __rte_unused, const char *params __rte_unused) { - DEBUGFUNC("rte_igbvf_pmd_init"); + PMD_INIT_FUNC_TRACE(); rte_eth_driver_register(&rte_igbvf_pmd); return (0); diff --git a/lib/librte_pmd_e1000/igb_pf.c b/lib/librte_pmd_e1000/igb_pf.c index 3d405f0..bc3816a 100644 --- a/lib/librte_pmd_e1000/igb_pf.c +++ b/lib/librte_pmd_e1000/igb_pf.c @@ -404,7 +404,7 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf) retval = e1000_read_mbx(hw, msgbuf, mbx_size, vf); if (retval) { - RTE_LOG(ERR, PMD, "Error mbx recv msg from VF %d\n", vf); + PMD_INIT_LOG(ERR, "Error mbx recv msg from VF %d", vf); return retval; } @@ -432,7 +432,8 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf) retval = igb_vf_set_vlan(dev, vf, msgbuf); break; default: - RTE_LOG(DEBUG, PMD, "Unhandled Msg %8.8x\n", (unsigned) msgbuf[0]); + PMD_INIT_LOG(DEBUG, "Unhandled Msg %8.8x", + (unsigned) msgbuf[0]); retval = E1000_ERR_MBX; break; } diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c index d4a803e..5600d02 100644 --- a/lib/librte_pmd_e1000/igb_rxtx.c +++ b/lib/librte_pmd_e1000/igb_rxtx.c @@ -1229,17 +1229,15 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev, * driver. */ if (tx_conf->tx_free_thresh != 0) - RTE_LOG(WARNING, PMD, - "The tx_free_thresh parameter is not " - "used for the 1G driver.\n"); + PMD_INIT_LOG(WARNING, "The tx_free_thresh parameter is not " + "used for the 1G driver."); if (tx_conf->tx_rs_thresh != 0) - RTE_LOG(WARNING, PMD, - "The tx_rs_thresh parameter is not " - "used for the 1G driver.\n"); + PMD_INIT_LOG(WARNING, "The tx_rs_thresh parameter is not " + "used for the 1G driver."); if (tx_conf->tx_thresh.wthresh == 0) - RTE_LOG(WARNING, PMD, - "To improve 1G driver performance, consider setting " - "the TX WTHRESH value to 4, 8, or 16.\n"); + PMD_INIT_LOG(WARNING, "To improve 1G driver performance, " + "consider setting the TX WTHRESH value to 4, 8, " + "or 16."); /* Free memory prior to re-allocation if needed */ if (dev->data->tx_queues[queue_idx] != NULL) {