Index: sys/conf/files =================================================================== RCS file: /cvsroot/src/sys/conf/files,v retrieving revision 1.908 diff -u -r1.908 files --- sys/conf/files 10 Jun 2008 14:03:57 -0000 1.908 +++ sys/conf/files 19 Jun 2008 09:10:01 -0000 @@ -917,6 +917,12 @@ file dev/ic/ahcisata_core.c ahcisata_core device ahcisata: ata, ata_dma, ata_udma, sata, ahcisata_core +# Mervell Serial-ATA Host Controller +define mvsata +file dev/ic/mvsata.c mvsata +device mvsata: ata, ata_dma, ata_udma, wdc_common, sata, mvsata +defflag opt_mvsata.h MVSATA_WITHOUTDMA + # DECchip 21x4x Ethernet controller family, and assorted clones. # device tlp: arp, ether, ifnet, mii, mii_bitbang Index: sys/dev/pci/files.pci =================================================================== RCS file: /cvsroot/src/sys/dev/pci/files.pci,v retrieving revision 1.304 diff -u -r1.304 files.pci --- sys/dev/pci/files.pci 23 May 2008 21:11:40 -0000 1.304 +++ sys/dev/pci/files.pci 19 Jun 2008 09:10:02 -0000 @@ -938,3 +938,7 @@ device siisata: ata, ata_dma, ata_udma, sata, siisata attach siisata at pci with siisata_pci file dev/pci/siisata_pci.c siisata_pci + +# Marvell Serial-ATA Host Controller +attach mvsata at pci with mvsata_pci +file dev/pci/mvsata_pci.c mvsata_pci Index: sys/dev/pci/pcidevs =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs,v retrieving revision 1.942 diff -u -r1.942 pcidevs --- sys/dev/pci/pcidevs 25 May 2008 15:58:48 -0000 1.942 +++ sys/dev/pci/pcidevs 19 Jun 2008 09:10:04 -0000 @@ -818,6 +818,8 @@ product ADP2 AIC7899D 0x00c3 AIC-7899D U160 product ADP2 AIC7899F 0x00c5 AIC-7899F RAID product ADP2 AIC7899P 0x00cf AIC-7899P U160 +product ADP2 1420SA 0x0241 RAID 1420SA +product ADP2 1430SA 0x0243 RAID 1430SA product ADP2 AAC2622 0x0282 AAC-2622 product ADP2 ASR2200S 0x0285 ASR-2200S product ADP2 ASR2120S 0x0286 ASR-2120S @@ -1888,6 +1890,8 @@ /* Marvell products */ product MARVELL GT64010A 0x0146 GT-64010A System Controller +product MARVELL 88F1181 0x1181 88F1181 +product MARVELL 88F1281 0x1281 88F1281 SoC Orion2 product MARVELL 88W8300_1 0x1fa6 Libertas 88W8300 product MARVELL 88W8310 0x1fa7 Libertas 88W8310 product MARVELL 88W8335_1 0x1faa Libertas 88W8335 @@ -1922,19 +1926,31 @@ product MARVELL YUKON_C055 0x436a Yukon 88EC055 product MARVELL GT64120 0x4620 GT-64120 System Controller product MARVELL BELKIN 0x5005 Belkin Gigabit Ethernet -product MARVELL 88SX5040 0x5040 88SX5040 SATA -product MARVELL 88SX5041 0x5041 88SX5041 SATA -product MARVELL 88SX5080 0x5080 88SX5080 SATA -product MARVELL 88SX5081 0x5081 88SX5081 SATA -product MARVELL 88SX6041 0x6041 88SX6041 SATA -product MARVELL 88SX6081 0x6081 88SX6041 SATA +product MARVELL 88SX5040 0x5040 88SX5040 SATA I +product MARVELL 88SX5041 0x5041 88SX5041 SATA I +product MARVELL 88SX5080 0x5080 88SX5080 SATA I +product MARVELL 88SX5081 0x5081 88SX5081 SATA I +product MARVELL 88F5082 0x5082 88F5082 SoC Orion1 +product MARVELL 88F5180N 0x5180 88F5180N SoC Orion1 +product MARVELL 88F5181 0x5181 88F5181 SoC Orion1 +product MARVELL 88F5182 0x5182 88F5182 SoC Orion1 +product MARVELL 88F5281 0x5281 88F5281 SoC Orion2 +product MARVELL 88SX6040 0x6040 88SX6040 SATA II +product MARVELL 88SX6041 0x6041 88SX6041 SATA II +product MARVELL 88SX6042 0x6042 88SX6042 SATA IIe +product MARVELL 88SX6080 0x6080 88SX6080 SATA II +product MARVELL 88SX6081 0x6081 88SX6081 SATA II +product MARVELL 88F6082 0x6082 88F6082 SoC Orion1 product MARVELL 88SE6101 0x6101 88SE6101 single-port PATA133 Controller product MARVELL 88SE6121 0x6121 88SE6121 SATA II Controller product MARVELL 88SE614X 0x6141 88SE614X SATA II PCI-E Controller product MARVELL 88SE6145 0x6145 88SE6145 SATA II PCI-E Controller +product MARVELL 88F6183 0x6183 88F6183 SoC Orion1 product MARVELL GT64130 0x6320 GT-64130 System Controller product MARVELL GT64260 0x6430 GT-64260 System Controller product MARVELL GT64360 0x6460 MV6436x System Controller +product MARVELL 88SX7042 0x7042 88SX7042 SATA IIe +product MARVELL 88W8660 0x8660 88W8660 SoC Orion1 /* Global Sun Tech products */ product GLOBALSUN GL24110P 0x1101 GL24110P PCI IEEE 802.11b @@ -3814,6 +3830,7 @@ product TRIONES HPT371 0x0007 HPT371 IDE Controller product TRIONES HPT374 0x0008 HPT374 IDE Controller product TRIONES HPT372N 0x0009 HPT372N IDE Controller +product TRIONES ROCKETRAID_2310 0x2310 RocketRAID 2310 RAID card /* TriTech Microelectronics products*/ product TRITECH TR25202 0xfc02 Pyramid3D TR25202 Index: sys/dev/pci/pcidevs.h =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs.h,v retrieving revision 1.943 diff -u -r1.943 pcidevs.h --- sys/dev/pci/pcidevs.h 25 May 2008 15:59:21 -0000 1.943 +++ sys/dev/pci/pcidevs.h 19 Jun 2008 09:10:06 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: pcidevs.h,v 1.943 2008/05/25 15:59:21 chs Exp $ */ +/* $NetBSD$ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -825,6 +825,8 @@ #define PCI_PRODUCT_ADP2_AIC7899D 0x00c3 /* AIC-7899D U160 */ #define PCI_PRODUCT_ADP2_AIC7899F 0x00c5 /* AIC-7899F RAID */ #define PCI_PRODUCT_ADP2_AIC7899P 0x00cf /* AIC-7899P U160 */ +#define PCI_PRODUCT_ADP2_1420SA 0x0241 /* RAID 1420SA */ +#define PCI_PRODUCT_ADP2_1430SA 0x0243 /* RAID 1430SA */ #define PCI_PRODUCT_ADP2_AAC2622 0x0282 /* AAC-2622 */ #define PCI_PRODUCT_ADP2_ASR2200S 0x0285 /* ASR-2200S */ #define PCI_PRODUCT_ADP2_ASR2120S 0x0286 /* ASR-2120S */ @@ -1895,6 +1897,8 @@ /* Marvell products */ #define PCI_PRODUCT_MARVELL_GT64010A 0x0146 /* GT-64010A System Controller */ +#define PCI_PRODUCT_MARVELL_88F1181 0x1181 /* 88F1181 */ +#define PCI_PRODUCT_MARVELL_88F1281 0x1281 /* 88F1281 SoC Orion2 */ #define PCI_PRODUCT_MARVELL_88W8300_1 0x1fa6 /* Libertas 88W8300 */ #define PCI_PRODUCT_MARVELL_88W8310 0x1fa7 /* Libertas 88W8310 */ #define PCI_PRODUCT_MARVELL_88W8335_1 0x1faa /* Libertas 88W8335 */ @@ -1929,19 +1933,31 @@ #define PCI_PRODUCT_MARVELL_YUKON_C055 0x436a /* Yukon 88EC055 */ #define PCI_PRODUCT_MARVELL_GT64120 0x4620 /* GT-64120 System Controller */ #define PCI_PRODUCT_MARVELL_BELKIN 0x5005 /* Belkin Gigabit Ethernet */ -#define PCI_PRODUCT_MARVELL_88SX5040 0x5040 /* 88SX5040 SATA */ -#define PCI_PRODUCT_MARVELL_88SX5041 0x5041 /* 88SX5041 SATA */ -#define PCI_PRODUCT_MARVELL_88SX5080 0x5080 /* 88SX5080 SATA */ -#define PCI_PRODUCT_MARVELL_88SX5081 0x5081 /* 88SX5081 SATA */ -#define PCI_PRODUCT_MARVELL_88SX6041 0x6041 /* 88SX6041 SATA */ -#define PCI_PRODUCT_MARVELL_88SX6081 0x6081 /* 88SX6041 SATA */ +#define PCI_PRODUCT_MARVELL_88SX5040 0x5040 /* 88SX5040 SATA I */ +#define PCI_PRODUCT_MARVELL_88SX5041 0x5041 /* 88SX5041 SATA I */ +#define PCI_PRODUCT_MARVELL_88SX5080 0x5080 /* 88SX5080 SATA I */ +#define PCI_PRODUCT_MARVELL_88SX5081 0x5081 /* 88SX5081 SATA I */ +#define PCI_PRODUCT_MARVELL_88F5082 0x5082 /* 88F5082 SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5180N 0x5180 /* 88F5180N SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5181 0x5181 /* 88F5181 SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5182 0x5182 /* 88F5182 SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5281 0x5281 /* 88F5281 SoC Orion2 */ +#define PCI_PRODUCT_MARVELL_88SX6040 0x6040 /* 88SX6040 SATA II */ +#define PCI_PRODUCT_MARVELL_88SX6041 0x6041 /* 88SX6041 SATA II */ +#define PCI_PRODUCT_MARVELL_88SX6042 0x6042 /* 88SX6042 SATA IIe */ +#define PCI_PRODUCT_MARVELL_88SX6080 0x6080 /* 88SX6080 SATA II */ +#define PCI_PRODUCT_MARVELL_88SX6081 0x6081 /* 88SX6081 SATA II */ +#define PCI_PRODUCT_MARVELL_88F6082 0x6082 /* 88F6082 SoC Orion1 */ #define PCI_PRODUCT_MARVELL_88SE6101 0x6101 /* 88SE6101 single-port PATA133 Controller */ #define PCI_PRODUCT_MARVELL_88SE6121 0x6121 /* 88SE6121 SATA II Controller */ #define PCI_PRODUCT_MARVELL_88SE614X 0x6141 /* 88SE614X SATA II PCI-E Controller */ #define PCI_PRODUCT_MARVELL_88SE6145 0x6145 /* 88SE6145 SATA II PCI-E Controller */ +#define PCI_PRODUCT_MARVELL_88F6183 0x6183 /* 88F6183 SoC Orion1 */ #define PCI_PRODUCT_MARVELL_GT64130 0x6320 /* GT-64130 System Controller */ #define PCI_PRODUCT_MARVELL_GT64260 0x6430 /* GT-64260 System Controller */ #define PCI_PRODUCT_MARVELL_GT64360 0x6460 /* MV6436x System Controller */ +#define PCI_PRODUCT_MARVELL_88SX7042 0x7042 /* 88SX7042 SATA IIe */ +#define PCI_PRODUCT_MARVELL_88W8660 0x8660 /* 88W8660 SoC Orion1 */ /* Global Sun Tech products */ #define PCI_PRODUCT_GLOBALSUN_GL24110P 0x1101 /* GL24110P PCI IEEE 802.11b */ @@ -3821,6 +3837,7 @@ #define PCI_PRODUCT_TRIONES_HPT371 0x0007 /* HPT371 IDE Controller */ #define PCI_PRODUCT_TRIONES_HPT374 0x0008 /* HPT374 IDE Controller */ #define PCI_PRODUCT_TRIONES_HPT372N 0x0009 /* HPT372N IDE Controller */ +#define PCI_PRODUCT_TRIONES_ROCKETRAID_2310 0x2310 /* RocketRAID 2310 RAID card */ /* TriTech Microelectronics products*/ #define PCI_PRODUCT_TRITECH_TR25202 0xfc02 /* Pyramid3D TR25202 */ Index: sys/dev/pci/pcidevs_data.h =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs_data.h,v retrieving revision 1.942 diff -u -r1.942 pcidevs_data.h --- sys/dev/pci/pcidevs_data.h 25 May 2008 15:59:21 -0000 1.942 +++ sys/dev/pci/pcidevs_data.h 19 Jun 2008 09:10:09 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: pcidevs_data.h,v 1.942 2008/05/25 15:59:21 chs Exp $ */ +/* $NetBSD$ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -3008,6 +3008,14 @@ "AIC-7899P U160", }, { + PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_1420SA, + "RAID 1420SA", + }, + { + PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_1430SA, + "RAID 1430SA", + }, + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AAC2622, "AAC-2622", }, @@ -6556,6 +6564,14 @@ "GT-64010A System Controller", }, { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F1181, + "88F1181", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F1281, + "88F1281 SoC Orion2", + }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8300_1, "Libertas 88W8300", }, @@ -6693,27 +6709,63 @@ }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5040, - "88SX5040 SATA", + "88SX5040 SATA I", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5041, - "88SX5041 SATA", + "88SX5041 SATA I", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5080, - "88SX5080 SATA", + "88SX5080 SATA I", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5081, - "88SX5081 SATA", + "88SX5081 SATA I", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5082, + "88F5082 SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5180N, + "88F5180N SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5181, + "88F5181 SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5182, + "88F5182 SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5281, + "88F5281 SoC Orion2", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6040, + "88SX6040 SATA II", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6041, - "88SX6041 SATA", + "88SX6041 SATA II", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6042, + "88SX6042 SATA IIe", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6080, + "88SX6080 SATA II", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6081, - "88SX6041 SATA", + "88SX6081 SATA II", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F6082, + "88F6082 SoC Orion1", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6101, @@ -6732,6 +6784,10 @@ "88SE6145 SATA II PCI-E Controller", }, { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F6183, + "88F6183 SoC Orion1", + }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64130, "GT-64130 System Controller", }, @@ -6744,6 +6800,14 @@ "MV6436x System Controller", }, { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX7042, + "88SX7042 SATA IIe", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8660, + "88W8660 SoC Orion1", + }, + { PCI_VENDOR_GLOBALSUN, PCI_PRODUCT_GLOBALSUN_GL24110P, "GL24110P PCI IEEE 802.11b", }, @@ -13232,6 +13296,10 @@ "HPT372N IDE Controller", }, { + PCI_VENDOR_TRIONES, PCI_PRODUCT_TRIONES_ROCKETRAID_2310, + "RocketRAID 2310 RAID card", + }, + { PCI_VENDOR_TRITECH, PCI_PRODUCT_TRITECH_TR25202, "Pyramid3D TR25202", }, @@ -14252,4 +14320,4 @@ "Video Controller", }, }; -const int pci_nproducts = 2963; +const int pci_nproducts = 2980;