Date: Sun, 10 Oct 2004 20:51:34 GMT From: Florian Le Goff <madflo@beertech.org> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/72492: [PATCH] USB UHCI device ID update (Intel ICH6) Message-ID: <200410102051.i9AKpYOc067966@www.freebsd.org> Resent-Message-ID: <200410102100.i9AL0mVD052357@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72492 >Category: misc >Synopsis: [PATCH] USB UHCI device ID update (Intel ICH6) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 10 21:00:48 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Florian Le Goff >Release: -current >Organization: >Environment: FreeBSD ble.bleland.poxx.net 6.0-CURRENT FreeBSD 6.0-CURRENT #15: Sun Oct 10 20:10:58 CEST 2004 root@ble.bleland.poxx.net:/usr/src/sys/i386/compile/BLE i386 >Description: My Intel-ICH6 based motherboard comes with four USB Controllers, who are seen as GENERIC devices on Sunday 10 October -current. >How-To-Repeat: First boot on the system : uhci0: <UHCI (generic) USB controller> port 0x8880-0x889f irq 23 at device 29.0 on pci0 uhci0: [GIANT-LOCKED] usb0: <UHCI (generic) USB controller> on uhci0 usb0: USB revision 1.0 uhub0: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub0: 2 ports with 2 removable, self powered uhci1: <UHCI (generic) USB controller> port 0x8c00-0x8c1f irq 19 at device 29.1 on pci0 uhci1: [GIANT-LOCKED] usb1: <UHCI (generic) USB controller> on uhci1 usb1: USB revision 1.0 uhub1: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub1: 2 ports with 2 removable, self powered ugen0: EMS Production Ltd. PSX gun controller converter, rev 1.00/19.12, addr 2 uhci2: <UHCI (generic) USB controller> port 0x9000-0x901f irq 18 at device 29.2 on pci0 uhci2: [GIANT-LOCKED] usb2: <UHCI (generic) USB controller> on uhci2 usb2: USB revision 1.0 uhub2: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub2: 2 ports with 2 removable, self powered uhci3: <UHCI (generic) USB controller> port 0x9080-0x909f irq 16 at device 29.3 on pci0 uhci3: [GIANT-LOCKED] With this patch, we have the following : uhci0: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-A> port 0x8880-0x889f irq 23 at device 29.0 on pci0 uhci0: [GIANT-LOCKED] usb0: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-A> on uhci0 usb0: USB revision 1.0 uhub0: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub0: 2 ports with 2 removable, self powered uhci1: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-B> port 0x8c00-0x8c1f irq 19 at device 29.1 on pci0 uhci1: [GIANT-LOCKED] usb1: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-B> on uhci1 usb1: USB revision 1.0 uhub1: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub1: 2 ports with 2 removable, self powered ugen0: EMS Production Ltd. PSX gun controller converter, rev 1.00/19.12, addr 2 uhci2: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-C> port 0x9000-0x901f irq 18 at device 29.2 on pci0 uhci2: [GIANT-LOCKED] usb2: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-C> on uhci2 usb2: USB revision 1.0 uhub2: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub2: 2 ports with 2 removable, self powered uhci3: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D> port 0x9080-0x909f irq 16 at device 29.3 on pci0 uhci3: [GIANT-LOCKED] usb3: <Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D> on uhci3 usb3: USB revision 1.0 uhub3: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub3: 2 ports with 2 removable, self powered >Fix: file impacted : src/sys/dev/usb/uhci_pci.c @@ -127,6 +127,18 @@ #define PCI_UHCI_DEVICEID_ICH5_D 0x24de8086 static const char *uhci_device_ich5_d = "Intel 82801EB (ICH5) USB controller USB-D"; +#define PCI_UHCI_DEVICEID_ICH6_A 0x26588086 +static const char *uhci_device_ich6_a = "Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-A"; + +#define PCI_UHCI_DEVICEID_ICH6_B 0x26598086 +static const char *uhci_device_ich6_b = "Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-B"; + +#define PCI_UHCI_DEVICEID_ICH6_C 0x265a8086 +static const char *uhci_device_ich6_c = "Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-C"; + +#define PCI_UHCI_DEVICEID_ICH6_D 0x265b8086 +static const char *uhci_device_ich6_d = "Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D"; + #define PCI_UHCI_DEVICEID_440MX 0x719a8086 static const char *uhci_device_440mx = "Intel 82443MX USB controller"; @@ -211,6 +223,14 @@ return (uhci_device_ich5_c); } else if (device_id == PCI_UHCI_DEVICEID_ICH5_D) { return (uhci_device_ich5_d); + } else if (device_id == PCI_UHCI_DEVICEID_ICH6_A) { + return (uhci_device_ich6_a); + } else if (device_id == PCI_UHCI_DEVICEID_ICH6_B) { + return (uhci_device_ich6_b); + } else if (device_id == PCI_UHCI_DEVICEID_ICH6_C) { + return (uhci_device_ich6_c); + } else if (device_id == PCI_UHCI_DEVICEID_ICH6_D) { + return (uhci_device_ich6_d); } else if (device_id == PCI_UHCI_DEVICEID_440MX) { return (uhci_device_440mx); } else if (device_id == PCI_UHCI_DEVICEID_460GX) { >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410102051.i9AKpYOc067966>