From nobody Mon Feb 28 06:55:50 2022 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 9889E19D300F; Mon, 28 Feb 2022 06:55:51 +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 4K6WP24s2Lz4RrJ; Mon, 28 Feb 2022 06:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646031351; 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=uSfUhbr7xCymVAXH1L9cIl1SQrWJG5Et7JEtzZRXJDQ=; b=yw8uAXcgVsgRgbxT78uF3CIYB7nbbx7gEaqh20Sox22gTKTCchmu6WG3iKCMzzDH68uKst SCulg2DKpWICnGu2Yz06I0H9k1NQIlLHmf8Fd1J0jouFb5FZQsFGTKYp8DnCTTf50ZHXTg ePt+gYPtoATNPM+SBj7GWecjgOc9rEClHaiiw4uXPaFI9t6bixzxw8I763m7YdNRnRleNC +HcEDUykdkoArDMBuq+qfvTZlTtBG0LKsiSR0KIXun3z9pi5VHxm5a338783oEvPJJ7J6q b3YMUIUFep5pqI3kxTh0F0F/FxCUX5jo6LNKLJeyJJqr9UEzo948LMCW59UwAw== 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 61F5416F67; Mon, 28 Feb 2022 06:55:50 +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 21S6toVo077939; Mon, 28 Feb 2022 06:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21S6tob5077938; Mon, 28 Feb 2022 06:55:50 GMT (envelope-from git) Date: Mon, 28 Feb 2022 06:55:50 GMT Message-Id: <202202280655.21S6tob5077938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: c50239ee3048 - stable/13 - cxgbe(4): Fix regression in previous attempt to fix FEC selection. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c50239ee304800de0aca21605aa4ed2a6225ee28 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646031351; 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=uSfUhbr7xCymVAXH1L9cIl1SQrWJG5Et7JEtzZRXJDQ=; b=Q650CrQa0kws/ujbCIHhvxtf2XlnrVYk1G/P5d9x67j6vo+hDxyR/vhucPY8dgoqPMWIy7 jYsLNcN33ueotJUlfky0YlfSqIrVaaOJS56SNVc2/jcwRVzl4DrF20fEn9DRals4sYT8Ae JQzQLkq38HGNI8tiEFRnl6pAaScIKVmHleoG3djb60+BTeSdsNq98s9kk+77nnqA4+Jj6f T0wvQwSUwavX2pRhdAvOaVxju1Pl4BLJl/+62OJfRALQlW74iU7vr6Gv2wzH9xWS0mm47J M8hawjNKoFdN8byVd6yMWSDBDZGaRVg/p4JmWGMG4Okf1bz6dVGL9ZTRv9tT/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646031351; a=rsa-sha256; cv=none; b=FcDFYPjkOoTR0BNCZ1FFw5P1XLNImBRdPNEQv06Z+Da4LaiVcBcXgqkVnhHFJ1hGwbW0dP 7mH0Q2zcGH6VFtIUHEKrSJWzgs+08dCDw4weXFhnSV8sEHTJICaifDsEuRaMq1WxHKHOZ8 5XKzusoXvxt3PCgh+om5aGmmLgOhNyU8TFZ5T2aQLPWRrrs81b+XGrQmF/Nj3+YjbWpWGx YNehNqGnaCDNLaOi1nxQZdsXFxiYADUV8WGpcbQj1AeNRQTce6N6M5B4K0T16/zylN0BF8 Gr7T75yhdl0Ueiq/NSGJDdeto7fMCeQMbM//R87NYCgyqeeud7SwLFZdhbSkCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c50239ee304800de0aca21605aa4ed2a6225ee28 commit c50239ee304800de0aca21605aa4ed2a6225ee28 Author: Navdeep Parhar AuthorDate: 2022-01-10 21:54:06 +0000 Commit: Navdeep Parhar CommitDate: 2022-02-28 06:50:29 +0000 cxgbe(4): Fix regression in previous attempt to fix FEC selection. Sponsored by: Chelsio Communications (cherry picked from commit d0ff9b029c7175e20c801126be127db7c651b02e) --- sys/dev/cxgbe/common/t4_hw.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c index c60594596959..6191cf5533cd 100644 --- a/sys/dev/cxgbe/common/t4_hw.c +++ b/sys/dev/cxgbe/common/t4_hw.c @@ -3947,12 +3947,13 @@ int t4_link_l1cfg(struct adapter *adap, unsigned int mbox, unsigned int port, * the potential top speed. Request the best * FEC at that speed instead. */ - if (speed & FW_PORT_CAP32_SPEED_100G && - fec == FW_PORT_CAP32_FEC_BASER_RS) - fec = FW_PORT_CAP32_FEC_RS; - else if (speed & FW_PORT_CAP32_SPEED_50G && - fec == FW_PORT_CAP32_FEC_RS) - fec = FW_PORT_CAP32_FEC_BASER_RS; + if (speed & FW_PORT_CAP32_SPEED_100G) { + if (fec == FW_PORT_CAP32_FEC_BASER_RS) + fec = FW_PORT_CAP32_FEC_RS; + } else if (speed & FW_PORT_CAP32_SPEED_50G) { + if (fec == FW_PORT_CAP32_FEC_RS) + fec = FW_PORT_CAP32_FEC_BASER_RS; + } } } else { /*