Add PCI device support for Intel S7000FC4UR in usb and ichwd, systems

will not install without the usb changes in the install kernel, so I
would like to MFC this in time for 7.0 RC

MFC: 3 days

4 files changed, 26 insertions, 0 deletions

diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index f6152dc..19b9e3b 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -93,6 +93,7 @@ static struct ichwd_device ichwd_devices[] = {
 	{ DEVICEID_ICH8,     "Intel ICH8 watchdog timer",       8 },
 	{ DEVICEID_ICH8DH,   "Intel ICH8DH watchdog timer",     8 },
 	{ DEVICEID_ICH8DO,   "Intel ICH8DO watchdog timer",     8 },
+	{ DEVICEID_63XXESB,  "Intel 63XXESB watchdog timer",    8 },
 	{ 0, NULL, 0 },
 };
 
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index cf80c28..ca1a15c 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -78,6 +78,7 @@ struct ichwd_softc {
 #define DEVICEID_82801FBR	0x2640
 #define DEVICEID_ICH6M		0x2641
 #define DEVICEID_ICH6W		0x2642
+#define DEVICEID_63XXESB	0x2670
 #define DEVICEID_ICH7		0x27b8
 #define DEVICEID_ICH7M		0x27b9
 #define DEVICEID_ICH7MDH	0x27bd
diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c
index c44eb1f..d64dd5c 100644
--- a/sys/dev/usb/ehci_pci.c
+++ b/sys/dev/usb/ehci_pci.c
@@ -117,6 +117,8 @@ static const char *ehci_device_ich5 = "Intel 82801EB/R (ICH5) USB 2.0 controller
 static const char *ehci_device_ich6 = "Intel 82801FB (ICH6) USB 2.0 controller";
 #define PCI_EHCI_DEVICEID_ICH7		0x27cc8086
 static const char *ehci_device_ich7 = "Intel 82801GB/R (ICH7) USB 2.0 controller";
+#define PCI_EHCI_DEVICEID_63XX		0x268c8086
+static const char *ehci_device_63XX = "Intel 63XXESB USB 2.0 controller";
  
 /* NEC */
 #define PCI_EHCI_DEVICEID_NEC		0x00e01033
@@ -218,6 +220,8 @@ ehci_pci_match(device_t self)
 		return (ehci_device_sb400);
 	case PCI_EHCI_DEVICEID_6300:
 		return (ehci_device_6300);
+	case PCI_EHCI_DEVICEID_63XX:
+		return (ehci_device_63XX);
 	case PCI_EHCI_DEVICEID_ICH4:
 		return (ehci_device_ich4);
 	case PCI_EHCI_DEVICEID_ICH5:
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index 6c880a5..81e0ec7 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -139,6 +139,18 @@ static const char *uhci_device_ich6_c = "Intel 82801FB/FR/FW/FRW (ICH6) USB cont
 #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_63XXESB_1	0x26888086
+static const char *uhci_device_esb_1 = "Intel 631XESB/632XESB/3100 USB controller USB-1";
+
+#define PCI_UHCI_DEVICEID_63XXESB_2	0x26898086
+static const char *uhci_device_esb_2 = "Intel 631XESB/632XESB/3100 USB controller USB-2";
+
+#define PCI_UHCI_DEVICEID_63XXESB_3	0x268a8086
+static const char *uhci_device_esb_3 = "Intel 631XESB/632XESB/3100 USB controller USB-3";
+
+#define PCI_UHCI_DEVICEID_63XXESB_4	0x268b8086
+static const char *uhci_device_esb_4 = "Intel 631XESB/632XESB/3100 USB controller USB-4";
+
 #define PCI_UHCI_DEVICEID_440MX		0x719a8086
 static const char *uhci_device_440mx = "Intel 82443MX USB controller";
 
@@ -230,6 +242,14 @@ uhci_pci_match(device_t self)
 		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_63XXESB_1) {
+		return (uhci_device_esb_1);
+	} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_2) {
+		return (uhci_device_esb_2);
+	} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_3) {
+		return (uhci_device_esb_3);
+	} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_4) {
+		return (uhci_device_esb_4);
 	} else if (device_id == PCI_UHCI_DEVICEID_440MX) {
 		return (uhci_device_440mx);
 	} else if (device_id == PCI_UHCI_DEVICEID_460GX) {