git: 6ea4d95f6c76 - main - Move support of Realtek 8156/8156B from cdce(4) to ure(4)

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/src/commit/?id=6ea4d95f6c76aa64d2db5c04c87e68dc299544df

commit 6ea4d95f6c76aa64d2db5c04c87e68dc299544df
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2024-08-12 04:04:05 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
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),