From nobody Mon Oct 21 02:59:48 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 4XX0Qr6pxHz5b65q; Mon, 21 Oct 2024 02:59:48 +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 4XX0Qr664bz45f7; Mon, 21 Oct 2024 02:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479588; 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=iXSEOuW/G4LKPnAgG5zhtnstjMUy+YV9QP5q3mbjMiU=; b=uh26uwAEyiVnOdCAAZxbIILG9CHwaEvozKYuU6TGdW52hzLfME4ud7T1iwHH3HIenNhQqk 8FxZr5TxNXFBLNN2ZHYQ0HjDpm8RJM8koBuOfuXL6FCycC2NZr81lhaeGJfV2rTb0WTczz oD+e1IYSY/dzNW/UZ+wOCN1enDkuXOhMgVC39h9OJMAQWFVTWg8aTbu2dkI+l4u+YkDOH+ dgBMVQTYMepuyyPqlm7XGlxyT2+OUCCtNeyLayQOTQR+lE3J2eDPukp+72f0NBfmJMjwKh vbzCCNjI55k971fTssuSNJi7BAZTg0FaQ6HKuJrI6yV4YioiIweACwDvoxSpfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479588; 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=iXSEOuW/G4LKPnAgG5zhtnstjMUy+YV9QP5q3mbjMiU=; b=x0fcsA4T9ZhNzLmPBqIwNJJUjCoTjjNKe4JFROw0dezNzul3uasCd7lacb4bGc4wfxw4oe aFAnWtcMq8SIgIhAAz5cdbYAItAKVMbbGaVRz6cOz7edrTi4ls6ASjRa44jBB2vxVwuILG kr+YoBFGzVFrcGnzba7lVKxJ4LEc9PXsc6KRJ/bw67hN8D53uzKQge4OT7jHXjW+4Kyukx UfOdQdovL8DK5ECii5MK+j6b0/PzglbgrlkOhDPjmTtykLDgIA9yItVGu7XSjf4GH0kfTy 4WszSIWEhy6i6V+q+F8kHljXLp9tHwIzPZVg1qIvhBjqm6HJ251S8G5uw9dVEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479588; a=rsa-sha256; cv=none; b=NvqkR0Bq9QwBf50C/xCTt6njjmttZAqGGBoApwhSOycXwoHI/qihYuwHIb0Sz9DfyeyT7C mAmgs8ipaOagfBUDZpHsb7heb5X+22TjL0rs5cHTJEZorahG2+Plf+j5rt2mqmHswM5fkz tIQZWA3J7/Nif7GSlehjkioregBJVUuVZpRIl+SXupBYSH1HpkfafjTAojUaWJsWDYvLQV THrDuS2MIde8WpLKt/f1Zu8R9MB65NfnmDpIbwgeUi+HBJ/HUplOKneLrO/KbjUlyE9d5i q9nBfDpLCmGD4Z3RK49ako5DscPEEYODoBOxbs2DiIbSDru2I5AifovLGmL6QA== 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 4XX0Qr5Y9Qz1Rqp; Mon, 21 Oct 2024 02:59:48 +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 49L2xm4i086563; Mon, 21 Oct 2024 02:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2xmtV086560; Mon, 21 Oct 2024 02:59:48 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:59:48 GMT Message-Id: <202410210259.49L2xmtV086560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 1b0af7617e6c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b0af7617e6cd25a1fc205f00636c19cbe6f541d Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0af7617e6cd25a1fc205f00636c19cbe6f541d commit 1b0af7617e6cd25a1fc205f00636c19cbe6f541d Author: Li-Wen Hsu AuthorDate: 2024-08-12 04:04:05 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 02:59:36 +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 (cherry picked from commit 6ea4d95f6c76aa64d2db5c04c87e68dc299544df) --- 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 ec968ea6a0d5..8139546ba3a9 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 @@ -103,10 +103,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 1aa658df3283..69103a690cac 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -282,7 +282,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 1104798b1c4d..6a4a108985f5 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -483,7 +483,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 91d47935221f..587543c3e43e 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -100,7 +100,6 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(ELSA, MODEM1, 0x0000, 0xffff, UQ_CFG_INDEX_1), USB_QUIRK(PLANEX2, MZKUE150N, 0x0000, 0xffff, UQ_CFG_INDEX_1), USB_QUIRK(CISCOLINKSYS, USB3GIGV1, 0x0000, 0xffff, UQ_CFG_INDEX_1), - USB_QUIRK(REALTEK, RTL8156, 0x0000, 0xffff, UQ_CFG_INDEX_2), /* Quirks for printer devices */ USB_QUIRK(HP, 895C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), USB_QUIRK(HP, 880C, 0x0000, 0xffff, UQ_BROKEN_BIDIR),