git: f6517a7e69c1 - main - e1000: fix timeout for shadow RAM write

[Kevin Bowling]

The branch main has been updated by kbowling (ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=f6517a7e69c10c6057d6c990a9f3ea22a2b62398

commit f6517a7e69c10c6057d6c990a9f3ea22a2b62398
Author:     Chengwen Feng <fengchengwen at huawei.com>
AuthorDate: 2021-04-21 09:15:35 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-09-17 21:24:29 +0000

    e1000: fix timeout for shadow RAM write
    
    This fixes the timed out for shadow RAM write EEWR can't be detected.
    
    Fixes: 5a32a257f957 ("e1000: more NICs in base driver")
    Cc: stable at dpdk.org
    
    Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
    Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
    Acked-by: Haiyue Wang <haiyue.wang at intel.com>
    
    Approved by:    imp
    Obtained from:  DPDK (4a8ab48ec47b3616272e50620b8e1a9599358ea6)
    MFC after:      1 week
---
 sys/dev/e1000/e1000_i210.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/dev/e1000/e1000_i210.c b/sys/dev/e1000/e1000_i210.c
index cd85a8c3172a..d3692db11245 100644
--- a/sys/dev/e1000/e1000_i210.c
+++ b/sys/dev/e1000/e1000_i210.c
@@ -195,6 +195,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;