From nobody Mon Jun 03 19:24:55 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 4VtNw81gYwz5JsGS; Mon, 03 Jun 2024 19:24:56 +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 4VtNw74L7rz4VKF; Mon, 3 Jun 2024 19:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717442695; 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=yPOzDGCV4gj/9bD5x+kJT4iGYPJKgXMiFGcHKY3L0VM=; b=V+UWcV2PI5XmzUl/fBinJZj53Y+CXC4JnXf4OLPMub+zE152hZGxK2c2M1H6P2eUgFdWcA XOk3oyCTNftD2DD1d1JHg5TciQEA7eQ9YkKFRmB2rXI3sAkYGwNf1PxCiB6EhWRCiniZSa UfeQoajpSqrxKVe5IkPao6SOaa3FAQ6M/zDnCwBcfDUBWlRXBrNOKpzLdl+sp6BacO+xay XRtW0hSxeZe8jUwZ6FRVTTrJL2mZ1tSRIidKrHnQzzqDakI6xAHx/0Osik/hynA5tG1UIz /GRBT40mnZK6M/ZyPEszGnZOQ50JsZ7ulUhAM94Cwo5YNxodBDk9ndLUV2307A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717442695; a=rsa-sha256; cv=none; b=jK0MdD0/4WOMcvF+JBOWghkIbq5QpU/LXJFDNBjnSTUabPYA2OYecDbb7govfRfOIQ2FLl mVmVqSNFcCKNeDObkYCFtQQLGIqWZBdZIApsTVho+WcgbR+ogT1A5si5FG3ouO4Bet9nmG Lo+EIHD8QJeWW84C7Ylgwxyvbr2+JiNt5CYOpP0bH8ZtxQFQedcuXuDMUIYM5nhJYCfqs+ s1nNR3m7Di7EVm20lGOmZ7vnDUJhL4Q3T3/fwkESSSKvzPI7ikgeHJZcNREt9UOWTSIijD aF3gGhRa4AJ3wnKZgnMBG11dQJfi+dcmejZiRV5oRzj7531nDs7DtayfF9fBHg== 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=1717442695; 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=yPOzDGCV4gj/9bD5x+kJT4iGYPJKgXMiFGcHKY3L0VM=; b=Dd+tNJk7AEQE2XZHWqkUHdJhG+jQHumnIlrFVs717NuY59jaolrLmEUr88AsuBEVP4aTns t3n2zu20VERetaekxfZ/CvLMcwbDqmyjKxQA9KWSNT70Iaq/pOK3U4GRm5QwKIkqds0s7y gqbA2xwMujxnt9+ggC0fiQJDnX6S/bYYYXleH3XDN1Ob11coQraD961QkiWAaCRVJdun+P 3kiKtuo7oQKe8tQRrxQNg1Q7b/zG/MP6vZtdy744U3B8VTXHbgRo800QD8JGthJGka+17p NHp66ejwGt65Y0Mje1ujwaJuq9CGPwlWx9VUUwxjtx8EoKPpKD7mGR7nHtoPBQ== 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 4VtNw73yc3znPC; Mon, 3 Jun 2024 19:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 453JOteW067624; Mon, 3 Jun 2024 19:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453JOtWt067621; Mon, 3 Jun 2024 19:24:55 GMT (envelope-from git) Date: Mon, 3 Jun 2024 19:24:55 GMT Message-Id: <202406031924.453JOtWt067621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1b5ff4b14dfa - stable/14 - if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b5ff4b14dfa8b49664b56c4c5d44faa129f36ba Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1b5ff4b14dfa8b49664b56c4c5d44faa129f36ba commit 1b5ff4b14dfa8b49664b56c4c5d44faa129f36ba Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:18:41 +0000 Commit: Warner Losh CommitDate: 2024-06-03 19:23:13 +0000 if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D429506 (cherry picked from commit 816abba22efcf1ba51f61b1d89320ca8b576274e) --- sys/dev/bnxt/if_bnxt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 5edb678ac444..872ffbb21e82 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -2121,6 +2121,8 @@ bnxt_media_change(if_ctx_t ctx) case IFM_40G_KR4: case IFM_40G_LR4: case IFM_40G_SR4: + case IFM_40G_XLAUI: + case IFM_40G_XLAUI_AC: softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; softc->link_info.req_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_40GB; @@ -2937,6 +2939,8 @@ bnxt_add_media_types(struct bnxt_softc *softc) case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE: BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_ACC); BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_AOC); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_XLAUI); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_XLAUI_AC); break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASECX: