From nobody Thu Sep 26 03:33:36 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 4XDfMN2Kh8z5Y73K; Thu, 26 Sep 2024 03:33:36 +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 4XDfMN1TlPz4YBy; Thu, 26 Sep 2024 03:33:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321616; 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=O5lqTD++AiHmG/hjAu7TzH+RmehVub7DAJZ54Wb5jlM=; b=kFvi2vpqfqAPiOa+4H+Y7cx/UUN3v9FAh1r8Sd83kvstsX35FDNrQMj8Lclbl9iVibqv9O K4cggF2WWvLkHhSF9rXb8G18950T47c2unu99lBwaSoZm8vG0C+oNC/oW7hvvqMrtNDjxS CV4YoAOkcVFqMeU7q/DRXCWa7E1Iu75m3U76jHGjpgLN7EjDLF0wRRtAd/9egiDMWVr8/J ZMyKaUdsV3cEHjOd6aBWwyq2bJOR/KmxcOg4pSh3PnmjKxgtFs/v+ZUBFnJO4R0xpyeF0U NizA+Wr7AJBsz1B7FYLrPzPxjnqordAaPZVvfqJ72AiCnPP6m5QtKeuzMnz4mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321616; 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=O5lqTD++AiHmG/hjAu7TzH+RmehVub7DAJZ54Wb5jlM=; b=g+zvsWUmPZi80x0OplZEwsC8WaJ/chAlndObjWXbvFQlwcguLIJFfk0C0wEIf84ls4gp+E 6TqqabKk3dbS01w4Kmm1BCq7TVsiJZqRUgL6mC9kg+wjyWp5+ttrFI7rXWSGhpluTpMFMg gE3eS6wPz0hMDoSezoqlvLqF9NHHvONxqaZfcqi8yRbZZz1GkhRy8ViXwfOPeR5yAN5Tk/ Q+mIwYwcafUUxzCHVQrWRHZdfkghn07dU5MwyqFVh95mULySeYFnmNXKtq3MpoLY0lpXMa K5cEWv+QEwty0h7XzKpe8J5BqNzN5UxEWXon2tyMDvEPZyrtHfIsMe/K7aQwRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727321616; a=rsa-sha256; cv=none; b=LO94d9KA1m0PorUfnUKGvY9Jr+moQk7kBmntQ1ymWv+O0CRn6Uiy36A03EwA6Rw87dm2B+ wGjrqK+0+3ORh32be8G7dt6SSsdXPawBKMc7X8OhSOhWkjN77y2cuPf1Xcpaft5U4qUjYC DP3mO6eeNbYTP3eHaDlAyETRLl7pBaJQ5OD9RjZE8ngAFQw+IzYTwD2kJNQJSwKmZYMNqi EU94iJiOBw2lL7rSX4PfckMDwA+L/QQQv3XE6ob+3bFAWEd+b1zGBViJXE1RYVtpjds6e2 PW3hyc0Os1ZII1RTnwQ0GKXay4AVup5+neMfqFQREiThHtvaqOZBam+Ie3kMkg== 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 4XDfMN14qYzgg1; Thu, 26 Sep 2024 03:33:36 +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 48Q3Xax4099035; Thu, 26 Sep 2024 03:33:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q3XaSg099031; Thu, 26 Sep 2024 03:33:36 GMT (envelope-from git) Date: Thu, 26 Sep 2024 03:33:36 GMT Message-Id: <202409260333.48Q3XaSg099031@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: 6f5092ed7503 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 6f5092ed7503608984447ee973decbdef8a7715f Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=6f5092ed7503608984447ee973decbdef8a7715f commit 6f5092ed7503608984447ee973decbdef8a7715f Author: Anatoly Burakov AuthorDate: 2024-09-19 05:38:32 +0000 Commit: Kevin Bowling CommitDate: 2024-09-26 03:32:06 +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); }