Author: mav
Date: Wed Aug 9 12:03:12 2017
New Revision: 322308
URL: https://svnweb.freebsd.org/changeset/base/322308
Log:
Add new Intel Lewisburg and Union Point chipset PCI IDs.
While there, polish some old AHCI ones, since they are still reused.
MFC after: 1 week
Modified:
head/sys/dev/ahci/ahci_pci.c
head/sys/dev/sound/pci/hda/hdac.c
head/sys/dev/sound/pci/hda/hdac.h
head/sys/dev/usb/controller/xhci_pci.c
Modified: head/sys/dev/ahci/ahci_pci.c
==============================================================================
--- head/sys/dev/ahci/ahci_pci.c Wed Aug 9 10:46:34 2017
(r322307)
+++ head/sys/dev/ahci/ahci_pci.c Wed Aug 9 12:03:12 2017
(r322308)
@@ -92,10 +92,10 @@ static const struct {
{0x27c58086, 0x00, "Intel ICH7M", 0},
{0x27c68086, 0x00, "Intel ICH7M", 0},
{0x28218086, 0x00, "Intel ICH8", 0},
- {0x28228086, 0x00, "Intel ICH8", 0},
+ {0x28228086, 0x00, "Intel ICH8+ (RAID)", 0},
{0x28248086, 0x00, "Intel ICH8", 0},
{0x28298086, 0x00, "Intel ICH8M", 0},
- {0x282a8086, 0x00, "Intel ICH8M", 0},
+ {0x282a8086, 0x00, "Intel ICH8M+ (RAID)", 0},
{0x29228086, 0x00, "Intel ICH9", 0},
{0x29238086, 0x00, "Intel ICH9", 0},
{0x29248086, 0x00, "Intel ICH9", 0},
@@ -108,14 +108,14 @@ static const struct {
{0x292f8086, 0x00, "Intel ICH9M", 0},
{0x294d8086, 0x00, "Intel ICH9", 0},
{0x294e8086, 0x00, "Intel ICH9M", 0},
- {0x3a058086, 0x00, "Intel ICH10", 0},
+ {0x3a058086, 0x00, "Intel ICH10 (RAID)", 0},
{0x3a228086, 0x00, "Intel ICH10", 0},
- {0x3a258086, 0x00, "Intel ICH10", 0},
+ {0x3a258086, 0x00, "Intel ICH10 (RAID)", 0},
{0x3b228086, 0x00, "Intel 5 Series/3400 Series", 0},
{0x3b238086, 0x00, "Intel 5 Series/3400 Series", 0},
- {0x3b258086, 0x00, "Intel 5 Series/3400 Series", 0},
+ {0x3b258086, 0x00, "Intel 5 Series/3400 Series (RAID)", 0},
{0x3b298086, 0x00, "Intel 5 Series/3400 Series", 0},
- {0x3b2c8086, 0x00, "Intel 5 Series/3400 Series", 0},
+ {0x3b2c8086, 0x00, "Intel 5 Series/3400 Series (RAID)", 0},
{0x3b2f8086, 0x00, "Intel 5 Series/3400 Series", 0},
{0x19b08086, 0x00, "Intel Denverton", 0},
{0x19b18086, 0x00, "Intel Denverton", 0},
@@ -139,12 +139,13 @@ static const struct {
{0x19cf8086, 0x00, "Intel Denverton", 0},
{0x1c028086, 0x00, "Intel Cougar Point", 0},
{0x1c038086, 0x00, "Intel Cougar Point", 0},
- {0x1c048086, 0x00, "Intel Cougar Point", 0},
- {0x1c058086, 0x00, "Intel Cougar Point", 0},
+ {0x1c048086, 0x00, "Intel Cougar Point (RAID)", 0},
+ {0x1c058086, 0x00, "Intel Cougar Point (RAID)", 0},
+ {0x1c068086, 0x00, "Intel Cougar Point (RAID)", 0},
{0x1d028086, 0x00, "Intel Patsburg", 0},
{0x1d048086, 0x00, "Intel Patsburg", 0},
{0x1d068086, 0x00, "Intel Patsburg", 0},
- {0x28268086, 0x00, "Intel Patsburg (RAID)", 0},
+ {0x28268086, 0x00, "Intel Patsburg+ (RAID)", 0},
{0x1e028086, 0x00, "Intel Panther Point", 0},
{0x1e038086, 0x00, "Intel Panther Point", 0},
{0x1e048086, 0x00, "Intel Panther Point (RAID)", 0},
@@ -170,8 +171,6 @@ static const struct {
{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 (RAID)", 0},
@@ -195,6 +194,8 @@ static const struct {
{0x8d648086, 0x00, "Intel Wellsburg (RAID)", 0},
{0x8d668086, 0x00, "Intel Wellsburg (RAID)", 0},
{0x8d6e8086, 0x00, "Intel Wellsburg (RAID)", 0},
+ {0x28238086, 0x00, "Intel Wellsburg+ (RAID)", 0},
+ {0x28278086, 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},
@@ -212,6 +213,17 @@ static const struct {
{0xa1068086, 0x00, "Intel Sunrise Point (RAID)", 0},
{0xa1078086, 0x00, "Intel Sunrise Point (RAID)", 0},
{0xa10f8086, 0x00, "Intel Sunrise Point (RAID)", 0},
+ {0xa1828086, 0x00, "Intel Lewisburg", 0},
+ {0xa1868086, 0x00, "Intel Lewisburg (RAID)", 0},
+ {0xa1d28086, 0x00, "Intel Lewisburg", 0},
+ {0xa1d68086, 0x00, "Intel Lewisburg (RAID)", 0},
+ {0xa2028086, 0x00, "Intel Lewisburg", 0},
+ {0xa2068086, 0x00, "Intel Lewisburg (RAID)", 0},
+ {0xa2528086, 0x00, "Intel Lewisburg", 0},
+ {0xa2568086, 0x00, "Intel Lewisburg (RAID)", 0},
+ {0xa2828086, 0x00, "Intel Union Point", 0},
+ {0xa2868086, 0x00, "Intel Union Point (RAID)", 0},
+ {0xa28e8086, 0x00, "Intel Union Point (RAID)", 0},
{0x23238086, 0x00, "Intel DH89xxCC", 0},
{0x2360197b, 0x00, "JMicron JMB360", 0},
{0x2361197b, 0x00, "JMicron JMB361", AHCI_Q_NOFORCE | AHCI_Q_1CH},
Modified: head/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdac.c Wed Aug 9 10:46:34 2017
(r322307)
+++ head/sys/dev/sound/pci/hda/hdac.c Wed Aug 9 12:03:12 2017
(r322308)
@@ -97,6 +97,8 @@ static const struct {
{ HDA_INTEL_KBLKLP, "Intel Kabylake-LP", 0, 0 },
{ HDA_INTEL_SRPT, "Intel Sunrise Point", 0, 0 },
{ HDA_INTEL_KBLK, "Intel Kabylake", 0, 0 },
+ { HDA_INTEL_KBLKH, "Intel Kabylake-H", 0, 0 },
+ { HDA_INTEL_CFLK, "Intel Coffelake", 0, 0 },
{ HDA_INTEL_82801F, "Intel 82801F", 0, 0 },
{ HDA_INTEL_63XXESB, "Intel 631x/632xESB", 0, 0 },
{ HDA_INTEL_82801G, "Intel 82801G", 0, 0 },
Modified: head/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- head/sys/dev/sound/pci/hda/hdac.h Wed Aug 9 10:46:34 2017
(r322307)
+++ head/sys/dev/sound/pci/hda/hdac.h Wed Aug 9 12:03:12 2017
(r322308)
@@ -73,6 +73,8 @@
#define HDA_INTEL_KBLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x9d71)
#define HDA_INTEL_SRPT HDA_MODEL_CONSTRUCT(INTEL, 0xa170)
#define HDA_INTEL_KBLK HDA_MODEL_CONSTRUCT(INTEL, 0xa171)
+#define HDA_INTEL_KBLKH HDA_MODEL_CONSTRUCT(INTEL, 0xa2f0)
+#define HDA_INTEL_CFLK HDA_MODEL_CONSTRUCT(INTEL, 0xa348)
#define HDA_INTEL_ALL HDA_MODEL_CONSTRUCT(INTEL, 0xffff)
/* Nvidia */
Modified: head/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci_pci.c Wed Aug 9 10:46:34 2017
(r322307)
+++ head/sys/dev/usb/controller/xhci_pci.c Wed Aug 9 12:03:12 2017
(r322308)
@@ -134,6 +134,10 @@ xhci_pci_match(device_t self)
return ("Intel Sunrise Point-LP USB 3.0 controller");
case 0xa12f8086:
return ("Intel Sunrise Point USB 3.0 controller");
+ case 0xa1af8086:
+ return ("Intel Lewisburg USB 3.0 controller");
+ case 0xa2af8086:
+ return ("Intel Union Point USB 3.0 controller");
case 0xa01b177d:
return ("Cavium ThunderX USB 3.0 controller");
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
