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 B63C84624E for ; Mon, 17 Feb 2025 18:07:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A9D8E400D6; Mon, 17 Feb 2025 18:07:00 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 9E962402D7 for ; Mon, 17 Feb 2025 18:06:59 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38a8b17d7a7so2617943f8f.2 for ; Mon, 17 Feb 2025 09:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812019; x=1740416819; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N5v4Hi+ntBhVEfza9NU14Ka13+FUyzfXIO+mBxVBzxI=; b=gn0H7NqjtckIQxvIS2V26CRBp0nEU4ySyVqcJFNkRmQnQO5Bm4TJarlXGA6wWcgnLe pAlpJyWU6nBcZCJm5nBOC1l7kY3v75PiOIzuIiA3pnzoLZkuNSoeES6wTorJ+3TNCokD x0L0TDinZ7YHRkPHubs3mvxo5YABM15wJITblTwPoaF59UWhlcH1gy21QdH9neHW843Y TBqSp1/6rvgjKVT5Xlrk/Uo/DvbRGY/UKubgd+WEu55ZraSYn1zDgPnmgIri84e6tRze ymk6uPVbSca4ebnBi1Zp9IkzvCEoJV79VtvMTOEhQRUBDK3mWXWxrWSbANRHvQJolz1b 7jsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812019; x=1740416819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N5v4Hi+ntBhVEfza9NU14Ka13+FUyzfXIO+mBxVBzxI=; b=UJbw5SdtHIKSWDSuudTUjkrhICxaQAZPfQ8kW2eQ6by1qn+j45oC7fIfIpD/D/1Xw6 qh6maJjVQCd5Pkp6v/zedWeSJxz35bZ/aLSPZHkar0c+df9UUImdFQrJ0SD/Ega72jeu Wb6olJbORZMCC9NPYHUAQ0Z+qP+F7OfKpEetVsoj1FOscNYvcVKaVc2YE8FORo4xIX0/ R/cQ/4bTASAbwXK1RttWeSHu8EC2f+MLLJWeY7uBeVvo87+iPY54sGYO0cWfTFRcUjl7 1GqzRxO/T/GO94OwwuFN+7RrycG+9+TFEemNte0jUUtlH/LM5zbPHguSLHbdJl5ynt/t 3UWQ== X-Forwarded-Encrypted: i=1; AJvYcCWYFu/63pzV2hQVZE2HFd412bOAJ8JiLFbYBsZ2sAzxP9u61fUxZyW0M0ThuEqhtf7qthQjrIc=@dpdk.org X-Gm-Message-State: AOJu0YyvQ+qpF1vy7LJMnVPgVEof3OCdr2JJhmYfk1KwcuVpXM428czz IR9EUWYCEvD2zzWScd9Gn94un7JdeCXq4/yQatdCFL1ak1bM9nVS/yhce1Fj2GkQxw== X-Gm-Gg: ASbGnct4YjeM7zhlJGDicWUlvmB6VAbrgRfSmXr0DxcAxnlojVbGqiL4gjlqNte6qYq 1F52cHGt+pcLxBBJ1EAysFooJe6J1dduVVnQ7nRlKGiUF1j2FrNxfnJwXl1q6SdcQYfuwGwrBsK prUjuQS3+mDxn3CuuoD8l/LTym82AfJ8z1lMSy+oEHV6snxFWbvgU5bxRHARhYbpU4YO74cmXYP rK+FxOBPfbXdUzGERND4YOHOLT7ITxxemnYCJ801eiaeFfEhMCBrA9cl2F7nBKMnjosRC/PCpAn jGEsn7w7eNYpNp0EWQeefw== X-Google-Smtp-Source: AGHT+IE4vo7gA/Q9/VweHVtw4jwJUpA7Dy2C+FQTbZ6ub6SRT8/kqshJkbSVEtTeiyCXmsFUJlOG6A== X-Received: by 2002:a05:6000:1cf:b0:38f:2e1e:12fc with SMTP id ffacd0b85a97d-38f33f2fb85mr9052249f8f.25.1739812019086; Mon, 17 Feb 2025 09:06:59 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4398e84efb9sm9592205e9.10.2025.02.17.09.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:06:58 -0800 (PST) From: luca.boccassi@gmail.com To: Sasha Neftin Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/igc/base: reset loop variable' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:11 +0000 Message-ID: <20250217170456.1068278-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 22.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/25. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/322c9ee4c7670df3cde2bdd0fa67b432768c5ac4 Thanks. Luca Boccassi --- >From 322c9ee4c7670df3cde2bdd0fa67b432768c5ac4 Mon Sep 17 00:00:00 2001 From: Sasha Neftin Date: Thu, 6 Feb 2025 16:08:28 +0000 Subject: [PATCH] net/igc/base: reset loop variable [ upstream commit 60dca8e0f6b2d8526dc9dc8b54e59b5d68964e8e ] When writing to Shadow RAM, we set rev_val on success, but since the value is already set to success initially, it is possible for none of the writes to be successful, yet ret_val will still be set to success. Fix it by resetting the ret_val to failure before every loop iteration. Fixes: 8cb7c57d9b3c ("net/igc: support device initialization") Signed-off-by: Sasha Neftin Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/igc/base/igc_i225.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/igc/base/igc_i225.c b/drivers/net/igc/base/igc_i225.c index 97dc7f454d..25cd2a8039 100644 --- a/drivers/net/igc/base/igc_i225.c +++ b/drivers/net/igc/base/igc_i225.c @@ -562,6 +562,7 @@ static s32 __igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words, } for (i = 0; i < words; i++) { + ret_val = -IGC_ERR_NVM; eewr = ((offset + i) << IGC_NVM_RW_ADDR_SHIFT) | (data[i] << IGC_NVM_RW_REG_DATA) | IGC_NVM_RW_REG_START; -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.216628171 +0000 +++ 0038-net-igc-base-reset-loop-variable.patch 2025-02-17 16:13:16.838441592 +0000 @@ -1 +1 @@ -From 60dca8e0f6b2d8526dc9dc8b54e59b5d68964e8e Mon Sep 17 00:00:00 2001 +From 322c9ee4c7670df3cde2bdd0fa67b432768c5ac4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60dca8e0f6b2d8526dc9dc8b54e59b5d68964e8e ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - drivers/net/intel/igc/base/igc_i225.c | 1 + + drivers/net/igc/base/igc_i225.c | 1 + @@ -21,5 +22,5 @@ -diff --git a/drivers/net/intel/igc/base/igc_i225.c b/drivers/net/intel/igc/base/igc_i225.c -index 1277f59885..003c060215 100644 ---- a/drivers/net/intel/igc/base/igc_i225.c -+++ b/drivers/net/intel/igc/base/igc_i225.c -@@ -565,6 +565,7 @@ static s32 __igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words, +diff --git a/drivers/net/igc/base/igc_i225.c b/drivers/net/igc/base/igc_i225.c +index 97dc7f454d..25cd2a8039 100644 +--- a/drivers/net/igc/base/igc_i225.c ++++ b/drivers/net/igc/base/igc_i225.c +@@ -562,6 +562,7 @@ static s32 __igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words,