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 7935D45BB6 for ; Wed, 23 Oct 2024 23:19:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7393D432CC; Wed, 23 Oct 2024 23:19:24 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id B5AFA40261 for ; Wed, 23 Oct 2024 23:19:22 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-431688d5127so2188095e9.0 for ; Wed, 23 Oct 2024 14:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718362; x=1730323162; 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=Agh71T07CWrN3wHK+lUM+KgcrMgVH7K5hidvWaE2MKU=; b=DtFAvoJD8eUu/2VcN7mTwbmqxeb+eeukwm2oA00TL2JyssJ4k9j2YL3iu9lkrwzGMv GKJ9u+M3r7SgHBcjxu/dEBO8aPiaWqPgOsqurxytU7VPe6nNFJWZWoaZ/GCNufrQkRzD vLNI6tGZKv0vld7vTrk0tUBLmk+Nq1B4VedpfLQ7mrMCCAzp9GLI3CcK4iPlvk2ofciD G/WbLt+u572H3XvV0W26Vh8LMyo3OvgJBQMakFKdiO9BNJz73OgxpkeEk4MnIWYldUMm K2YdlfcD+VkOsTTV3t8HRdPrEYcdJl4f7gJoXcR0DPcN3/1gLvpgoxyVJtHwDC3gVuLO hSMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718362; x=1730323162; 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=Agh71T07CWrN3wHK+lUM+KgcrMgVH7K5hidvWaE2MKU=; b=kLbWpHoCqt9F9H18TpSUWV9qPW65H3+9/RDMuPHVanenO3+IneR8xFUgorojAaFr/l VLGc0BpBg2XMAfXvPnWWqq4JNjizkB/7QgLtBY+bOqNDhTn+EhU2Zw94Al3rUAcqGxPz aJTaWM0f2dfoAec3qfJe18moqGI3I9ud4jHohtVxBCAaW7iMdMe7zIEIwwJiExlG0IEg IyZL9SlbpNRqezrZ5H/mSuZDx7nBO5tX+2GMG2GrOb6icU/v/U7MAmkoll0aVprX8dBc VaD29gmnQcw/fyPHIdZNwkovy2ZjKXWBSSO2MHo3ikQ9FujvwmRhAIUzeITAgg0cENqg TR2w== X-Forwarded-Encrypted: i=1; AJvYcCWd2cmhvmll5gajkvsXhvKqRAU8pOlqlsRz0eqP5U7zPfbDWoLDEZ+f5MTezOxRd8ViIadJbn0=@dpdk.org X-Gm-Message-State: AOJu0YxyiMv6wpv7znOVsybE/vbAT65fRccPTVgzfR7CG2DlcTZrDRjb Y6vZiX0KssmPA/mGC71auJzlFpPtuT7hdFYROAnPcoIOCp5M7x3pOSxasg== X-Google-Smtp-Source: AGHT+IGDk/O2QhP63LL0GVil4PfJ73mVRjeg6RQ/gGTRpo0toaNPyD05Va+um3yUmrut5ALuRPB+0Q== X-Received: by 2002:a05:600c:35cd:b0:431:4c14:abf4 with SMTP id 5b1f17b1804b1-43184150bc4mr36527625e9.14.1729718362218; Wed, 23 Oct 2024 14:19:22 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a5b98asm9792643f8f.61.2024.10.23.14.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:19:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Barbara Skobiej Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/ixgbe/base: fix unchecked return value' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:17 +0100 Message-ID: <20241023211704.1216956-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. 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/c2cd652d0f0aeb5fe958d9550cb3d34f91cf070a Thanks. Luca Boccassi --- >From c2cd652d0f0aeb5fe958d9550cb3d34f91cf070a Mon Sep 17 00:00:00 2001 From: Barbara Skobiej Date: Thu, 29 Aug 2024 10:00:11 +0100 Subject: [PATCH] net/ixgbe/base: fix unchecked return value [ upstream commit eb3684b191928ebb5d263e3f8ab1e309bfec099e ] There was unchecked return value in the ixgbe_stop_mac_link_on_d3_82599 function. Added checking of return value from the called function ixgbe_read_eeprom. Fixes: b7ad3713b958 ("ixgbe/base: allow to disable link on D3") Signed-off-by: Barbara Skobiej Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/ixgbe/base/ixgbe_82599.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c index 69fd4cd3fb..b39dd70da0 100644 --- a/drivers/net/ixgbe/base/ixgbe_82599.c +++ b/drivers/net/ixgbe/base/ixgbe_82599.c @@ -551,13 +551,15 @@ out: **/ void ixgbe_stop_mac_link_on_d3_82599(struct ixgbe_hw *hw) { - u32 autoc2_reg; u16 ee_ctrl_2 = 0; + u32 autoc2_reg; + u32 status; DEBUGFUNC("ixgbe_stop_mac_link_on_d3_82599"); - ixgbe_read_eeprom(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2); + status = ixgbe_read_eeprom(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2); - if (!ixgbe_mng_present(hw) && !hw->wol_enabled && + if (status == IXGBE_SUCCESS && + !ixgbe_mng_present(hw) && !hw->wol_enabled && ee_ctrl_2 & IXGBE_EEPROM_CCD_BIT) { autoc2_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC2); autoc2_reg |= IXGBE_AUTOC2_LINK_DISABLE_ON_D3_MASK; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:41.927199737 +0100 +++ 0037-net-ixgbe-base-fix-unchecked-return-value.patch 2024-10-23 22:16:40.475941807 +0100 @@ -1 +1 @@ -From eb3684b191928ebb5d263e3f8ab1e309bfec099e Mon Sep 17 00:00:00 2001 +From c2cd652d0f0aeb5fe958d9550cb3d34f91cf070a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eb3684b191928ebb5d263e3f8ab1e309bfec099e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c4ad906f0f..3110477700 100644 +index 69fd4cd3fb..b39dd70da0 100644 @@ -24 +25 @@ -@@ -556,13 +556,15 @@ out: +@@ -551,13 +551,15 @@ out: