| From aa1dcb5646fdf34a15763facf4bf5e482a2814ca Mon Sep 17 00:00:00 2001 |
| From: Dmitry Bogdanov <dbezrukov@marvell.com> |
| Date: Mon, 29 Nov 2021 05:28:23 -0800 |
| Subject: atlantic: Increase delay for fw transactions |
| |
| From: Dmitry Bogdanov <dbezrukov@marvell.com> |
| |
| commit aa1dcb5646fdf34a15763facf4bf5e482a2814ca upstream. |
| |
| The max waiting period (of 1 ms) while reading the data from FW shared |
| buffer is too small for certain types of data (e.g., stats). There's a |
| chance that FW could be updating buffer at the same time and driver |
| would be unsuccessful in reading data. Firmware manual recommends to |
| have 1 sec timeout to fix this issue. |
| |
| Fixes: 5cfd54d7dc186 ("net: atlantic: minimal A2 fw_ops") |
| Signed-off-by: Dmitry Bogdanov <dbezrukov@marvell.com> |
| Signed-off-by: Sudarsana Reddy Kalluru <skalluru@marvell.com> |
| Signed-off-by: Igor Russkikh <irusskikh@marvell.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c |
| +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c |
| @@ -84,7 +84,7 @@ static int hw_atl2_shared_buffer_read_bl |
| if (cnt > AQ_A2_FW_READ_TRY_MAX) |
| return -ETIME; |
| if (tid1.transaction_cnt_a != tid1.transaction_cnt_b) |
| - udelay(1); |
| + mdelay(1); |
| } while (tid1.transaction_cnt_a != tid1.transaction_cnt_b); |
| |
| hw_atl2_mif_shared_buf_read(self, offset, (u32 *)data, dwords); |
| @@ -339,8 +339,11 @@ static int aq_a2_fw_update_stats(struct |
| { |
| struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv; |
| struct statistics_s stats; |
| + int err; |
| |
| - hw_atl2_shared_buffer_read_safe(self, stats, &stats); |
| + err = hw_atl2_shared_buffer_read_safe(self, stats, &stats); |
| + if (err) |
| + return err; |
| |
| #define AQ_SDELTA(_N_, _F_) (self->curr_stats._N_ += \ |
| stats.msm._F_ - priv->last_stats.msm._F_) |
