From d9bd48f4035df4f9d50fff13fa647c6f54360cde Mon Sep 17 00:00:00 2001 From: zrj Date: Fri, 30 Mar 2018 09:22:21 +0300 Subject: [PATCH] kernel/usb4bsd: Add missing descriptions for C610/X99 controllers. Codename Wellsburg. While there, fix few typos and match entries in share/misc/pci_vendors. --- sys/bus/u4b/controller/ehci_pci.c | 6 +++++- sys/bus/u4b/controller/xhci_pci.c | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/bus/u4b/controller/ehci_pci.c b/sys/bus/u4b/controller/ehci_pci.c index 1162a65ab9..6b978e4025 100644 --- a/sys/bus/u4b/controller/ehci_pci.c +++ b/sys/bus/u4b/controller/ehci_pci.c @@ -164,11 +164,15 @@ ehci_pci_match(device_t self) return ("Intel Wildcat Point USB 2.0 controller USB-A"); case 0x8cad8086: return ("Intel Wildcat Point USB 2.0 controller USB-B"); + case 0x8d268086: + return ("Intel Wellsburg USB 2.0 controller"); + case 0x8d2d8086: + return ("Intel Wellsburg USB 2.0 controller"); case 0x9c268086: return ("Intel Lynx Point LP USB 2.0 controller USB"); case 0x00e01033: - return ("NEC uPD 720100 USB 2.0 controller"); + return ("NEC uPD 72010x USB 2.0 controller"); case 0x006810de: return "NVIDIA nForce2 USB 2.0 controller"; diff --git a/sys/bus/u4b/controller/xhci_pci.c b/sys/bus/u4b/controller/xhci_pci.c index 636747e456..4bb7031d99 100644 --- a/sys/bus/u4b/controller/xhci_pci.c +++ b/sys/bus/u4b/controller/xhci_pci.c @@ -99,7 +99,7 @@ xhci_pci_match(device_t self) return ("ASMedia ASM1042 USB 3.0 controller"); case 0x0f358086: - return ("Intel Intel BayTrail USB 3.0 controller"); + return ("Intel BayTrail USB 3.0 controller"); case 0x9c318086: case 0x1e318086: return ("Intel Panther Point USB 3.0 controller"); @@ -107,8 +107,11 @@ xhci_pci_match(device_t self) return ("Intel Lynx Point USB 3.0 controller"); case 0x8cb18086: return ("Intel Wildcat Point USB 3.0 controller"); + case 0x8d318086: + return ("Intel Wellsburg USB 3.0 controller"); case 0x9cb18086: - return ("Intel Wildcat Point-LB USB 3.0 controller"); + return ("Intel Wildcat Point-LP USB 3.0 controller"); + default: break; } @@ -199,7 +202,7 @@ xhci_pci_attach(device_t self) /* check for USB 3.0 controllers which don't support 64-bit DMA */ switch (pci_get_devid(self)) { case 0x01941033: /* NEC uPD720200 USB 3.0 controller */ - case 0x00141912: /* NEC uPD720201 USB 3.0 controller */ + case 0x00141912: /* NEC uPD720201 USB 3.0 controller */ case 0x78141022: /* AMD A10-7300, tested does not work w/64-bit DMA */ usedma32 = 1; break; -- 2.11.4.GIT