From nobody Thu Sep 26 03:29:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XDfH12sXyz5Y6d0; Thu, 26 Sep 2024 03:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDfH11CZKz4VmG; Thu, 26 Sep 2024 03:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMwN9j6TRTURc+1dSJnu6kPAW1/Levp+aYWzuj4rVDs=; b=bh6wN70rbNuiX+Gb2SE8YI5xh/38FHxQre228I8qd564Aq59p+uwadzXrqRu8diE91lXWn 4+2rW8fPrWKE8wgpRNlITjUgVANLTaAvN4LnoC1zjtnkUMLhRwmYE38oyf6y99PYZOAEbJ rqZdXf1nmjv/3G68TgwesEViZiqgmn1ZSbg9GI/EX9FUfMEIUa2Rfor77uS/7/i1LP48fJ n44Np/5jyq8uiAYki2KmgAI29DDroVb1o5ORUAso9yTgchEhn+VcdhABcLKystHefOknFo OPGZSaJvWoObvirs4f7R71DxeKGaU0yNIBYSb71LuEC6S+ugf0XV7XOIcLNEcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMwN9j6TRTURc+1dSJnu6kPAW1/Levp+aYWzuj4rVDs=; b=jYuzqjLMN6uWAUbUw5SQhnbmedAe4YoJHTPfDV01rxFbn6d4BbBwQC9o/RItp2KEVux1KR bs2cQ0tXNO7bz3BvCggLCAnkf2SshTNQGtqhNGS1BZqaZyr4k/xzv/I9dzVTyUjlhfxdWm F+2MleQeS6af3iCiL/KXYblUSLCAlolxKsvOA6KoZLoyuPajhriBG/P9VewUMKuC6cgLze KqzkRMOUIBp/i+3l3tAo55Sm9mEwR1Pu86Y4ppvlV+h4WEYnVCmNt48DCXkcW7QwR2V+Y7 DDNAqa9X7UkBIKjUj3dGMnzsAd75uI8ghJEWq/gZWbklCiHagHVOciRRsIviIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727321389; a=rsa-sha256; cv=none; b=PBVqe3nw/1fN09HUdZcwLjEXMJj3zljPuKkuHeYnIzGBbY49bWuZ/fID6KqWSrco8zM6Mh rli8i1kBLe/0pXkeSNKvjbmb1TZxLS7ysqprNd59rAdIwQqajUZyMX6TeA33hcpldiVVL5 zVUUVqTx8mMaZd9MAreUFhZO9uXYESxek4yuj9+0VhErSwmbMeVeQ4Qu89t7VgBRoP3lR1 ZLSgQ2lzs3US9F3NrSFQH/JQi77TmWbk2hYZ1R8SGXj9G9m/Bxk98japacynMOctMiWu1b j7dqMwXQDIV3lq1z5qSmdzRhIIpUGBobmCJtl2nw32YlLN/jl79OfHcltoHY0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XDfH05SKXzgfd; Thu, 26 Sep 2024 03:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48Q3TmBd082609; Thu, 26 Sep 2024 03:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q3TmeS082606; Thu, 26 Sep 2024 03:29:48 GMT (envelope-from git) Date: Thu, 26 Sep 2024 03:29:48 GMT Message-Id: <202409260329.48Q3TmeS082606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: ee5cdcc50d36 - stable/14 - e1000: fix link power down List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ee5cdcc50d36a9059da2c3bfff49521909ea1bd5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ee5cdcc50d36a9059da2c3bfff49521909ea1bd5 commit ee5cdcc50d36a9059da2c3bfff49521909ea1bd5 Author: Anatoly Burakov AuthorDate: 2024-09-19 05:38:32 +0000 Commit: Kevin Bowling CommitDate: 2024-09-26 03:27:57 +0000 e1000: fix link power down DPDK commit message net/e1000/base: fix link power down Current code is a result of work to reduce duplication between various device models. However, the logic that was replaced did not exactly match the new logic, and as a result the link power down was not working correctly for some NICs, and the link remained up even when the interface is down. Fix it to correctly power down the link under all circumstances that were supported by old logic. Fixes: 44dddd1 ("net/e1000/base: remove duplicated codes") Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson Obtained from: DPDK (a8218d0) (cherry picked from commit 811912c46b5886f1aa3bb7a51a6ec1270bc947a8) --- sys/dev/e1000/e1000_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/e1000_base.c b/sys/dev/e1000/e1000_base.c index ff810821d9e9..d83dc48c4d4d 100644 --- a/sys/dev/e1000/e1000_base.c +++ b/sys/dev/e1000/e1000_base.c @@ -137,7 +137,7 @@ void e1000_power_down_phy_copper_base(struct e1000_hw *hw) return; /* If the management interface is not enabled, then power down */ - if (phy->ops.check_reset_block(hw)) + if (!(e1000_enable_mng_pass_thru(hw) || phy->ops.check_reset_block(hw))) e1000_power_down_phy_copper(hw); }