Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/matt-nb6-plus]: src/sys/dev/pci Merge tickets 658 and 659.
details: https://anonhg.NetBSD.org/src/rev/af0fbb06a99f
branches: matt-nb6-plus
changeset: 774486:af0fbb06a99f
user: matt <matt%NetBSD.org@localhost>
date: Sun Nov 18 22:15:58 2012 +0000
description:
Merge tickets 658 and 659.
diffstat:
sys/dev/pci/ahcisata_pci.c | 12 +-
sys/dev/pci/pcidevs | 413 +-
sys/dev/pci/pcidevs.h | 413 +-
sys/dev/pci/pcidevs_data.h | 14470 ++++++++++++++++++++++--------------------
4 files changed, 8481 insertions(+), 6827 deletions(-)
diffs (truncated from 19837 to 300 lines):
diff -r 700c2db41401 -r af0fbb06a99f sys/dev/pci/ahcisata_pci.c
--- a/sys/dev/pci/ahcisata_pci.c Thu Nov 01 16:44:44 2012 +0000
+++ b/sys/dev/pci/ahcisata_pci.c Sun Nov 18 22:15:58 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.27 2012/01/30 19:41:18 drochner Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.27.4.1 2012/11/18 22:16:11 matt Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.27 2012/01/30 19:41:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.27.4.1 2012/11/18 22:16:11 matt Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -97,6 +97,14 @@
/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1,
AHCI_PCI_QUIRK_BAD64 },
+ { PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1061_01,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1061_02,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1061_11,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_ASMEDIA, PCI_PRODUCT_ASMEDIA_ASM1061_12,
+ AHCI_PCI_QUIRK_FORCE },
};
struct ahci_pci_softc {
diff -r 700c2db41401 -r af0fbb06a99f sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs Thu Nov 01 16:44:44 2012 +0000
+++ b/sys/dev/pci/pcidevs Sun Nov 18 22:15:58 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1102.2.6 2012/06/28 16:06:36 riz Exp $
+$NetBSD: pcidevs,v 1.1102.2.6.2.1 2012/11/18 22:15:58 matt Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -617,14 +617,18 @@
vendor RDC 0x17F3 RDC Semiconductor
vendor LINKSYS2 0x17fe Linksys
vendor RALINK 0x1814 Ralink Technologies
-vendor RMI 0x182e Raza Microelectronics Inc. (NetLogic)
+vendor RMI 0x182e Raza Microelectronics Inc. (Broadcom)
+vendor NETLOGIC 0x184e Netlogic Microsystems (Broadcom)
vendor BBELEC 0x1896 B & B Electronics
+vendor XGI 0x18ca XGI Technology
vendor RENESAS 0x1912 Renesas Technologies
vendor FREESCALE 0x1957 Freescale Semiconductor
vendor ATTANSIC 0x1969 Attansic Technologies
vendor JMICRON 0x197b JMicron Technology
vendor EVE 0x1adb EVE
vendor QUMRANET 0x1af4 Qumranet
+vendor ASMEDIA 0x1b21 ASMedia
+vendor FRESCO 0x1b73 Fresco Logic
vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID)
vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID)
vendor SUNIX2 0x1fd4 SUNIX Co
@@ -649,6 +653,7 @@
vendor PCHDTV 0x7063 pcHDTV
vendor QUANCOM 0x8008 QUANCOM Electronic GmbH
vendor INTEL 0x8086 Intel
+vendor VIRTUALBOX 0x80ee VirtualBox
vendor TRIGEM2 0x8800 Trigem Computer (2nd PCI Vendor ID)
vendor PROLAN 0x8c4a ProLAN
vendor COMPUTONE 0x8e0e Computone
@@ -910,6 +915,9 @@
product ALTEON BCM5700 0x0003 ACEnic BCM5700 10/100/1000 Ethernet
product ALTEON BCM5701 0x0004 ACEnic BCM5701 10/100/1000 Ethernet
+/* Altera products */
+product ALTERA EP4CGX15BF14C8N 0x4c15 EP4CGX15BF14C8N
+
/* Altima products */
product ALTIMA AC1000 0x03e8 AC1000 Gigabit Ethernet
product ALTIMA AC1001 0x03e9 AC1001 Gigabit Ethernet
@@ -1008,8 +1016,18 @@
product AMD PBC8111_AC 0x746d AMD8111 AC97 Audio
product AMD PBC8111_MC97 0x746e AMD8111 MC97 Modem
product AMD PBC8111_AC_756b 0x756b AMD8111 756b ACPI Controller
-product AMD HUDSON2_IDE 0x780c HUDSON-2 IDE Controller
-product AMD HUDSON2_SATA 0x7800 HUDSON-2 SATA Controller
+product AMD HUDSON_SATA 0x7800 Hudson SATA Controller
+product AMD HUDSON_SATA_AHCI 0x7801 Hudson AHCI SATA Controller
+product AMD HUDSON_SDHC 0x7806 Hudson SD Flash Controller
+product AMD HUDSON_OHCI 0x7807 Hudson USB OHCI Controller
+product AMD HUDSON_EHCI 0x7808 Hudson USB EHCI Controller
+product AMD HUDSON_OHCI_2 0x7809 Hudson USB OHCI Controller
+product AMD HUDSON_SMB 0x780b Hudson SMBus Controller
+product AMD HUDSON_IDE 0x780c Hudson IDE Controller
+product AMD HUDSON_HDAUDIO 0x780d Hudson HD Audio Controller
+product AMD HUDSON_LPC 0x780e Hudson LPC Bridge
+product AMD HUDSON_PCI 0x780f Hudson PCI Bridge
+product AMD HUDSON_XHCI 0x7812 Hudson USB xHCI Controller
product AMD RS880_HB 0x9601 RS880 Host Bridge
product AMD RS780_PPB_GFX 0x9602 RS780 PCI-PCI Bridge (int gfx)
product AMD RS780_PPB_GFX0 0x9603 RS780 PCI-PCI Bridge (ext gfx port 0)
@@ -1117,6 +1135,12 @@
/* ASIX Electronics products */
product ASIX AX88140A 0x1400 AX88140A 10/100 Ethernet
+/* ASMedia products */
+product ASMEDIA ASM1061_01 0x0601 ASM1061 AHCI SATA III Controller
+product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller
+product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller
+product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller
+
/* Asustek products */
product ASUSTEK HFCPCI 0x0675 ISDN
@@ -1133,6 +1157,8 @@
/* ATI products */
/* See http://www.x.org/wiki/Radeon%20ASICs */
+product ATI RADEON_WRESTLER_HDMI 0x1314 Wrestler HDMI Audio
+product ATI RADEON_BEAVERCREEK_HDMI 0x1714 BeaverCreek HDMI Audio
product ATI RADEON_RV380_3150 0x3150 Radeon Mobility X600 (M24) 3150
product ATI RADEON_RV380_3154 0x3154 FireGL M24 GL 3154
product ATI RADEON_RV380_3E50 0x3e50 Radeon X600 (RV380) 3E50
@@ -1206,6 +1232,7 @@
product ATI SB700_SATA_RAID 0x4392 SB700/SB800 RAID SATA Controller
product ATI SB700_SATA_RAID5 0x4393 SB700/SB800 RAID5 SATA Controller
product ATI SB700_SATA_FC 0x4394 SB700/SB800 FC SATA Controller
+product ATI SB700_SATA_AHCI2 0x4395 SB700/SB800 SATA Controller (AHCI mode)
product ATI SB700_USB_EHCI 0x4396 SB700/SB800 USB EHCI Controller
product ATI SB800_SATA 0x4395 SB800 SATA Controller
product ATI SB700_USB_OHCI0 0x4397 SB700/SB800 USB OHCI Controller
@@ -1430,7 +1457,9 @@
product ATI RS690_PPB_7917 0x7917 RS690 PCI to PCI-Express Port 3 Bridge
product ATI RADEON_HD4650 0x9498 Radeon HD4650
product ATI RADEON_HD2600_XT 0x9588 Radeon HD2600 XT GDDR3
+product ATI RADEON_HD3400_M82 0x95c4 Mobility Radeon HD 3400 Series (M82)
product ATI RADEON_HD4250_S 0x95C5 Radeon HD4250 GPU (RV610) Secondary
+product ATI RADEON_HD6520G 0x9647 Radeon HD6520G
product ATI RADEON_HD4200 0x9712 Radeon HD4200 Mobility
product ATI RADEON_HD4250 0x9715 Radeon HD4250 GPU (RS880)
product ATI RADEON_HD6310 0x9802 Radeon HD6310 Graphics
@@ -1493,6 +1522,7 @@
product AVM T1 0x1200 Primary Rate T1 ISDN Interface
/* RMI products */
+product RMI XLR_PCIX 0x000b XLR PCI-X bridge
product RMI XLS_PCIE 0xabcd XLS PCIe-PCIe bridge
/* B & B Electronics Products */
@@ -1570,6 +1600,7 @@
product BROADCOM BCM5787F 0x167f BCM5787F 10/100 Ethernet
product BROADCOM BCM5761E 0x1680 BCM5761E 10/100/1000 Ethernet
product BROADCOM BCM5761 0x1681 BCM5761 10/100/1000 Ethernet
+product BROADCOM BCM57762 0x1682 BCM57762 Gigabit Ethernet
product BROADCOM BCM5764 0x1684 BCM5764 NetXtreme 1000baseT Ethernet
product BROADCOM BCM5761S 0x1688 BCM5761S 10/100/1000 Ethernet
product BROADCOM BCM5761SE 0x1689 BCM5761SE 10/100/1000 Ethernet
@@ -1611,10 +1642,10 @@
product BROADCOM BCM5906M 0x1713 BCM5906M NetLink Fast Ethernet
product BROADCOM BCM4303 0x4301 BCM4303
product BROADCOM BCM4307 0x4307 BCM4307
-product BROADCOM BCM4311 0x4311 BCM4311
-product BROADCOM BCM4312 0x4312 BCM4312
-product BROADCOM BCM4313 0x4313 BCM4313
-product BROADCOM BCM4315 0x4315 BCM4315
+product BROADCOM BCM4311 0x4311 BCM4311 2.4GHz
+product BROADCOM BCM4312 0x4312 BCM4312 Dualband
+product BROADCOM BCM4313 0x4313 BCM4313 5GHz
+product BROADCOM BCM4315 0x4315 BCM4315 2.4GHz
product BROADCOM BCM4318 0x4318 BCM4318 AirForce One 54g
product BROADCOM BCM4319 0x4319 BCM4319
product BROADCOM BCM4306 0x4320 BCM4306
@@ -1628,6 +1659,10 @@
product BROADCOM BCM432B 0x432b BCM432B 802.11a/b/g/n
product BROADCOM BCM432C 0x432c BCM432C 802.11b/g/n
product BROADCOM BCM432D 0x432d BCM432D 802.11
+product BROADCOM BCM43224 0x4353 BCM43224 Dualband 802.11
+product BROADCOM BCM43225 0x4357 BCM43225 2.4GHz 802.11
+product BROADCOM BCM43227 0x4358 BCM43227 2.4GHz 802.11
+product BROADCOM BCM43228 0x4359 BCM43228 Dualband 802.11
product BROADCOM BCM4401 0x4401 BCM4401 10/100 Ethernet
product BROADCOM 5801 0x5801 5801 Security Processor
product BROADCOM 5802 0x5802 5802 Security Processor
@@ -1806,6 +1841,16 @@
product COMTROL ROCKETMODEM4 0x000d RocketModem 4 Port
product COMTROL ROCKETPORTP232 0x000e RocketPort 2 Port RS232
product COMTROL ROCKETPORTP422 0x000f RocketPort 2 Port RS422
+product COMTROL ROCKETPORT550811A 0x8010 RocketPort 550/8 RJ11 part A
+product COMTROL ROCKETPORT550811B 0x8011 RocketPort 550/8 RJ11 part B
+product COMTROL ROCKETPORT5508OA 0x8012 RocketPort 550/8 Octa part A
+product COMTROL ROCKETPORT5508OB 0x8013 RocketPort 550/8 Octa part B
+product COMTROL ROCKETPORT5504 0x8014 RocketPort 550/4
+product COMTROL ROCKETPORT550Q 0x8015 RocketPort 550/Quad
+product COMTROL ROCKETPORT55016A 0x8016 RocketPort 550/16 part A
+product COMTROL ROCKETPORT55016B 0x8017 RocketPort 550/16 part B
+product COMTROL ROCKETPORT5508A 0x8018 RocketPort 550/8 part A
+product COMTROL ROCKETPORT5508B 0x8019 RocketPort 550/8 part B
/* Conexant Systems products */
product CONEXANT SOFTK56 0x2443 SoftK56 PCI Software Modem
@@ -2044,6 +2089,10 @@
product FORTEMEDIA FM801 0x0801 801 Sound
product FORTEMEDIA PCIJOY 0x0802 PCI Gameport Joystick
+/* Fresco Logic products */
+product FRESCO FL1000 0x1000 FL1000 USB3 Host Controller
+product FRESCO FL1009 0x1009 FL1009 USB3 Host Controller
+
/* Future Domain products */
product FUTUREDOMAIN TMC_18C30 0x0000 TMC-18C30 (36C70)
@@ -2084,6 +2133,32 @@
product FREESCALE P2020 0x0071 P2020
product FREESCALE P2010E 0x0078 P2010E
product FREESCALE P2010 0x0079 P2010
+product FREESCALE P1020E 0x0100 P1021E
+product FREESCALE P1020 0x0101 P1020
+product FREESCALE P1021E 0x0102 P1021E
+product FREESCALE P1021 0x0103 P1021
+product FREESCALE P1024E 0x0104 P1024E
+product FREESCALE P1024 0x0105 P1024
+product FREESCALE P1025E 0x0106 P1025E
+product FREESCALE P1025 0x0107 P1025
+product FREESCALE P1011E 0x0108 P1011E
+product FREESCALE P1011 0x0109 P1011
+product FREESCALE P1022E 0x0110 P1022E
+product FREESCALE P1022 0x0111 P1022
+product FREESCALE P1013E 0x0118 P1013E
+product FREESCALE P1013 0x0119 P1013
+product FREESCALE P4080E 0x0400 P4080E
+product FREESCALE P4080 0x0401 P4080
+product FREESCALE P4040E 0x0408 P4040E
+product FREESCALE P4040 0x0409 P4040
+product FREESCALE P2040E 0x0410 P2040E
+product FREESCALE P2040 0x0411 P2040
+product FREESCALE P3041E 0x041e P3041E
+product FREESCALE P3041 0x041f P3041
+product FREESCALE P5020E 0x0420 P5020E
+product FREESCALE P5020 0x0421 P5020
+product FREESCALE P5010E 0x0428 P5010E
+product FREESCALE P5010 0x0429 P5010
/* Marvell products */
product MARVELL GT64010A 0x0146 GT-64010A System Controller
@@ -2110,6 +2185,7 @@
product MARVELL YUKON_8036 0x4351 Yukon 88E8036
product MARVELL YUKON_8038 0x4352 Yukon 88E8038
product MARVELL YUKON_8039 0x4353 Yukon 88E8039
+product MARVELL YUKON_8040 0x4354 Yukon 88E8040
product MARVELL YUKON_C033 0x4356 Yukon 88EC033
product MARVELL YUKON_8052 0x4360 Yukon 88E8052
product MARVELL YUKON_8050 0x4361 Yukon 88E8050
@@ -2147,6 +2223,7 @@
product MARVELL 88F6183 0x6183 88F6183 SoC Orion1
product MARVELL 88F6192 0x6192 88F6192 SoC Kirkwood
product MARVELL 88F6281 0x6281 88F6281 SoC Kirkwood
+product MARVELL 88F6282 0x6282 88F6282 SoC Kirkwood
product MARVELL GT64130 0x6320 GT-64130 System Controller
product MARVELL GT64260 0x6430 GT-64260 System Controller
product MARVELL MV64360 0x6460 MV6436x System Controller
@@ -2342,8 +2419,23 @@
product INTEL WIFI_LINK_6230_2 0x0091 Centrino Advanced-N 6230
product INTEL SANDYBRIDGE_HB 0x0100 Sandy Bridge Host Bridge
product INTEL SANDYBRIDGE_IGD 0x0102 Sandy Bridge Integrated Graphics Device
+product INTEL SANDYBRIDGE_IGD_1 0x0112 Sandy Bridge Integrated Graphics Device
+product INTEL SANDYBRIDGE_IGD_2 0x0122 Sandy Bridge Integrated Graphics Device
product INTEL SANDYBRIDGE_M_HB 0x0104 Sandy Bridge Host Bridge
product INTEL SANDYBRIDGE_M_IGD 0x0106 Sandy Bridge Integrated Graphics Device
+product INTEL SANDYBRIDGE_M_IGD_1 0x0116 Sandy Bridge Integrated Graphics Device
+product INTEL SANDYBRIDGE_M_IGD_2 0x0126 Sandy Bridge Integrated Graphics Device
+product INTEL SANDYBRIDGE_S_HB 0x0108 Sandy Bridge Host Bridge
+product INTEL SANDYBRIDGE_S_IGD 0x010A Sandy Bridge Integrated Graphics Device
+product INTEL IVYBRIDGE_HB 0x0150 Ivy Bridge Host Bridge
+product INTEL IVYBRIDGE_IGD 0x0152 Ivy Bridge Integrated Graphics Device
+product INTEL IVYBRIDGE_IGD_1 0x0162 Ivy Bridge Integrated Graphics Device
+product INTEL IVYBRIDGE_M_HB 0x0154 Ivy Bridge Host Bridge
+product INTEL IVYBRIDGE_M_IGD 0x0156 Ivy Bridge Integrated Graphics Device
+product INTEL IVYBRIDGE_M_IGD_1 0x0166 Ivy Bridge Integrated Graphics Device
+product INTEL IVYBRIDGE_S_HB 0x0158 Ivy Bridge Host Bridge
+product INTEL IVYBRIDGE_S_IGD 0x015a Ivy Bridge Integrated Graphics Device
+product INTEL IVYBRIDGE_S_IGD_1 0x016a Ivy Bridge Integrated Graphics Device
product INTEL 80312 0x030d 80312 I/O Companion Chip
product INTEL 80321 0x0319 80321 I/O Processor
product INTEL IOP333_A 0x0370 IOP333 PCI Express-to-PCI Bridge #0
@@ -2360,6 +2452,8 @@
product INTEL PCMC 0x04a3 82434LX/NX PCI, Cache and Memory Controller (PCMC)
product INTEL GDT_RAID1 0x0600 GDT RAID
product INTEL GDT_RAID2 0x061f GDT RAID
+product INTEL WIFI_LINK_2230_1 0x0887 Centrino Wireless-N 2230
+product INTEL WIFI_LINK_2230_2 0x0888 Centrino Wireless-N 2230
product INTEL 80960RM 0x0962 i960 RM PCI-PCI
product INTEL 80960RN 0x0964 i960 RN PCI-PCI
product INTEL 82542 0x1000 i82542 Gigabit Ethernet
@@ -2573,7 +2667,7 @@
product INTEL 6SERIES_PCIE_7 0x1c1c 6 Series PCIE
product INTEL 6SERIES_PCIE_8 0x1c1e 6 Series PCIE
product INTEL 6SERIES_HDA 0x1c20 6 Series HD Audio
-product INTEL 6SERIES_SMB 0x1c22 6 Series SMBus
+product INTEL 6SERIES_SMB 0x1c22 6 Series SMBus Controller
product INTEL 6SERIES_THERM 0x1c24 6 Series Thermal
Home |
Main Index |
Thread Index |
Old Index