From nobody Mon Aug 12 06:57:21 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 4Wj51F5T6Pz5TJy9; Mon, 12 Aug 2024 06:57:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wj51F2jjVz4rT1; Mon, 12 Aug 2024 06:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723445841; 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=hqPniyDCSdVbYDc08sEg3QlunCCZLtrPOAMxxSRoyug=; b=DTfmVpKP1jWH8tChZ4bNl3u8B18Bh4pNqSL+kEM/qis5stP39B8/6yZLo9CWbBKAin778j Q4t3Fr4m4Mxsz6117YyN1KkQ+q/I7cMrwnyoVsQxCal9NrFSVlVM+2Xb5MlO4+V3LNo1mJ 7Nk6vVJzZlgNl7KtVZJSucwRz4BQVQV0YUdxQAz9F7mUtxOZGYQHGoZ2g5aGoYQm4Iqq5b jHQlp8oB/G8N/QXsBIk/Pqkeu37Ew1pcmuOs/bgw76/fiMWXg35AqVHe+OrTUFM77co1kz L0oypTRnOPkkAJvjmjKEsnjXBKusVeo/CwlTYHK7QY/dbT3rBQD19i5Kn126gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723445841; a=rsa-sha256; cv=none; b=SAMzVUqFFHFfEHc5wleuj0lDxOWkjovJeHWM78/mmU4ZnMium9J7pEpuBQb04CGPJkySQx YdfTuJLbDp02N8tcuS5C/BYqtFs6JjNpjcFN65gAAE1wWrQSRM6jJRn8sknmfvf9kmqcUK AbKEg51Ygrg29BOXB70JV/hoR7SjZzJ884QnaBXE8un+lbcdbbuGQBIqLcjmFDrmOxQQQs h+xcXWqLZHQkqSK4kKZv7fn24iLldC+sxJ/fJ2tQwzc0cSEexNUxvXExxw7IcLCKwCRoTm 0Qm0XAMFqKOVr97IdL6W2jxeko36zTV3Dw3Da/bdop5HY/9zx0H4gMUaE3Wucg== 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=1723445841; 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=hqPniyDCSdVbYDc08sEg3QlunCCZLtrPOAMxxSRoyug=; b=I6I2EHmyCjlehwYVwvvdUdwDt1MJxRkmJgr4MS9fZRpkKb83ZIgY75ThQjx9L/QJ3KNTpr 0AsIYGPDXJsJBdp4tDho3icVY5b9W5pTCFuMp7JU2Z4v6AWAGaBqmpNd7Y3uAID7vYMxTK XcoLOn/2Jf9H+xT7E+G0Z85xdakl6fvPGJ7IXnJCk8dpWlplhxJWRkp9QyMAeU8mVzj90A rsPDTVitcxg7Mr4ex9csVwFGNFyyolgwHxCo+PpnTNb+FFoLRRwkOqgZUvl4nPI58/YJC3 ArLGzBsT1pPQSIcXZsUB1QUenxukiXuiAhy6V+3GAWbhAAC72N6vgHVNAX3n4Q== 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 4Wj51F2KwRzHVg; Mon, 12 Aug 2024 06:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47C6vLAF028513; Mon, 12 Aug 2024 06:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47C6vLTX028510; Mon, 12 Aug 2024 06:57:21 GMT (envelope-from git) Date: Mon, 12 Aug 2024 06:57:21 GMT Message-Id: <202408120657.47C6vLTX028510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 6ea4d95f6c76 - main - Move support of Realtek 8156/8156B from cdce(4) to ure(4) 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ea4d95f6c76aa64d2db5c04c87e68dc299544df Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=6ea4d95f6c76aa64d2db5c04c87e68dc299544df commit 6ea4d95f6c76aa64d2db5c04c87e68dc299544df Author: Li-Wen Hsu AuthorDate: 2024-08-12 04:04:05 +0000 Commit: Li-Wen Hsu CommitDate: 2024-08-12 06:56:28 +0000 Move support of Realtek 8156/8156B from cdce(4) to ure(4) Reviewed by: kevlo, imp, hrs MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45088 --- share/man/man4/cdce.4 | 6 +----- share/man/man4/ure.4 | 9 +++++++-- sys/dev/usb/net/if_cdce.c | 1 - sys/dev/usb/net/if_ure.c | 2 +- sys/dev/usb/quirk/usb_quirk.c | 1 - 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index 6768c7bbf517..9d842e475d85 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\" -.Dd February 10, 2023 +.Dd May 3, 2024 .Dt CDCE 4 .Os .Sh NAME @@ -107,10 +107,6 @@ Sharp Zaurus PDA .It Terayon TJ-715 DOCSIS Cable Modem .It -Realtek RTL8156 USB GBE/2.5G Ethernet Family Controller -.It -Planex USB-LAN2500R -.It Huawei 3G/4G LTE (eg. E3372, E5573) and other mobile network devices .El .Sh DIAGNOSTICS diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index 18b68ec9bc8a..942764109dd8 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -23,12 +23,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 31, 2016 +.Dd May 3, 2024 .Dt URE 4 .Os .Sh NAME .Nm ure -.Nd "RealTek RTL8152/RTL8153 USB to Ethernet controller driver" +.Nd "RealTek RTL8152/RTL8153/RTL8153B/RTL8156/RTL8156B USB to Ethernet controller driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -90,6 +90,11 @@ Set 1000baseTX operation over twisted pair. The RealTek gigE chips support 1000Mbps in .Cm full-duplex mode only. +.It Cm 2500base-T +Set 2500Base-T operation over twisted pair. +The RealTek 8156/8156B chips support 2500Mbps in +.Cm full-duplex +mode only. .El .Pp The diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index d53d861cfb00..cbb6ae76ef0c 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -281,7 +281,6 @@ static const STRUCT_USB_HOST_ID cdce_host_devs[] = { {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, - {USB_VPI(USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8156, 0)}, {USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR), USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x16), diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c index e9112f403ef5..3f72adb21aea 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -478,7 +478,7 @@ done: } /* - * Probe for a RTL8152/RTL8153 chip. + * Probe for a RTL8152/RTL8153/RTL8156 chip. */ static int ure_probe(device_t dev) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 11be1215062e..d6ddeafd7195 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -111,7 +111,6 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(ELSA, MODEM1, UQ_CFG_INDEX_1), USB_QUIRK(PLANEX2, MZKUE150N, UQ_CFG_INDEX_1), USB_QUIRK(CISCOLINKSYS, USB3GIGV1, UQ_CFG_INDEX_1), - USB_QUIRK(REALTEK, RTL8156, UQ_CFG_INDEX_2), /* Quirks for printer devices */ USB_QUIRK(HP, 895C, UQ_BROKEN_BIDIR), USB_QUIRK(HP, 880C, UQ_BROKEN_BIDIR),