From nobody Thu Sep 19 19:05:17 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 4X8lMf1mwKz5X8Ny; Thu, 19 Sep 2024 19:05:18 +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 4X8lMf0myXz4KHW; Thu, 19 Sep 2024 19:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726772718; 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=CNP/VT+dRBOeeFv9Q2VYNSc2R+NalO6z1B6A63Fnpv8=; b=rAjhiMGbXWfMrWeLCjFzhjHRkXpJnF9mZCOl61ef4vkU7qa8Ob5PWPEoL7Ke4b1Z3a66g1 P2LgCJful8uS5zvDCHDbN3Or3SQ0E+w536JwpaFIk4azHJninYWEgSIbfLoid93Ye9gYTk ESpg6nkrv9rdICKjqLgpgjyz8bihs6T9bOM7aMlesNNGYdGXDso5PF4Uyn5YfbM0quWGlF wkL4HOWgSvKbn93NgI/DgSzPRU/2eRwvfPHruuJKOQjY6K3143C/vAu/2Rw86q5ybxXYzH SegjTyw9WalUV+2IEVNL+Q3yVT2XxQbqVjNgJsL/gwLThlDLYD+HbNivsWkqXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726772718; a=rsa-sha256; cv=none; b=jCcf+Kmce+6oKWhno3qM0Xmn5UR9J1sCZWjX1HgW2iR0UR7KNyyyPcLkMnakyFfWAxJn5d 1+o1qUGgjYHu4zNkEpedoiM9hnZaJjyx2t8s9+CugEtz4v0Hje86rVwf6ifyZ6d8iVi3jX 0/nbXvEoiLsaxJsFg74kKfOWiSzGWj2/6YNF1JbdwgQo9vNNsYhiWbmfv1+joiaHlnZJ3Q 1ERCkARg9sM6swu9+WBPsmM1IXkhOfJoCd0F6wPj3CzfRwKZdHcTfxcS37Cn6T7ip7SHyZ nAZzImEaefjmTn9czG1v60DgTgT6Sf2fym+x+uLOCYr0mz/dSql5ZdczKdUDeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726772718; 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=CNP/VT+dRBOeeFv9Q2VYNSc2R+NalO6z1B6A63Fnpv8=; b=tRzNbEWww7NM12OTw5cQk90AVIG/8Qc0h5UJshX9zxkl+KT4hZuhnZ6ompTloMmxT7iG1j Skrd+0Fd3c6H0bCxSNYREpOoVUfOlFJ4nHtRbUVeiffJXYUafTZQyKeoA3O7+DKEcC75rV dn8++I2tZs851gynYmLr2wN85OlAKbZ8ujDBlt5FsW5zeGf7pl1DYVkwRxhRM+qrfliFgT hITu5uHAKZJHYL4fCO4UzYsYqlXXeZU1TlArrLzGE3ddhmfoAwrvYjWpuB4/ibq5oUSgAG DcZRRBnTIJlur0sF/RJczcQkHuuCVCMg9Tb4wtlDj/R9Ip2pd24jVHFz31UE+g== 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 4X8lMf0GlnzJCB; Thu, 19 Sep 2024 19:05:18 +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 48JJ5HNp014392; Thu, 19 Sep 2024 19:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JJ5HMc014388; Thu, 19 Sep 2024 19:05:17 GMT (envelope-from git) Date: Thu, 19 Sep 2024 19:05:17 GMT Message-Id: <202409191905.48JJ5HMc014388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 811912c46b58 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 811912c46b5886f1aa3bb7a51a6ec1270bc947a8 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=811912c46b5886f1aa3bb7a51a6ec1270bc947a8 commit 811912c46b5886f1aa3bb7a51a6ec1270bc947a8 Author: Anatoly Burakov AuthorDate: 2024-09-19 05:38:32 +0000 Commit: Kevin Bowling CommitDate: 2024-09-19 19:04:47 +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) MFC after: 1 week --- 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); }