patch 'net/ngbe: fix debug logs' has been queued to stable release 21.11.1
Kevin Traynor
ktraynor at redhat.com
Tue Mar 1 11:42:26 CET 2022
Hi,
FYI, your patch has been queued to stable release 21.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/06/22. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/a8be311dd15259201f229522e67fff9a1d49bdf7
Thanks.
Kevin
---
>From a8be311dd15259201f229522e67fff9a1d49bdf7 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Wed, 23 Feb 2022 18:28:56 +0800
Subject: [PATCH] net/ngbe: fix debug logs
[ upstream commit c811e6a492affd55a1c02b13e93591214be2dd1f ]
Remove 'DEBUGFUNC' due to too many invalid debug log prints, unify the
DEBUG level macros.
Fixes: cc934df178ab ("net/ngbe: add log and error types")
Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
drivers/net/ngbe/base/ngbe_eeprom.c | 22 +---
drivers/net/ngbe/base/ngbe_hw.c | 150 +++++++--------------------
drivers/net/ngbe/base/ngbe_mbx.c | 22 ----
drivers/net/ngbe/base/ngbe_mng.c | 14 +--
drivers/net/ngbe/base/ngbe_phy.c | 30 ++----
drivers/net/ngbe/base/ngbe_phy_mvl.c | 13 +--
drivers/net/ngbe/base/ngbe_phy_rtl.c | 10 +-
drivers/net/ngbe/base/ngbe_phy_yt.c | 16 +--
drivers/net/ngbe/ngbe_logs.h | 7 +-
9 files changed, 57 insertions(+), 227 deletions(-)
diff --git a/drivers/net/ngbe/base/ngbe_eeprom.c b/drivers/net/ngbe/base/ngbe_eeprom.c
index f9a876e9bd..6375ee9b29 100644
--- a/drivers/net/ngbe/base/ngbe_eeprom.c
+++ b/drivers/net/ngbe/base/ngbe_eeprom.c
@@ -21,6 +21,4 @@ s32 ngbe_init_eeprom_params(struct ngbe_hw *hw)
u16 eeprom_size;
- DEBUGFUNC("ngbe_init_eeprom_params");
-
if (eeprom->type != ngbe_eeprom_unknown)
return 0;
@@ -53,6 +51,6 @@ 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,
+ DEBUGOUT("eeprom params: type = %d, size = %d, address bits: %d %d",
+ eeprom->type, eeprom->word_size,
eeprom->address_bits, eeprom->sw_addr);
@@ -73,7 +71,4 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
u32 swsm;
- DEBUGFUNC("ngbe_get_eeprom_semaphore");
-
-
/* Get SMBI software semaphore between device drivers first */
for (i = 0; i < timeout; i++) {
@@ -91,6 +86,5 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_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
@@ -135,11 +129,10 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
*/
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");
+ DEBUGOUT("Software semaphore SMBI between device drivers not granted.");
}
@@ -155,6 +148,4 @@ 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);
@@ -277,5 +268,4 @@ s32 ngbe_validate_eeprom_checksum_em(struct ngbe_hw *hw,
int err = 0;
- DEBUGFUNC("ngbe_validate_eeprom_checksum_em");
UNREFERENCED_PARAMETER(checksum_val);
@@ -316,6 +306,4 @@ s32 ngbe_save_eeprom_version(struct ngbe_hw *hw)
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);
diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c
index 782fd71d29..c462fec9f9 100644
--- a/drivers/net/ngbe/base/ngbe_hw.c
+++ b/drivers/net/ngbe/base/ngbe_hw.c
@@ -21,6 +21,4 @@ s32 ngbe_start_hw(struct ngbe_hw *hw)
s32 err;
- DEBUGFUNC("ngbe_start_hw");
-
/* Clear the VLAN filter table */
hw->mac.clear_vfta(hw);
@@ -32,5 +30,5 @@ s32 ngbe_start_hw(struct ngbe_hw *hw)
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;
}
@@ -56,6 +54,4 @@ s32 ngbe_init_hw(struct ngbe_hw *hw)
s32 status;
- DEBUGFUNC("ngbe_init_hw");
-
ngbe_save_eeprom_version(hw);
@@ -68,5 +64,5 @@ 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;
@@ -157,6 +153,4 @@ 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);
@@ -206,6 +200,4 @@ 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 */
@@ -306,6 +298,4 @@ s32 ngbe_get_mac_addr(struct ngbe_hw *hw, u8 *mac_addr)
u16 i;
- DEBUGFUNC("ngbe_get_mac_addr");
-
wr32(hw, NGBE_ETHADDRIDX, 0);
rar_high = rd32(hw, NGBE_ETHADDRH);
@@ -333,6 +323,4 @@ void ngbe_set_lan_id_multi_port(struct ngbe_hw *hw)
u32 reg = 0;
- DEBUGFUNC("ngbe_set_lan_id_multi_port");
-
reg = rd32(hw, NGBE_PORTSTAT);
bus->lan_id = NGBE_PORTSTAT_ID(reg);
@@ -354,6 +342,4 @@ s32 ngbe_stop_hw(struct ngbe_hw *hw)
s32 status = 0;
- DEBUGFUNC("ngbe_stop_hw");
-
/*
* Set the adapter_stopped flag so other driver functions stop touching
@@ -411,6 +397,4 @@ 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;
@@ -433,6 +417,4 @@ 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;
@@ -456,6 +438,4 @@ 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)) {
@@ -488,9 +468,7 @@ s32 ngbe_set_rar(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
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;
}
@@ -540,9 +518,7 @@ s32 ngbe_clear_rar(struct ngbe_hw *hw, u32 index)
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;
}
@@ -580,6 +556,4 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
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
@@ -592,16 +566,16 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
hw->mac.get_mac_addr(hw, hw->mac.addr);
- DEBUGOUT(" Keeping Current RAR0 Addr =%.2X %.2X %.2X ",
+ DEBUGOUT(" Keeping Current RAR0 Addr = "
+ RTE_ETHER_ADDR_PRT_FMT,
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 = "
+ RTE_ETHER_ADDR_PRT_FMT,
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]);
@@ -613,5 +587,5 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
/* 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);
@@ -627,5 +601,5 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
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);
@@ -652,6 +626,4 @@ 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 */
@@ -668,5 +640,5 @@ static s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
break;
default: /* Invalid mc_filter_type */
- DEBUGOUT("MC filter type param set incorrectly\n");
+ DEBUGOUT("MC filter type param set incorrectly");
ASSERT(0);
break;
@@ -691,10 +663,8 @@ void ngbe_set_mta(struct ngbe_hw *hw, u8 *mc_addr)
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);
/*
@@ -730,6 +700,4 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
u32 vmdq;
- DEBUGFUNC("ngbe_update_mc_addr_list");
-
/*
* Set the new number of MC addresses that we are being requested to
@@ -741,5 +709,5 @@ 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));
}
@@ -747,5 +715,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
/* 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));
}
@@ -764,5 +732,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
}
- DEBUGOUT("ngbe update mc addr list complete\n");
+ DEBUGOUT("ngbe update mc addr list complete");
return 0;
}
@@ -779,9 +747,7 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
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;
@@ -839,5 +805,5 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
break;
default:
- DEBUGOUT("Flow control param set incorrectly\n");
+ DEBUGOUT("Flow control param set incorrectly");
err = NGBE_ERR_CONFIG;
goto out;
@@ -863,6 +829,4 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
u32 fcrtl, fcrth;
- DEBUGFUNC("ngbe_fc_enable");
-
/* Validate the water mark configuration */
if (!hw->fc.pause_time) {
@@ -875,5 +839,5 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
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;
@@ -931,5 +895,5 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
break;
default:
- DEBUGOUT("Flow control param set incorrectly\n");
+ DEBUGOUT("Flow control param set incorrectly");
err = NGBE_ERR_CONFIG;
goto out;
@@ -989,6 +953,5 @@ 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",
+ DEBUGOUT("Local or link partner's advertised flow control settings are NULL. Local: %x, link partner: %x",
adv_reg, lp_reg);
return NGBE_ERR_FC_NOT_NEGOTIATED;
@@ -1005,20 +968,20 @@ 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;
@@ -1058,6 +1021,4 @@ void ngbe_fc_autoneg(struct ngbe_hw *hw)
bool link_up;
- DEBUGFUNC("ngbe_fc_autoneg");
-
/*
* AN should have completed when the cable was plugged in.
@@ -1103,6 +1064,4 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
u32 data, i;
- DEBUGFUNC("ngbe_set_pcie_master");
-
ngbe_hic_pcie_read(hw, addr, &data, 4);
if (enable)
@@ -1128,5 +1087,5 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
}
- 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;
@@ -1151,6 +1110,4 @@ s32 ngbe_acquire_swfw_sync(struct ngbe_hw *hw, u32 mask)
u32 i;
- DEBUGFUNC("ngbe_acquire_swfw_sync");
-
for (i = 0; i < timeout; i++) {
/*
@@ -1195,6 +1152,4 @@ void ngbe_release_swfw_sync(struct ngbe_hw *hw, u32 mask)
u32 swmask = mask;
- DEBUGFUNC("ngbe_release_swfw_sync");
-
ngbe_get_eeprom_semaphore(hw);
@@ -1220,7 +1175,4 @@ s32 ngbe_disable_sec_rx_path(struct ngbe_hw *hw)
u32 secrxreg;
- DEBUGFUNC("ngbe_disable_sec_rx_path");
-
-
secrxreg = rd32(hw, NGBE_SECRXCTL);
secrxreg |= NGBE_SECRXCTL_XDSA;
@@ -1237,6 +1189,5 @@ 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");
+ DEBUGOUT("Rx unit being enabled before security path fully disabled. Continuing with init.");
return 0;
@@ -1253,6 +1204,4 @@ 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;
@@ -1274,9 +1223,7 @@ s32 ngbe_clear_vmdq(struct ngbe_hw *hw, u32 rar, u32 vmdq)
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;
}
@@ -1312,9 +1259,7 @@ s32 ngbe_set_vmdq(struct ngbe_hw *hw, u32 rar, u32 vmdq)
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;
}
@@ -1337,6 +1282,5 @@ 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++)
@@ -1393,5 +1337,5 @@ s32 ngbe_find_vlvf_slot(struct ngbe_hw *hw, u32 vlan, bool vlvf_bypass)
*/
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;
@@ -1414,6 +1358,4 @@ s32 ngbe_set_vfta(struct ngbe_hw *hw, u32 vlan, u32 vind,
s32 err;
- DEBUGFUNC("ngbe_set_vfta");
-
if (vlan > 4095 || vind > 63)
return NGBE_ERR_PARAM;
@@ -1483,6 +1425,4 @@ s32 ngbe_set_vlvf(struct ngbe_hw *hw, u32 vlan, u32 vind,
s32 vlvf_index;
- DEBUGFUNC("ngbe_set_vlvf");
-
if (vlan > 4095 || vind > 63)
return NGBE_ERR_PARAM;
@@ -1564,6 +1504,4 @@ 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);
@@ -1593,6 +1531,4 @@ s32 ngbe_check_mac_link_em(struct ngbe_hw *hw, u32 *speed,
s32 status = 0;
- DEBUGFUNC("ngbe_check_mac_link_em");
-
reg = rd32(hw, NGBE_GPIOINTSTAT);
wr32(hw, NGBE_GPIOEOI, reg);
@@ -1618,5 +1554,4 @@ s32 ngbe_get_link_capabilities_em(struct ngbe_hw *hw,
s32 status = 0;
- DEBUGFUNC("\n");
hw->mac.autoneg = *autoneg;
@@ -1641,6 +1576,4 @@ 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);
@@ -1722,6 +1655,4 @@ 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));
@@ -1747,6 +1678,4 @@ s32 ngbe_mac_check_overtemp(struct ngbe_hw *hw)
u32 ts_state;
- DEBUGFUNC("ngbe_mac_check_overtemp");
-
/* Check that the LASI temp alarm status was triggered */
ts_state = rd32(hw, NGBE_TSALM);
@@ -1803,6 +1732,4 @@ 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);
@@ -1833,5 +1760,5 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
}
- 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;
@@ -1847,6 +1774,4 @@ 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.
@@ -1855,5 +1780,4 @@ s32 ngbe_enable_rx_dma(struct ngbe_hw *hw, u32 regval)
* completely disabled prior to enabling the Rx unit.
*/
-
hw->mac.disable_sec_rx_path(hw);
@@ -1936,6 +1860,4 @@ s32 ngbe_init_ops_pf(struct ngbe_hw *hw)
struct ngbe_mbx_info *mbx = &hw->mbx;
- DEBUGFUNC("ngbe_init_ops_pf");
-
/* BUS */
bus->set_lan_id = ngbe_set_lan_id_multi_port;
@@ -2039,6 +1961,4 @@ 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
@@ -22,6 +22,4 @@ s32 ngbe_read_mbx(struct ngbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
s32 ret_val = NGBE_ERR_MBX;
- DEBUGFUNC("ngbe_read_mbx");
-
/* limit read to size of mailbox */
if (size > mbx->size)
@@ -48,6 +46,4 @@ s32 ngbe_write_mbx(struct ngbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
s32 ret_val = 0;
- DEBUGFUNC("ngbe_write_mbx");
-
if (size > mbx->size) {
ret_val = NGBE_ERR_MBX;
@@ -72,6 +68,4 @@ s32 ngbe_check_for_msg(struct ngbe_hw *hw, u16 mbx_id)
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);
@@ -92,6 +86,4 @@ s32 ngbe_check_for_ack(struct ngbe_hw *hw, u16 mbx_id)
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);
@@ -112,6 +104,4 @@ s32 ngbe_check_for_rst(struct ngbe_hw *hw, u16 mbx_id)
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);
@@ -145,6 +135,4 @@ s32 ngbe_check_for_msg_pf(struct ngbe_hw *hw, u16 vf_number)
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;
@@ -167,6 +155,4 @@ s32 ngbe_check_for_ack_pf(struct ngbe_hw *hw, u16 vf_number)
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;
@@ -189,6 +175,4 @@ s32 ngbe_check_for_rst_pf(struct ngbe_hw *hw, u16 vf_number)
s32 ret_val = NGBE_ERR_MBX;
- DEBUGFUNC("ngbe_check_for_rst_pf");
-
vflre = rd32(hw, NGBE_FLRVFE);
if (vflre & (1 << vf_number)) {
@@ -213,6 +197,4 @@ STATIC s32 ngbe_obtain_mbx_lock_pf(struct ngbe_hw *hw, u16 vf_number)
u32 p2v_mailbox;
- DEBUGFUNC("ngbe_obtain_mbx_lock_pf");
-
/* Take ownership of the buffer */
wr32(hw, NGBE_MBCTL(vf_number), NGBE_MBCTL_PFU);
@@ -243,6 +225,4 @@ s32 ngbe_write_mbx_pf(struct ngbe_hw *hw, u32 *msg, u16 size, u16 vf_number)
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);
@@ -284,6 +264,4 @@ s32 ngbe_read_mbx_pf(struct ngbe_hw *hw, u32 *msg, u16 size, u16 vf_number)
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);
diff --git a/drivers/net/ngbe/base/ngbe_mng.c b/drivers/net/ngbe/base/ngbe_mng.c
index 68e06e2c24..dd32644bfe 100644
--- a/drivers/net/ngbe/base/ngbe_mng.c
+++ b/drivers/net/ngbe/base/ngbe_mng.c
@@ -27,8 +27,6 @@ ngbe_hic_unlocked(struct ngbe_hw *hw, u32 *buffer, u32 length, u32 timeout)
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;
}
@@ -60,5 +58,5 @@ ngbe_hic_unlocked(struct ngbe_hw *hw, u32 *buffer, u32 length, u32 timeout)
&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;
}
@@ -96,8 +94,6 @@ ngbe_host_interface_command(struct ngbe_hw *hw, u32 *buffer,
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;
}
@@ -141,5 +137,5 @@ ngbe_host_interface_command(struct ngbe_hw *hw, u32 *buffer,
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;
@@ -307,6 +303,4 @@ s32 ngbe_hic_check_cap(struct ngbe_hw *hw)
int i;
- DEBUGFUNC("\n");
-
command.hdr.req.cmd = FW_EEPROM_CHECK_STATUS;
command.hdr.req.buf_lenh = 0;
diff --git a/drivers/net/ngbe/base/ngbe_phy.c b/drivers/net/ngbe/base/ngbe_phy.c
index 51b0a2ec60..7a0ebba98c 100644
--- a/drivers/net/ngbe/base/ngbe_phy.c
+++ b/drivers/net/ngbe/base/ngbe_phy.c
@@ -47,5 +47,5 @@ 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;
@@ -73,6 +73,4 @@ s32 ngbe_identify_phy(struct ngbe_hw *hw)
u16 phy_addr;
- DEBUGFUNC("ngbe_identify_phy");
-
if (hw->phy.type != ngbe_phy_unknown)
return 0;
@@ -104,9 +102,7 @@ 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;
}
@@ -126,6 +122,4 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
bool valid = false;
- DEBUGFUNC("ngbe_validate_phy_addr");
-
if (hw->sub_device_id == NGBE_SUB_DEV_ID_EM_YT8521S_SFP)
return true;
@@ -138,5 +132,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
valid = true;
- DEBUGOUT("PHY ID HIGH is 0x%04X\n", phy_id);
+ DEBUGOUT("PHY ID HIGH is 0x%04X", phy_id);
return valid;
@@ -154,6 +148,4 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
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,
@@ -167,5 +159,5 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
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);
@@ -182,6 +174,4 @@ enum ngbe_phy_type ngbe_get_phy_type_from_id(struct ngbe_hw *hw)
enum ngbe_phy_type phy_type;
- DEBUGFUNC("ngbe_get_phy_type_from_id");
-
switch (hw->phy.id) {
case NGBE_PHYID_RTL:
@@ -216,6 +206,4 @@ 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,5 +270,5 @@ 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,6 +294,4 @@ s32 ngbe_read_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
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,5 +333,5 @@ s32 ngbe_write_phy_reg_mdi(struct ngbe_hw *hw, u32 reg_addr,
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,6 +354,4 @@ s32 ngbe_write_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
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,6 +379,4 @@ s32 ngbe_init_phy(struct ngbe_hw *hw)
s32 err = 0;
- DEBUGFUNC("ngbe_init_phy");
-
hw->phy.addr = 0;
diff --git a/drivers/net/ngbe/base/ngbe_phy_mvl.c b/drivers/net/ngbe/base/ngbe_phy_mvl.c
index 2eb351d258..b1da0e3167 100644
--- a/drivers/net/ngbe/base/ngbe_phy_mvl.c
+++ b/drivers/net/ngbe/base/ngbe_phy_mvl.c
@@ -55,6 +55,4 @@ s32 ngbe_init_phy_mvl(struct ngbe_hw *hw)
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);
@@ -74,5 +72,5 @@ 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;
}
@@ -120,5 +118,4 @@ s32 ngbe_setup_phy_link_mvl(struct ngbe_hw *hw, u32 speed,
u16 value;
- DEBUGFUNC("ngbe_setup_phy_link_mvl");
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
@@ -177,6 +174,4 @@ s32 ngbe_reset_phy_mvl(struct ngbe_hw *hw)
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;
@@ -203,5 +198,5 @@ 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;
}
@@ -251,6 +246,4 @@ s32 ngbe_set_phy_pause_adv_mvl(struct ngbe_hw *hw, u16 pause_bit)
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);
@@ -276,6 +269,4 @@ s32 ngbe_check_phy_link_mvl(struct ngbe_hw *hw,
u16 insr = 0;
- DEBUGFUNC("ngbe_check_phy_link_mvl");
-
/* Initialize speed and link to default case */
*link_up = false;
diff --git a/drivers/net/ngbe/base/ngbe_phy_rtl.c b/drivers/net/ngbe/base/ngbe_phy_rtl.c
index 7b08b7a46c..a95efcbab6 100644
--- a/drivers/net/ngbe/base/ngbe_phy_rtl.c
+++ b/drivers/net/ngbe/base/ngbe_phy_rtl.c
@@ -58,5 +58,5 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
}
if (i == 15) {
- DEBUGOUT("GPhy reset exceeds maximum times.\n");
+ DEBUGOUT("GPhy reset exceeds maximum times.");
return NGBE_ERR_PHY_TIMEOUT;
}
@@ -109,6 +109,4 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
u16 value = 0;
- DEBUGFUNC("ngbe_setup_phy_link_rtl");
-
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
@@ -130,5 +128,5 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
default:
value = RTL_BMCR_SPEED_SELECT1 | RTL_BMCR_SPEED_SELECT0;
- DEBUGOUT("unknown speed = 0x%x.\n", speed);
+ DEBUGOUT("unknown speed = 0x%x.", speed);
break;
}
@@ -230,6 +228,4 @@ s32 ngbe_reset_phy_rtl(struct ngbe_hw *hw)
s32 status = 0;
- DEBUGFUNC("ngbe_reset_phy_rtl");
-
value |= RTL_BMCR_RESET;
status = hw->phy.write_reg(hw, RTL_BMCR, RTL_DEV_ZERO, value);
@@ -300,6 +296,4 @@ s32 ngbe_check_phy_link_rtl(struct ngbe_hw *hw, u32 *speed, bool *link_up)
u16 insr = 0;
- DEBUGFUNC("ngbe_check_phy_link_rtl");
-
hw->phy.read_reg(hw, RTL_INSR, 0xa43, &insr);
diff --git a/drivers/net/ngbe/base/ngbe_phy_yt.c b/drivers/net/ngbe/base/ngbe_phy_yt.c
index 8db0f9ce48..40f1725f61 100644
--- a/drivers/net/ngbe/base/ngbe_phy_yt.c
+++ b/drivers/net/ngbe/base/ngbe_phy_yt.c
@@ -103,6 +103,4 @@ s32 ngbe_init_phy_yt(struct ngbe_hw *hw)
u16 value = 0;
- DEBUGFUNC("ngbe_init_phy_yt");
-
if (hw->phy.type != ngbe_phy_yt8521s_sfi)
return 0;
@@ -132,5 +130,4 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
u16 value;
- DEBUGFUNC("ngbe_setup_phy_link_yt");
UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
@@ -209,6 +206,4 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
s32 status = 0;
- DEBUGFUNC("ngbe_reset_phy_yt");
-
if (hw->phy.type != ngbe_phy_yt8521s &&
hw->phy.type != ngbe_phy_yt8521s_sfi)
@@ -228,5 +223,5 @@ 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;
}
@@ -240,6 +235,4 @@ s32 ngbe_get_phy_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
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;
@@ -254,6 +247,4 @@ s32 ngbe_get_phy_lp_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
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;
@@ -268,7 +259,4 @@ s32 ngbe_set_phy_pause_adv_yt(struct ngbe_hw *hw, u16 pause_bit)
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;
@@ -288,6 +276,4 @@ s32 ngbe_check_phy_link_yt(struct ngbe_hw *hw,
u16 insr = 0;
- DEBUGFUNC("ngbe_check_phy_link_yt");
-
/* Initialize speed and link to default case */
*link_up = false;
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
@@ -38,9 +38,6 @@ extern int ngbe_logtype_tx;
#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.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-03-01 10:41:03.323583411 +0000
+++ 0070-net-ngbe-fix-debug-logs.patch 2022-03-01 10:41:01.377244113 +0000
@@ -1 +1 @@
-From c811e6a492affd55a1c02b13e93591214be2dd1f Mon Sep 17 00:00:00 2001
+From a8be311dd15259201f229522e67fff9a1d49bdf7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c811e6a492affd55a1c02b13e93591214be2dd1f ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15 +16 @@
- drivers/net/ngbe/base/ngbe_hw.c | 152 +++++++--------------------
+ drivers/net/ngbe/base/ngbe_hw.c | 150 +++++++--------------------
@@ -17 +18 @@
- drivers/net/ngbe/base/ngbe_mng.c | 16 +--
+ drivers/net/ngbe/base/ngbe_mng.c | 14 +--
@@ -19,3 +20,3 @@
- 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/base/ngbe_phy_mvl.c | 13 +--
+ drivers/net/ngbe/base/ngbe_phy_rtl.c | 10 +-
+ drivers/net/ngbe/base/ngbe_phy_yt.c | 16 +--
@@ -23 +24 @@
- 9 files changed, 65 insertions(+), 237 deletions(-)
+ 9 files changed, 57 insertions(+), 227 deletions(-)
@@ -96 +97 @@
-index 931fe8c8cb..fa2d749240 100644
+index 782fd71d29..c462fec9f9 100644
@@ -127 +128 @@
-@@ -156,6 +152,4 @@ s32 ngbe_reset_hw_em(struct ngbe_hw *hw)
+@@ -157,6 +153,4 @@ s32 ngbe_reset_hw_em(struct ngbe_hw *hw)
@@ -134 +135 @@
-@@ -205,6 +199,4 @@ s32 ngbe_clear_hw_cntrs(struct ngbe_hw *hw)
+@@ -206,6 +200,4 @@ s32 ngbe_clear_hw_cntrs(struct ngbe_hw *hw)
@@ -141 +142 @@
-@@ -305,6 +297,4 @@ s32 ngbe_get_mac_addr(struct ngbe_hw *hw, u8 *mac_addr)
+@@ -306,6 +298,4 @@ s32 ngbe_get_mac_addr(struct ngbe_hw *hw, u8 *mac_addr)
@@ -148 +149 @@
-@@ -332,6 +322,4 @@ void ngbe_set_lan_id_multi_port(struct ngbe_hw *hw)
+@@ -333,6 +323,4 @@ void ngbe_set_lan_id_multi_port(struct ngbe_hw *hw)
@@ -155 +156 @@
-@@ -353,6 +341,4 @@ s32 ngbe_stop_hw(struct ngbe_hw *hw)
+@@ -354,6 +342,4 @@ s32 ngbe_stop_hw(struct ngbe_hw *hw)
@@ -162 +163 @@
-@@ -410,6 +396,4 @@ s32 ngbe_led_on(struct ngbe_hw *hw, u32 index)
+@@ -411,6 +397,4 @@ s32 ngbe_led_on(struct ngbe_hw *hw, u32 index)
@@ -169 +170 @@
-@@ -432,6 +416,4 @@ s32 ngbe_led_off(struct ngbe_hw *hw, u32 index)
+@@ -433,6 +417,4 @@ s32 ngbe_led_off(struct ngbe_hw *hw, u32 index)
@@ -176 +177 @@
-@@ -455,6 +437,4 @@ s32 ngbe_validate_mac_addr(u8 *mac_addr)
+@@ -456,6 +438,4 @@ s32 ngbe_validate_mac_addr(u8 *mac_addr)
@@ -183 +184 @@
-@@ -487,9 +467,7 @@ s32 ngbe_set_rar(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
+@@ -488,9 +468,7 @@ s32 ngbe_set_rar(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
@@ -194 +195 @@
-@@ -539,9 +517,7 @@ s32 ngbe_clear_rar(struct ngbe_hw *hw, u32 index)
+@@ -540,9 +518,7 @@ s32 ngbe_clear_rar(struct ngbe_hw *hw, u32 index)
@@ -205 +206 @@
-@@ -579,6 +555,4 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
+@@ -580,6 +556,4 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
@@ -212 +213 @@
-@@ -591,16 +565,16 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
+@@ -592,16 +566,16 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
@@ -236 +237 @@
-@@ -612,5 +586,5 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
+@@ -613,5 +587,5 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
@@ -243 +244 @@
-@@ -626,5 +600,5 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
+@@ -627,5 +601,5 @@ s32 ngbe_init_rx_addrs(struct ngbe_hw *hw)
@@ -250 +251 @@
-@@ -651,6 +625,4 @@ static s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
+@@ -652,6 +626,4 @@ static s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
@@ -257 +258 @@
-@@ -667,5 +639,5 @@ static s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
+@@ -668,5 +640,5 @@ static s32 ngbe_mta_vector(struct ngbe_hw *hw, u8 *mc_addr)
@@ -264 +265 @@
-@@ -690,10 +662,8 @@ void ngbe_set_mta(struct ngbe_hw *hw, u8 *mc_addr)
+@@ -691,10 +663,8 @@ void ngbe_set_mta(struct ngbe_hw *hw, u8 *mc_addr)
@@ -276 +277 @@
-@@ -729,6 +699,4 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
+@@ -730,6 +700,4 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
@@ -283 +284 @@
-@@ -740,5 +708,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
+@@ -741,5 +709,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
@@ -290 +291 @@
-@@ -746,5 +714,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
+@@ -747,5 +715,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
@@ -297 +298 @@
-@@ -763,5 +731,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
+@@ -764,5 +732,5 @@ s32 ngbe_update_mc_addr_list(struct ngbe_hw *hw, u8 *mc_addr_list,
@@ -304 +305 @@
-@@ -778,9 +746,7 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
+@@ -779,9 +747,7 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
@@ -315 +316 @@
-@@ -838,5 +804,5 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
+@@ -839,5 +805,5 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw)
@@ -322 +323 @@
-@@ -862,6 +828,4 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
+@@ -863,6 +829,4 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
@@ -329 +330 @@
-@@ -874,5 +838,5 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
+@@ -875,5 +839,5 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
@@ -336 +337 @@
-@@ -930,5 +894,5 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
+@@ -931,5 +895,5 @@ s32 ngbe_fc_enable(struct ngbe_hw *hw)
@@ -343 +344 @@
-@@ -988,6 +952,5 @@ s32 ngbe_negotiate_fc(struct ngbe_hw *hw, u32 adv_reg, u32 lp_reg,
+@@ -989,6 +953,5 @@ s32 ngbe_negotiate_fc(struct ngbe_hw *hw, u32 adv_reg, u32 lp_reg,
@@ -351 +352 @@
-@@ -1004,20 +967,20 @@ s32 ngbe_negotiate_fc(struct ngbe_hw *hw, u32 adv_reg, u32 lp_reg,
+@@ -1005,20 +968,20 @@ s32 ngbe_negotiate_fc(struct ngbe_hw *hw, u32 adv_reg, u32 lp_reg,
@@ -377 +378 @@
-@@ -1057,6 +1020,4 @@ void ngbe_fc_autoneg(struct ngbe_hw *hw)
+@@ -1058,6 +1021,4 @@ void ngbe_fc_autoneg(struct ngbe_hw *hw)
@@ -384 +385 @@
-@@ -1102,6 +1063,4 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
+@@ -1103,6 +1064,4 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
@@ -391 +392 @@
-@@ -1127,5 +1086,5 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
+@@ -1128,5 +1087,5 @@ s32 ngbe_set_pcie_master(struct ngbe_hw *hw, bool enable)
@@ -405,7 +405,0 @@
-@@ -1175,5 +1132,5 @@ 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);
-
@@ -509 +503 @@
- u16 value = 0;
+
@@ -513 +507 @@
-@@ -1643,6 +1578,4 @@ s32 ngbe_setup_mac_link_em(struct ngbe_hw *hw,
+@@ -1641,6 +1576,4 @@ s32 ngbe_setup_mac_link_em(struct ngbe_hw *hw,
@@ -520 +514 @@
-@@ -1724,6 +1657,4 @@ s32 ngbe_init_thermal_sensor_thresh(struct ngbe_hw *hw)
+@@ -1722,6 +1655,4 @@ s32 ngbe_init_thermal_sensor_thresh(struct ngbe_hw *hw)
@@ -527 +521 @@
-@@ -1749,6 +1680,4 @@ s32 ngbe_mac_check_overtemp(struct ngbe_hw *hw)
+@@ -1747,6 +1678,4 @@ s32 ngbe_mac_check_overtemp(struct ngbe_hw *hw)
@@ -534 +528 @@
-@@ -1805,6 +1734,4 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
+@@ -1803,6 +1732,4 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
@@ -541 +535 @@
-@@ -1847,5 +1774,5 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
+@@ -1833,5 +1760,5 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
@@ -548 +542 @@
-@@ -1861,6 +1788,4 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
+@@ -1847,6 +1774,4 @@ s32 ngbe_set_mac_type(struct ngbe_hw *hw)
@@ -555 +549 @@
-@@ -1869,5 +1794,4 @@ s32 ngbe_enable_rx_dma(struct ngbe_hw *hw, u32 regval)
+@@ -1855,5 +1780,4 @@ s32 ngbe_enable_rx_dma(struct ngbe_hw *hw, u32 regval)
@@ -561 +555 @@
-@@ -1961,6 +1885,4 @@ s32 ngbe_init_ops_pf(struct ngbe_hw *hw)
+@@ -1936,6 +1860,4 @@ s32 ngbe_init_ops_pf(struct ngbe_hw *hw)
@@ -568 +562 @@
-@@ -2065,6 +1987,4 @@ s32 ngbe_init_shared_code(struct ngbe_hw *hw)
+@@ -2039,6 +1961,4 @@ s32 ngbe_init_shared_code(struct ngbe_hw *hw)
@@ -657 +651 @@
-index c6f4dc2e0b..ad9372bec2 100644
+index 68e06e2c24..dd32644bfe 100644
@@ -701,7 +694,0 @@
-@@ -346,6 +340,4 @@ s32 ngbe_phy_led_oem_chk(struct ngbe_hw *hw, u32 *data)
- int i;
-
-- DEBUGFUNC("\n");
--
- command.hdr.req.cmd = FW_PHY_LED_CONF;
- command.hdr.req.buf_lenh = 0;
@@ -709 +696 @@
-index 93450b2977..3d5093ec7e 100644
+index 51b0a2ec60..7a0ebba98c 100644
@@ -719 +706 @@
-@@ -72,6 +72,4 @@ s32 ngbe_identify_phy(struct ngbe_hw *hw)
+@@ -73,6 +73,4 @@ s32 ngbe_identify_phy(struct ngbe_hw *hw)
@@ -726 +713 @@
-@@ -103,9 +101,7 @@ s32 ngbe_check_reset_blocked(struct ngbe_hw *hw)
+@@ -104,9 +102,7 @@ s32 ngbe_check_reset_blocked(struct ngbe_hw *hw)
@@ -737 +724 @@
-@@ -125,6 +121,4 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
+@@ -126,6 +122,4 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
@@ -744 +731 @@
-@@ -137,5 +131,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
+@@ -138,5 +132,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
@@ -751 +738 @@
-@@ -153,6 +147,4 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
+@@ -154,6 +148,4 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
@@ -758 +745 @@
-@@ -166,5 +158,5 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
+@@ -167,5 +159,5 @@ s32 ngbe_get_phy_id(struct ngbe_hw *hw)
@@ -765,2 +752,2 @@
-@@ -180,6 +172,4 @@ s32 ngbe_get_phy_type_from_id(struct ngbe_hw *hw)
- s32 status = 0;
+@@ -182,6 +174,4 @@ enum ngbe_phy_type ngbe_get_phy_type_from_id(struct ngbe_hw *hw)
+ enum ngbe_phy_type phy_type;
@@ -772 +759 @@
-@@ -217,6 +207,4 @@ s32 ngbe_reset_phy(struct ngbe_hw *hw)
+@@ -216,6 +206,4 @@ s32 ngbe_reset_phy(struct ngbe_hw *hw)
@@ -779 +766 @@
-@@ -283,5 +271,5 @@ s32 ngbe_read_phy_reg_mdi(struct ngbe_hw *hw, u32 reg_addr, u32 device_type,
+@@ -282,5 +270,5 @@ s32 ngbe_read_phy_reg_mdi(struct ngbe_hw *hw, u32 reg_addr, u32 device_type,
@@ -786 +773 @@
-@@ -307,6 +295,4 @@ s32 ngbe_read_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
+@@ -306,6 +294,4 @@ s32 ngbe_read_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
@@ -793 +780 @@
-@@ -348,5 +334,5 @@ s32 ngbe_write_phy_reg_mdi(struct ngbe_hw *hw, u32 reg_addr,
+@@ -347,5 +333,5 @@ s32 ngbe_write_phy_reg_mdi(struct ngbe_hw *hw, u32 reg_addr,
@@ -800 +787 @@
-@@ -369,6 +355,4 @@ s32 ngbe_write_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
+@@ -368,6 +354,4 @@ s32 ngbe_write_phy_reg(struct ngbe_hw *hw, u32 reg_addr,
@@ -807 +794 @@
-@@ -396,6 +380,4 @@ s32 ngbe_init_phy(struct ngbe_hw *hw)
+@@ -395,6 +379,4 @@ s32 ngbe_init_phy(struct ngbe_hw *hw)
@@ -815 +802 @@
-index 01cb6b9bb3..a828597e7b 100644
+index 2eb351d258..b1da0e3167 100644
@@ -818,8 +805 @@
-@@ -67,5 +67,5 @@ s32 ngbe_check_phy_mode_mvl(struct ngbe_hw *hw)
- 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;
- }
-@@ -80,6 +80,4 @@ s32 ngbe_init_phy_mvl(struct ngbe_hw *hw)
+@@ -55,6 +55,4 @@ s32 ngbe_init_phy_mvl(struct ngbe_hw *hw)
@@ -832 +812 @@
-@@ -99,5 +97,5 @@ s32 ngbe_init_phy_mvl(struct ngbe_hw *hw)
+@@ -74,5 +72,5 @@ s32 ngbe_init_phy_mvl(struct ngbe_hw *hw)
@@ -839 +819 @@
-@@ -138,5 +136,4 @@ s32 ngbe_setup_phy_link_mvl(struct ngbe_hw *hw, u32 speed,
+@@ -120,5 +118,4 @@ s32 ngbe_setup_phy_link_mvl(struct ngbe_hw *hw, u32 speed,
@@ -845,8 +825 @@
-@@ -171,5 +168,5 @@ s32 ngbe_setup_phy_link_mvl(struct ngbe_hw *hw, u32 speed,
- value = MVL_CTRL_SPEED_SELECT0 |
- MVL_CTRL_SPEED_SELECT1;
-- DEBUGOUT("unknown speed = 0x%x.\n", speed);
-+ DEBUGOUT("unknown speed = 0x%x.", speed);
- break;
- }
-@@ -236,6 +233,4 @@ s32 ngbe_reset_phy_mvl(struct ngbe_hw *hw)
+@@ -177,6 +174,4 @@ s32 ngbe_reset_phy_mvl(struct ngbe_hw *hw)
@@ -859 +832 @@
-@@ -262,5 +257,5 @@ s32 ngbe_reset_phy_mvl(struct ngbe_hw *hw)
+@@ -203,5 +198,5 @@ s32 ngbe_reset_phy_mvl(struct ngbe_hw *hw)
@@ -866 +839 @@
-@@ -310,6 +305,4 @@ s32 ngbe_set_phy_pause_adv_mvl(struct ngbe_hw *hw, u16 pause_bit)
+@@ -251,6 +246,4 @@ s32 ngbe_set_phy_pause_adv_mvl(struct ngbe_hw *hw, u16 pause_bit)
@@ -873 +846 @@
-@@ -335,6 +328,4 @@ s32 ngbe_check_phy_link_mvl(struct ngbe_hw *hw,
+@@ -276,6 +269,4 @@ s32 ngbe_check_phy_link_mvl(struct ngbe_hw *hw,
@@ -881 +854 @@
-index f49d829dff..3a2d624ddb 100644
+index 7b08b7a46c..a95efcbab6 100644
@@ -884 +857 @@
-@@ -80,5 +80,5 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
+@@ -58,5 +58,5 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
@@ -891,29 +864 @@
-@@ -87,5 +87,5 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
- 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;
- }
-@@ -98,5 +98,5 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
- }
- if (i == 1000)
-- DEBUGOUT("PHY wait mdio 1 access timeout.\n");
-+ DEBUGOUT("PHY wait mdio 1 access timeout.");
-
-
-@@ -104,5 +104,5 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
- 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;
- }
-@@ -115,5 +115,5 @@ s32 ngbe_init_phy_rtl(struct ngbe_hw *hw)
- }
- if (i == 1000)
-- DEBUGOUT("PHY wait mdio 2 access timeout.\n");
-+ DEBUGOUT("PHY wait mdio 2 access timeout.");
-
- for (i = 0; i < 1000; i++) {
-@@ -141,6 +141,4 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
+@@ -109,6 +109,4 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
@@ -926 +871 @@
-@@ -162,5 +160,5 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
+@@ -130,5 +128,5 @@ s32 ngbe_setup_phy_link_rtl(struct ngbe_hw *hw,
@@ -933 +878 @@
-@@ -254,6 +252,4 @@ s32 ngbe_reset_phy_rtl(struct ngbe_hw *hw)
+@@ -230,6 +228,4 @@ s32 ngbe_reset_phy_rtl(struct ngbe_hw *hw)
@@ -940 +885 @@
-@@ -314,6 +310,4 @@ s32 ngbe_check_phy_link_rtl(struct ngbe_hw *hw, u32 *speed, bool *link_up)
+@@ -300,6 +296,4 @@ s32 ngbe_check_phy_link_rtl(struct ngbe_hw *hw, u32 *speed, bool *link_up)
@@ -948 +893 @@
-index 2d184a1c30..34d69707dd 100644
+index 8db0f9ce48..40f1725f61 100644
@@ -956,3 +901,3 @@
- /* close sds area register */
- ngbe_write_phy_reg_ext_yt(hw, YT_SMI_PHY, 0, 0);
-@@ -131,5 +129,4 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
+ if (hw->phy.type != ngbe_phy_yt8521s_sfi)
+ return 0;
+@@ -132,5 +130,4 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
@@ -964,8 +909 @@
-@@ -154,5 +151,5 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
- value = YT_BCR_SPEED_SELECT0 |
- YT_BCR_SPEED_SELECT1;
-- DEBUGOUT("unknown speed = 0x%x.\n",
-+ DEBUGOUT("unknown speed = 0x%x.",
- speed);
- break;
-@@ -325,6 +322,4 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
+@@ -209,6 +206,4 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
@@ -978 +916 @@
-@@ -362,5 +357,5 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
+@@ -228,5 +223,5 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
@@ -985 +923 @@
-@@ -374,6 +369,4 @@ s32 ngbe_get_phy_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
+@@ -240,6 +235,4 @@ s32 ngbe_get_phy_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
@@ -992 +930 @@
-@@ -388,6 +381,4 @@ s32 ngbe_get_phy_lp_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
+@@ -254,6 +247,4 @@ s32 ngbe_get_phy_lp_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
@@ -999 +937 @@
-@@ -402,7 +393,4 @@ s32 ngbe_set_phy_pause_adv_yt(struct ngbe_hw *hw, u16 pause_bit)
+@@ -268,7 +259,4 @@ s32 ngbe_set_phy_pause_adv_yt(struct ngbe_hw *hw, u16 pause_bit)
@@ -1007 +945 @@
-@@ -422,6 +410,4 @@ s32 ngbe_check_phy_link_yt(struct ngbe_hw *hw,
+@@ -288,6 +276,4 @@ s32 ngbe_check_phy_link_yt(struct ngbe_hw *hw,
More information about the stable
mailing list