Module Name: src
Committed By: snj
Date: Mon Mar 30 16:49:26 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: ahcisata_pci.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #616):
sys/dev/pci/ahcisata_pci.c: revision 1.14
Add the other three PCI ids for the nvidia MCP65 SATA controller to
the quirk table. This way they attach as ahcisata and work, instead of
attaching as viaide and failing miserably.
Fixes PR kern/37826.
XXX: There are a bunch of additional MCP67 and MCP73 PCI ids that
XXX: should probably be added also, but I don't want to do that without
XXX: further investigation and testing.
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 src/sys/dev/pci/ahcisata_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.12.4.1 src/sys/dev/pci/ahcisata_pci.c:1.12.4.2
--- src/sys/dev/pci/ahcisata_pci.c:1.12.4.1 Wed Dec 10 21:55:27 2008
+++ src/sys/dev/pci/ahcisata_pci.c Mon Mar 30 16:49:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.12.4.1 2008/12/10 21:55:27 snj Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.12.4.2 2009/03/30 16:49:25 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.12.4.1 2008/12/10 21:55:27 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.12.4.2 2009/03/30 16:49:25 snj Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -54,6 +54,12 @@
static const struct pci_quirkdata ahci_pci_quirks[] = {
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA,
AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA2,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA3,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA4,
+ AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_SATA,
AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_AHCI_1,
