Author: mav
Date: Fri Nov 15 10:28:59 2013
New Revision: 258162
URL: http://svnweb.freebsd.org/changeset/base/258162
Log:
Add some more IDs for Intel ATA, AHCI and USB controllers.
Modified:
head/sys/dev/ahci/ahci.c
head/sys/dev/ata/ata-pci.h
head/sys/dev/ata/chipsets/ata-intel.c
head/sys/dev/usb/controller/ehci_pci.c
Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c Fri Nov 15 07:26:50 2013 (r258161)
+++ head/sys/dev/ahci/ahci.c Fri Nov 15 10:28:59 2013 (r258162)
@@ -192,21 +192,54 @@ static struct {
{0x28268086, 0x00, "Intel Patsburg (RAID)", 0},
{0x1e028086, 0x00, "Intel Panther Point", 0},
{0x1e038086, 0x00, "Intel Panther Point", 0},
- {0x1e048086, 0x00, "Intel Panther Point", 0},
- {0x1e058086, 0x00, "Intel Panther Point", 0},
- {0x1e068086, 0x00, "Intel Panther Point", 0},
- {0x1e078086, 0x00, "Intel Panther Point", 0},
- {0x1e0e8086, 0x00, "Intel Panther Point", 0},
- {0x1e0f8086, 0x00, "Intel Panther Point", 0},
+ {0x1e048086, 0x00, "Intel Panther Point (RAID)", 0},
+ {0x1e058086, 0x00, "Intel Panther Point (RAID)", 0},
+ {0x1e068086, 0x00, "Intel Panther Point (RAID)", 0},
+ {0x1e078086, 0x00, "Intel Panther Point (RAID)", 0},
+ {0x1e0e8086, 0x00, "Intel Panther Point (RAID)", 0},
+ {0x1e0f8086, 0x00, "Intel Panther Point (RAID)", 0},
+ {0x1f228086, 0x00, "Intel Avoton", 0},
+ {0x1f238086, 0x00, "Intel Avoton", 0},
+ {0x1f248086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f258086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f268086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f278086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f2e8086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f2f8086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f328086, 0x00, "Intel Avoton", 0},
+ {0x1f338086, 0x00, "Intel Avoton", 0},
+ {0x1f348086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f358086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f368086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f378086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f3e8086, 0x00, "Intel Avoton (RAID)", 0},
+ {0x1f3f8086, 0x00, "Intel Avoton (RAID)", 0},
{0x23a38086, 0x00, "Intel Coleto Creek", 0},
+ {0x28238086, 0x00, "Intel Wellsburg (RAID)", 0},
+ {0x28278086, 0x00, "Intel Wellsburg (RAID)", 0},
{0x8c028086, 0x00, "Intel Lynx Point", 0},
{0x8c038086, 0x00, "Intel Lynx Point", 0},
- {0x8c048086, 0x00, "Intel Lynx Point", 0},
- {0x8c058086, 0x00, "Intel Lynx Point", 0},
- {0x8c068086, 0x00, "Intel Lynx Point", 0},
- {0x8c078086, 0x00, "Intel Lynx Point", 0},
- {0x8c0e8086, 0x00, "Intel Lynx Point", 0},
- {0x8c0f8086, 0x00, "Intel Lynx Point", 0},
+ {0x8c048086, 0x00, "Intel Lynx Point (RAID)", 0},
+ {0x8c058086, 0x00, "Intel Lynx Point (RAID)", 0},
+ {0x8c068086, 0x00, "Intel Lynx Point (RAID)", 0},
+ {0x8c078086, 0x00, "Intel Lynx Point (RAID)", 0},
+ {0x8c0e8086, 0x00, "Intel Lynx Point (RAID)", 0},
+ {0x8c0f8086, 0x00, "Intel Lynx Point (RAID)", 0},
+ {0x8d028086, 0x00, "Intel Wellsburg", 0},
+ {0x8d048086, 0x00, "Intel Wellsburg (RAID)", 0},
+ {0x8d068086, 0x00, "Intel Wellsburg (RAID)", 0},
+ {0x8d628086, 0x00, "Intel Wellsburg", 0},
+ {0x8d648086, 0x00, "Intel Wellsburg (RAID)", 0},
+ {0x8d668086, 0x00, "Intel Wellsburg (RAID)", 0},
+ {0x8d6e8086, 0x00, "Intel Wellsburg (RAID)", 0},
+ {0x9c028086, 0x00, "Intel Lynx Point-LP", 0},
+ {0x9c038086, 0x00, "Intel Lynx Point-LP", 0},
+ {0x9c048086, 0x00, "Intel Lynx Point-LP (RAID)", 0},
+ {0x9c058086, 0x00, "Intel Lynx Point-LP (RAID)", 0},
+ {0x9c068086, 0x00, "Intel Lynx Point-LP (RAID)", 0},
+ {0x9c078086, 0x00, "Intel Lynx Point-LP (RAID)", 0},
+ {0x9c0e8086, 0x00, "Intel Lynx Point-LP (RAID)", 0},
+ {0x9c0f8086, 0x00, "Intel Lynx Point-LP (RAID)", 0},
{0x23238086, 0x00, "Intel DH89xxCC", 0},
{0x2360197b, 0x00, "JMicron JMB360", 0},
{0x2361197b, 0x00, "JMicron JMB361", AHCI_Q_NOFORCE},
Modified: head/sys/dev/ata/ata-pci.h
==============================================================================
--- head/sys/dev/ata/ata-pci.h Fri Nov 15 07:26:50 2013 (r258161)
+++ head/sys/dev/ata/ata-pci.h Fri Nov 15 10:28:59 2013 (r258162)
@@ -257,6 +257,11 @@ struct ata_pci_controller {
#define ATA_PPT_R5 0x1e0e8086
#define ATA_PPT_R6 0x1e0f8086
+#define ATA_AVOTON_S1 0x1f208086
+#define ATA_AVOTON_S2 0x1f218086
+#define ATA_AVOTON_S3 0x1f308086
+#define ATA_AVOTON_S4 0x1f318086
+
#define ATA_LPT_S1 0x8c008086
#define ATA_LPT_S2 0x8c018086
#define ATA_LPT_AH1 0x8c028086
@@ -270,6 +275,16 @@ struct ata_pci_controller {
#define ATA_LPT_R5 0x8c0e8086
#define ATA_LPT_R6 0x8c0f8086
+#define ATA_WELLS_S1 0x8d008086
+#define ATA_WELLS_S2 0x8d088086
+#define ATA_WELLS_S3 0x8d608086
+#define ATA_WELLS_S4 0x8d688086
+
+#define ATA_LPTLP_S1 0x9c008086
+#define ATA_LPTLP_S2 0x9c018086
+#define ATA_LPTLP_S3 0x9c088086
+#define ATA_LPTLP_S4 0x9c098086
+
#define ATA_I31244 0x32008086
#define ATA_ISCH 0x811a8086
#define ATA_DH89XXCC 0x23238086
Modified: head/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-intel.c Fri Nov 15 07:26:50 2013
(r258161)
+++ head/sys/dev/ata/chipsets/ata-intel.c Fri Nov 15 10:28:59 2013
(r258162)
@@ -211,6 +211,10 @@ ata_intel_probe(device_t dev)
{ ATA_PPT_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Panther Point" },
{ ATA_PPT_R5, 0, INTEL_AHCI, 0, ATA_SA300, "Panther Point" },
{ ATA_PPT_R6, 0, INTEL_AHCI, 0, ATA_SA300, "Panther Point" },
+ { ATA_AVOTON_S1, 0, INTEL_6CH, 0, ATA_SA300, "Avoton" },
+ { ATA_AVOTON_S2, 0, INTEL_6CH, 0, ATA_SA300, "Avoton" },
+ { ATA_AVOTON_S3, 0, INTEL_6CH2, 0, ATA_SA300, "Avoton" },
+ { ATA_AVOTON_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Avoton" },
{ ATA_LPT_S1, 0, INTEL_6CH, 0, ATA_SA300, "Lynx Point" },
{ ATA_LPT_S2, 0, INTEL_6CH, 0, ATA_SA300, "Lynx Point" },
{ ATA_LPT_AH1, 0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
@@ -223,6 +227,14 @@ ata_intel_probe(device_t dev)
{ ATA_LPT_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point" },
{ ATA_LPT_R5, 0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
{ ATA_LPT_R6, 0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
+ { ATA_WELLS_S1, 0, INTEL_6CH, 0, ATA_SA300, "Wellsburg" },
+ { ATA_WELLS_S2, 0, INTEL_6CH2, 0, ATA_SA300, "Wellsburg" },
+ { ATA_WELLS_S3, 0, INTEL_6CH, 0, ATA_SA300, "Wellsburg" },
+ { ATA_WELLS_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Wellsburg" },
+ { ATA_LPTLP_S1, 0, INTEL_6CH, 0, ATA_SA300, "Lynx Point-LP" },
+ { ATA_LPTLP_S2, 0, INTEL_6CH, 0, ATA_SA300, "Lynx Point-LP" },
+ { ATA_LPTLP_S3, 0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point-LP" },
+ { ATA_LPTLP_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point-LP" },
{ ATA_I31244, 0, 0, 2, ATA_SA150, "31244" },
{ ATA_ISCH, 0, 0, 1, ATA_UDMA5, "SCH" },
{ ATA_DH89XXCC, 0, INTEL_AHCI, 0, ATA_SA300, "DH89xxCC" },
Modified: head/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_pci.c Fri Nov 15 07:26:50 2013
(r258161)
+++ head/sys/dev/usb/controller/ehci_pci.c Fri Nov 15 10:28:59 2013
(r258162)
@@ -124,6 +124,8 @@ ehci_pci_match(device_t self)
return ("Intel Panther Point USB 2.0 controller");
case 0x1e2d8086:
return ("Intel Panther Point USB 2.0 controller");
+ case 0x1f2c8086:
+ return ("Intel Avoton USB 2.0 controller");
case 0x25ad8086:
return "Intel 6300ESB USB 2.0 controller";
case 0x24cd8086:
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
