From 2c0325226cfe873b89a1dc3e9b7a5ba774e4f583 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Wed, 23 Feb 2022 18:28:57 +0800 Subject: [PATCH] net/txgbe: fix debug logs [ upstream commit 75c85e39652ef2eb54dd07b8f3d6b42b3930e8fe ] Remove 'DEBUGFUNC' due to too many invalid debug log prints, unify the DEBUG level macros. Fixes: 7dc117068a7c ("net/txgbe: support probe and remove") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/meson.build | 2 +- drivers/net/txgbe/base/txgbe_eeprom.c | 41 ++---- drivers/net/txgbe/base/txgbe_hw.c | 185 +++++--------------------- drivers/net/txgbe/base/txgbe_mbx.c | 22 --- drivers/net/txgbe/base/txgbe_mng.c | 15 +-- drivers/net/txgbe/base/txgbe_osdep.h | 1 + drivers/net/txgbe/base/txgbe_phy.c | 66 ++------- drivers/net/txgbe/txgbe_logs.h | 7 +- 8 files changed, 66 insertions(+), 273 deletions(-) diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build index 3c63bf5f4c..cf4e8cb0b4 100644 --- a/drivers/net/txgbe/base/meson.build +++ b/drivers/net/txgbe/base/meson.build @@ -21,6 +21,6 @@ foreach flag: error_cflags endforeach base_lib = static_library('txgbe_base', sources, - dependencies: static_rte_eal, + dependencies: [static_rte_eal, static_rte_net], c_args: c_args) base_objs = base_lib.extract_all_objects() diff --git a/drivers/net/txgbe/base/txgbe_eeprom.c b/drivers/net/txgbe/base/txgbe_eeprom.c index bcbf3503c8..6ff0f23f18 100644 --- a/drivers/net/txgbe/base/txgbe_eeprom.c +++ b/drivers/net/txgbe/base/txgbe_eeprom.c @@ -20,8 +20,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; @@ -53,12 +51,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, + DEBUGOUT("eeprom params: type = %d, size = %d, address bits: %d %d", + eeprom->type, eeprom->word_size, eeprom->address_bits, eeprom->sw_addr); return 0; @@ -77,9 +75,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++) { /* @@ -95,8 +90,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"); + DEBUGOUT("Driver can't access the eeprom - SMBI Semaphore not granted."); /* * this release is particularly important because our attempts * above to get the semaphore may have succeeded, and if there @@ -139,13 +133,12 @@ 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"); + DEBUGOUT("Software semaphore SMBI between device drivers not granted."); } return status; @@ -159,8 +152,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); @@ -289,8 +280,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; @@ -347,8 +336,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; @@ -398,11 +385,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; } @@ -436,15 +421,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; } @@ -456,7 +439,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; } @@ -465,7 +448,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 */ @@ -484,15 +467,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 5ee13b0f82..e6ffbd900e 100644 --- a/drivers/net/txgbe/base/txgbe_hw.c +++ b/drivers/net/txgbe/base/txgbe_hw.c @@ -40,8 +40,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: @@ -92,11 +90,9 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw) u64 reg_bp = 0; bool locked = false; - 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; } @@ -194,7 +190,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; } @@ -225,7 +221,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; } @@ -244,8 +240,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); @@ -258,7 +252,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; } @@ -320,8 +314,6 @@ s32 txgbe_init_hw(struct txgbe_hw *hw) { s32 status; - DEBUGFUNC("txgbe_init_hw"); - /* Reset the hardware */ status = hw->mac.reset_hw(hw); if (status == 0 || status == TXGBE_ERR_SFP_NOT_PRESENT) { @@ -330,7 +322,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; } @@ -346,8 +338,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++) { @@ -467,8 +457,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); @@ -494,8 +482,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); @@ -521,8 +507,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 @@ -569,8 +553,6 @@ s32 txgbe_led_on(struct txgbe_hw *hw, u32 index) { u32 led_reg = rd32(hw, TXGBE_LEDCTL); - DEBUGFUNC("txgbe_led_on"); - if (index > 4) return TXGBE_ERR_PARAM; @@ -592,8 +574,6 @@ s32 txgbe_led_off(struct txgbe_hw *hw, u32 index) { u32 led_reg = rd32(hw, TXGBE_LEDCTL); - DEBUGFUNC("txgbe_led_off"); - if (index > 4) return TXGBE_ERR_PARAM; @@ -616,8 +596,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; @@ -648,11 +626,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; } @@ -700,11 +676,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; } @@ -740,8 +714,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. @@ -759,7 +731,7 @@ s32 txgbe_init_rx_addrs(struct txgbe_hw *hw) hw->mac.addr[4], hw->mac.addr[5]); } else { /* Setup the receive address. */ - DEBUGOUT("Overriding MAC Address in RAR[0]\n"); + DEBUGOUT("Overriding MAC Address in RAR[0]"); DEBUGOUT(" New MAC Addr =%.2X %.2X %.2X ", hw->mac.addr[0], hw->mac.addr[1], hw->mac.addr[2]); @@ -777,7 +749,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); @@ -791,7 +763,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); @@ -816,8 +788,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)); @@ -832,7 +802,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; } @@ -855,12 +825,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 @@ -894,8 +862,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. @@ -905,13 +871,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)); } @@ -928,7 +894,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; } @@ -946,8 +912,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; @@ -960,7 +924,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; } @@ -1018,7 +982,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; } @@ -1079,8 +1043,7 @@ s32 txgbe_negotiate_fc(struct txgbe_hw *hw, u32 adv_reg, u32 lp_reg, u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm) { if ((!(adv_reg)) || (!(lp_reg))) { - DEBUGOUT("Local or link partner's advertised flow control " - "settings are NULL. Local: %x, link partner: %x\n", + DEBUGOUT("Local or link partner's advertised flow control settings are NULL. Local: %x, link partner: %x", adv_reg, lp_reg); return TXGBE_ERR_FC_NOT_NEGOTIATED; } @@ -1095,22 +1058,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; } @@ -1210,8 +1173,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: @@ -1277,8 +1238,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 @@ -1321,8 +1280,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); @@ -1346,8 +1303,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); @@ -1362,8 +1317,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"); + DEBUGOUT("Rx unit being enabled before security path fully disabled. Continuing with init."); return 0; } @@ -1378,8 +1332,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); @@ -1415,8 +1367,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 " - "path fully disabled. Continuing with init."); + DEBUGOUT("Tx unit being enabled before security path fully disabled. Continuing with init."); return 0; } @@ -1453,8 +1404,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. @@ -1485,8 +1434,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. @@ -1535,8 +1482,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) @@ -1567,11 +1512,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; } @@ -1621,11 +1564,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; } @@ -1650,8 +1591,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); @@ -1706,7 +1646,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; } @@ -1727,8 +1667,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; @@ -1796,8 +1734,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; @@ -1877,8 +1813,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); @@ -1932,8 +1866,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. */ @@ -1964,7 +1896,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); } @@ -2019,8 +1951,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; @@ -2110,8 +2040,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; @@ -2233,8 +2161,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; @@ -2265,8 +2191,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) @@ -2337,8 +2261,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) @@ -2363,7 +2285,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; } @@ -2413,7 +2335,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; } @@ -2479,8 +2401,6 @@ s32 txgbe_init_shared_code(struct txgbe_hw *hw) { s32 status; - DEBUGFUNC("txgbe_init_shared_code"); - /* * Set the mac type */ @@ -2513,8 +2433,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; @@ -2550,7 +2468,7 @@ s32 txgbe_set_mac_type(struct txgbe_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; } @@ -2559,8 +2477,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 @@ -2607,8 +2523,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 == TXGBE_DEV_ID_RAPTOR_QSFP) { /* Store flag indicating I2C bus access control unit. */ hw->phy.qsfp_shared_i2c_bus = TRUE; @@ -2650,8 +2564,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; @@ -2671,7 +2583,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; } @@ -2769,8 +2681,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; @@ -2895,8 +2805,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 || @@ -3000,8 +2908,6 @@ u32 txgbe_get_media_type_raptor(struct txgbe_hw *hw) { u32 media_type; - DEBUGFUNC("txgbe_get_media_type_raptor"); - /* Detect if there is a copper PHY attached. */ switch (hw->phy.type) { case txgbe_phy_cu_unknown: @@ -3050,8 +2956,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 @@ -3134,8 +3038,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; @@ -3167,7 +3069,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; } @@ -3193,8 +3095,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; @@ -3283,8 +3183,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"); + DEBUGOUT("Smartspeed has downgraded the link speed from the maximum advertised"); return status; } @@ -3313,8 +3212,6 @@ s32 txgbe_setup_mac_link(struct txgbe_hw *hw, u32 i; u32 link_capabilities = TXGBE_LINK_SPEED_UNKNOWN; - DEBUGFUNC("txgbe_setup_mac_link"); - /* Check to see if speed passed in is supported. */ status = hw->mac.get_link_capabilities(hw, &link_capabilities, &autoneg); @@ -3421,8 +3318,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); @@ -3530,8 +3425,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) @@ -3661,8 +3554,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; @@ -3687,8 +3578,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 @@ -3721,8 +3610,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 bfe53478ea..3ef4fce1f2 100644 --- a/drivers/net/txgbe/base/txgbe_mbx.c +++ b/drivers/net/txgbe/base/txgbe_mbx.c @@ -20,8 +20,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; @@ -46,8 +44,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); @@ -70,8 +66,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); @@ -90,8 +84,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); @@ -110,8 +102,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); @@ -144,8 +134,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; @@ -168,8 +156,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; @@ -193,8 +179,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; @@ -217,8 +201,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); @@ -247,8 +229,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) @@ -288,8 +268,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 224e48f5e1..b492dc8f11 100644 --- a/drivers/net/txgbe/base/txgbe_mng.c +++ b/drivers/net/txgbe/base/txgbe_mng.c @@ -44,10 +44,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; } @@ -77,7 +75,7 @@ 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; } @@ -113,10 +111,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; } @@ -158,7 +154,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; } @@ -284,7 +280,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; @@ -337,8 +332,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_osdep.h b/drivers/net/txgbe/base/txgbe_osdep.h index e18e400af3..4a0dd385b3 100644 --- a/drivers/net/txgbe/base/txgbe_osdep.h +++ b/drivers/net/txgbe/base/txgbe_osdep.h @@ -17,6 +17,7 @@ #include #include #include +#include #include "../txgbe_logs.h" diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c index aa8037a36e..ce6d580636 100644 --- a/drivers/net/txgbe/base/txgbe_phy.c +++ b/drivers/net/txgbe/base/txgbe_phy.c @@ -22,7 +22,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; } @@ -87,8 +87,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) @@ -124,11 +122,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; } @@ -146,8 +142,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); @@ -155,7 +149,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; } @@ -171,8 +165,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); @@ -185,7 +177,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; @@ -200,8 +192,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; @@ -259,7 +249,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; @@ -273,8 +263,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); @@ -330,7 +318,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; } @@ -354,8 +342,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; @@ -393,7 +379,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"); + DEBUGOUT("PHY write cmd didn't complete"); return -TERR_PHY; } @@ -414,8 +400,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; @@ -439,8 +423,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 */ @@ -526,8 +508,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. @@ -598,8 +578,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); @@ -627,8 +605,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; @@ -672,8 +648,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) { @@ -747,8 +721,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); @@ -786,8 +758,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; @@ -967,7 +937,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; } @@ -996,8 +966,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; @@ -1140,10 +1108,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; @@ -1169,8 +1137,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); @@ -1203,8 +1169,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); @@ -1223,8 +1187,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 */ @@ -1287,8 +1249,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 */ @@ -1342,8 +1302,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, @@ -1371,12 +1329,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); diff --git a/drivers/net/txgbe/txgbe_logs.h b/drivers/net/txgbe/txgbe_logs.h index f44ca06ee2..337e2cb5e8 100644 --- a/drivers/net/txgbe/txgbe_logs.h +++ b/drivers/net/txgbe/txgbe_logs.h @@ -45,10 +45,7 @@ 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(DEBUG, fmt, ##args) +#define PMD_INIT_FUNC_TRACE() PMD_DRV_LOG(DEBUG, ">>") #endif /* _TXGBE_LOGS_H_ */