From nobody Sun Nov 26 00:38:35 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 4Sd8wC2QPGz522GM; Sun, 26 Nov 2023 00:38:35 +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 4Sd8wC20bkz3K7t; Sun, 26 Nov 2023 00:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700959115; 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=eLsOcv/jADh1xJfIYPQK8/co2/+hbtCBCM4znoPRDYM=; b=LM5ZF71W45a5e5J+Wgi66RIWaAhBpQVMJJ8Ec2WJSlDnfXUyptfF3wCwvytJcaN7dRVGtQ XpQ1VuTmvewYAG1N0jCM/CjbcMMuJjEynlF3NEw78mTb0vMJe+xWqTmmFNl96LtT/NqslH 83w9rEuatXZM6ZBzKf4QapJ2m2shz0OclKiI2D5HkKYjb27I8qtanIrrhyerqoimQiO4fy ZG/hdWaKvAvW7zxG/XYcE4Lb0hWMm16m/hv7JTrjyYGisfxZpZYis8jozAqgAbXlgQVmI8 4KPp+oWzwvM8al5lXAEX7qlsaJnzsg1gwZQbCeUHIZjPPziSKVelkdlZui1PMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700959115; 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=eLsOcv/jADh1xJfIYPQK8/co2/+hbtCBCM4znoPRDYM=; b=y4rd+3429lKztInUUpcCpYyZg9Xj/H84tyTjLDhI0zA0n3iJfBq/G4dIhVtbuxnsWGIOua syhN+wrByOj1mcGn9WDok/yGAh18whMAs7RMrEOst4R8sywMODkqpKS2tVqNCajfz3Fa1E iL7/L77Szbraf7DcgYTzBg3VgJs7nZL6wtSzcj8eKZMxrIl8umiD01FRoz0sy2iPq3dkzJ 9AQRGye/rf8xhi6ThKO+eurtmxaHhHNl6xgPYh0+/nm+lMJQ9DA/r2fgcQVdg6Exp1bWb7 EbBTFfHAHo0nwm26F6c80ArxquJFGpLQ4Du2Cqn0eZiQdWnTRngxzOqb2YWh8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700959115; a=rsa-sha256; cv=none; b=k7hFLhIPF/0goPPfQFyIbjSQ9zIhdma4x69WCveAsHtMe1MvxMZqV9BhSotwx7+0zZZK25 tM8xqskiDfHw0GEZGxYyeh3wP97OJrZvGPXU7jj4idldqcTk98NWd7t8SED+HxopiY62Bu V6BZgvKI4iYhv/PzA8hEuqU8Rby2+04kPE6as546c7Q5ONUd7wdO/JYrZnQpeXKvRxDjTX 6W/BIniPuIUYHv2u6URhBnGj7PvHb1RCMviMmALVVUoNT/EgtHK3FhUM4+wvgR2KWJWt4d dOSxGTv0flntUR7uBiYF9Hh9VTCfAx3KSVHBmUt1PVET2ceJRheep4fnxi/ARQ== 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 4Sd8wC14jtzZtD; Sun, 26 Nov 2023 00:38:35 +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 3AQ0cZij074357; Sun, 26 Nov 2023 00:38:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0cZJu074354; Sun, 26 Nov 2023 00:38:35 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:38:35 GMT Message-Id: <202311260038.3AQ0cZJu074354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: d0b589b23134 - stable/14 - re(4): Add support for 8168FP HW rev 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0b589b231345f449af5fa4549bbc747d6530af3 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=d0b589b231345f449af5fa4549bbc747d6530af3 commit d0b589b231345f449af5fa4549bbc747d6530af3 Author: Brad Smith AuthorDate: 2023-11-23 20:13:00 +0000 Commit: Xin LI CommitDate: 2023-11-26 00:38:05 +0000 re(4): Add support for 8168FP HW rev (cherry picked from commit 88d2b69c719a20da9eb53f1c58adf6ecb005f8ce) Differential Revision: https://reviews.freebsd.org/D42671 --- sys/dev/re/if_re.c | 2 ++ sys/dev/rl/if_rlreg.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 83fd31fc4f0b..594ed9d60379 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -243,6 +243,7 @@ static const struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, { RL_HWREV_8168EP, RL_8169, "8168EP/8111EP", RL_JUMBO_MTU_9K}, { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168FP, RL_8169, "8168FP/8111FP", RL_JUMBO_MTU_9K}, { RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_JUMBO_MTU_9K}, { RL_HWREV_8168GU, RL_8169, "8168GU/8111GU", RL_JUMBO_MTU_9K}, { RL_HWREV_8168H, RL_8169, "8168H/8111H", RL_JUMBO_MTU_9K}, @@ -1495,6 +1496,7 @@ re_attach(device_t dev) RL_FLAG_CMDSTOP_WAIT_TXQ | RL_FLAG_WOL_MANLINK; break; case RL_HWREV_8168EP: + case RL_HWREV_8168FP: case RL_HWREV_8168G: case RL_HWREV_8411B: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | diff --git a/sys/dev/rl/if_rlreg.h b/sys/dev/rl/if_rlreg.h index 808d11e34346..7de7e2fcc585 100644 --- a/sys/dev/rl/if_rlreg.h +++ b/sys/dev/rl/if_rlreg.h @@ -194,6 +194,7 @@ #define RL_HWREV_8168EP 0x50000000 #define RL_HWREV_8168GU 0x50800000 #define RL_HWREV_8168H 0x54000000 +#define RL_HWREV_8168FP 0x54800000 #define RL_HWREV_8411B 0x5C800000 #define RL_HWREV_8139 0x60000000 #define RL_HWREV_8139A 0x70000000