From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B9D41A0A02 for ; Mon, 17 May 2021 18:16:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B2EF740041; Mon, 17 May 2021 18:16:04 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id F315541105 for ; Mon, 17 May 2021 18:16:02 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifuS-0008HI-Fc; Mon, 17 May 2021 16:16:00 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , Haiyue Wang , dpdk stable Date: Mon, 17 May 2021 18:09:29 +0200 Message-Id: <20210517161039.3132619-140-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/e1000/base: fix timeout for shadow RAM write' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c7a61d9dfbcc8883a13763fe8a24f0e860b9d3fe Thanks. Christian Ehrhardt --- >From c7a61d9dfbcc8883a13763fe8a24f0e860b9d3fe Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 21 Apr 2021 17:15:35 +0800 Subject: [PATCH] net/e1000/base: fix timeout for shadow RAM write [ upstream commit 4a8ab48ec47b3616272e50620b8e1a9599358ea6 ] This fixes the timed out for shadow RAM write EEWR can't be detected. Fixes: 5a32a257f957 ("e1000: more NICs in base driver") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Haiyue Wang --- drivers/net/e1000/base/e1000_i210.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/e1000/base/e1000_i210.c b/drivers/net/e1000/base/e1000_i210.c index 9298223c33..025262d1e5 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; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.892545492 +0200 +++ 0140-net-e1000-base-fix-timeout-for-shadow-RAM-write.patch 2021-05-17 17:40:29.415811398 +0200 @@ -1 +1 @@ -From 4a8ab48ec47b3616272e50620b8e1a9599358ea6 Mon Sep 17 00:00:00 2001 +From c7a61d9dfbcc8883a13763fe8a24f0e860b9d3fe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4a8ab48ec47b3616272e50620b8e1a9599358ea6 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3c349d33ff..52800376e4 100644 +index 9298223c33..025262d1e5 100644 @@ -28 +29 @@ - eewr = ((offset + i) << E1000_NVM_RW_ADDR_SHIFT) | + eewr = ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) |