From nobody Mon Jan 10 22:06:31 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 7DDF4193624F; Mon, 10 Jan 2022 22:06:31 +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 4JXnwR1mGkz4gDt; Mon, 10 Jan 2022 22:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1C98550F8; Mon, 10 Jan 2022 22:06:31 +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 20AM6V0P085044; Mon, 10 Jan 2022 22:06:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AM6V5M085043; Mon, 10 Jan 2022 22:06:31 GMT (envelope-from git) Date: Mon, 10 Jan 2022 22:06:31 GMT Message-Id: <202201102206.20AM6V5M085043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: d0ff9b029c71 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d0ff9b029c7175e20c801126be127db7c651b02e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641852391; 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=TTgd1nfT57SEb71IsZuTnCSE/ZxVObXG9nofD7052CM=; b=jUzckJm6eeqgQQ/X7pPxSABq+aG8KRk6IfSOJvt1wyiMRivQSxjKRfVnDV0+DxDNqx2Y+e tBW8auo3HccDpb6sBQWx7GSPtwfuvbTvBJCznnVrqY5LXwEqrof5oT9E6IiRkZIXzCibfX YBXRlQN/mV6j8/oevbHbUX8QR7Kr3IVVAzaIgL/5Umta161EQMGIgYO8b6vxLuMuf15e1h KhZ0kb8y8sxi0noKiGQv1GmaPrauvO4TduOPRCD8F9EySHJi+FY3HETj3iQ+sg4E4xTwE/ BvjJ1TForcKeuUyU/GsSBe67R3atshaxTIRziD/9hcjcXnYQU7SkRAHWmSxXWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641852391; a=rsa-sha256; cv=none; b=UqXPC9eCje2D4tzRR6yAFK6KYwbt8lYtHe7rKLP5bI+1w5T10CS0HjjwqQFWtpA8gyapOG sN5ge241KNEPz5wb6em3RJ/xh4oQTNBtLp49x9MWckpTPKRKZ8MM4bmmZ/VIIzrptFVBW6 iivKdbyGVzURVdH+Co0N8i4FFr8yQRmlL8hzitmXsELKYbKu7wHrcS/VqxbhjIXxuxopZQ vhSW0X52YtQcdXu2VHSJfogdLWPKhZMnEbA/l6j1r93moF3aUn8tq0BvkYqAkVtoflGT1G TiXd89aXbZ/kHF3wUcSHoQ7imL8pwZK892o80OqYu4EPgUoFzpvSD8m7k3YZNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=d0ff9b029c7175e20c801126be127db7c651b02e commit d0ff9b029c7175e20c801126be127db7c651b02e Author: Navdeep Parhar AuthorDate: 2022-01-10 21:54:06 +0000 Commit: Navdeep Parhar CommitDate: 2022-01-10 22:04:56 +0000 cxgbe(4): Fix regression in previous attempt to fix FEC selection. Fixes: f3c2987f2f5c91f0801fa8bbf9e1bc09d91aeb46 MFC after: 3 days Sponsored by: Chelsio Communications --- 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 b99d67bca49b..c7e4d48e855f 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 { /*