[v3] net/e1000: fix timed out for shadow RAM write

Message ID 1618996535-49755-1-git-send-email-humin29@huawei.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v3] net/e1000: fix timed out for shadow RAM write |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot success github build: passed
ci/iol-testing fail Testing issues
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

humin (Q) April 21, 2021, 9:15 a.m. UTC
  From: Chengwen Feng <fengchengwen@huawei.com>

This fixes the timed out for shadow RAM write EEWR can't be detected.

Fixes: 5a32a257f957 ("e1000: more NICs in base driver")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
v3:
* update commit info.

v2:
* change 'E1000_ERR_NVM' to '-E1000_ERR_NVM'.
---
 drivers/net/e1000/base/e1000_i210.c | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Wang, Haiyue April 21, 2021, 11:22 a.m. UTC | #1
> -----Original Message-----
> From: Min Hu (Connor) <humin29@huawei.com>
> Sent: Wednesday, April 21, 2021 17:16
> To: dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang, Haiyue
> <haiyue.wang@intel.com>
> Subject: [PATCH v3] net/e1000: fix timed out for shadow RAM write
> 
> From: Chengwen Feng <fengchengwen@huawei.com>
> 
> This fixes the timed out for shadow RAM write EEWR can't be detected.
> 
> Fixes: 5a32a257f957 ("e1000: more NICs in base driver")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
> ---
> v3:
> * update commit info.
> 
> v2:
> * change 'E1000_ERR_NVM' to '-E1000_ERR_NVM'.
> ---
>  drivers/net/e1000/base/e1000_i210.c | 2 ++
>  1 file changed, 2 insertions(+)
> 

Thanks!

Acked-by: Haiyue Wang <haiyue.wang@intel.com>

> --
> 2.7.4
  
Qi Zhang April 21, 2021, 2:38 p.m. UTC | #2
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Wang, Haiyue
> Sent: Wednesday, April 21, 2021 7:22 PM
> To: Min Hu (Connor) <humin29@huawei.com>; dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Guo, Jia <jia.guo@intel.com>
> Subject: Re: [dpdk-dev] [PATCH v3] net/e1000: fix timed out for shadow RAM
> write
> 
> > -----Original Message-----
> > From: Min Hu (Connor) <humin29@huawei.com>
> > Sent: Wednesday, April 21, 2021 17:16
> > To: dev@dpdk.org
> > Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Guo, Jia
> > <jia.guo@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>
> > Subject: [PATCH v3] net/e1000: fix timed out for shadow RAM write
> >
> > From: Chengwen Feng <fengchengwen@huawei.com>
> >
> > This fixes the timed out for shadow RAM write EEWR can't be detected.
> >
> > Fixes: 5a32a257f957 ("e1000: more NICs in base driver")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> > Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
> > ---
> > v3:
> > * update commit info.
> >
> > v2:
> > * change 'E1000_ERR_NVM' to '-E1000_ERR_NVM'.
> > ---
> >  drivers/net/e1000/base/e1000_i210.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> 
> Thanks!
> 
> Acked-by: Haiyue Wang <haiyue.wang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
> 
> > --
> > 2.7.4
  

Patch

diff --git a/drivers/net/e1000/base/e1000_i210.c b/drivers/net/e1000/base/e1000_i210.c
index 3c349d3..5280037 100644
--- a/drivers/net/e1000/base/e1000_i210.c
+++ b/drivers/net/e1000/base/e1000_i210.c
@@ -310,6 +310,8 @@  STATIC s32 e1000_write_nvm_srwr(struct e1000_hw *hw, u16 offset, u16 words,
 	}
 
 	for (i = 0; i < words; i++) {
+		ret_val = -E1000_ERR_NVM;
+
 		eewr = ((offset + i) << E1000_NVM_RW_ADDR_SHIFT) |
 			(data[i] << E1000_NVM_RW_REG_DATA) |
 			E1000_NVM_RW_REG_START;