Thu Jan 9 22:37:19 2014 UTC ()
revert unintended changes


(christos)
diff -r1.32 -r1.33 src/sys/dev/pci/ahcisata_pci.c
diff -r1.1178 -r1.1179 src/sys/dev/pci/pcidevs
cvs diff -r1.32 -r1.33 src/sys/dev/pci/ahcisata_pci.c (expand / switch to unified diff)

--- src/sys/dev/pci/ahcisata_pci.c 2014/01/09 21:14:53 1.32
+++ src/sys/dev/pci/ahcisata_pci.c 2014/01/09 22:37:19 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $ */ 1/* $NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2006 Manuel Bouyer. 4 * Copyright (c) 2006 Manuel Bouyer.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -16,27 +16,27 @@ @@ -16,27 +16,27 @@
16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 * 25 *
26 */ 26 */
27 27
28#include <sys/cdefs.h> 28#include <sys/cdefs.h>
29__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $");
30 30
31#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/malloc.h> 32#include <sys/malloc.h>
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/kernel.h> 34#include <sys/kernel.h>
35#include <sys/systm.h> 35#include <sys/systm.h>
36#include <sys/disklabel.h> 36#include <sys/disklabel.h>
37#include <sys/pmf.h> 37#include <sys/pmf.h>
38 38
39#include <dev/pci/pcivar.h> 39#include <dev/pci/pcivar.h>
40#include <dev/pci/pcidevs.h> 40#include <dev/pci/pcidevs.h>
41#include <dev/pci/pciidereg.h> 41#include <dev/pci/pciidereg.h>
42#include <dev/pci/pciidevar.h> 42#include <dev/pci/pciidevar.h>
@@ -157,27 +157,27 @@ static const struct ahci_pci_quirk ahci_ @@ -157,27 +157,27 @@ static const struct ahci_pci_quirk ahci_
157 AHCI_QUIRK_BADPMP }, 157 AHCI_QUIRK_BADPMP },
158 { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_AHCI_10, 158 { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_AHCI_10,
159 AHCI_QUIRK_BADPMP }, 159 AHCI_QUIRK_BADPMP },
160 { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_AHCI_11, 160 { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_AHCI_11,
161 AHCI_QUIRK_BADPMP }, 161 AHCI_QUIRK_BADPMP },
162 { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_AHCI_12, 162 { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_AHCI_12,
163 AHCI_QUIRK_BADPMP }, 163 AHCI_QUIRK_BADPMP },
164 { PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5288, 164 { PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5288,
165 AHCI_PCI_QUIRK_FORCE }, 165 AHCI_PCI_QUIRK_FORCE },
166 { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6121, 166 { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6121,
167 AHCI_PCI_QUIRK_FORCE | AHCI_QUIRK_BADPMP }, 167 AHCI_PCI_QUIRK_FORCE | AHCI_QUIRK_BADPMP },
168 { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6145, 168 { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6145,
169 AHCI_QUIRK_BADPMP }, 169 AHCI_QUIRK_BADPMP },
170 { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE912X, 170 { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE9128,
171 AHCI_PCI_QUIRK_FORCE }, 171 AHCI_PCI_QUIRK_FORCE },
172 /* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */ 172 /* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
173 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1, 173 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1,
174 AHCI_PCI_QUIRK_BAD64 | AHCI_QUIRK_BADPMPRESET }, 174 AHCI_PCI_QUIRK_BAD64 | AHCI_QUIRK_BADPMPRESET },
175 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_AHCI, 175 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_AHCI,
176 AHCI_QUIRK_BADPMPRESET }, 176 AHCI_QUIRK_BADPMPRESET },
177 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_RAID, 177 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_RAID,
178 AHCI_QUIRK_BADPMPRESET }, 178 AHCI_QUIRK_BADPMPRESET },
179 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_RAID5, 179 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_RAID5,
180 AHCI_QUIRK_BADPMPRESET }, 180 AHCI_QUIRK_BADPMPRESET },
181 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_FC, 181 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_FC,
182 AHCI_QUIRK_BADPMPRESET }, 182 AHCI_QUIRK_BADPMPRESET },
183 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_AHCI2, 183 { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_AHCI2,
cvs diff -r1.1178 -r1.1179 src/sys/dev/pci/pcidevs (expand / switch to unified diff)

--- src/sys/dev/pci/pcidevs 2014/01/09 17:28:05 1.1178
+++ src/sys/dev/pci/pcidevs 2014/01/09 22:37:18 1.1179
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: pcidevs,v 1.1178 2014/01/09 17:28:05 msaitoh Exp $ 1$NetBSD: pcidevs,v 1.1179 2014/01/09 22:37:18 christos Exp $
2 2
3/* 3/*
4 * Copyright (c) 1995, 1996 Christopher G. Demetriou 4 * Copyright (c) 1995, 1996 Christopher G. Demetriou
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -2330,26 +2330,27 @@ product MARVELL 88SX7042 0x7042 88SX7042 @@ -2330,26 +2330,27 @@ product MARVELL 88SX7042 0x7042 88SX7042
2330product MARVELL MV78100 0x7810 MV78100 SoC Discovery Innovation 2330product MARVELL MV78100 0x7810 MV78100 SoC Discovery Innovation
2331product MARVELL MV78130 0x7813 MV78130 SoC Armada XP 2331product MARVELL MV78130 0x7813 MV78130 SoC Armada XP
2332product MARVELL MV78160 0x7816 MV78160 SoC Armada XP 2332product MARVELL MV78160 0x7816 MV78160 SoC Armada XP
2333product MARVELL MV78200 0x7820 MV78200 SoC Discovery Innovation 2333product MARVELL MV78200 0x7820 MV78200 SoC Discovery Innovation
2334product MARVELL MV78230 0x7823 MV78230 SoC Armada XP 2334product MARVELL MV78230 0x7823 MV78230 SoC Armada XP
2335product MARVELL MV78260 0x7826 MV78260 SoC Armada XP 2335product MARVELL MV78260 0x7826 MV78260 SoC Armada XP
2336product MARVELL MV78460 0x7846 MV78460 SoC Armada XP 2336product MARVELL MV78460 0x7846 MV78460 SoC Armada XP
2337product MARVELL 88W8660 0x8660 88W8660 SoC Orion1 2337product MARVELL 88W8660 0x8660 88W8660 SoC Orion1
2338 2338
2339product MARVELL2 88SE9120 0x9120 88SE9120 SATA 2339product MARVELL2 88SE9120 0x9120 88SE9120 SATA
2340product MARVELL2 88SE912X 0x9123 88SE912x SATA II or III PCI-E AHCI Controller 2340product MARVELL2 88SE912X 0x9123 88SE912x SATA II or III PCI-E AHCI Controller
2341product MARVELL2 88SE9125 0x9125 88SE9125 SATA III PCI-E AHCI Controller 2341product MARVELL2 88SE9125 0x9125 88SE9125 SATA III PCI-E AHCI Controller
2342product MARVELL2 88SE9172 0x9172 88SE9172 SATA 2342product MARVELL2 88SE9172 0x9172 88SE9172 SATA
 2343product MARVELL2 88SE9128 0x91a3 88SE9128 SATA
2343product MARVELL2 88SE9182 0x9182 88SE9182 SATA 2344product MARVELL2 88SE9182 0x9182 88SE9182 SATA
2344product MARVELL2 88SE9183 0x9183 88SE9183 SATA 2345product MARVELL2 88SE9183 0x9183 88SE9183 SATA
2345product MARVELL2 88SE9215 0x9215 88SE9215 SATA 2346product MARVELL2 88SE9215 0x9215 88SE9215 SATA
2346product MARVELL2 88SE9220 0x9220 88SE9220 SATA 2347product MARVELL2 88SE9220 0x9220 88SE9220 SATA
2347product MARVELL2 88SE9230 0x9230 88SE9230 SATA 2348product MARVELL2 88SE9230 0x9230 88SE9230 SATA
2348product MARVELL2 88SE9235 0x9235 88SE9235 SATA 2349product MARVELL2 88SE9235 0x9235 88SE9235 SATA
2349 2350
2350/* Global Sun Tech products */ 2351/* Global Sun Tech products */
2351product GLOBALSUN GL24110P 0x1101 GL24110P PCI IEEE 802.11b 2352product GLOBALSUN GL24110P 0x1101 GL24110P PCI IEEE 802.11b
2352product GLOBALSUN GL24110P02 0x1102 GL24110P PCI IEEE 802.11b 2353product GLOBALSUN GL24110P02 0x1102 GL24110P PCI IEEE 802.11b
2353 2354
2354/* Guillemot products */ 2355/* Guillemot products */
2355product GUILLEMOT MAXIRADIO 0x1001 MAXIRADIO 2356product GUILLEMOT MAXIRADIO 0x1001 MAXIRADIO