From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by dpdk.org (Postfix) with ESMTP id 485F9B38D for ; Fri, 10 Apr 2015 17:18:23 +0200 (CEST) Received: by pacyx8 with SMTP id yx8so24568103pac.1 for ; Fri, 10 Apr 2015 08:18:22 -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=xDyJpvS3hCVD+i7PE0FARGInCSyRRwlf9i4lW7CLoC4=; b=A2jYTx5VfjBcHlrn4Sy+kbE9NeAzTvmG3c2lAT7pos3rQIBJCvFY5iAzofTuiLxH77 RNWMm4yH00E2/ge4f+ZD9EM9aavnfucarBW31+VRANDcN00Oz8bLt/eq/mg8rRbfbZN+ rUJBOUl3zEEgW3kf2YQy8r8VCOnJpkfxKD5TXb6voiIDsH3Y7kz6VTqgGvvOPyZUOVV0 jugpN4B/2FyUmKzAyQsZcEOj2jjhNbeSZdMn5pGrGdCAFRo53bggB88j2FVp5VE/ec9i +7aNx+5TL3hGCv6CiIQsBW+D8w9u18t7uqnGQwfTXnOEOH92434T4VPfkBTSZJh6eBCo kBWA== X-Gm-Message-State: ALoCoQlqSkvKqVcc6gVPc0Anh5qluSy5FDYjli8XNZltF+aRmFaHYAfIZuVbttfvSbrdlEaHC0wS X-Received: by 10.68.253.162 with SMTP id ab2mr3578088pbd.62.1428679102562; Fri, 10 Apr 2015 08:18:22 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id hb6sm2565597pbd.88.2015.04.10.08.18.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Apr 2015 08:18:21 -0700 (PDT) From: Stephen Hemminger To: Helin Zhang , Konstantin Ananyev Date: Fri, 10 Apr 2015 08:18:25 -0700 Message-Id: <1428679105-8115-3-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428679105-8115-1-git-send-email-stephen@networkplumber.org> References: <1428679105-8115-1-git-send-email-stephen@networkplumber.org> Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH 2/2] e1000: silence noisy log messages 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: , X-List-Received-Date: Fri, 10 Apr 2015 15:18:23 -0000 Same as ixgbe. Should not be as chatty in log and should be possible to compile away all the debug messages. Signed-off-by: Stephen Hemminger --- lib/librte_pmd_e1000/e1000_logs.h | 3 +-- lib/librte_pmd_e1000/em_ethdev.c | 10 ++++------ lib/librte_pmd_e1000/igb_ethdev.c | 16 ++++++---------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/lib/librte_pmd_e1000/e1000_logs.h b/lib/librte_pmd_e1000/e1000_logs.h index 4a92804..81e7bf5 100644 --- a/lib/librte_pmd_e1000/e1000_logs.h +++ b/lib/librte_pmd_e1000/e1000_logs.h @@ -35,8 +35,7 @@ #define _E1000_LOGS_H_ #define PMD_INIT_LOG(level, fmt, args...) \ - rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \ - "PMD: %s(): " fmt "\n", __func__, ##args) + RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args) #ifdef RTE_LIBRTE_E1000_DEBUG_INIT #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c index 76f45c9..9189134 100644 --- a/lib/librte_pmd_e1000/em_ethdev.c +++ b/lib/librte_pmd_e1000/em_ethdev.c @@ -270,7 +270,7 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev) /* initialize the vfta */ memset(shadow_vfta, 0, sizeof(*shadow_vfta)); - PMD_INIT_LOG(INFO, "port_id %d vendorID=0x%x deviceID=0x%x", + PMD_INIT_LOG(DEBUG, "port_id %d vendorID=0x%x deviceID=0x%x", eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); @@ -1293,16 +1293,14 @@ eth_em_interrupt_action(struct rte_eth_dev *dev) memset(&link, 0, sizeof(link)); rte_em_dev_atomic_read_link_status(dev, &link); if (link.link_status) { - PMD_INIT_LOG(INFO, " Port %d: Link Up - speed %u Mbps - %s", + PMD_INIT_LOG(DEBUG, " Port %d: Link Up - speed %u Mbps - %s", dev->data->port_id, (unsigned)link.link_speed, link.link_duplex == ETH_LINK_FULL_DUPLEX ? "full-duplex" : "half-duplex"); } else { - PMD_INIT_LOG(INFO, " Port %d: Link Down", dev->data->port_id); + PMD_INIT_LOG(DEBUG, " Port %d: Link Down", dev->data->port_id); } - PMD_INIT_LOG(INFO, "PCI Address: %04d:%02d:%02d:%d", - dev->pci_dev->addr.domain, dev->pci_dev->addr.bus, - dev->pci_dev->addr.devid, dev->pci_dev->addr.function); + tctl = E1000_READ_REG(hw, E1000_TCTL); rctl = E1000_READ_REG(hw, E1000_RCTL); if (link.link_status) { diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c index b3892a5..7d00aed 100644 --- a/lib/librte_pmd_e1000/igb_ethdev.c +++ b/lib/librte_pmd_e1000/igb_ethdev.c @@ -580,7 +580,7 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev) E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext); E1000_WRITE_FLUSH(hw); - PMD_INIT_LOG(INFO, "port_id %d vendorID=0x%x deviceID=0x%x", + PMD_INIT_LOG(DEBUG, "port_id %d vendorID=0x%x deviceID=0x%x", eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); @@ -1906,21 +1906,17 @@ eth_igb_interrupt_action(struct rte_eth_dev *dev) memset(&link, 0, sizeof(link)); rte_igb_dev_atomic_read_link_status(dev, &link); if (link.link_status) { - PMD_INIT_LOG(INFO, + PMD_INIT_LOG(DEBUG, " Port %d: Link Up - speed %u Mbps - %s", dev->data->port_id, (unsigned)link.link_speed, link.link_duplex == ETH_LINK_FULL_DUPLEX ? "full-duplex" : "half-duplex"); } else { - PMD_INIT_LOG(INFO, " Port %d: Link Down", + PMD_INIT_LOG(DEBUG, " Port %d: Link Down", dev->data->port_id); } - PMD_INIT_LOG(INFO, "PCI Address: %04d:%02d:%02d:%d", - dev->pci_dev->addr.domain, - dev->pci_dev->addr.bus, - dev->pci_dev->addr.devid, - dev->pci_dev->addr.function); + tctl = E1000_READ_REG(hw, E1000_TCTL); rctl = E1000_READ_REG(hw, E1000_RCTL); if (link.link_status) { @@ -2204,12 +2200,12 @@ igbvf_dev_configure(struct rte_eth_dev *dev) */ #ifndef RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC if (!conf->rxmode.hw_strip_crc) { - PMD_INIT_LOG(INFO, "VF can't disable HW CRC Strip"); + PMD_INIT_LOG(NOTICE, "VF can't disable HW CRC Strip"); conf->rxmode.hw_strip_crc = 1; } #else if (conf->rxmode.hw_strip_crc) { - PMD_INIT_LOG(INFO, "VF can't enable HW CRC Strip"); + PMD_INIT_LOG(NOTICE, "VF can't enable HW CRC Strip"); conf->rxmode.hw_strip_crc = 0; } #endif -- 2.1.4