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 <stephen at networkplumber.org>

--- 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, " >>")
--- a/lib/librte_pmd_e1000/em_ethdev.c
+++ b/lib/librte_pmd_e1000/em_ethdev.c
@@ -272,7 +272,7 @@
        /* 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);

@@ -1295,16 +1295,14 @@
        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) {
--- a/lib/librte_pmd_e1000/igb_ethdev.c
+++ b/lib/librte_pmd_e1000/igb_ethdev.c
@@ -586,7 +586,7 @@
        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);

@@ -1873,21 +1873,17 @@
                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) {
---
 lib/librte_pmd_e1000/e1000_logs.h |  3 +--
 lib/librte_pmd_e1000/em_ethdev.c  | 10 ++++------
 lib/librte_pmd_e1000/igb_ethdev.c | 12 ++++--------
 3 files changed, 9 insertions(+), 16 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 3f2897e..a865d0a 100644
--- a/lib/librte_pmd_e1000/em_ethdev.c
+++ b/lib/librte_pmd_e1000/em_ethdev.c
@@ -272,7 +272,7 @@ eth_em_dev_init(__attribute__((unused)) struct eth_driver 
*eth_drv,
        /* 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);

@@ -1295,16 +1295,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 504ae74..c0068e3 100644
--- a/lib/librte_pmd_e1000/igb_ethdev.c
+++ b/lib/librte_pmd_e1000/igb_ethdev.c
@@ -582,7 +582,7 @@ eth_igb_dev_init(__attribute__((unused)) struct eth_driver 
*eth_drv,
        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) {
-- 
2.1.4

Reply via email to