* [PATCH 1/2] net/ngbe: fix debug log
2022-02-21 9:21 [PATCH 0/2] Wangxun log fixes Jiawen Wu
@ 2022-02-21 9:21 ` Jiawen Wu
2022-02-21 13:06 ` Ferruh Yigit
2022-02-21 9:21 ` [PATCH 2/2] net/txgbe: " Jiawen Wu
1 sibling, 1 reply; 6+ messages in thread
From: Jiawen Wu @ 2022-02-21 9:21 UTC (permalink / raw)
To: dev; +Cc: Jiawen Wu, stable
Remove 'DEBUGFUNC' due to too many invalid debug log prints, unify the
DEBUG level macros.
Fixes: cc934df178ab ("net/ngbe: add log and error types")
Cc: stable@dpdk.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
drivers/net/ngbe/base/ngbe_eeprom.c | 18 +---
drivers/net/ngbe/base/ngbe_hw.c | 148 ++++++---------------------
drivers/net/ngbe/base/ngbe_mbx.c | 22 ----
drivers/net/ngbe/base/ngbe_mng.c | 16 +--
drivers/net/ngbe/base/ngbe_phy.c | 30 ++----
drivers/net/ngbe/base/ngbe_phy_mvl.c | 17 +--
drivers/net/ngbe/base/ngbe_phy_rtl.c | 18 ++--
drivers/net/ngbe/base/ngbe_phy_yt.c | 18 +---
drivers/net/ngbe/ngbe_logs.h | 7 +-
9 files changed, 62 insertions(+), 232 deletions(-)
diff --git a/drivers/net/ngbe/base/ngbe_eeprom.c b/drivers/net/ngbe/base/ngbe_eeprom.c
index f9a876e9bd..dcebe6056d 100644
--- a/drivers/net/ngbe/base/ngbe_eeprom.c
+++ b/drivers/net/ngbe/base/ngbe_eeprom.c
@@ -20,8 +20,6 @@ s32 ngbe_init_eeprom_params(struct ngbe_hw *hw)
u32 eec;
u16 eeprom_size;
- DEBUGFUNC("ngbe_init_eeprom_params");
-
if (eeprom->type != ngbe_eeprom_unknown)
return 0;
@@ -53,7 +51,7 @@ s32 ngbe_init_eeprom_params(struct ngbe_hw *hw)
eeprom->sw_addr = 0x80;
DEBUGOUT("eeprom params: type = %d, size = %d, address bits: "
- "%d %d\n", eeprom->type, eeprom->word_size,
+ "%d %d", eeprom->type, eeprom->word_size,
eeprom->address_bits, eeprom->sw_addr);
return 0;
@@ -72,9 +70,6 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
u32 i;
u32 swsm;
- DEBUGFUNC("ngbe_get_eeprom_semaphore");
-
-
/* Get SMBI software semaphore between device drivers first */
for (i = 0; i < timeout; i++) {
/*
@@ -91,7 +86,7 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
if (i == timeout) {
DEBUGOUT("Driver can't access the eeprom - SMBI Semaphore "
- "not granted.\n");
+ "not granted.");
/*
* this release is particularly important because our attempts
* above to get the semaphore may have succeeded, and if there
@@ -134,13 +129,13 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
* was not granted because we don't have access to the EEPROM
*/
if (i >= timeout) {
- DEBUGOUT("SWESMBI Software EEPROM semaphore not granted.\n");
+ DEBUGOUT("SWESMBI Software EEPROM semaphore not granted.");
ngbe_release_eeprom_semaphore(hw);
status = NGBE_ERR_EEPROM;
}
} else {
DEBUGOUT("Software semaphore SMBI between device drivers "
- "not granted.\n");
+ "not granted.");
}
return status;
@@ -154,8 +149,6 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
**/
void ngbe_release_eeprom_semaphore(struct ngbe_hw *hw)
{
- DEBUGFUNC("ngbe_release_eeprom_semaphore");
-
wr32m(hw, NGBE_MNGSWSYNC, NGBE_MNGSWSYNC_REQ, 0);
wr32m(hw, NGBE_SWSEM, NGBE_SWSEM_PF, 0);
ngbe_flush(hw);
@@ -276,7 +269,6 @@ s32 ngbe_validate_eeprom_checksum_em(struct ngbe_hw *hw,
u32 eeprom_cksum_devcap = 0;
int err = 0;
- DEBUGFUNC("ngbe_validate_eeprom_checksum_em");
UNREFERENCED_PARAMETER(checksum_val);
/* Check EEPROM only once */
@@ -315,8 +307,6 @@ s32 ngbe_save_eeprom_version(struct ngbe_hw *hw)
u32 etrack_id = 0;
u32 offset = (hw->rom.sw_addr + NGBE_EEPROM_VERSION_L) << 1;
- DEBUGFUNC("ngbe_save_eeprom_version");
-
if (hw->bus.lan_id == 0) {
hw->rom.read32(hw, offset, &eeprom_verl);
etrack_id = eeprom_verl;
diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c
index 931fe8c8cb..2478c7b1e2 100644
--- a/drivers/net/ngbe/base/ngbe_hw.c
+++ b/drivers/net/ngbe/base/ngbe_hw.c
@@ -20,8 +20,6 @@ s32 ngbe_start_hw(struct ngbe_hw *hw)
{
s32 err;
- DEBUGFUNC("ngbe_start_hw");
-
/* Clear the VLAN filter table */
hw->mac.clear_vfta(hw);
@@ -31,7 +29,7 @@ s32 ngbe_start_hw(struct ngbe_hw *hw)
/* Setup flow control */
err = hw->mac.setup_fc(hw);
if (err != 0 && err != NGBE_NOT_IMPLEMENTED) {
- DEBUGOUT("Flow control setup failed, returning %d\n", err);
+ DEBUGOUT("Flow control setup failed, returning %d", err);
return err;
}
@@ -55,8 +53,6 @@ s32 ngbe_init_hw(struct ngbe_hw *hw)
{
s32 status;
- DEBUGFUNC("ngbe_init_hw");
-
ngbe_save_eeprom_version(hw);
/* Reset the hardware */
@@ -67,7 +63,7 @@ s32 ngbe_init_hw(struct ngbe_hw *hw)
}
if (status != 0)
- DEBUGOUT("Failed to initialize HW, STATUS = %d\n", status);
+ DEBUGOUT("Failed to initialize HW, STATUS = %d", status);
return status;
}
@@ -155,8 +151,6 @@ s32 ngbe_reset_hw_em(struct ngbe_hw *hw)
{
s32 status;
- DEBUGFUNC("ngbe_reset_hw_em");
-
/* Call adapter stop to disable tx/rx and clear interrupts */
status = hw->mac.stop_hw(hw);
if (status != 0)
@@ -204,8 +198,6 @@ s32 ngbe_clear_hw_cntrs(struct ngbe_hw *hw)
{
u16 i = 0;
- DEBUGFUNC("ngbe_clear_hw_cntrs");
-
/* QP Stats */
/* don't write clear queue stats */
for (i = 0; i < NGBE_MAX_QP; i++) {
@@ -304,8 +296,6 @@ s32 ngbe_get_mac_addr(struct ngbe_hw *hw, u8 *mac_addr)
u32 rar_low;
u16 i;
- DEBUGFUNC("ngbe_get_mac_addr");
-
wr32(hw, NGBE_ETHADDRIDX, 0);
rar_high = rd32(hw, NGBE_ETHADDRH);
rar_low = rd32(hw, NGBE_ETHADDRL);
@@ -331,8 +321,6 @@ void ngbe_set_lan_id_multi_port(struct ngbe_hw *hw)
struct ngbe_bus_info *bus = &hw->bus;
u32 reg = 0;
- DEBUGFUNC("ngbe_set_lan_id_multi_port");
-
reg = rd32(hw, NGBE_PORTSTAT);
bus->lan_id = NGBE_PORTSTAT_ID(reg);
bus->func = bus->lan_id;
@@ -352,8 +340,6 @@ s32 ngbe_stop_hw(struct ngbe_hw *hw)
u16 i;
s32 status = 0;
- DEBUGFUNC("ngbe_stop_hw");
-
/*
* Set the adapter_stopped flag so other driver functions stop touching
* the hardware
@@ -409,8 +395,6 @@ s32 ngbe_led_on(struct ngbe_hw *hw, u32 index)
{
u32 led_reg = rd32(hw, NGBE_LEDCTL);
- DEBUGFUNC("ngbe_led_on");
-
if (index > 3)
return NGBE_ERR_PARAM;
@@ -431,8 +415,6 @@ s32 ngbe_led_off(struct ngbe_hw *hw, u32 index)
{
u32 led_reg = rd32(hw, NGBE_LEDCTL);
- DEBUGFUNC("ngbe_led_off");
-
if (index > 3)
return NGBE_ERR_PARAM;
@@ -454,8 +436,6 @@ s32 ngbe_validate_mac_addr(u8 *mac_addr)
{
s32 status = 0;
- DEBUGFUNC("ngbe_validate_mac_addr");
-
/* Make sure it is not a multicast address */
if (NGBE_IS_MULTICAST((struct rte_ether_addr *)mac_addr)) {
status = NGBE_ERR_INVALID_MAC_ADDR;
@@ -486,11 +466,9 @@ s32 ngbe_set_rar(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
u32 rar_low, rar_high;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("ngbe_set_rar");
-
/* Make sure we are using a valid rar index range */
if (index >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", index);
+ DEBUGOUT("RAR index %d is out of range.", index);
return NGBE_ERR_INVALID_ARGUMENT;
}
@@ -538,11 +516,9 @@ s32 ngbe_clear_rar(struct ngbe_hw *hw, u32 index)
u32 rar_high;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("ngbe_clear_rar");
-
/* Make sure we are using a valid rar index range */
if (index >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", index);
+ DEBUGOUT("RAR index %d is out of range.", index);
return NGBE_ERR_INVALID_ARGUMENT;
}
@@ -578,8 +554,6 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
u32 psrctl;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("ngbe_init_rx_addrs");
-
/*
* If the current mac address is valid, assume it is a software override
* to the permanent address.
@@ -590,18 +564,16 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
/* Get the MAC address from the RAR0 for later reference */
hw->mac.get_mac_addr(hw, hw->mac.addr);
- DEBUGOUT(" Keeping Current RAR0 Addr =%.2X %.2X %.2X ",
+ DEBUGOUT(" Keeping Current RAR0 Addr =%.2X %.2X %.2X %.2X %.2X %.2X",
hw->mac.addr[0], hw->mac.addr[1],
- hw->mac.addr[2]);
- DEBUGOUT("%.2X %.2X %.2X\n", hw->mac.addr[3],
+ hw->mac.addr[2], hw->mac.addr[3],
hw->mac.addr[4], hw->mac.addr[5]);
} else {
/* Setup the receive address. */
- DEBUGOUT("Overriding MAC Address in RAR[0]\n");
- DEBUGOUT(" New MAC Addr =%.2X %.2X %.2X ",
+ DEBUGOUT("Overriding MAC Address in RAR[0]");
+ DEBUGOUT(" New MAC Addr =%.2X %.2X %.2X %.2X %.2X %.2X",
hw->mac.addr[0], hw->mac.addr[1],
- hw->mac.addr[2]);
- DEBUGOUT("%.2X %.2X %.2X\n", hw->mac.addr[3],
+ hw->mac.addr[2], hw->mac.addr[3],
hw->mac.addr[4], hw->mac.addr[5]);
hw->mac.set_rar(hw, 0, hw->mac.addr, 0, true);
@@ -611,7 +583,7 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
hw->mac.clear_vmdq(hw, 0, BIT_MASK32);
/* Zero out the other receive addresses. */
- DEBUGOUT("Clearing RAR[1-%d]\n", rar_entries - 1);
+ DEBUGOUT("Clearing RAR[1-%d]", rar_entries - 1);
for (i = 1; i < rar_entries; i++) {
wr32(hw, NGBE_ETHADDRIDX, i);
wr32(hw, NGBE_ETHADDRL, 0);
@@ -625,7 +597,7 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
psrctl |= NGBE_PSRCTL_ADHF12(hw->mac.mc_filter_type);
wr32(hw, NGBE_PSRCTL, psrctl);
- DEBUGOUT(" Clearing MTA\n");
+ DEBUGOUT(" Clearing MTA");
for (i = 0; i < hw->mac.mcft_size; i++)
wr32(hw, NGBE_MCADDRTBL(i), 0);
@@ -650,8 +622,6 @@ static s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
{
u32 vector = 0;
- DEBUGFUNC("ngbe_mta_vector");
-
switch (hw->mac.mc_filter_type) {
case 0: /* use bits [47:36] of the address */
vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
@@ -666,7 +636,7 @@ static s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
break;
default: /* Invalid mc_filter_type */
- DEBUGOUT("MC filter type param set incorrectly\n");
+ DEBUGOUT("MC filter type param set incorrectly");
ASSERT(0);
break;
}
@@ -689,12 +659,10 @@ void ngbe_set_mta(struct ngbe_hw *hw, u8 *mc_addr)
u32 vector_bit;
u32 vector_reg;
- DEBUGFUNC("ngbe_set_mta");
-
hw->addr_ctrl.mta_in_use++;
vector = ngbe_mta_vector(hw, mc_addr);
- DEBUGOUT(" bit-vector = 0x%03X\n", vector);
+ DEBUGOUT(" bit-vector = 0x%03X", vector);
/*
* The MTA is a register array of 128 32-bit registers. It is treated
@@ -728,8 +696,6 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
u32 i;
u32 vmdq;
- DEBUGFUNC("ngbe_update_mc_addr_list");
-
/*
* Set the new number of MC addresses that we are being requested to
* use.
@@ -739,13 +705,13 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
/* Clear mta_shadow */
if (clear) {
- DEBUGOUT(" Clearing MTA\n");
+ DEBUGOUT(" Clearing MTA");
memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
}
/* Update mta_shadow */
for (i = 0; i < mc_addr_count; i++) {
- DEBUGOUT(" Adding the multicast addresses:\n");
+ DEBUGOUT(" Adding the multicast addresses:");
ngbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq));
}
@@ -762,7 +728,7 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
wr32(hw, NGBE_PSRCTL, psrctl);
}
- DEBUGOUT("ngbe update mc addr list complete\n");
+ DEBUGOUT("ngbe update mc addr list complete");
return 0;
}
@@ -777,11 +743,9 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
s32 err = 0;
u16 reg_cu = 0;
- DEBUGFUNC("ngbe_setup_fc");
-
/* Validate the requested mode */
if (hw->fc.strict_ieee && hw->fc.requested_mode == ngbe_fc_rx_pause) {
- DEBUGOUT("ngbe_fc_rx_pause not valid in strict IEEE mode\n");
+ DEBUGOUT("ngbe_fc_rx_pause not valid in strict IEEE mode");
err = NGBE_ERR_INVALID_LINK_SETTINGS;
goto out;
}
@@ -837,7 +801,7 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
reg_cu |= 0xC00; /*need to merge rtl and mvl on page 0*/
break;
default:
- DEBUGOUT("Flow control param set incorrectly\n");
+ DEBUGOUT("Flow control param set incorrectly");
err = NGBE_ERR_CONFIG;
goto out;
}
@@ -861,8 +825,6 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
u32 pause_time;
u32 fcrtl, fcrth;
- DEBUGFUNC("ngbe_fc_enable");
-
/* Validate the water mark configuration */
if (!hw->fc.pause_time) {
err = NGBE_ERR_INVALID_LINK_SETTINGS;
@@ -873,7 +835,7 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
if ((hw->fc.current_mode & ngbe_fc_tx_pause) && hw->fc.high_water) {
if (!hw->fc.low_water ||
hw->fc.low_water >= hw->fc.high_water) {
- DEBUGOUT("Invalid water mark configuration\n");
+ DEBUGOUT("Invalid water mark configuration");
err = NGBE_ERR_INVALID_LINK_SETTINGS;
goto out;
}
@@ -929,7 +891,7 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
fccfg_reg |= NGBE_TXFCCFG_FC;
break;
default:
- DEBUGOUT("Flow control param set incorrectly\n");
+ DEBUGOUT("Flow control param set incorrectly");
err = NGBE_ERR_CONFIG;
goto out;
}
@@ -988,7 +950,7 @@ s32 ngbe_negotiate_fc(struct ngbe_hw *hw, u32 adv_reg, u32 lp_reg,
{
if ((!(adv_reg)) || (!(lp_reg))) {
DEBUGOUT("Local or link partner's advertised flow control "
- "settings are NULL. Local: %x, link partner: %x\n",
+ "settings are NULL. Local: %x, link partner: %x",
adv_reg, lp_reg);
return NGBE_ERR_FC_NOT_NEGOTIATED;
}
@@ -1003,22 +965,22 @@ s32 ngbe_negotiate_fc(struct ngbe_hw *hw, u32 adv_reg, u32 lp_reg,
*/
if (hw->fc.requested_mode == ngbe_fc_full) {
hw->fc.current_mode = ngbe_fc_full;
- DEBUGOUT("Flow Control = FULL.\n");
+ DEBUGOUT("Flow Control = FULL.");
} else {
hw->fc.current_mode = ngbe_fc_rx_pause;
- DEBUGOUT("Flow Control=RX PAUSE frames only\n");
+ DEBUGOUT("Flow Control=RX PAUSE frames only");
}
} else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
hw->fc.current_mode = ngbe_fc_tx_pause;
- DEBUGOUT("Flow Control = TX PAUSE frames only.\n");
+ DEBUGOUT("Flow Control = TX PAUSE frames only.");
} else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
!(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
hw->fc.current_mode = ngbe_fc_rx_pause;
- DEBUGOUT("Flow Control = RX PAUSE frames only.\n");
+ DEBUGOUT("Flow Control = RX PAUSE frames only.");
} else {
hw->fc.current_mode = ngbe_fc_none;
- DEBUGOUT("Flow Control = NONE.\n");
+ DEBUGOUT("Flow Control = NONE.");
}
return 0;
}
@@ -1056,8 +1018,6 @@ void ngbe_fc_autoneg(struct ngbe_hw *hw)
u32 speed;
bool link_up;
- DEBUGFUNC("ngbe_fc_autoneg");
-
/*
* AN should have completed when the cable was plugged in.
* Look for reasons to bail out. Bail out if:
@@ -1101,8 +1061,6 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
u16 addr = 0x04;
u32 data, i;
- DEBUGFUNC("ngbe_set_pcie_master");
-
ngbe_hic_pcie_read(hw, addr, &data, 4);
if (enable)
data |= 0x04;
@@ -1126,7 +1084,7 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
goto out;
}
- DEBUGOUT("PCIe transaction pending bit also did not clear.\n");
+ DEBUGOUT("PCIe transaction pending bit also did not clear.");
status = NGBE_ERR_MASTER_REQUESTS_PENDING;
out:
@@ -1150,8 +1108,6 @@ s32 ngbe_acquire_swfw_sync(struct ngbe_hw *hw, u32 mask)
u32 timeout = 200;
u32 i;
- DEBUGFUNC("ngbe_acquire_swfw_sync");
-
for (i = 0; i < timeout; i++) {
/*
* SW NVM semaphore bit is used for access to all
@@ -1174,7 +1130,7 @@ s32 ngbe_acquire_swfw_sync(struct ngbe_hw *hw, u32 mask)
}
fwsm = rd32(hw, NGBE_MNGFWSYNC);
- DEBUGOUT("SWFW semaphore not granted: MNG_SWFW_SYNC = 0x%x, MNG_FW_SM = 0x%x\n",
+ DEBUGOUT("SWFW semaphore not granted: MNG_SWFW_SYNC = 0x%x, MNG_FW_SM = 0x%x",
mngsem, fwsm);
msec_delay(5);
@@ -1194,8 +1150,6 @@ void ngbe_release_swfw_sync(struct ngbe_hw *hw, u32 mask)
u32 mngsem;
u32 swmask = mask;
- DEBUGFUNC("ngbe_release_swfw_sync");
-
ngbe_get_eeprom_semaphore(hw);
mngsem = rd32(hw, NGBE_MNGSEM);
@@ -1219,9 +1173,6 @@ s32 ngbe_disable_sec_rx_path(struct ngbe_hw *hw)
int i;
u32 secrxreg;
- DEBUGFUNC("ngbe_disable_sec_rx_path");
-
-
secrxreg = rd32(hw, NGBE_SECRXCTL);
secrxreg |= NGBE_SECRXCTL_XDSA;
wr32(hw, NGBE_SECRXCTL, secrxreg);
@@ -1237,7 +1188,7 @@ s32 ngbe_disable_sec_rx_path(struct ngbe_hw *hw)
/* For informational purposes only */
if (i >= NGBE_MAX_SECRX_POLL)
DEBUGOUT("Rx unit being enabled before security "
- "path fully disabled. Continuing with init.\n");
+ "path fully disabled. Continuing with init.");
return 0;
}
@@ -1252,8 +1203,6 @@ s32 ngbe_enable_sec_rx_path(struct ngbe_hw *hw)
{
u32 secrxreg;
- DEBUGFUNC("ngbe_enable_sec_rx_path");
-
secrxreg = rd32(hw, NGBE_SECRXCTL);
secrxreg &= ~NGBE_SECRXCTL_XDSA;
wr32(hw, NGBE_SECRXCTL, secrxreg);
@@ -1273,11 +1222,9 @@ s32 ngbe_clear_vmdq(struct ngbe_hw *hw, u32 rar, u32 vmdq)
u32 mpsar;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("ngbe_clear_vmdq");
-
/* Make sure we are using a valid rar index range */
if (rar >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", rar);
+ DEBUGOUT("RAR index %d is out of range.", rar);
return NGBE_ERR_INVALID_ARGUMENT;
}
@@ -1311,11 +1258,9 @@ s32 ngbe_set_vmdq(struct ngbe_hw *hw, u32 rar, u32 vmdq)
u32 mpsar;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("ngbe_set_vmdq");
-
/* Make sure we are using a valid rar index range */
if (rar >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", rar);
+ DEBUGOUT("RAR index %d is out of range.", rar);
return NGBE_ERR_INVALID_ARGUMENT;
}
@@ -1336,8 +1281,7 @@ s32 ngbe_init_uta_tables(struct ngbe_hw *hw)
{
int i;
- DEBUGFUNC("ngbe_init_uta_tables");
- DEBUGOUT(" Clearing UTA\n");
+ DEBUGOUT(" Clearing UTA");
for (i = 0; i < 128; i++)
wr32(hw, NGBE_UCADDRTBL(i), 0);
@@ -1392,7 +1336,7 @@ s32 ngbe_find_vlvf_slot(struct ngbe_hw *hw, u32 vlan, bool vlvf_bypass)
* slot we found during our search, else error.
*/
if (!first_empty_slot)
- DEBUGOUT("No space in VLVF.\n");
+ DEBUGOUT("No space in VLVF.");
return first_empty_slot ? first_empty_slot : NGBE_ERR_NO_SPACE;
}
@@ -1413,8 +1357,6 @@ s32 ngbe_set_vfta(struct ngbe_hw *hw, u32 vlan, u32 vind,
u32 regidx, vfta_delta, vfta;
s32 err;
- DEBUGFUNC("ngbe_set_vfta");
-
if (vlan > 4095 || vind > 63)
return NGBE_ERR_PARAM;
@@ -1482,8 +1424,6 @@ s32 ngbe_set_vlvf(struct ngbe_hw *hw, u32 vlan, u32 vind,
u32 portctl;
s32 vlvf_index;
- DEBUGFUNC("ngbe_set_vlvf");
-
if (vlan > 4095 || vind > 63)
return NGBE_ERR_PARAM;
@@ -1563,8 +1503,6 @@ s32 ngbe_clear_vfta(struct ngbe_hw *hw)
{
u32 offset;
- DEBUGFUNC("ngbe_clear_vfta");
-
for (offset = 0; offset < hw->mac.vft_size; offset++)
wr32(hw, NGBE_VLANTBL(offset), 0);
@@ -1592,8 +1530,6 @@ s32 ngbe_check_mac_link_em(struct ngbe_hw *hw, u32 *speed,
u32 i, reg;
s32 status = 0;
- DEBUGFUNC("ngbe_check_mac_link_em");
-
reg = rd32(hw, NGBE_GPIOINTSTAT);
wr32(hw, NGBE_GPIOEOI, reg);
@@ -1617,7 +1553,6 @@ s32 ngbe_get_link_capabilities_em(struct ngbe_hw *hw,
{
s32 status = 0;
u16 value = 0;
- DEBUGFUNC("\n");
hw->mac.autoneg = *autoneg;
@@ -1642,8 +1577,6 @@ s32 ngbe_setup_mac_link_em(struct ngbe_hw *hw,
{
s32 status;
- DEBUGFUNC("\n");
-
/* Setup the PHY according to input speed */
status = hw->phy.setup_link(hw, speed, autoneg_wait_to_complete);
@@ -1723,8 +1656,6 @@ s32 ngbe_init_thermal_sensor_thresh(struct ngbe_hw *hw)
{
struct ngbe_thermal_sensor_data *data = &hw->mac.thermal_sensor_data;
- DEBUGFUNC("ngbe_init_thermal_sensor_thresh");
-
memset(data, 0, sizeof(struct ngbe_thermal_sensor_data));
if (hw->bus.lan_id != 0)
@@ -1748,8 +1679,6 @@ s32 ngbe_mac_check_overtemp(struct ngbe_hw *hw)
s32 status = 0;
u32 ts_state;
- DEBUGFUNC("ngbe_mac_check_overtemp");
-
/* Check that the LASI temp alarm status was triggered */
ts_state = rd32(hw, NGBE_TSALM);
@@ -1804,8 +1733,6 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
{
s32 err = 0;
- DEBUGFUNC("ngbe_set_mac_type");
-
if (hw->vendor_id != PCI_VENDOR_ID_WANGXUN) {
DEBUGOUT("Unsupported vendor id: %x", hw->vendor_id);
return NGBE_ERR_DEVICE_NOT_SUPPORTED;
@@ -1846,7 +1773,7 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
break;
}
- DEBUGOUT("found mac: %d media: %d, returns: %d\n",
+ DEBUGOUT("found mac: %d media: %d, returns: %d",
hw->mac.type, hw->phy.media_type, err);
return err;
}
@@ -1860,15 +1787,12 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
**/
s32 ngbe_enable_rx_dma(struct ngbe_hw *hw, u32 regval)
{
- DEBUGFUNC("ngbe_enable_rx_dma");
-
/*
* Workaround silicon errata when enabling the Rx datapath.
* If traffic is incoming before we enable the Rx unit, it could hang
* the Rx DMA unit. Therefore, make sure the security engine is
* completely disabled prior to enabling the Rx unit.
*/
-
hw->mac.disable_sec_rx_path(hw);
if (regval & NGBE_PBRXCTL_ENA)
@@ -1960,8 +1884,6 @@ s32 ngbe_init_ops_pf(struct ngbe_hw *hw)
struct ngbe_rom_info *rom = &hw->rom;
struct ngbe_mbx_info *mbx = &hw->mbx;
- DEBUGFUNC("ngbe_init_ops_pf");
-
/* BUS */
bus->set_lan_id = ngbe_set_lan_id_multi_port;
@@ -2064,8 +1986,6 @@ s32 ngbe_init_shared_code(struct ngbe_hw *hw)
{
s32 status = 0;
- DEBUGFUNC("ngbe_init_shared_code");
-
/*
* Set the mac type
*/
diff --git a/drivers/net/ngbe/base/ngbe_mbx.c b/drivers/net/ngbe/base/ngbe_mbx.c
index 764ae81319..bc0adbb3ec 100644
--- a/drivers/net/ngbe/base/ngbe_mbx.c
+++ b/drivers/net/ngbe/base/ngbe_mbx.c
@@ -21,8 +21,6 @@ s32 ngbe_read_mbx(struct ngbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
struct ngbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = NGBE_ERR_MBX;
- DEBUGFUNC("ngbe_read_mbx");
-
/* limit read to size of mailbox */
if (size > mbx->size)
size = mbx->size;
@@ -47,8 +45,6 @@ s32 ngbe_write_mbx(struct ngbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
struct ngbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = 0;
- DEBUGFUNC("ngbe_write_mbx");
-
if (size > mbx->size) {
ret_val = NGBE_ERR_MBX;
DEBUGOUT("Invalid mailbox message size %d", size);
@@ -71,8 +67,6 @@ s32 ngbe_check_for_msg(struct ngbe_hw *hw, u16 mbx_id)
struct ngbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = NGBE_ERR_MBX;
- DEBUGFUNC("ngbe_check_for_msg");
-
if (mbx->check_for_msg)
ret_val = mbx->check_for_msg(hw, mbx_id);
@@ -91,8 +85,6 @@ s32 ngbe_check_for_ack(struct ngbe_hw *hw, u16 mbx_id)
struct ngbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = NGBE_ERR_MBX;
- DEBUGFUNC("ngbe_check_for_ack");
-
if (mbx->check_for_ack)
ret_val = mbx->check_for_ack(hw, mbx_id);
@@ -111,8 +103,6 @@ s32 ngbe_check_for_rst(struct ngbe_hw *hw, u16 mbx_id)
struct ngbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = NGBE_ERR_MBX;
- DEBUGFUNC("ngbe_check_for_rst");
-
if (mbx->check_for_rst)
ret_val = mbx->check_for_rst(hw, mbx_id);
@@ -144,8 +134,6 @@ s32 ngbe_check_for_msg_pf(struct ngbe_hw *hw, u16 vf_number)
s32 ret_val = NGBE_ERR_MBX;
u32 vf_bit = vf_number;
- DEBUGFUNC("ngbe_check_for_msg_pf");
-
if (!ngbe_check_for_bit_pf(hw, NGBE_MBVFICR_VFREQ_VF1 << vf_bit)) {
ret_val = 0;
hw->mbx.stats.reqs++;
@@ -166,8 +154,6 @@ s32 ngbe_check_for_ack_pf(struct ngbe_hw *hw, u16 vf_number)
s32 ret_val = NGBE_ERR_MBX;
u32 vf_bit = vf_number;
- DEBUGFUNC("ngbe_check_for_ack_pf");
-
if (!ngbe_check_for_bit_pf(hw, NGBE_MBVFICR_VFACK_VF1 << vf_bit)) {
ret_val = 0;
hw->mbx.stats.acks++;
@@ -188,8 +174,6 @@ s32 ngbe_check_for_rst_pf(struct ngbe_hw *hw, u16 vf_number)
u32 vflre = 0;
s32 ret_val = NGBE_ERR_MBX;
- DEBUGFUNC("ngbe_check_for_rst_pf");
-
vflre = rd32(hw, NGBE_FLRVFE);
if (vflre & (1 << vf_number)) {
ret_val = 0;
@@ -212,8 +196,6 @@ STATIC s32 ngbe_obtain_mbx_lock_pf(struct ngbe_hw *hw, u16 vf_number)
s32 ret_val = NGBE_ERR_MBX;
u32 p2v_mailbox;
- DEBUGFUNC("ngbe_obtain_mbx_lock_pf");
-
/* Take ownership of the buffer */
wr32(hw, NGBE_MBCTL(vf_number), NGBE_MBCTL_PFU);
@@ -242,8 +224,6 @@ s32 ngbe_write_mbx_pf(struct ngbe_hw *hw, u32 *msg, u16 size, u16 vf_number)
s32 ret_val;
u16 i;
- DEBUGFUNC("ngbe_write_mbx_pf");
-
/* lock the mailbox to prevent pf/vf race condition */
ret_val = ngbe_obtain_mbx_lock_pf(hw, vf_number);
if (ret_val)
@@ -283,8 +263,6 @@ s32 ngbe_read_mbx_pf(struct ngbe_hw *hw, u32 *msg, u16 size, u16 vf_number)
s32 ret_val;
u16 i;
- DEBUGFUNC("ngbe_read_mbx_pf");
-
/* lock the mailbox to prevent pf/vf race condition */
ret_val = ngbe_obtain_mbx_lock_pf(hw, vf_number);
if (ret_val)
diff --git a/drivers/net/ngbe/base/ngbe_mng.c b/drivers/net/ngbe/base/ngbe_mng.c
index c6f4dc2e0b..ad9372bec2 100644
--- a/drivers/net/ngbe/base/ngbe_mng.c
+++ b/drivers/net/ngbe/base/ngbe_mng.c
@@ -26,10 +26,8 @@ ngbe_hic_unlocked(struct ngbe_hw *hw, u32 *buffer, u32 length, u32 timeout)
u32 value, loop;
u16 i, dword_len;
- DEBUGFUNC("ngbe_hic_unlocked");
-
if (!length || length > NGBE_PMMBX_BSIZE) {
- DEBUGOUT("Buffer length failure buffersize=%d.\n", length);
+ DEBUGOUT("Buffer length failure buffersize=%d.", length);
return NGBE_ERR_HOST_INTERFACE_COMMAND;
}
@@ -59,7 +57,7 @@ ngbe_hic_unlocked(struct ngbe_hw *hw, u32 *buffer, u32 length, u32 timeout)
NGBE_MNGMBXCTL_FWRDY, NGBE_MNGMBXCTL_FWRDY,
&value, timeout, 1000);
if (!loop || !(value & NGBE_MNGMBXCTL_FWACK)) {
- DEBUGOUT("Command has failed with no status valid.\n");
+ DEBUGOUT("Command has failed with no status valid.");
return NGBE_ERR_HOST_INTERFACE_COMMAND;
}
@@ -95,10 +93,8 @@ ngbe_host_interface_command(struct ngbe_hw *hw, u32 *buffer,
u32 bi;
u32 dword_len;
- DEBUGFUNC("ngbe_host_interface_command");
-
if (length == 0 || length > NGBE_PMMBX_BSIZE) {
- DEBUGOUT("Buffer length failure buffersize=%d.\n", length);
+ DEBUGOUT("Buffer length failure buffersize=%d.", length);
return NGBE_ERR_HOST_INTERFACE_COMMAND;
}
@@ -140,7 +136,7 @@ ngbe_host_interface_command(struct ngbe_hw *hw, u32 *buffer,
goto rel_out;
if (length < buf_len + hdr_size) {
- DEBUGOUT("Buffer not large enough for reply message.\n");
+ DEBUGOUT("Buffer not large enough for reply message.");
err = NGBE_ERR_HOST_INTERFACE_COMMAND;
goto rel_out;
}
@@ -306,8 +302,6 @@ s32 ngbe_hic_check_cap(struct ngbe_hw *hw)
s32 err;
int i;
- DEBUGFUNC("\n");
-
command.hdr.req.cmd = FW_EEPROM_CHECK_STATUS;
command.hdr.req.buf_lenh = 0;
command.hdr.req.buf_lenl = 0;
@@ -345,8 +339,6 @@ s32 ngbe_phy_led_oem_chk(struct ngbe_hw *hw, u32 *data)
s32 err;
int i;
- DEBUGFUNC("\n");
-
command.hdr.req.cmd = FW_PHY_LED_CONF;
command.hdr.req.buf_lenh = 0;
command.hdr.req.buf_lenl = 0;
diff --git a/drivers/net/ngbe/base/ngbe_phy.c b/drivers/net/ngbe/base/ngbe_phy.c
index 93450b2977..3d5093ec7e 100644
--- a/drivers/net/ngbe/base/ngbe_phy.c
+++ b/drivers/net/ngbe/base/ngbe_phy.c
@@ -46,7 +46,7 @@ s32 ngbe_mdi_map_register(mdi_reg_t *reg, mdi_reg_22_t *reg22)
static bool ngbe_probe_phy(struct ngbe_hw *hw, u16 phy_addr)
{
if (!ngbe_validate_phy_addr(hw, phy_addr)) {
- DEBUGOUT("Unable to validate PHY address 0x%04X\n",
+ DEBUGOUT("Unable to validate PHY address 0x%04X",
phy_addr);
return false;
}
@@ -71,8 +71,6 @@ s32 ngbe_identify_phy(struct ngbe_hw *hw)
s32 err = NGBE_ERR_PHY_ADDR_INVALID;
u16 phy_addr;
- DEBUGFUNC("ngbe_identify_phy");
-
if (hw->phy.type != ngbe_phy_unknown)
return 0;
@@ -102,11 +100,9 @@ s32 ngbe_check_reset_blocked(struct ngbe_hw *hw)
{
u32 mmngc;
- DEBUGFUNC("ngbe_check_reset_blocked");
-
mmngc = rd32(hw, NGBE_STAT);
if (mmngc & NGBE_STAT_MNGVETO) {
- DEBUGOUT("MNG_VETO bit detected.\n");
+ DEBUGOUT("MNG_VETO bit detected.");
return true;
}
@@ -124,8 +120,6 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
u16 phy_id = 0;
bool valid = false;
- DEBUGFUNC("ngbe_validate_phy_addr");
-
if (hw->sub_device_id == NGBE_SUB_DEV_ID_EM_YT8521S_SFP)
return true;
@@ -136,7 +130,7 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
if (phy_id != 0xFFFF && phy_id != 0x0)
valid = true;
- DEBUGOUT("PHY ID HIGH is 0x%04X\n", phy_id);
+ DEBUGOUT("PHY ID HIGH is 0x%04X", phy_id);
return valid;
}
@@ -152,8 +146,6 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
u16 phy_id_high = 0;
u16 phy_id_low = 0;
- DEBUGFUNC("ngbe_get_phy_id");
-
err = hw->phy.read_reg(hw, NGBE_MD_PHY_ID_HIGH,
NGBE_MD_DEV_PMA_PMD,
&phy_id_high);
@@ -165,7 +157,7 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
hw->phy.id |= (u32)(phy_id_low & NGBE_PHY_REVISION_MASK);
hw->phy.revision = (u32)(phy_id_low & ~NGBE_PHY_REVISION_MASK);
- DEBUGOUT("PHY_ID_HIGH 0x%04X, PHY_ID_LOW 0x%04X\n",
+ DEBUGOUT("PHY_ID_HIGH 0x%04X, PHY_ID_LOW 0x%04X",
phy_id_high, phy_id_low);
return err;
@@ -179,8 +171,6 @@ s32 ngbe_get_phy_type_from_id(struct ngbe_hw *hw)
{
s32 status = 0;
- DEBUGFUNC("ngbe_get_phy_type_from_id");
-
switch (hw->phy.id) {
case NGBE_PHYID_RTL:
hw->phy.type = ngbe_phy_rtl;
@@ -216,8 +206,6 @@ s32 ngbe_reset_phy(struct ngbe_hw *hw)
{
s32 err = 0;
- DEBUGFUNC("ngbe_reset_phy");
-
if (hw->phy.type == ngbe_phy_unknown)
err = ngbe_identify_phy(hw);
@@ -282,7 +270,7 @@ s32 ngbe_read_phy_reg_mdi(struct ngbe_hw *hw, u32 reg_addr, u32 device_type,
*/
if (!po32m(hw, NGBE_MDIOSCD, NGBE_MDIOSCD_BUSY,
0, NULL, 100, 100)) {
- DEBUGOUT("PHY address command did not complete\n");
+ DEBUGOUT("PHY address command did not complete");
return NGBE_ERR_PHY;
}
@@ -306,8 +294,6 @@ s32 ngbe_read_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
s32 err;
u32 gssr = hw->phy.phy_semaphore_mask;
- DEBUGFUNC("ngbe_read_phy_reg");
-
if (hw->mac.acquire_swfw_sync(hw, gssr))
return NGBE_ERR_SWFW_SYNC;
@@ -347,7 +333,7 @@ s32 ngbe_write_phy_reg_mdi(struct ngbe_hw *hw, u32 reg_addr,
/* wait for completion */
if (!po32m(hw, NGBE_MDIOSCD, NGBE_MDIOSCD_BUSY,
0, NULL, 100, 100)) {
- TLOG_DEBUG("PHY write cmd didn't complete\n");
+ DEBUGOUT("PHY write cmd didn't complete");
return NGBE_ERR_PHY;
}
@@ -368,8 +354,6 @@ s32 ngbe_write_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
s32 err;
u32 gssr = hw->phy.phy_semaphore_mask;
- DEBUGFUNC("ngbe_write_phy_reg");
-
if (hw->mac.acquire_swfw_sync(hw, gssr))
err = NGBE_ERR_SWFW_SYNC;
@@ -395,8 +379,6 @@ s32 ngbe_init_phy(struct ngbe_hw *hw)
struct ngbe_phy_info *phy = &hw->phy;
s32 err = 0;
- DEBUGFUNC("ngbe_init_phy");
-
hw->phy.addr = 0;
switch (hw->sub_device_id) {
diff --git a/drivers/net/ngbe/base/ngbe_phy_mvl.c b/drivers/net/ngbe/base/ngbe_phy_mvl.c
index 01cb6b9bb3..a828597e7b 100644
--- a/drivers/net/ngbe/base/ngbe_phy_mvl.c
+++ b/drivers/net/ngbe/base/ngbe_phy_mvl.c
@@ -66,7 +66,7 @@ s32 ngbe_check_phy_mode_mvl(struct ngbe_hw *hw)
hw->phy.media_type = ngbe_media_type_fiber;
hw->mac.link_type = ngbe_link_fiber;
} else {
- DEBUGOUT("marvell 88E1512 mode %x is not supported.\n", value);
+ DEBUGOUT("marvell 88E1512 mode %x is not supported.", value);
return NGBE_ERR_DEVICE_NOT_SUPPORTED;
}
@@ -79,8 +79,6 @@ s32 ngbe_init_phy_mvl(struct ngbe_hw *hw)
u16 value = 0;
int i;
- DEBUGFUNC("ngbe_init_phy_mvl");
-
/* enable interrupts, only link status change and an done is allowed */
ngbe_write_phy_reg_mdi(hw, MVL_PAGE_SEL, 0, 2);
ngbe_read_phy_reg_mdi(hw, MVL_RGM_CTL2, 0, &value);
@@ -98,7 +96,7 @@ s32 ngbe_init_phy_mvl(struct ngbe_hw *hw)
}
if (i == 15) {
- DEBUGOUT("phy reset exceeds maximum waiting period.\n");
+ DEBUGOUT("phy reset exceeds maximum waiting period.");
return NGBE_ERR_TIMEOUT;
}
@@ -137,7 +135,6 @@ s32 ngbe_setup_phy_link_mvl(struct ngbe_hw *hw, u32 speed,
u16 value_r9 = 0;
u16 value;
- DEBUGFUNC("ngbe_setup_phy_link_mvl");
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
if (hw->led_conf == 0xFFFF) {
@@ -170,7 +167,7 @@ s32 ngbe_setup_phy_link_mvl(struct ngbe_hw *hw, u32 speed,
default:
value = MVL_CTRL_SPEED_SELECT0 |
MVL_CTRL_SPEED_SELECT1;
- DEBUGOUT("unknown speed = 0x%x.\n", speed);
+ DEBUGOUT("unknown speed = 0x%x.", speed);
break;
}
/* duplex full */
@@ -235,8 +232,6 @@ s32 ngbe_reset_phy_mvl(struct ngbe_hw *hw)
u16 ctrl = 0;
s32 status = 0;
- DEBUGFUNC("ngbe_reset_phy_mvl");
-
if (hw->phy.type != ngbe_phy_mvl && hw->phy.type != ngbe_phy_mvl_sfi)
return NGBE_ERR_PHY_TYPE;
@@ -261,7 +256,7 @@ s32 ngbe_reset_phy_mvl(struct ngbe_hw *hw)
}
if (i == MVL_PHY_RST_WAIT_PERIOD) {
- DEBUGOUT("PHY reset polling failed to complete.\n");
+ DEBUGOUT("PHY reset polling failed to complete.");
return NGBE_ERR_RESET_FAILED;
}
@@ -309,8 +304,6 @@ s32 ngbe_set_phy_pause_adv_mvl(struct ngbe_hw *hw, u16 pause_bit)
u16 value;
s32 status = 0;
- DEBUGFUNC("ngbe_set_phy_pause_adv_mvl");
-
if (hw->phy.type == ngbe_phy_mvl) {
status = hw->phy.read_reg(hw, MVL_ANA, 0, &value);
value &= ~(MVL_CANA_ASM_PAUSE | MVL_CANA_PAUSE);
@@ -334,8 +327,6 @@ s32 ngbe_check_phy_link_mvl(struct ngbe_hw *hw,
u16 phy_data = 0;
u16 insr = 0;
- DEBUGFUNC("ngbe_check_phy_link_mvl");
-
/* Initialize speed and link to default case */
*link_up = false;
*speed = NGBE_LINK_SPEED_UNKNOWN;
diff --git a/drivers/net/ngbe/base/ngbe_phy_rtl.c b/drivers/net/ngbe/base/ngbe_phy_rtl.c
index f49d829dff..3a2d624ddb 100644
--- a/drivers/net/ngbe/base/ngbe_phy_rtl.c
+++ b/drivers/net/ngbe/base/ngbe_phy_rtl.c
@@ -79,14 +79,14 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
msec_delay(10);
}
if (i == 15) {
- DEBUGOUT("GPhy reset exceeds maximum times.\n");
+ DEBUGOUT("GPhy reset exceeds maximum times.");
return NGBE_ERR_PHY_TIMEOUT;
}
hw->phy.write_reg(hw, RTL_SCR, 0xa46, RTL_SCR_EFUSE);
hw->phy.read_reg(hw, RTL_SCR, 0xa46, &value);
if (!(value & RTL_SCR_EFUSE)) {
- DEBUGOUT("Write EFUSE failed.\n");
+ DEBUGOUT("Write EFUSE failed.");
return NGBE_ERR_PHY_TIMEOUT;
}
@@ -97,13 +97,13 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
msec_delay(1);
}
if (i == 1000)
- DEBUGOUT("PHY wait mdio 1 access timeout.\n");
+ DEBUGOUT("PHY wait mdio 1 access timeout.");
hw->phy.write_reg(hw, RTL_SCR, 0xa46, RTL_SCR_EXTINI);
hw->phy.read_reg(hw, RTL_SCR, 0xa46, &value);
if (!(value & RTL_SCR_EXTINI)) {
- DEBUGOUT("Write EXIINI failed.\n");
+ DEBUGOUT("Write EXIINI failed.");
return NGBE_ERR_PHY_TIMEOUT;
}
@@ -114,7 +114,7 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
msec_delay(1);
}
if (i == 1000)
- DEBUGOUT("PHY wait mdio 2 access timeout.\n");
+ DEBUGOUT("PHY wait mdio 2 access timeout.");
for (i = 0; i < 1000; i++) {
hw->phy.read_reg(hw, RTL_GSR, 0xa42, &value);
@@ -140,8 +140,6 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
u16 autoneg_reg = NGBE_MII_AUTONEG_REG;
u16 value = 0;
- DEBUGFUNC("ngbe_setup_phy_link_rtl");
-
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
hw->phy.read_reg(hw, RTL_INSR, 0xa43, &autoneg_reg);
@@ -161,7 +159,7 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
break;
default:
value = RTL_BMCR_SPEED_SELECT1 | RTL_BMCR_SPEED_SELECT0;
- DEBUGOUT("unknown speed = 0x%x.\n", speed);
+ DEBUGOUT("unknown speed = 0x%x.", speed);
break;
}
/* duplex full */
@@ -253,8 +251,6 @@ s32 ngbe_reset_phy_rtl(struct ngbe_hw *hw)
u16 value = 0;
s32 status = 0;
- DEBUGFUNC("ngbe_reset_phy_rtl");
-
value |= RTL_BMCR_RESET;
status = hw->phy.write_reg(hw, RTL_BMCR, RTL_DEV_ZERO, value);
@@ -313,8 +309,6 @@ s32 ngbe_check_phy_link_rtl(struct ngbe_hw *hw, u32 *speed, bool *link_up)
u16 phy_data = 0;
u16 insr = 0;
- DEBUGFUNC("ngbe_check_phy_link_rtl");
-
hw->phy.read_reg(hw, RTL_INSR, 0xa43, &insr);
/* Initialize speed and link to default case */
diff --git a/drivers/net/ngbe/base/ngbe_phy_yt.c b/drivers/net/ngbe/base/ngbe_phy_yt.c
index 2d184a1c30..34d69707dd 100644
--- a/drivers/net/ngbe/base/ngbe_phy_yt.c
+++ b/drivers/net/ngbe/base/ngbe_phy_yt.c
@@ -102,8 +102,6 @@ s32 ngbe_init_phy_yt(struct ngbe_hw *hw)
{
u16 value = 0;
- DEBUGFUNC("ngbe_init_phy_yt");
-
/* close sds area register */
ngbe_write_phy_reg_ext_yt(hw, YT_SMI_PHY, 0, 0);
/* enable interrupts */
@@ -130,7 +128,6 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
u16 value_r9 = 0;
u16 value;
- DEBUGFUNC("ngbe_setup_phy_link_yt");
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
hw->phy.autoneg_advertised = 0;
@@ -153,7 +150,7 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
default:
value = YT_BCR_SPEED_SELECT0 |
YT_BCR_SPEED_SELECT1;
- DEBUGOUT("unknown speed = 0x%x.\n",
+ DEBUGOUT("unknown speed = 0x%x.",
speed);
break;
}
@@ -324,8 +321,6 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
u16 ctrl = 0;
s32 status = 0;
- DEBUGFUNC("ngbe_reset_phy_yt");
-
if (hw->phy.type != ngbe_phy_yt8521s &&
hw->phy.type != ngbe_phy_yt8521s_sfi)
return NGBE_ERR_PHY_TYPE;
@@ -361,7 +356,7 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
}
if (i == YT_PHY_RST_WAIT_PERIOD) {
- DEBUGOUT("PHY reset polling failed to complete.\n");
+ DEBUGOUT("PHY reset polling failed to complete.");
return NGBE_ERR_RESET_FAILED;
}
@@ -373,8 +368,6 @@ s32 ngbe_get_phy_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
u16 value;
s32 status = 0;
- DEBUGFUNC("ngbe_get_phy_advertised_pause_yt");
-
status = hw->phy.read_reg(hw, YT_ANA, 0, &value);
value &= YT_FANA_PAUSE_MASK;
*pause_bit = (u8)(value >> 7);
@@ -387,8 +380,6 @@ s32 ngbe_get_phy_lp_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
u16 value;
s32 status = 0;
- DEBUGFUNC("ngbe_get_phy_lp_advertised_pause_yt");
-
status = hw->phy.read_reg(hw, YT_LPAR, 0, &value);
value &= YT_FLPAR_PAUSE_MASK;
*pause_bit = (u8)(value >> 7);
@@ -401,9 +392,6 @@ s32 ngbe_set_phy_pause_adv_yt(struct ngbe_hw *hw, u16 pause_bit)
u16 value;
s32 status = 0;
- DEBUGFUNC("ngbe_set_phy_pause_adv_yt");
-
-
status = hw->phy.read_reg(hw, YT_ANA, 0, &value);
value &= ~YT_FANA_PAUSE_MASK;
value |= pause_bit;
@@ -421,8 +409,6 @@ s32 ngbe_check_phy_link_yt(struct ngbe_hw *hw,
u16 phy_data = 0;
u16 insr = 0;
- DEBUGFUNC("ngbe_check_phy_link_yt");
-
/* Initialize speed and link to default case */
*link_up = false;
*speed = NGBE_LINK_SPEED_UNKNOWN;
diff --git a/drivers/net/ngbe/ngbe_logs.h b/drivers/net/ngbe/ngbe_logs.h
index fd306419e6..e5165ffd60 100644
--- a/drivers/net/ngbe/ngbe_logs.h
+++ b/drivers/net/ngbe/ngbe_logs.h
@@ -37,10 +37,7 @@ extern int ngbe_logtype_tx;
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
-#define TLOG_DEBUG(fmt, args...) PMD_DRV_LOG(DEBUG, fmt, ##args)
-
-#define DEBUGOUT(fmt, args...) TLOG_DEBUG(fmt, ##args)
-#define PMD_INIT_FUNC_TRACE() TLOG_DEBUG(" >>")
-#define DEBUGFUNC(fmt) TLOG_DEBUG(fmt)
+#define DEBUGOUT(fmt, args...) PMD_DRV_LOG(DEBUG, fmt, ##args)
+#define PMD_INIT_FUNC_TRACE() PMD_DRV_LOG(DEBUG, ">>")
#endif /* _NGBE_LOGS_H_ */
--
2.21.0.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/2] net/txgbe: fix debug log
2022-02-21 9:21 [PATCH 0/2] Wangxun log fixes Jiawen Wu
2022-02-21 9:21 ` [PATCH 1/2] net/ngbe: fix debug log Jiawen Wu
@ 2022-02-21 9:21 ` Jiawen Wu
2022-02-21 13:10 ` Ferruh Yigit
1 sibling, 1 reply; 6+ messages in thread
From: Jiawen Wu @ 2022-02-21 9:21 UTC (permalink / raw)
To: dev; +Cc: Jiawen Wu, stable
Remove 'DEBUGFUNC' due to too many invalid debug log prints, unify the
DEBUG level macros.
Fixes: 7dc117068a7c ("net/txgbe: support probe and remove")
Cc: stable@dpdk.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
drivers/net/txgbe/base/txgbe_eeprom.c | 37 ++---
drivers/net/txgbe/base/txgbe_hw.c | 196 ++++++--------------------
drivers/net/txgbe/base/txgbe_mbx.c | 38 -----
drivers/net/txgbe/base/txgbe_mng.c | 21 +--
drivers/net/txgbe/base/txgbe_phy.c | 84 ++---------
drivers/net/txgbe/base/txgbe_vf.c | 12 +-
drivers/net/txgbe/txgbe_logs.h | 7 +-
7 files changed, 74 insertions(+), 321 deletions(-)
diff --git a/drivers/net/txgbe/base/txgbe_eeprom.c b/drivers/net/txgbe/base/txgbe_eeprom.c
index 72901cd0b0..1ec7ff7e0d 100644
--- a/drivers/net/txgbe/base/txgbe_eeprom.c
+++ b/drivers/net/txgbe/base/txgbe_eeprom.c
@@ -21,8 +21,6 @@ s32 txgbe_init_eeprom_params(struct txgbe_hw *hw)
u16 eeprom_size;
int err = 0;
- DEBUGFUNC("txgbe_init_eeprom_params");
-
if (eeprom->type != txgbe_eeprom_unknown)
return 0;
@@ -54,12 +52,12 @@ s32 txgbe_init_eeprom_params(struct txgbe_hw *hw)
err = eeprom->read32(hw, TXGBE_SW_REGION_PTR << 1, &eeprom->sw_addr);
if (err) {
- DEBUGOUT("EEPROM read failed.\n");
+ DEBUGOUT("EEPROM read failed.");
return err;
}
DEBUGOUT("eeprom params: type = %d, size = %d, address bits: "
- "%d %d\n", eeprom->type, eeprom->word_size,
+ "%d %d", eeprom->type, eeprom->word_size,
eeprom->address_bits, eeprom->sw_addr);
return 0;
@@ -78,9 +76,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw)
u32 i;
u32 swsm;
- DEBUGFUNC("txgbe_get_eeprom_semaphore");
-
-
/* Get SMBI software semaphore between device drivers first */
for (i = 0; i < timeout; i++) {
/*
@@ -97,7 +92,7 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw)
if (i == timeout) {
DEBUGOUT("Driver can't access the eeprom - SMBI Semaphore "
- "not granted.\n");
+ "not granted.");
/*
* this release is particularly important because our attempts
* above to get the semaphore may have succeeded, and if there
@@ -140,13 +135,13 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw)
* was not granted because we don't have access to the EEPROM
*/
if (i >= timeout) {
- DEBUGOUT("SWESMBI Software EEPROM semaphore not granted.\n");
+ DEBUGOUT("SWESMBI Software EEPROM semaphore not granted.");
txgbe_release_eeprom_semaphore(hw);
status = TXGBE_ERR_EEPROM;
}
} else {
DEBUGOUT("Software semaphore SMBI between device drivers "
- "not granted.\n");
+ "not granted.");
}
return status;
@@ -160,8 +155,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw)
**/
void txgbe_release_eeprom_semaphore(struct txgbe_hw *hw)
{
- DEBUGFUNC("txgbe_release_eeprom_semaphore");
-
wr32m(hw, TXGBE_MNGSWSYNC, TXGBE_MNGSWSYNC_REQ, 0);
wr32m(hw, TXGBE_SWSEM, TXGBE_SWSEM_PF, 0);
txgbe_flush(hw);
@@ -290,8 +283,6 @@ s32 txgbe_ee_write16(struct txgbe_hw *hw, u32 offset,
u32 addr = (offset << 1);
int err;
- DEBUGFUNC("\n");
-
err = hw->mac.acquire_swfw_sync(hw, mask);
if (err)
return err;
@@ -348,8 +339,6 @@ s32 txgbe_ee_writew_sw(struct txgbe_hw *hw, u32 offset,
u32 addr = hw->rom.sw_addr + (offset << 1);
int err;
- DEBUGFUNC("\n");
-
err = hw->mac.acquire_swfw_sync(hw, mask);
if (err)
return err;
@@ -399,11 +388,9 @@ s32 txgbe_calc_eeprom_checksum(struct txgbe_hw *hw)
int err;
u16 buffer[BUFF_SIZE];
- DEBUGFUNC("txgbe_calc_eeprom_checksum");
-
err = hw->rom.readw_sw(hw, TXGBE_EEPROM_CHECKSUM, &read_checksum);
if (err) {
- DEBUGOUT("EEPROM read failed\n");
+ DEBUGOUT("EEPROM read failed");
return err;
}
@@ -437,15 +424,13 @@ s32 txgbe_validate_eeprom_checksum(struct txgbe_hw *hw,
u16 read_checksum = 0;
int err;
- DEBUGFUNC("txgbe_validate_eeprom_checksum");
-
/* Read the first word from the EEPROM. If this times out or fails, do
* not continue or we could be in for a very long wait while every
* EEPROM read fails
*/
err = hw->rom.read16(hw, 0, &checksum);
if (err) {
- DEBUGOUT("EEPROM read failed\n");
+ DEBUGOUT("EEPROM read failed");
return err;
}
@@ -457,7 +442,7 @@ s32 txgbe_validate_eeprom_checksum(struct txgbe_hw *hw,
err = hw->rom.readw_sw(hw, TXGBE_EEPROM_CHECKSUM, &read_checksum);
if (err) {
- DEBUGOUT("EEPROM read failed\n");
+ DEBUGOUT("EEPROM read failed");
return err;
}
@@ -466,7 +451,7 @@ s32 txgbe_validate_eeprom_checksum(struct txgbe_hw *hw,
*/
if (read_checksum != checksum) {
err = TXGBE_ERR_EEPROM_CHECKSUM;
- DEBUGOUT("EEPROM checksum error\n");
+ DEBUGOUT("EEPROM checksum error");
}
/* If the user cares, return the calculated checksum */
@@ -485,15 +470,13 @@ s32 txgbe_update_eeprom_checksum(struct txgbe_hw *hw)
s32 status;
u16 checksum;
- DEBUGFUNC("txgbe_update_eeprom_checksum");
-
/* Read the first word from the EEPROM. If this times out or fails, do
* not continue or we could be in for a very long wait while every
* EEPROM read fails
*/
status = hw->rom.read16(hw, 0, &checksum);
if (status) {
- DEBUGOUT("EEPROM read failed\n");
+ DEBUGOUT("EEPROM read failed");
return status;
}
diff --git a/drivers/net/txgbe/base/txgbe_hw.c b/drivers/net/txgbe/base/txgbe_hw.c
index db8ffe61a4..eaec5b7f8c 100644
--- a/drivers/net/txgbe/base/txgbe_hw.c
+++ b/drivers/net/txgbe/base/txgbe_hw.c
@@ -42,8 +42,6 @@ bool txgbe_device_supports_autoneg_fc(struct txgbe_hw *hw)
u32 speed;
bool link_up;
- DEBUGFUNC("txgbe_device_supports_autoneg_fc");
-
switch (hw->phy.media_type) {
case txgbe_media_type_fiber_qsfp:
case txgbe_media_type_fiber:
@@ -93,11 +91,9 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw)
u32 value = 0;
u64 reg_bp = 0;
- DEBUGFUNC("txgbe_setup_fc");
-
/* Validate the requested mode */
if (hw->fc.strict_ieee && hw->fc.requested_mode == txgbe_fc_rx_pause) {
- DEBUGOUT("txgbe_fc_rx_pause not valid in strict IEEE mode\n");
+ DEBUGOUT("txgbe_fc_rx_pause not valid in strict IEEE mode");
err = TXGBE_ERR_INVALID_LINK_SETTINGS;
goto out;
}
@@ -149,7 +145,7 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw)
SR_AN_MMD_ADV_REG1_PAUSE_ASM;
break;
default:
- DEBUGOUT("Flow control param set incorrectly\n");
+ DEBUGOUT("Flow control param set incorrectly");
err = TXGBE_ERR_CONFIG;
goto out;
}
@@ -180,7 +176,7 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw)
TXGBE_MD_DEV_AUTO_NEG, reg_cu);
}
- DEBUGOUT("Set up FC; reg = 0x%08X\n", reg);
+ DEBUGOUT("Set up FC; reg = 0x%08X", reg);
out:
return err;
}
@@ -199,8 +195,6 @@ s32 txgbe_start_hw(struct txgbe_hw *hw)
s32 err;
u16 device_caps;
- DEBUGFUNC("txgbe_start_hw");
-
/* Set the media type */
hw->phy.media_type = hw->phy.get_media_type(hw);
@@ -213,7 +207,7 @@ s32 txgbe_start_hw(struct txgbe_hw *hw)
/* Setup flow control */
err = txgbe_setup_fc(hw);
if (err != 0 && err != TXGBE_NOT_IMPLEMENTED) {
- DEBUGOUT("Flow control setup failed, returning %d\n", err);
+ DEBUGOUT("Flow control setup failed, returning %d", err);
return err;
}
@@ -275,8 +269,6 @@ s32 txgbe_init_hw(struct txgbe_hw *hw)
{
s32 status;
- DEBUGFUNC("txgbe_init_hw");
-
/* Get firmware version */
hw->phy.get_fw_version(hw, &hw->fw_version);
@@ -288,7 +280,7 @@ s32 txgbe_init_hw(struct txgbe_hw *hw)
}
if (status != 0)
- DEBUGOUT("Failed to initialize HW, STATUS = %d\n", status);
+ DEBUGOUT("Failed to initialize HW, STATUS = %d", status);
return status;
}
@@ -304,8 +296,6 @@ s32 txgbe_clear_hw_cntrs(struct txgbe_hw *hw)
{
u16 i = 0;
- DEBUGFUNC("txgbe_clear_hw_cntrs");
-
/* QP Stats */
/* don't write clear queue stats */
for (i = 0; i < TXGBE_MAX_QP; i++) {
@@ -425,8 +415,6 @@ s32 txgbe_get_mac_addr(struct txgbe_hw *hw, u8 *mac_addr)
u32 rar_low;
u16 i;
- DEBUGFUNC("txgbe_get_mac_addr");
-
wr32(hw, TXGBE_ETHADDRIDX, 0);
rar_high = rd32(hw, TXGBE_ETHADDRH);
rar_low = rd32(hw, TXGBE_ETHADDRL);
@@ -452,8 +440,6 @@ void txgbe_set_lan_id_multi_port(struct txgbe_hw *hw)
struct txgbe_bus_info *bus = &hw->bus;
u32 reg;
- DEBUGFUNC("txgbe_set_lan_id_multi_port_pcie");
-
reg = rd32(hw, TXGBE_PORTSTAT);
bus->lan_id = TXGBE_PORTSTAT_ID(reg);
@@ -479,8 +465,6 @@ s32 txgbe_stop_hw(struct txgbe_hw *hw)
u32 reg_val;
u16 i;
- DEBUGFUNC("txgbe_stop_hw");
-
/*
* Set the adapter_stopped flag so other driver functions stop touching
* the hardware
@@ -527,8 +511,6 @@ s32 txgbe_led_on(struct txgbe_hw *hw, u32 index)
{
u32 led_reg = rd32(hw, TXGBE_LEDCTL);
- DEBUGFUNC("txgbe_led_on");
-
/* To turn on the LED, set mode to ON. */
led_reg |= index << TXGBE_LEDCTL_ORD_SHIFT;
led_reg |= index;
@@ -547,8 +529,6 @@ s32 txgbe_led_off(struct txgbe_hw *hw, u32 index)
{
u32 led_reg = rd32(hw, TXGBE_LEDCTL);
- DEBUGFUNC("txgbe_led_off");
-
/* To turn off the LED, set mode to OFF. */
led_reg &= ~(index << TXGBE_LEDCTL_ORD_SHIFT);
led_reg |= index;
@@ -568,8 +548,6 @@ s32 txgbe_validate_mac_addr(u8 *mac_addr)
{
s32 status = 0;
- DEBUGFUNC("txgbe_validate_mac_addr");
-
/* Make sure it is not a multicast address */
if (TXGBE_IS_MULTICAST(mac_addr)) {
status = TXGBE_ERR_INVALID_MAC_ADDR;
@@ -600,11 +578,9 @@ s32 txgbe_set_rar(struct txgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
u32 rar_low, rar_high;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("txgbe_set_rar");
-
/* Make sure we are using a valid rar index range */
if (index >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", index);
+ DEBUGOUT("RAR index %d is out of range.", index);
return TXGBE_ERR_INVALID_ARGUMENT;
}
@@ -652,11 +628,9 @@ s32 txgbe_clear_rar(struct txgbe_hw *hw, u32 index)
u32 rar_high;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("txgbe_clear_rar");
-
/* Make sure we are using a valid rar index range */
if (index >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", index);
+ DEBUGOUT("RAR index %d is out of range.", index);
return TXGBE_ERR_INVALID_ARGUMENT;
}
@@ -692,8 +666,6 @@ s32 txgbe_init_rx_addrs(struct txgbe_hw *hw)
u32 psrctl;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("txgbe_init_rx_addrs");
-
/*
* If the current mac address is valid, assume it is a software override
* to the permanent address.
@@ -704,18 +676,16 @@ s32 txgbe_init_rx_addrs(struct txgbe_hw *hw)
/* Get the MAC address from the RAR0 for later reference */
hw->mac.get_mac_addr(hw, hw->mac.addr);
- DEBUGOUT(" Keeping Current RAR0 Addr =%.2X %.2X %.2X ",
+ DEBUGOUT(" Keeping Current RAR0 Addr =%.2X %.2X %.2X %.2X %.2X %.2X",
hw->mac.addr[0], hw->mac.addr[1],
- hw->mac.addr[2]);
- DEBUGOUT("%.2X %.2X %.2X\n", hw->mac.addr[3],
+ hw->mac.addr[2], hw->mac.addr[3],
hw->mac.addr[4], hw->mac.addr[5]);
} else {
/* Setup the receive address. */
- DEBUGOUT("Overriding MAC Address in RAR[0]\n");
- DEBUGOUT(" New MAC Addr =%.2X %.2X %.2X ",
+ DEBUGOUT("Overriding MAC Address in RAR[0]");
+ DEBUGOUT(" New MAC Addr =%.2X %.2X %.2X %.2X %.2X %.2X",
hw->mac.addr[0], hw->mac.addr[1],
- hw->mac.addr[2]);
- DEBUGOUT("%.2X %.2X %.2X\n", hw->mac.addr[3],
+ hw->mac.addr[2], hw->mac.addr[3],
hw->mac.addr[4], hw->mac.addr[5]);
hw->mac.set_rar(hw, 0, hw->mac.addr, 0, true);
@@ -729,7 +699,7 @@ s32 txgbe_init_rx_addrs(struct txgbe_hw *hw)
hw->addr_ctrl.rar_used_count = 1;
/* Zero out the other receive addresses. */
- DEBUGOUT("Clearing RAR[1-%d]\n", rar_entries - 1);
+ DEBUGOUT("Clearing RAR[1-%d]", rar_entries - 1);
for (i = 1; i < rar_entries; i++) {
wr32(hw, TXGBE_ETHADDRIDX, i);
wr32(hw, TXGBE_ETHADDRL, 0);
@@ -743,7 +713,7 @@ s32 txgbe_init_rx_addrs(struct txgbe_hw *hw)
psrctl |= TXGBE_PSRCTL_ADHF12(hw->mac.mc_filter_type);
wr32(hw, TXGBE_PSRCTL, psrctl);
- DEBUGOUT(" Clearing MTA\n");
+ DEBUGOUT(" Clearing MTA");
for (i = 0; i < hw->mac.mcft_size; i++)
wr32(hw, TXGBE_MCADDRTBL(i), 0);
@@ -768,8 +738,6 @@ static s32 txgbe_mta_vector(struct txgbe_hw *hw, u8 *mc_addr)
{
u32 vector = 0;
- DEBUGFUNC("txgbe_mta_vector");
-
switch (hw->mac.mc_filter_type) {
case 0: /* use bits [47:36] of the address */
vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
@@ -784,7 +752,7 @@ static s32 txgbe_mta_vector(struct txgbe_hw *hw, u8 *mc_addr)
vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
break;
default: /* Invalid mc_filter_type */
- DEBUGOUT("MC filter type param set incorrectly\n");
+ DEBUGOUT("MC filter type param set incorrectly");
ASSERT(0);
break;
}
@@ -807,12 +775,10 @@ void txgbe_set_mta(struct txgbe_hw *hw, u8 *mc_addr)
u32 vector_bit;
u32 vector_reg;
- DEBUGFUNC("txgbe_set_mta");
-
hw->addr_ctrl.mta_in_use++;
vector = txgbe_mta_vector(hw, mc_addr);
- DEBUGOUT(" bit-vector = 0x%03X\n", vector);
+ DEBUGOUT(" bit-vector = 0x%03X", vector);
/*
* The MTA is a register array of 128 32-bit registers. It is treated
@@ -846,8 +812,6 @@ s32 txgbe_update_mc_addr_list(struct txgbe_hw *hw, u8 *mc_addr_list,
u32 i;
u32 vmdq;
- DEBUGFUNC("txgbe_update_mc_addr_list");
-
/*
* Set the new number of MC addresses that we are being requested to
* use.
@@ -857,13 +821,13 @@ s32 txgbe_update_mc_addr_list(struct txgbe_hw *hw, u8 *mc_addr_list,
/* Clear mta_shadow */
if (clear) {
- DEBUGOUT(" Clearing MTA\n");
+ DEBUGOUT(" Clearing MTA");
memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
}
/* Update mta_shadow */
for (i = 0; i < mc_addr_count; i++) {
- DEBUGOUT(" Adding the multicast addresses:\n");
+ DEBUGOUT(" Adding the multicast addresses:");
txgbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq));
}
@@ -880,7 +844,7 @@ s32 txgbe_update_mc_addr_list(struct txgbe_hw *hw, u8 *mc_addr_list,
wr32(hw, TXGBE_PSRCTL, psrctl);
}
- DEBUGOUT("txgbe update mc addr list complete\n");
+ DEBUGOUT("txgbe update mc addr list complete");
return 0;
}
@@ -898,8 +862,6 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)
u32 fcrtl, fcrth;
int i;
- DEBUGFUNC("txgbe_fc_enable");
-
/* Validate the water mark configuration */
if (!hw->fc.pause_time) {
err = TXGBE_ERR_INVALID_LINK_SETTINGS;
@@ -912,7 +874,7 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)
hw->fc.high_water[i]) {
if (!hw->fc.low_water[i] ||
hw->fc.low_water[i] >= hw->fc.high_water[i]) {
- DEBUGOUT("Invalid water mark configuration\n");
+ DEBUGOUT("Invalid water mark configuration");
err = TXGBE_ERR_INVALID_LINK_SETTINGS;
goto out;
}
@@ -970,7 +932,7 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)
fccfg_reg |= TXGBE_TXFCCFG_FC;
break;
default:
- DEBUGOUT("Flow control param set incorrectly\n");
+ DEBUGOUT("Flow control param set incorrectly");
err = TXGBE_ERR_CONFIG;
goto out;
}
@@ -1032,7 +994,7 @@ s32 txgbe_negotiate_fc(struct txgbe_hw *hw, u32 adv_reg, u32 lp_reg,
{
if ((!(adv_reg)) || (!(lp_reg))) {
DEBUGOUT("Local or link partner's advertised flow control "
- "settings are NULL. Local: %x, link partner: %x\n",
+ "settings are NULL. Local: %x, link partner: %x",
adv_reg, lp_reg);
return TXGBE_ERR_FC_NOT_NEGOTIATED;
}
@@ -1047,22 +1009,22 @@ s32 txgbe_negotiate_fc(struct txgbe_hw *hw, u32 adv_reg, u32 lp_reg,
*/
if (hw->fc.requested_mode == txgbe_fc_full) {
hw->fc.current_mode = txgbe_fc_full;
- DEBUGOUT("Flow Control = FULL.\n");
+ DEBUGOUT("Flow Control = FULL.");
} else {
hw->fc.current_mode = txgbe_fc_rx_pause;
- DEBUGOUT("Flow Control=RX PAUSE frames only\n");
+ DEBUGOUT("Flow Control=RX PAUSE frames only");
}
} else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
hw->fc.current_mode = txgbe_fc_tx_pause;
- DEBUGOUT("Flow Control = TX PAUSE frames only.\n");
+ DEBUGOUT("Flow Control = TX PAUSE frames only.");
} else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
!(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
hw->fc.current_mode = txgbe_fc_rx_pause;
- DEBUGOUT("Flow Control = RX PAUSE frames only.\n");
+ DEBUGOUT("Flow Control = RX PAUSE frames only.");
} else {
hw->fc.current_mode = txgbe_fc_none;
- DEBUGOUT("Flow Control = NONE.\n");
+ DEBUGOUT("Flow Control = NONE.");
}
return 0;
}
@@ -1162,8 +1124,6 @@ void txgbe_fc_autoneg(struct txgbe_hw *hw)
u32 speed;
bool link_up;
- DEBUGFUNC("txgbe_fc_autoneg");
-
/*
* AN should have completed when the cable was plugged in.
* Look for reasons to bail out. Bail out if:
@@ -1229,8 +1189,6 @@ s32 txgbe_acquire_swfw_sync(struct txgbe_hw *hw, u32 mask)
u32 timeout = 200;
u32 i;
- DEBUGFUNC("txgbe_acquire_swfw_sync");
-
for (i = 0; i < timeout; i++) {
/*
* SW NVM semaphore bit is used for access to all
@@ -1273,8 +1231,6 @@ void txgbe_release_swfw_sync(struct txgbe_hw *hw, u32 mask)
u32 mngsem;
u32 swmask = mask;
- DEBUGFUNC("txgbe_release_swfw_sync");
-
txgbe_get_eeprom_semaphore(hw);
mngsem = rd32(hw, TXGBE_MNGSEM);
@@ -1298,8 +1254,6 @@ s32 txgbe_disable_sec_rx_path(struct txgbe_hw *hw)
int i;
u32 secrxreg;
- DEBUGFUNC("txgbe_disable_sec_rx_path");
-
secrxreg = rd32(hw, TXGBE_SECRXCTL);
secrxreg |= TXGBE_SECRXCTL_XDSA;
wr32(hw, TXGBE_SECRXCTL, secrxreg);
@@ -1315,7 +1269,7 @@ s32 txgbe_disable_sec_rx_path(struct txgbe_hw *hw)
/* For informational purposes only */
if (i >= TXGBE_MAX_SECRX_POLL)
DEBUGOUT("Rx unit being enabled before security "
- "path fully disabled. Continuing with init.\n");
+ "path fully disabled. Continuing with init.");
return 0;
}
@@ -1330,8 +1284,6 @@ s32 txgbe_enable_sec_rx_path(struct txgbe_hw *hw)
{
u32 secrxreg;
- DEBUGFUNC("txgbe_enable_sec_rx_path");
-
secrxreg = rd32(hw, TXGBE_SECRXCTL);
secrxreg &= ~TXGBE_SECRXCTL_XDSA;
wr32(hw, TXGBE_SECRXCTL, secrxreg);
@@ -1367,7 +1319,7 @@ int txgbe_disable_sec_tx_path(struct txgbe_hw *hw)
/* For informational purposes only */
if (i >= TXGBE_MAX_SECTX_POLL)
- PMD_DRV_LOG(DEBUG, "Tx unit being enabled before security "
+ DEBUGOUT("Tx unit being enabled before security "
"path fully disabled. Continuing with init.");
return 0;
@@ -1405,8 +1357,6 @@ static s32 txgbe_get_san_mac_addr_offset(struct txgbe_hw *hw,
{
s32 err;
- DEBUGFUNC("txgbe_get_san_mac_addr_offset");
-
/*
* First read the EEPROM pointer to see if the MAC addresses are
* available.
@@ -1437,8 +1387,6 @@ s32 txgbe_get_san_mac_addr(struct txgbe_hw *hw, u8 *san_mac_addr)
u8 i;
s32 err;
- DEBUGFUNC("txgbe_get_san_mac_addr");
-
/*
* First read the EEPROM pointer to see if the MAC addresses are
* available. If they're not, no point in calling set_lan_id() here.
@@ -1487,8 +1435,6 @@ s32 txgbe_set_san_mac_addr(struct txgbe_hw *hw, u8 *san_mac_addr)
u16 san_mac_data, san_mac_offset;
u8 i;
- DEBUGFUNC("txgbe_set_san_mac_addr");
-
/* Look for SAN mac address pointer. If not defined, return */
err = txgbe_get_san_mac_addr_offset(hw, &san_mac_offset);
if (err || san_mac_offset == 0 || san_mac_offset == 0xFFFF)
@@ -1519,11 +1465,9 @@ s32 txgbe_clear_vmdq(struct txgbe_hw *hw, u32 rar, u32 vmdq)
u32 mpsar_lo, mpsar_hi;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("txgbe_clear_vmdq");
-
/* Make sure we are using a valid rar index range */
if (rar >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", rar);
+ DEBUGOUT("RAR index %d is out of range.", rar);
return TXGBE_ERR_INVALID_ARGUMENT;
}
@@ -1573,11 +1517,9 @@ s32 txgbe_set_vmdq(struct txgbe_hw *hw, u32 rar, u32 vmdq)
u32 mpsar;
u32 rar_entries = hw->mac.num_rar_entries;
- DEBUGFUNC("txgbe_set_vmdq");
-
/* Make sure we are using a valid rar index range */
if (rar >= rar_entries) {
- DEBUGOUT("RAR index %d is out of range.\n", rar);
+ DEBUGOUT("RAR index %d is out of range.", rar);
return TXGBE_ERR_INVALID_ARGUMENT;
}
@@ -1602,8 +1544,7 @@ s32 txgbe_init_uta_tables(struct txgbe_hw *hw)
{
int i;
- DEBUGFUNC("txgbe_init_uta_tables");
- DEBUGOUT(" Clearing UTA\n");
+ DEBUGOUT(" Clearing UTA");
for (i = 0; i < 128; i++)
wr32(hw, TXGBE_UCADDRTBL(i), 0);
@@ -1658,7 +1599,7 @@ s32 txgbe_find_vlvf_slot(struct txgbe_hw *hw, u32 vlan, bool vlvf_bypass)
* slot we found during our search, else error.
*/
if (!first_empty_slot)
- DEBUGOUT("No space in VLVF.\n");
+ DEBUGOUT("No space in VLVF.");
return first_empty_slot ? first_empty_slot : TXGBE_ERR_NO_SPACE;
}
@@ -1679,8 +1620,6 @@ s32 txgbe_set_vfta(struct txgbe_hw *hw, u32 vlan, u32 vind,
u32 regidx, vfta_delta, vfta;
s32 err;
- DEBUGFUNC("txgbe_set_vfta");
-
if (vlan > 4095 || vind > 63)
return TXGBE_ERR_PARAM;
@@ -1748,8 +1687,6 @@ s32 txgbe_set_vlvf(struct txgbe_hw *hw, u32 vlan, u32 vind,
u32 portctl;
s32 vlvf_index;
- DEBUGFUNC("txgbe_set_vlvf");
-
if (vlan > 4095 || vind > 63)
return TXGBE_ERR_PARAM;
@@ -1829,8 +1766,6 @@ s32 txgbe_clear_vfta(struct txgbe_hw *hw)
{
u32 offset;
- DEBUGFUNC("txgbe_clear_vfta");
-
for (offset = 0; offset < hw->mac.vft_size; offset++)
wr32(hw, TXGBE_VLANTBL(offset), 0);
@@ -1884,8 +1819,6 @@ s32 txgbe_check_mac_link(struct txgbe_hw *hw, u32 *speed,
u32 links_reg, links_orig;
u32 i;
- DEBUGFUNC("txgbe_check_mac_link");
-
/* If Crosstalk fix enabled do the sanity check of making sure
* the SFP+ cage is full.
*/
@@ -1916,7 +1849,7 @@ s32 txgbe_check_mac_link(struct txgbe_hw *hw, u32 *speed,
links_reg = rd32(hw, TXGBE_PORTSTAT);
if (links_orig != links_reg) {
- DEBUGOUT("LINKS changed from %08X to %08X\n",
+ DEBUGOUT("LINKS changed from %08X to %08X",
links_orig, links_reg);
}
@@ -1971,8 +1904,6 @@ s32 txgbe_get_wwn_prefix(struct txgbe_hw *hw, u16 *wwnn_prefix,
u16 offset, caps;
u16 alt_san_mac_blk_offset;
- DEBUGFUNC("txgbe_get_wwn_prefix");
-
/* clear output first */
*wwnn_prefix = 0xFFFF;
*wwpn_prefix = 0xFFFF;
@@ -2062,8 +1993,6 @@ void txgbe_set_ethertype_anti_spoofing(struct txgbe_hw *hw,
**/
s32 txgbe_get_device_caps(struct txgbe_hw *hw, u16 *device_caps)
{
- DEBUGFUNC("txgbe_get_device_caps");
-
hw->rom.readw_sw(hw, TXGBE_DEVICE_CAPS, device_caps);
return 0;
@@ -2185,8 +2114,6 @@ s32 txgbe_get_thermal_sensor_data(struct txgbe_hw *hw)
s64 tsv;
u32 ts_stat;
- DEBUGFUNC("txgbe_get_thermal_sensor_data");
-
/* Only support thermal sensors attached to physical port 0 */
if (hw->bus.lan_id != 0)
return TXGBE_NOT_IMPLEMENTED;
@@ -2217,8 +2144,6 @@ s32 txgbe_init_thermal_sensor_thresh(struct txgbe_hw *hw)
{
struct txgbe_thermal_sensor_data *data = &hw->mac.thermal_sensor_data;
- DEBUGFUNC("txgbe_init_thermal_sensor_thresh");
-
memset(data, 0, sizeof(struct txgbe_thermal_sensor_data));
if (hw->bus.lan_id != 0)
@@ -2289,8 +2214,6 @@ s32 txgbe_setup_mac_link_multispeed_fiber(struct txgbe_hw *hw,
u32 i = 0;
bool autoneg, link_up = false;
- DEBUGFUNC("txgbe_setup_mac_link_multispeed_fiber");
-
/* Mask off requested but non-supported speeds */
status = hw->mac.get_link_capabilities(hw, &link_speed, &autoneg);
if (status != 0)
@@ -2315,7 +2238,7 @@ s32 txgbe_setup_mac_link_multispeed_fiber(struct txgbe_hw *hw,
/* QSFP module automatically detects MAC link speed */
break;
default:
- DEBUGOUT("Unexpected media type.\n");
+ DEBUGOUT("Unexpected media type.");
break;
}
@@ -2365,7 +2288,7 @@ s32 txgbe_setup_mac_link_multispeed_fiber(struct txgbe_hw *hw,
/* QSFP module automatically detects link speed */
break;
default:
- DEBUGOUT("Unexpected media type.\n");
+ DEBUGOUT("Unexpected media type.");
break;
}
@@ -2431,8 +2354,6 @@ s32 txgbe_init_shared_code(struct txgbe_hw *hw)
{
s32 status;
- DEBUGFUNC("txgbe_init_shared_code");
-
/*
* Set the mac type
*/
@@ -2468,8 +2389,6 @@ s32 txgbe_set_mac_type(struct txgbe_hw *hw)
{
s32 err = 0;
- DEBUGFUNC("txgbe_set_mac_type");
-
if (hw->vendor_id != PCI_VENDOR_ID_WANGXUN) {
DEBUGOUT("Unsupported vendor id: %x", hw->vendor_id);
return TXGBE_ERR_DEVICE_NOT_SUPPORTED;
@@ -2491,7 +2410,7 @@ s32 txgbe_set_mac_type(struct txgbe_hw *hw)
break;
}
- DEBUGOUT("found mac: %d, returns: %d\n",
+ DEBUGOUT("found mac: %d, returns: %d",
hw->mac.type, err);
return err;
}
@@ -2500,8 +2419,6 @@ void txgbe_init_mac_link_ops(struct txgbe_hw *hw)
{
struct txgbe_mac_info *mac = &hw->mac;
- DEBUGFUNC("txgbe_init_mac_link_ops");
-
/*
* enable the laser control functions for SFP+ fiber
* and MNG not enabled
@@ -2544,8 +2461,6 @@ s32 txgbe_init_phy_raptor(struct txgbe_hw *hw)
struct txgbe_phy_info *phy = &hw->phy;
s32 err = 0;
- DEBUGFUNC("txgbe_init_phy_raptor");
-
if ((hw->device_id & 0xFF) == TXGBE_DEV_ID_QSFP) {
/* Store flag indicating I2C bus access control unit. */
hw->phy.qsfp_shared_i2c_bus = TRUE;
@@ -2592,8 +2507,6 @@ s32 txgbe_setup_sfp_modules(struct txgbe_hw *hw)
{
s32 err = 0;
- DEBUGFUNC("txgbe_setup_sfp_modules");
-
if (hw->phy.sfp_type == txgbe_sfp_type_unknown)
return 0;
@@ -2613,7 +2526,7 @@ s32 txgbe_setup_sfp_modules(struct txgbe_hw *hw)
msec_delay(hw->rom.semaphore_delay);
if (err) {
- DEBUGOUT("sfp module setup not complete\n");
+ DEBUGOUT("sfp module setup not complete");
return TXGBE_ERR_SFP_SETUP_NOT_COMPLETE;
}
@@ -2711,8 +2624,6 @@ s32 txgbe_init_ops_pf(struct txgbe_hw *hw)
struct txgbe_rom_info *rom = &hw->rom;
struct txgbe_mbx_info *mbx = &hw->mbx;
- DEBUGFUNC("txgbe_init_ops_pf");
-
/* BUS */
bus->set_lan_id = txgbe_set_lan_id_multi_port;
@@ -2839,8 +2750,6 @@ s32 txgbe_get_link_capabilities_raptor(struct txgbe_hw *hw,
s32 status = 0;
u32 autoc = 0;
- DEBUGFUNC("txgbe_get_link_capabilities_raptor");
-
/* Check if 1G SFP module. */
if (hw->phy.sfp_type == txgbe_sfp_type_1g_cu_core0 ||
hw->phy.sfp_type == txgbe_sfp_type_1g_cu_core1 ||
@@ -2944,8 +2853,6 @@ u32 txgbe_get_media_type_raptor(struct txgbe_hw *hw)
{
u32 media_type;
- DEBUGFUNC("txgbe_get_media_type_raptor");
-
if (hw->phy.ffe_set)
txgbe_bp_mode_set(hw);
@@ -3004,8 +2911,6 @@ s32 txgbe_start_mac_link_raptor(struct txgbe_hw *hw,
s32 status = 0;
bool got_lock = false;
- DEBUGFUNC("txgbe_start_mac_link_raptor");
-
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
/* reset_pipeline requires us to hold this lock as it writes to
@@ -3095,8 +3000,6 @@ void txgbe_enable_tx_laser_multispeed_fiber(struct txgbe_hw *hw)
**/
void txgbe_flap_tx_laser_multispeed_fiber(struct txgbe_hw *hw)
{
- DEBUGFUNC("txgbe_flap_tx_laser_multispeed_fiber");
-
/* Blocked by MNG FW so bail */
if (txgbe_check_reset_blocked(hw))
return;
@@ -3128,7 +3031,7 @@ void txgbe_set_hard_rate_select_speed(struct txgbe_hw *hw,
esdp_reg &= ~(TXGBE_GPIOBIT_4 | TXGBE_GPIOBIT_5);
break;
default:
- DEBUGOUT("Invalid fixed module speed\n");
+ DEBUGOUT("Invalid fixed module speed");
return;
}
@@ -3154,8 +3057,6 @@ s32 txgbe_setup_mac_link_smartspeed(struct txgbe_hw *hw,
bool link_up = false;
u32 autoc_reg = rd32_epcs(hw, SR_AN_MMD_ADV_REG1);
- DEBUGFUNC("txgbe_setup_mac_link_smartspeed");
-
/* Set autoneg_advertised value based on input link speed */
hw->phy.autoneg_advertised = 0;
@@ -3245,7 +3146,7 @@ s32 txgbe_setup_mac_link_smartspeed(struct txgbe_hw *hw,
out:
if (link_up && link_speed == TXGBE_LINK_SPEED_1GB_FULL)
DEBUGOUT("Smartspeed has downgraded the link speed "
- "from the maximum advertised\n");
+ "from the maximum advertised");
return status;
}
@@ -3271,7 +3172,6 @@ s32 txgbe_setup_mac_link(struct txgbe_hw *hw,
u64 orig_autoc = 0;
u32 link_capabilities = TXGBE_LINK_SPEED_UNKNOWN;
- DEBUGFUNC("txgbe_setup_mac_link");
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
/* Check to see if speed passed in is supported. */
@@ -3358,8 +3258,6 @@ static s32 txgbe_setup_copper_link_raptor(struct txgbe_hw *hw,
{
s32 status;
- DEBUGFUNC("txgbe_setup_copper_link_raptor");
-
/* Setup the PHY according to input speed */
status = hw->phy.setup_link_speed(hw, speed,
autoneg_wait_to_complete);
@@ -3468,8 +3366,6 @@ s32 txgbe_reset_hw(struct txgbe_hw *hw)
s32 status;
u32 autoc;
- DEBUGFUNC("txgbe_reset_hw");
-
/* Call adapter stop to disable tx/rx and clear interrupts */
status = hw->mac.stop_hw(hw);
if (status != 0)
@@ -3625,15 +3521,13 @@ s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw)
u32 fdircmd;
fdirctrl &= ~TXGBE_FDIRCTL_INITDONE;
- DEBUGFUNC("txgbe_reinit_fdir_tables");
-
/*
* Before starting reinitialization process,
* FDIRPICMD.OP must be zero.
*/
err = txgbe_fdir_check_cmd_complete(hw, &fdircmd);
if (err) {
- DEBUGOUT("Flow Director previous command did not complete, aborting table re-initialization.\n");
+ DEBUGOUT("Flow Director previous command did not complete, aborting table re-initialization.");
return err;
}
@@ -3667,7 +3561,7 @@ s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw)
msec_delay(1);
}
if (i >= TXGBE_FDIR_INIT_DONE_POLL) {
- DEBUGOUT("Flow Director Signature poll time exceeded!\n");
+ DEBUGOUT("Flow Director Signature poll time exceeded!");
return TXGBE_ERR_FDIR_REINIT_FAILED;
}
@@ -3693,8 +3587,6 @@ s32 txgbe_start_hw_raptor(struct txgbe_hw *hw)
{
s32 err = 0;
- DEBUGFUNC("txgbe_start_hw_raptor");
-
err = txgbe_start_hw(hw);
if (err != 0)
goto out;
@@ -3719,8 +3611,6 @@ s32 txgbe_start_hw_raptor(struct txgbe_hw *hw)
**/
s32 txgbe_enable_rx_dma_raptor(struct txgbe_hw *hw, u32 regval)
{
- DEBUGFUNC("txgbe_enable_rx_dma_raptor");
-
/*
* Workaround silicon errata when enabling the Rx datapath.
* If traffic is incoming before we enable the Rx unit, it could hang
@@ -3753,8 +3643,6 @@ bool txgbe_verify_lesm_fw_enabled_raptor(struct txgbe_hw *hw)
u16 fw_offset, fw_lesm_param_offset, fw_lesm_state;
s32 status;
- DEBUGFUNC("txgbe_verify_lesm_fw_enabled_raptor");
-
/* get the offset to the Firmware Module block */
status = hw->rom.read16(hw, TXGBE_FW_PTR, &fw_offset);
diff --git a/drivers/net/txgbe/base/txgbe_mbx.c b/drivers/net/txgbe/base/txgbe_mbx.c
index 4d64c6c3e9..7f2489a13f 100644
--- a/drivers/net/txgbe/base/txgbe_mbx.c
+++ b/drivers/net/txgbe/base/txgbe_mbx.c
@@ -21,8 +21,6 @@ s32 txgbe_read_mbx(struct txgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_read_mbx");
-
/* limit read to size of mailbox */
if (size > mbx->size)
size = mbx->size;
@@ -47,8 +45,6 @@ s32 txgbe_write_mbx(struct txgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = 0;
- DEBUGFUNC("txgbe_write_mbx");
-
if (size > mbx->size) {
ret_val = TXGBE_ERR_MBX;
DEBUGOUT("Invalid mailbox message size %d", size);
@@ -71,8 +67,6 @@ s32 txgbe_check_for_msg(struct txgbe_hw *hw, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_check_for_msg");
-
if (mbx->check_for_msg)
ret_val = mbx->check_for_msg(hw, mbx_id);
@@ -91,8 +85,6 @@ s32 txgbe_check_for_ack(struct txgbe_hw *hw, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_check_for_ack");
-
if (mbx->check_for_ack)
ret_val = mbx->check_for_ack(hw, mbx_id);
@@ -111,8 +103,6 @@ s32 txgbe_check_for_rst(struct txgbe_hw *hw, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_check_for_rst");
-
if (mbx->check_for_rst)
ret_val = mbx->check_for_rst(hw, mbx_id);
@@ -131,8 +121,6 @@ STATIC s32 txgbe_poll_for_msg(struct txgbe_hw *hw, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
int countdown = mbx->timeout;
- DEBUGFUNC("txgbe_poll_for_msg");
-
if (!countdown || !mbx->check_for_msg)
goto out;
@@ -162,8 +150,6 @@ STATIC s32 txgbe_poll_for_ack(struct txgbe_hw *hw, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
int countdown = mbx->timeout;
- DEBUGFUNC("txgbe_poll_for_ack");
-
if (!countdown || !mbx->check_for_ack)
goto out;
@@ -196,8 +182,6 @@ s32 txgbe_read_posted_mbx(struct txgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
struct txgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_read_posted_mbx");
-
if (!mbx->read)
goto out;
@@ -226,8 +210,6 @@ s32 txgbe_write_posted_mbx(struct txgbe_hw *hw, u32 *msg, u16 size,
struct txgbe_mbx_info *mbx = &hw->mbx;
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_write_posted_mbx");
-
/* exit if either we can't write or there isn't a defined timeout */
if (!mbx->write || !mbx->timeout)
goto out;
@@ -292,7 +274,6 @@ s32 txgbe_check_for_msg_vf(struct txgbe_hw *hw, u16 mbx_id)
s32 ret_val = TXGBE_ERR_MBX;
UNREFERENCED_PARAMETER(mbx_id);
- DEBUGFUNC("txgbe_check_for_msg_vf");
if (!txgbe_check_for_bit_vf(hw, TXGBE_VFMBCTL_PFSTS)) {
ret_val = 0;
@@ -314,7 +295,6 @@ s32 txgbe_check_for_ack_vf(struct txgbe_hw *hw, u16 mbx_id)
s32 ret_val = TXGBE_ERR_MBX;
UNREFERENCED_PARAMETER(mbx_id);
- DEBUGFUNC("txgbe_check_for_ack_vf");
if (!txgbe_check_for_bit_vf(hw, TXGBE_VFMBCTL_PFACK)) {
ret_val = 0;
@@ -336,7 +316,6 @@ s32 txgbe_check_for_rst_vf(struct txgbe_hw *hw, u16 mbx_id)
s32 ret_val = TXGBE_ERR_MBX;
UNREFERENCED_PARAMETER(mbx_id);
- DEBUGFUNC("txgbe_check_for_rst_vf");
if (!txgbe_check_for_bit_vf(hw, (TXGBE_VFMBCTL_RSTD |
TXGBE_VFMBCTL_RSTI))) {
@@ -357,8 +336,6 @@ STATIC s32 txgbe_obtain_mbx_lock_vf(struct txgbe_hw *hw)
{
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_obtain_mbx_lock_vf");
-
/* Take ownership of the buffer */
wr32(hw, TXGBE_VFMBCTL, TXGBE_VFMBCTL_VFU);
@@ -386,8 +363,6 @@ s32 txgbe_write_mbx_vf(struct txgbe_hw *hw, u32 *msg, u16 size,
UNREFERENCED_PARAMETER(mbx_id);
- DEBUGFUNC("txgbe_write_mbx_vf");
-
/* lock the mailbox to prevent pf/vf race condition */
ret_val = txgbe_obtain_mbx_lock_vf(hw);
if (ret_val)
@@ -426,7 +401,6 @@ s32 txgbe_read_mbx_vf(struct txgbe_hw *hw, u32 *msg, u16 size,
s32 ret_val = 0;
u16 i;
- DEBUGFUNC("txgbe_read_mbx_vf");
UNREFERENCED_PARAMETER(mbx_id);
/* lock the mailbox to prevent pf/vf race condition */
@@ -499,8 +473,6 @@ s32 txgbe_check_for_msg_pf(struct txgbe_hw *hw, u16 vf_number)
s32 index = TXGBE_MBVFICR_INDEX(vf_number);
u32 vf_bit = vf_number % 16;
- DEBUGFUNC("txgbe_check_for_msg_pf");
-
if (!txgbe_check_for_bit_pf(hw, TXGBE_MBVFICR_VFREQ_VF1 << vf_bit,
index)) {
ret_val = 0;
@@ -523,8 +495,6 @@ s32 txgbe_check_for_ack_pf(struct txgbe_hw *hw, u16 vf_number)
s32 index = TXGBE_MBVFICR_INDEX(vf_number);
u32 vf_bit = vf_number % 16;
- DEBUGFUNC("txgbe_check_for_ack_pf");
-
if (!txgbe_check_for_bit_pf(hw, TXGBE_MBVFICR_VFACK_VF1 << vf_bit,
index)) {
ret_val = 0;
@@ -548,8 +518,6 @@ s32 txgbe_check_for_rst_pf(struct txgbe_hw *hw, u16 vf_number)
u32 vflre = 0;
s32 ret_val = TXGBE_ERR_MBX;
- DEBUGFUNC("txgbe_check_for_rst_pf");
-
vflre = rd32(hw, TXGBE_FLRVFE(reg_offset));
if (vflre & (1 << vf_shift)) {
ret_val = 0;
@@ -572,8 +540,6 @@ STATIC s32 txgbe_obtain_mbx_lock_pf(struct txgbe_hw *hw, u16 vf_number)
s32 ret_val = TXGBE_ERR_MBX;
u32 p2v_mailbox;
- DEBUGFUNC("txgbe_obtain_mbx_lock_pf");
-
/* Take ownership of the buffer */
wr32(hw, TXGBE_MBCTL(vf_number), TXGBE_MBCTL_PFU);
@@ -602,8 +568,6 @@ s32 txgbe_write_mbx_pf(struct txgbe_hw *hw, u32 *msg, u16 size, u16 vf_number)
s32 ret_val;
u16 i;
- DEBUGFUNC("txgbe_write_mbx_pf");
-
/* lock the mailbox to prevent pf/vf race condition */
ret_val = txgbe_obtain_mbx_lock_pf(hw, vf_number);
if (ret_val)
@@ -643,8 +607,6 @@ s32 txgbe_read_mbx_pf(struct txgbe_hw *hw, u32 *msg, u16 size, u16 vf_number)
s32 ret_val;
u16 i;
- DEBUGFUNC("txgbe_read_mbx_pf");
-
/* lock the mailbox to prevent pf/vf race condition */
ret_val = txgbe_obtain_mbx_lock_pf(hw, vf_number);
if (ret_val)
diff --git a/drivers/net/txgbe/base/txgbe_mng.c b/drivers/net/txgbe/base/txgbe_mng.c
index d0aa665d4a..07bbfe8142 100644
--- a/drivers/net/txgbe/base/txgbe_mng.c
+++ b/drivers/net/txgbe/base/txgbe_mng.c
@@ -45,10 +45,8 @@ txgbe_hic_unlocked(struct txgbe_hw *hw, u32 *buffer, u32 length, u32 timeout)
u32 value, loop;
u16 i, dword_len;
- DEBUGFUNC("txgbe_hic_unlocked");
-
if (!length || length > TXGBE_PMMBX_BSIZE) {
- DEBUGOUT("Buffer length failure buffersize=%d.\n", length);
+ DEBUGOUT("Buffer length failure buffersize=%d.", length);
return TXGBE_ERR_HOST_INTERFACE_COMMAND;
}
@@ -78,12 +76,12 @@ txgbe_hic_unlocked(struct txgbe_hw *hw, u32 *buffer, u32 length, u32 timeout)
TXGBE_MNGMBXCTL_FWRDY, TXGBE_MNGMBXCTL_FWRDY,
&value, timeout, 1000);
if (!loop || !(value & TXGBE_MNGMBXCTL_FWACK)) {
- DEBUGOUT("Command has failed with no status valid.\n");
+ DEBUGOUT("Command has failed with no status valid.");
return TXGBE_ERR_HOST_INTERFACE_COMMAND;
}
if ((rd32(hw, TXGBE_MNGMBX) & 0xff0000) >> 16 == 0x80) {
- DEBUGOUT("It's unknown command.\n");
+ DEBUGOUT("It's unknown command.");
return TXGBE_ERR_MNG_ACCESS_FAILED;
}
@@ -119,10 +117,8 @@ txgbe_host_interface_command(struct txgbe_hw *hw, u32 *buffer,
u32 bi;
u32 dword_len;
- DEBUGFUNC("txgbe_host_interface_command");
-
if (length == 0 || length > TXGBE_PMMBX_BSIZE) {
- DEBUGOUT("Buffer length failure buffersize=%d.\n", length);
+ DEBUGOUT("Buffer length failure buffersize=%d.", length);
return TXGBE_ERR_HOST_INTERFACE_COMMAND;
}
@@ -164,7 +160,7 @@ txgbe_host_interface_command(struct txgbe_hw *hw, u32 *buffer,
goto rel_out;
if (length < buf_len + hdr_size) {
- DEBUGOUT("Buffer not large enough for reply message.\n");
+ DEBUGOUT("Buffer not large enough for reply message.");
err = TXGBE_ERR_HOST_INTERFACE_COMMAND;
goto rel_out;
}
@@ -273,8 +269,6 @@ s32 txgbe_close_notify(struct txgbe_hw *hw)
s32 status;
struct txgbe_hic_write_shadow_ram buffer;
- DEBUGFUNC("txgbe_close_notify");
-
buffer.hdr.req.cmd = FW_DW_CLOSE_NOTIFY;
buffer.hdr.req.buf_lenh = 0;
buffer.hdr.req.buf_lenl = 0;
@@ -305,8 +299,6 @@ s32 txgbe_open_notify(struct txgbe_hw *hw)
s32 status;
struct txgbe_hic_write_shadow_ram buffer;
- DEBUGFUNC("txgbe_open_notify");
-
buffer.hdr.req.cmd = FW_DW_OPEN_NOTIFY;
buffer.hdr.req.buf_lenh = 0;
buffer.hdr.req.buf_lenl = 0;
@@ -354,7 +346,6 @@ s32 txgbe_hic_set_drv_ver(struct txgbe_hw *hw, u8 maj, u8 min,
int i;
s32 ret_val = 0;
- DEBUGFUNC("txgbe_hic_set_drv_ver");
UNREFERENCED_PARAMETER(len, driver_ver);
fw_cmd.hdr.cmd = FW_CEM_CMD_DRIVER_INFO;
@@ -407,8 +398,6 @@ txgbe_hic_reset(struct txgbe_hw *hw)
int i;
s32 err = 0;
- DEBUGFUNC("\n");
-
reset_cmd.hdr.cmd = FW_RESET_CMD;
reset_cmd.hdr.buf_len = FW_RESET_LEN;
reset_cmd.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c
index 3fb929f37a..504e513274 100644
--- a/drivers/net/txgbe/base/txgbe_phy.c
+++ b/drivers/net/txgbe/base/txgbe_phy.c
@@ -35,7 +35,7 @@ static bool txgbe_identify_extphy(struct txgbe_hw *hw)
u16 phy_addr = 0;
if (!txgbe_validate_phy_addr(hw, phy_addr)) {
- DEBUGOUT("Unable to validate PHY address 0x%04X\n",
+ DEBUGOUT("Unable to validate PHY address 0x%04X",
phy_addr);
return false;
}
@@ -100,8 +100,6 @@ s32 txgbe_identify_phy(struct txgbe_hw *hw)
{
s32 err = TXGBE_ERR_PHY_ADDR_INVALID;
- DEBUGFUNC("txgbe_identify_phy");
-
txgbe_read_phy_if(hw);
if (hw->phy.type != txgbe_phy_unknown)
@@ -137,11 +135,9 @@ s32 txgbe_check_reset_blocked(struct txgbe_hw *hw)
{
u32 mmngc;
- DEBUGFUNC("txgbe_check_reset_blocked");
-
mmngc = rd32(hw, TXGBE_STAT);
if (mmngc & TXGBE_STAT_MNGVETO) {
- DEBUGOUT("MNG_VETO bit detected.\n");
+ DEBUGOUT("MNG_VETO bit detected.");
return true;
}
@@ -159,8 +155,6 @@ bool txgbe_validate_phy_addr(struct txgbe_hw *hw, u32 phy_addr)
u16 phy_id = 0;
bool valid = false;
- DEBUGFUNC("txgbe_validate_phy_addr");
-
hw->phy.addr = phy_addr;
hw->phy.read_reg(hw, TXGBE_MD_PHY_ID_HIGH,
TXGBE_MD_DEV_PMA_PMD, &phy_id);
@@ -168,7 +162,7 @@ bool txgbe_validate_phy_addr(struct txgbe_hw *hw, u32 phy_addr)
if (phy_id != 0xFFFF && phy_id != 0x0)
valid = true;
- DEBUGOUT("PHY ID HIGH is 0x%04X\n", phy_id);
+ DEBUGOUT("PHY ID HIGH is 0x%04X", phy_id);
return valid;
}
@@ -184,8 +178,6 @@ s32 txgbe_get_phy_id(struct txgbe_hw *hw)
u16 phy_id_high = 0;
u16 phy_id_low = 0;
- DEBUGFUNC("txgbe_get_phy_id");
-
err = hw->phy.read_reg(hw, TXGBE_MD_PHY_ID_HIGH,
TXGBE_MD_DEV_PMA_PMD,
&phy_id_high);
@@ -198,7 +190,7 @@ s32 txgbe_get_phy_id(struct txgbe_hw *hw)
hw->phy.id |= (u32)(phy_id_low & TXGBE_PHY_REVISION_MASK);
hw->phy.revision = (u32)(phy_id_low & ~TXGBE_PHY_REVISION_MASK);
}
- DEBUGOUT("PHY_ID_HIGH 0x%04X, PHY_ID_LOW 0x%04X\n",
+ DEBUGOUT("PHY_ID_HIGH 0x%04X, PHY_ID_LOW 0x%04X",
phy_id_high, phy_id_low);
return err;
@@ -213,8 +205,6 @@ enum txgbe_phy_type txgbe_get_phy_type_from_id(u32 phy_id)
{
enum txgbe_phy_type phy_type;
- DEBUGFUNC("txgbe_get_phy_type_from_id");
-
switch (phy_id) {
case TXGBE_PHYID_TN1010:
phy_type = txgbe_phy_tn;
@@ -272,7 +262,7 @@ txgbe_reset_extphy(struct txgbe_hw *hw)
if (ctrl & TXGBE_MD_PORT_CTRL_RESET) {
err = TXGBE_ERR_RESET_FAILED;
- DEBUGOUT("PHY reset polling failed to complete.\n");
+ DEBUGOUT("PHY reset polling failed to complete.");
}
return err;
@@ -286,8 +276,6 @@ s32 txgbe_reset_phy(struct txgbe_hw *hw)
{
s32 err = 0;
- DEBUGFUNC("txgbe_reset_phy");
-
if (hw->phy.type == txgbe_phy_unknown)
err = txgbe_identify_phy(hw);
@@ -343,7 +331,7 @@ s32 txgbe_read_phy_reg_mdi(struct txgbe_hw *hw, u32 reg_addr, u32 device_type,
*/
if (!po32m(hw, TXGBE_MDIOSCD, TXGBE_MDIOSCD_BUSY,
0, NULL, 100, 100)) {
- DEBUGOUT("PHY address command did not complete\n");
+ DEBUGOUT("PHY address command did not complete");
return TXGBE_ERR_PHY;
}
@@ -367,8 +355,6 @@ s32 txgbe_read_phy_reg(struct txgbe_hw *hw, u32 reg_addr,
s32 err;
u32 gssr = hw->phy.phy_semaphore_mask;
- DEBUGFUNC("txgbe_read_phy_reg");
-
if (hw->mac.acquire_swfw_sync(hw, gssr))
return TXGBE_ERR_SWFW_SYNC;
@@ -406,7 +392,7 @@ s32 txgbe_write_phy_reg_mdi(struct txgbe_hw *hw, u32 reg_addr,
/* wait for completion */
if (!po32m(hw, TXGBE_MDIOSCD, TXGBE_MDIOSCD_BUSY,
0, NULL, 100, 100)) {
- TLOG_DEBUG("PHY write cmd didn't complete\n");
+ TLOG_DEBUG("PHY write cmd didn't complete");
return -TERR_PHY;
}
@@ -427,8 +413,6 @@ s32 txgbe_write_phy_reg(struct txgbe_hw *hw, u32 reg_addr,
s32 err;
u32 gssr = hw->phy.phy_semaphore_mask;
- DEBUGFUNC("txgbe_write_phy_reg");
-
if (hw->mac.acquire_swfw_sync(hw, gssr))
err = TXGBE_ERR_SWFW_SYNC;
@@ -452,8 +436,6 @@ s32 txgbe_setup_phy_link(struct txgbe_hw *hw)
bool autoneg = false;
u32 speed;
- DEBUGFUNC("txgbe_setup_phy_link");
-
txgbe_get_copper_link_capabilities(hw, &speed, &autoneg);
/* Set or unset auto-negotiation 10G advertisement */
@@ -539,8 +521,6 @@ s32 txgbe_setup_phy_link_speed(struct txgbe_hw *hw,
{
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
- DEBUGFUNC("txgbe_setup_phy_link_speed");
-
/*
* Clear autoneg_advertised and set new values based on input link
* speed.
@@ -623,8 +603,6 @@ s32 txgbe_get_copper_link_capabilities(struct txgbe_hw *hw,
{
s32 err = 0;
- DEBUGFUNC("txgbe_get_copper_link_capabilities");
-
*autoneg = true;
if (!hw->phy.speeds_supported)
err = txgbe_get_copper_speeds_supported(hw);
@@ -652,8 +630,6 @@ s32 txgbe_check_phy_link_tnx(struct txgbe_hw *hw, u32 *speed,
u16 phy_speed = 0;
u16 phy_data = 0;
- DEBUGFUNC("txgbe_check_phy_link_tnx");
-
/* Initialize speed and link to default case */
*link_up = false;
*speed = TXGBE_LINK_SPEED_10GB_FULL;
@@ -697,8 +673,6 @@ s32 txgbe_setup_phy_link_tnx(struct txgbe_hw *hw)
bool autoneg = false;
u32 speed;
- DEBUGFUNC("txgbe_setup_phy_link_tnx");
-
txgbe_get_copper_link_capabilities(hw, &speed, &autoneg);
if (speed & TXGBE_LINK_SPEED_10GB_FULL) {
@@ -772,8 +746,6 @@ s32 txgbe_identify_module(struct txgbe_hw *hw)
{
s32 err = TXGBE_ERR_SFP_NOT_PRESENT;
- DEBUGFUNC("txgbe_identify_module");
-
switch (hw->phy.media_type) {
case txgbe_media_type_fiber:
err = txgbe_identify_sfp_module(hw);
@@ -811,8 +783,6 @@ s32 txgbe_identify_sfp_module(struct txgbe_hw *hw)
u8 cable_spec = 0;
u16 enforce_sfp = 0;
- DEBUGFUNC("txgbe_identify_sfp_module");
-
if (hw->phy.media_type != txgbe_media_type_fiber) {
hw->phy.sfp_type = txgbe_sfp_type_not_present;
return TXGBE_ERR_SFP_NOT_PRESENT;
@@ -992,7 +962,7 @@ s32 txgbe_identify_sfp_module(struct txgbe_hw *hw)
hw->phy.sfp_type == txgbe_sfp_type_1g_lx_core1 ||
hw->phy.sfp_type == txgbe_sfp_type_1g_sx_core0 ||
hw->phy.sfp_type == txgbe_sfp_type_1g_sx_core1)) {
- DEBUGOUT("SFP+ module not supported\n");
+ DEBUGOUT("SFP+ module not supported");
hw->phy.type = txgbe_phy_sfp_unsupported;
return TXGBE_ERR_SFP_NOT_SUPPORTED;
}
@@ -1021,8 +991,6 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw)
u8 device_tech = 0;
bool active_cable = false;
- DEBUGFUNC("txgbe_identify_qsfp_module");
-
if (hw->phy.media_type != txgbe_media_type_fiber_qsfp) {
hw->phy.sfp_type = txgbe_sfp_type_not_present;
err = TXGBE_ERR_SFP_NOT_PRESENT;
@@ -1165,10 +1133,10 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw)
if (hw->allow_unsupported_sfp) {
DEBUGOUT("WARNING: Wangxun (R) Network Connections are quality tested using Wangxun (R) Ethernet Optics. "
"Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. "
- "Wangxun Corporation is not responsible for any harm caused by using untested modules.\n");
+ "Wangxun Corporation is not responsible for any harm caused by using untested modules.");
err = 0;
} else {
- DEBUGOUT("QSFP module not supported\n");
+ DEBUGOUT("QSFP module not supported");
hw->phy.type =
txgbe_phy_sfp_unsupported;
err = TXGBE_ERR_SFP_NOT_SUPPORTED;
@@ -1194,8 +1162,6 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw)
s32 txgbe_read_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
u8 *eeprom_data)
{
- DEBUGFUNC("txgbe_read_i2c_eeprom");
-
return hw->phy.read_i2c_byte(hw, byte_offset,
TXGBE_I2C_EEPROM_DEV_ADDR,
eeprom_data);
@@ -1228,8 +1194,6 @@ s32 txgbe_read_i2c_sff8472(struct txgbe_hw *hw, u8 byte_offset,
s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
u8 eeprom_data)
{
- DEBUGFUNC("txgbe_write_i2c_eeprom");
-
return hw->phy.write_i2c_byte(hw, byte_offset,
TXGBE_I2C_EEPROM_DEV_ADDR,
eeprom_data);
@@ -1248,8 +1212,6 @@ s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
s32 txgbe_read_i2c_byte_unlocked(struct txgbe_hw *hw, u8 byte_offset,
u8 dev_addr, u8 *data)
{
- DEBUGFUNC("txgbe_read_i2c_byte");
-
txgbe_i2c_start(hw, dev_addr);
/* wait tx empty */
@@ -1312,8 +1274,6 @@ s32 txgbe_read_i2c_byte(struct txgbe_hw *hw, u8 byte_offset,
s32 txgbe_write_i2c_byte_unlocked(struct txgbe_hw *hw, u8 byte_offset,
u8 dev_addr, u8 data)
{
- DEBUGFUNC("txgbe_write_i2c_byte");
-
txgbe_i2c_start(hw, dev_addr);
/* wait tx empty */
@@ -1367,8 +1327,6 @@ s32 txgbe_write_i2c_byte(struct txgbe_hw *hw, u8 byte_offset,
**/
static void txgbe_i2c_start(struct txgbe_hw *hw, u8 dev_addr)
{
- DEBUGFUNC("txgbe_i2c_start");
-
wr32(hw, TXGBE_I2CENA, 0);
wr32(hw, TXGBE_I2CCON,
@@ -1396,12 +1354,10 @@ static void txgbe_i2c_start(struct txgbe_hw *hw, u8 dev_addr)
**/
static void txgbe_i2c_stop(struct txgbe_hw *hw)
{
- DEBUGFUNC("txgbe_i2c_stop");
-
/* wait for completion */
if (!po32m(hw, TXGBE_I2CSTAT, TXGBE_I2CSTAT_MST,
0, NULL, 100, 100)) {
- DEBUGFUNC("i2c stop timeout.");
+ DEBUGOUT("i2c stop timeout.");
}
wr32(hw, TXGBE_I2CENA, 0);
@@ -2420,8 +2376,6 @@ s32 txgbe_kr_handle(struct txgbe_hw *hw)
u32 value;
s32 status = 0;
- DEBUGFUNC("txgbe_kr_handle");
-
value = rd32_epcs(hw, VR_AN_INTR);
BP_LOG("AN INTERRUPT!! value: 0x%x\n", value);
if (!(value & VR_AN_INTR_PG_RCV)) {
@@ -2445,8 +2399,6 @@ static s32 txgbe_handle_bp_flow(u32 link_mode, struct txgbe_hw *hw)
s32 status = 0;
struct txgbe_backplane_ability local_ability, lp_ability;
- DEBUGFUNC("txgbe_handle_bp_flow");
-
local_ability.current_link_mode = link_mode;
/* 1. Get the local AN73 Base Page Ability */
@@ -2548,8 +2500,6 @@ static void txgbe_get_bp_ability(struct txgbe_backplane_ability *ability,
{
u32 value = 0;
- DEBUGFUNC("txgbe_get_bp_ability");
-
/* Link Partner Base Page */
if (link_partner == 1) {
/* Read the link partner AN73 Base Page Ability Registers */
@@ -2621,8 +2571,6 @@ static s32 txgbe_check_bp_ability(struct txgbe_backplane_ability *local_ability,
u32 com_link_abi;
s32 ret = 0;
- DEBUGFUNC("txgbe_check_bp_ability");
-
com_link_abi = local_ability->link_ability & lp_ability->link_ability;
BP_LOG("com_link_abi = 0x%x, local_ability = 0x%x, lp_ability = 0x%x\n",
com_link_abi, local_ability->link_ability,
@@ -2678,8 +2626,6 @@ static void txgbe_clear_bp_intr(u32 bit, u32 bit_high, struct txgbe_hw *hw)
{
u32 rdata = 0, wdata, i;
- DEBUGFUNC("txgbe_clear_bp_intr");
-
rdata = rd32_epcs(hw, VR_AN_INTR);
BP_LOG("[Before clear]Read VR AN MMD Interrupt Register: 0x%x\n",
rdata);
@@ -2704,8 +2650,6 @@ static s32 txgbe_enable_kr_training(struct txgbe_hw *hw)
s32 status = 0;
u32 value = 0;
- DEBUGFUNC("txgbe_enable_kr_training");
-
BP_LOG("Enable Clause 72 KR Training ...\n");
if (CL72_KRTR_PRBS_MODE_EN != 0xFFFF) {
@@ -2749,8 +2693,6 @@ static s32 txgbe_disable_kr_training(struct txgbe_hw *hw, s32 post, s32 mode)
{
s32 status = 0;
- DEBUGFUNC("txgbe_disable_kr_training");
-
BP_LOG("Disable Clause 72 KR Training ...\n");
/* Read PHY Lane0 TX EQ before Clause 72 KR Training. */
txgbe_read_phy_lane_tx_eq(0, hw, post, mode);
@@ -2767,8 +2709,6 @@ static s32 txgbe_check_kr_training(struct txgbe_hw *hw)
int i;
int times = hw->devarg.poll ? 35 : 20;
- DEBUGFUNC("txgbe_check_kr_training");
-
for (i = 0; i < times; i++) {
value = rd32_epcs(hw, SR_PMA_KR_LP_CEU);
BP_LOG("SR PMA MMD 10GBASE-KR LP Coefficient Update Register: 0x%x\n",
@@ -2826,8 +2766,6 @@ static void txgbe_read_phy_lane_tx_eq(u16 lane, struct txgbe_hw *hw,
u32 addr;
u32 tx_main_cursor, tx_pre_cursor, tx_post_cursor, lmain;
- DEBUGFUNC("txgbe_read_phy_lane_tx_eq");
-
addr = TXGBE_PHY_LANE0_TX_EQ_CTL1 | (lane << 8);
value = rd32_ephy(hw, addr);
BP_LOG("PHY LANE TX EQ Read Value: %x\n", lane);
diff --git a/drivers/net/txgbe/base/txgbe_vf.c b/drivers/net/txgbe/base/txgbe_vf.c
index fb6d6d90ea..a73502351e 100644
--- a/drivers/net/txgbe/base/txgbe_vf.c
+++ b/drivers/net/txgbe/base/txgbe_vf.c
@@ -107,8 +107,6 @@ s32 txgbe_reset_hw_vf(struct txgbe_hw *hw)
u32 msgbuf[TXGBE_VF_PERMADDR_MSG_LEN];
u8 *addr = (u8 *)(&msgbuf[1]);
- DEBUGFUNC("txgbevf_reset_hw_vf");
-
/* Call adapter stop to disable tx/rx and clear interrupts */
hw->mac.stop_hw(hw);
@@ -121,7 +119,7 @@ s32 txgbe_reset_hw_vf(struct txgbe_hw *hw)
mbx->write_posted(hw, msgbuf, 1, 0);
msec_delay(10);
- DEBUGOUT("Issuing a function level reset to MAC\n");
+ DEBUGOUT("Issuing a function level reset to MAC");
wr32(hw, TXGBE_VFRST, TXGBE_VFRST_SET);
txgbe_flush(hw);
msec_delay(50);
@@ -238,7 +236,7 @@ STATIC s32 txgbe_mta_vector(struct txgbe_hw *hw, u8 *mc_addr)
vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
break;
default: /* Invalid mc_filter_type */
- DEBUGOUT("MC filter type param set incorrectly\n");
+ DEBUGOUT("MC filter type param set incorrectly");
ASSERT(0);
break;
}
@@ -316,8 +314,6 @@ s32 txgbe_update_mc_addr_list_vf(struct txgbe_hw *hw, u8 *mc_addr_list,
UNREFERENCED_PARAMETER(clear);
- DEBUGFUNC("txgbe_update_mc_addr_list_vf");
-
/* Each entry in the list uses 1 16 bit word. We have 30
* 16 bit words available in our HW msg buffer (minus 1 for the
* msg type). That's 30 hash values if we pack 'em right. If
@@ -327,7 +323,7 @@ s32 txgbe_update_mc_addr_list_vf(struct txgbe_hw *hw, u8 *mc_addr_list,
* addresses except for in large enterprise network environments.
*/
- DEBUGOUT("MC Addr Count = %d\n", mc_addr_count);
+ DEBUGOUT("MC Addr Count = %d", mc_addr_count);
cnt = (mc_addr_count > 30) ? 30 : mc_addr_count;
msgbuf[0] = TXGBE_VF_SET_MULTICAST;
@@ -335,7 +331,7 @@ s32 txgbe_update_mc_addr_list_vf(struct txgbe_hw *hw, u8 *mc_addr_list,
for (i = 0; i < cnt; i++) {
vector = txgbe_mta_vector(hw, next(hw, &mc_addr_list, &vmdq));
- DEBUGOUT("Hash value = 0x%03X\n", vector);
+ DEBUGOUT("Hash value = 0x%03X", vector);
vector_list[i] = (u16)vector;
}
diff --git a/drivers/net/txgbe/txgbe_logs.h b/drivers/net/txgbe/txgbe_logs.h
index 67e9bfb3af..38c5d05984 100644
--- a/drivers/net/txgbe/txgbe_logs.h
+++ b/drivers/net/txgbe/txgbe_logs.h
@@ -48,11 +48,8 @@ extern int txgbe_logtype_tx_free;
#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0)
#endif
-#define TLOG_DEBUG(fmt, args...) PMD_DRV_LOG(DEBUG, fmt, ##args)
-
-#define DEBUGOUT(fmt, args...) TLOG_DEBUG(fmt, ##args)
-#define PMD_INIT_FUNC_TRACE() TLOG_DEBUG(" >>")
-#define DEBUGFUNC(fmt) TLOG_DEBUG(fmt)
+#define DEBUGOUT(fmt, args...) PMD_DRV_LOG(fmt, ##args)
+#define PMD_INIT_FUNC_TRACE() PMD_DRV_LOG(" >>")
extern int txgbe_logtype_bp;
#define BP_LOG(fmt, args...) \
--
2.21.0.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread