From nobody Tue Feb 21 23:57:16 2023 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 4PLx6P2G3dz3tfcM; Tue, 21 Feb 2023 23:57:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PLx6P0vYsz4ZXD; Tue, 21 Feb 2023 23:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677023837; 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=/0jj8H58mS7E+7Ampam2f2a1FZm08e5f2nvcMPANcc8=; b=J451Co6mKFFLxCuwEH1XB97eZj54P/K8MibG92hao+t4rSsixPLOzyfAOUDFp9Z/MvsuJX 9neiniVx0UGpMiKe+nPSSJIufouWFAYQtPox5rDUQ3NWtMAObkiklv4ceBvjbin+936znC QCqI1dUNErPTEgBAeAT1pD2RWT0kNBqs1wnf95ibRj4+4KZoLzBacUQ2m954HIvFd7L3Ei 8Q77e98HbLPpCJ8OEI+sad46+3596aR7v9JYeAomBnAtwaxDlo9tqVmwDFuku5SbmdFpFU ZsKo0EL9GWc1fSidmYJvAeVJXQSt8LrTX+3ezOZbKNZUp54ux91Mli0DtG/heQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677023837; 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=/0jj8H58mS7E+7Ampam2f2a1FZm08e5f2nvcMPANcc8=; b=USyQSe6DMvyBRXX6owHsCrc432YSzPjjg1L3mtfFIvYUmjT+swDY0Ssri3o4JAW6I39B2p YtNHmwC+SAzWozCr+mVD7ukmw1++v6yuDlbXORFKiytHOrY4tQ143WTMg4w2vUEpbzFNow 3rk15z8D7XUCpewyBhrQS+fx9E2rFsl6BlMy+aHZA3KO84iSTyuuRaEPiyMxJsfoNLs5JP oClL+ZHNbPQskmHsIhFVOci0aeW22YpS7+FdsIRTbqJhs4zXlTz4VPmYSZ2/KdArlUAJoc S+eUxbW45rKWr5/H9T21/tYWEusbRX8tcuB6H6/cKMFO6rzNT0BPACbAjWWsRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677023837; a=rsa-sha256; cv=none; b=FHsuTcB4IXh5iLCgsI9wDHWjpyas96Mf2pRR86xL+92rJUqxoHek0bVuE6/1pl+awfxdhV +cCp1alHP2cMBZHQ+2TYnDizTqh8oc42qfdXXHMf5YoVSL95afinnyerTvmiuFXC90IVl0 CR2hvLUb27yEYaqqVg1cRFyVbdQNbkzyE6t0F56T+desI36yjj/M4Gp7t4Zj1TURcZTot0 Qu6Ia6bja6JwgclvugjRiWLd1e/44N2AUmo/ddVq9UW5NYGfdTDX40l5utF0BQLVnnK+Ly KKzyHIvR+pP3IYvJn02ouopSb341cL1Ms3cvzH7CACkj/UvWi8JIK+fBJX/OtA== 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 4PLx6N6TXQzftr; Tue, 21 Feb 2023 23:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31LNvGM3068469; Tue, 21 Feb 2023 23:57:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LNvGQm068468; Tue, 21 Feb 2023 23:57:16 GMT (envelope-from git) Date: Tue, 21 Feb 2023 23:57:16 GMT Message-Id: <202302212357.31LNvGQm068468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 7006923991c6 - releng/13.2 - ixgbe(4): Filter out spurious link up indication 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 7006923991c6e56399b07dd839378c81844df8ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=7006923991c6e56399b07dd839378c81844df8ef commit 7006923991c6e56399b07dd839378c81844df8ef Author: Krzysztof Galazka AuthorDate: 2023-02-15 22:35:40 +0000 Commit: Eric Joyner CommitDate: 2023-02-21 23:56:00 +0000 ixgbe(4): Filter out spurious link up indication Extend SFP+ cage crosstalk fix by re-checking link state after 5ms delay to filter out spurious link up indication by transceiver with no fiber cable connected. Signed-off-by: Krzysztof Galazka Signed-off-by: Eric Joyner Reviewed by: erj@ Tested by: Gowtham Kumar Ks Approved by: re (cperciva) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D38395 (cherry picked from commit 04a5e6d7cadd06b10169c3c3a560649e7dc7444c) (cherry picked from commit 25d43e3c6b365c3fb68c594fe1b9a40b98bf4f00) --- sys/dev/ixgbe/ixgbe_common.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index 3f38f5e27123..86301dab80ed 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -4232,10 +4232,25 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS); } } else { - if (links_reg & IXGBE_LINKS_UP) + if (links_reg & IXGBE_LINKS_UP) { + if (ixgbe_need_crosstalk_fix(hw)) { + /* Check the link state again after a delay + * to filter out spurious link up + * notifications. + */ + msec_delay(5); + links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS); + if (!(links_reg & IXGBE_LINKS_UP)) { + *link_up = false; + *speed = IXGBE_LINK_SPEED_UNKNOWN; + return IXGBE_SUCCESS; + } + + } *link_up = true; - else + } else { *link_up = false; + } } switch (links_reg & IXGBE_LINKS_SPEED_82599) {