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 518674624E for ; Mon, 17 Feb 2025 18:08:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 43675400EF; Mon, 17 Feb 2025 18:08:05 +0100 (CET) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by mails.dpdk.org (Postfix) with ESMTP id 9ED7A402BC for ; Mon, 17 Feb 2025 18:08:03 +0100 (CET) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5461f2ca386so1227998e87.1 for ; Mon, 17 Feb 2025 09:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812083; x=1740416883; 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=Zsv0h6erpGnrsraGkDkH81f2Vag/gL1F28MGGSB/2nw=; b=hT9NLH1KET9zzVSVvIJVMcr5bF7DV53VHHpRPBPdQ7WZwPbXp/o48Z3SlPP9IxSwY3 0RPDai5lYpbotP0MaYZ2OKUUcZnEXNw4Uer++Dtq42eh+wZHg5sl3AyEabMhFVE+mS/9 bEs7jAPlPTVN04mHSDx6FZtKp3YbFCb99jYbw9AXUpzCWBDnW7cnQNJevnjvaTI4CmU+ JSsCo9kc+hV6u/+QvZfxjkkqO452sxi8AAWNltMDM5ayVLEmTZ+ICcmRVm9/hwnEfYnc bZcHr/YzfCKhUKkclvE5N5G1TMyxadaLjgJDjrv7JbmH6g31O4J1CkFk7eGsIx/I4h8P aRWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812083; x=1740416883; 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=Zsv0h6erpGnrsraGkDkH81f2Vag/gL1F28MGGSB/2nw=; b=bamBV1qWtH9mI+2Wc7iW/a2LbotulBRXnxkKoL4tYreXOFDZP71oI5JmhLnwFACglP r0PZ9hVjhPsrUNKoB3XNuFcpE8UlDvWKrdMiPUV/kp4uUMA9HRifInOPrKrqdsyfTETD LjQlvA8IzY+WOLBk4yCNNzibhxHF859FHvXgntRPs1vD25oUnq3+EZJE0FBJHpuMp6Xp jK78+10Y4661xnEfI7TjGrxKxK2BIk0pWHJXiRbUM3YJoMjPf6XzBzkeV7jIo7e0tAru Z8/sbHUiXbjauuzEz6d7+OoVVI+ATAUTqI/geoynU55M/C9k7d04EnA0y6VBguUQ0daJ zXxg== X-Forwarded-Encrypted: i=1; AJvYcCWLpXKqAnQ+imXZPVmV1lNnWDemZCJkpdWe3j1wbR3PzIW/3oBc15lcMo9vWGb9dXex41jPAC8=@dpdk.org X-Gm-Message-State: AOJu0Ywq8pRaPnBYP5dSLiKsvM1BYX9S6HO3kql2vmDiSWzpS8Te1rNS JTXpPV8S3JvnbxPe2uyvKW0uQt/lva/UUeeZYiJGs9727Z7wSi8m X-Gm-Gg: ASbGncubBfChM8Hyq/J31qITC3peJZsyK3JFgVdGbhYD/aFb3C18qtcWF1Izk766619 OVm3KtEVA9T7UUD6sWXVE0hiSiEEETBiOxxBOLLLuGZQT+/haIckh2YPAKZd+U8aiuOzGWJo0h3 C6lOEDMUYw0ppJeeEA9+QTOC4Ym45AVIq8GY7e4XuGlcCTwavbp022+GBGFMbZk2JmLIUGO8BMn /tE07LsUhyP8pL6j5rSSUgf3xgMdX2Keu3XTYX8rSz3XAJpwjkgK82H9+eIFsaRxLepsSvPmob8 LtPj2XzpEaD51ew/cG1sPA== X-Google-Smtp-Source: AGHT+IEBa21K/998D/69VvS8S5gsVN+yetZ1F2dSj/HqrdS1E893tyPMdEiQfVJP2eRZAS3NHxEUSw== X-Received: by 2002:a05:6512:3a91:b0:545:1dea:7b2f with SMTP id 2adb3069b0e04-5452fe8fc06mr3150174e87.45.1739812082578; Mon, 17 Feb 2025 09:08:02 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4398242f2c2sm40240305e9.20.2025.02.17.09.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:02 -0800 (PST) From: luca.boccassi@gmail.com To: Carolyn Wyborny Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: skip management check for 82575' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:30 +0000 Message-ID: <20250217170456.1068278-57-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/25eabd599b8b3d6712c04847907f17df7fac1e80 Thanks. Luca Boccassi --- >From 25eabd599b8b3d6712c04847907f17df7fac1e80 Mon Sep 17 00:00:00 2001 From: Carolyn Wyborny Date: Thu, 6 Feb 2025 16:08:47 +0000 Subject: [PATCH] net/e1000/base: skip management check for 82575 [ upstream commit d107a23f60c6a8b9543c386ecc48abc4f92f50d3 ] On 82575, driver is not supposed to check if management control is enabled, and flush the Rx FIFO unconditionally. Fixes: 44dddd14059f ("net/e1000/base: remove duplicated codes") Signed-off-by: Carolyn Wyborny Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/e1000/base/e1000_base.c index 3ec32e7240..e10bc6907a 100644 --- a/drivers/net/e1000/base/e1000_base.c +++ b/drivers/net/e1000/base/e1000_base.c @@ -132,7 +132,8 @@ void e1000_rx_fifo_flush_base(struct e1000_hw *hw) rfctl |= E1000_RFCTL_IPV6_EX_DIS; E1000_WRITE_REG(hw, E1000_RFCTL, rfctl); - if (!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN)) + if (hw->mac.type != e1000_82575 || + !(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN)) return; /* Disable all Rx queues */ -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.861788017 +0000 +++ 0057-net-e1000-base-skip-management-check-for-82575.patch 2025-02-17 16:13:16.854441592 +0000 @@ -1 +1 @@ -From d107a23f60c6a8b9543c386ecc48abc4f92f50d3 Mon Sep 17 00:00:00 2001 +From 25eabd599b8b3d6712c04847907f17df7fac1e80 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d107a23f60c6a8b9543c386ecc48abc4f92f50d3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/net/intel/e1000/base/e1000_base.c | 3 ++- + drivers/net/e1000/base/e1000_base.c | 3 ++- @@ -19 +20 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_base.c b/drivers/net/intel/e1000/base/e1000_base.c +diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/e1000/base/e1000_base.c @@ -21,2 +22,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_base.c -+++ b/drivers/net/intel/e1000/base/e1000_base.c +--- a/drivers/net/e1000/base/e1000_base.c ++++ b/drivers/net/e1000/base/e1000_base.c