Aquantia/Marvell atlantic bugfixes 2020/01
Subsystems (3)
cover Aquantia/Marvell atlantic bugfixes 2020/01
Hi David,
Here is a set of recently discovered bugfixes,
Please integrate, thanks!
Igor Russkikh (3):
net: atlantic: broken link status on old fw
net: atlantic: loopback configuration in improper place
net: atlantic: remove duplicate entries
drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 4 ++-- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 3 --- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 net: atlantic: broken link status on old fw
Last code/checkpatch cleanup did a copy paste error where code from firmware 3 API logic was moved to firmware 1 logic.
This resulted in FW1.x users would never see the link state as active.
--- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +1 -3
@@ -667,9 +667,7 @@ int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self)u32 speed; mpi_state =hw_atl_utils_mpi_get_state (self); - speed = mpi_state & (FW2X_RATE_100M |FW2X_RATE_1G | -FW2X_RATE_2G5 |FW2X_RATE_5G | -FW2X_RATE_10G ); + speed = mpi_state >>HW_ATL_MPI_SPEED_SHIFT ;if (!speed) { link_status->mbps =0U ;
Signature · 1 line
2.20.1
PATCH 2/3 net: atlantic: loopback configuration in improper place
In reply to Igor RusskikhInitial loopback configuration should be called earlier, before starting traffic on HW blocks. Otherwise depending on race conditions it could be kept disabled.
--- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +2 -2
@@ -403,6 +403,8 @@ int aq_nic_start(struct aq_nic_s *self)if (err <0 ) goto err_exit; +aq_nic_set_loopback (self); + err = self->aq_hw_ops->hw_start (self->aq_hw);if (err <0 ) goto err_exit;
@@ -413,8 +415,6 @@ int aq_nic_start(struct aq_nic_s *self)INIT_WORK (&self->service_task, aq_nic_service_task); -aq_nic_set_loopback (self); -timer_setup (&self->service_timer, aq_nic_service_timer_cb,0 );aq_nic_service_timer_cb (&self->service_timer);
Signature · 1 line
2.20.1
PATCH 3/3 net: atlantic: remove duplicate entries
In reply to Igor RusskikhFunction entries were duplicated accidentally, removing the dups.
--- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +0 -3
@@ -1525,9 +1525,6 @@ const struct aq_hw_ops hw_atl_ops_b0 = { .rx_extract_ts = hw_atl_b0_rx_extract_ts, .extract_hwts = hw_atl_b0_extract_hwts, .hw_set_offload = hw_atl_b0_hw_offload_set, - .hw_get_hw_stats = hw_atl_utils_get_hw_stats, - .hw_get_fw_version = hw_atl_utils_get_fw_version, - .hw_set_offload = hw_atl_b0_hw_offload_set, .hw_set_loopback = hw_atl_b0_set_loopback, .hw_set_fc = hw_atl_b0_set_fc, };
Signature · 1 line
2.20.1
From: Igor Russkikh <[email protected]>
Date: Mon, 6 Jan 2020 14:22:27 +0300
Quoted 3 lines
Here is a set of recently discovered bugfixes,
Please integrate, thanks!
Series applied.