Remove support for cancelled NVIDIA MCP7B and add initial support for

MCP89.

From Brad based on information from Peer Chen @ NVIDIA via Linux.

4 files changed, 29 insertions, 28 deletions

diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index dcde9e2ef96..e8c92bb1a11 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: azalia.c,v 1.139 2009/06/09 05:16:42 jakemsr Exp $	*/
+/*	$OpenBSD: azalia.c,v 1.140 2009/06/18 08:19:03 jsg Exp $	*/
 /*	$NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $	*/
 
 /*-
@@ -411,10 +411,10 @@ azalia_pci_attach(struct device *parent, struct device *self, void *aux)
 	case PCI_PRODUCT_NVIDIA_MCP79_HDA_2:
 	case PCI_PRODUCT_NVIDIA_MCP79_HDA_3:
 	case PCI_PRODUCT_NVIDIA_MCP79_HDA_4:
-	case PCI_PRODUCT_NVIDIA_MCP7B_HDA_1:
-	case PCI_PRODUCT_NVIDIA_MCP7B_HDA_2:
-	case PCI_PRODUCT_NVIDIA_MCP7B_HDA_3:
-	case PCI_PRODUCT_NVIDIA_MCP7B_HDA_4:
+	case PCI_PRODUCT_NVIDIA_MCP89_HDA_1:
+	case PCI_PRODUCT_NVIDIA_MCP89_HDA_2:
+	case PCI_PRODUCT_NVIDIA_MCP89_HDA_3:
+	case PCI_PRODUCT_NVIDIA_MCP89_HDA_4:
 		reg = azalia_pci_read(pa->pa_pc, pa->pa_tag, NVIDIA_PCIE_SNOOP_REG);
 		reg &= NVIDIA_PCIE_SNOOP_MASK;
 		reg |= NVIDIA_PCIE_SNOOP_ENABLE;
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 0ef03c16e88..74ff3e7d363 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nfe.c,v 1.88 2009/03/29 21:53:52 sthen Exp $	*/
+/*	$OpenBSD: if_nfe.c,v 1.89 2009/06/18 08:19:03 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -161,7 +161,8 @@ const struct pci_matchid nfe_devices[] = {
 	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_LAN1 },
 	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_LAN2 },
 	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_LAN3 },
-	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_LAN4 }
+	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_LAN4 },
+	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP89_LAN }
 };
 
 int
@@ -247,6 +248,7 @@ nfe_attach(struct device *parent, struct device *self, void *aux)
 	case PCI_PRODUCT_NVIDIA_MCP79_LAN2:
 	case PCI_PRODUCT_NVIDIA_MCP79_LAN3:
 	case PCI_PRODUCT_NVIDIA_MCP79_LAN4:
+	case PCI_PRODUCT_NVIDIA_MCP89_LAN:
 		sc->sc_flags |= NFE_JUMBO_SUP | NFE_40BIT_ADDR | NFE_HW_CSUM |
 		    NFE_CORRECT_MACADDR | NFE_PWR_MGMT;
 		break;
diff --git a/sys/dev/pci/nviic.c b/sys/dev/pci/nviic.c
index 4329390da60..3758d203ea2 100644
--- a/sys/dev/pci/nviic.c
+++ b/sys/dev/pci/nviic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nviic.c,v 1.13 2008/05/22 05:27:01 brad Exp $ */
+/*	$OpenBSD: nviic.c,v 1.14 2009/06/18 08:19:03 jsg Exp $ */
 
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -126,8 +126,7 @@ const struct pci_matchid nviic_ids[] = {
 	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_SMB },
 	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_SMB },
 	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_SMB },
-	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_SMB },
-	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP7B_SMB }
+	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_SMB }
 };
 
 int
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 0d1e412e851..e6db1c628b7 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1477 2009/06/04 05:01:17 claudio Exp $
+$OpenBSD: pcidevs,v 1.1478 2009/06/18 08:19:34 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -4089,23 +4089,23 @@ product NVIDIA MCP77_AHCI_9	0x0ad8	MCP77 AHCI
 product NVIDIA MCP77_AHCI_10	0x0ad9	MCP77 AHCI
 product NVIDIA MCP77_AHCI_11	0x0ada	MCP77 AHCI
 product NVIDIA MCP77_AHCI_12	0x0adb	MCP77 AHCI
-product NVIDIA MCP7B_SMB	0x0bc0	MCP7B SMBus
-product NVIDIA MCP7B_AHCI_1	0x0bc8	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_2	0x0bc9	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_3	0x0bca	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_4	0x0bcb	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_5	0x0bcc	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_6	0x0bcd	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_7	0x0bce	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_8	0x0bcf	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_9	0x0bd0	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_10	0x0bd1	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_11	0x0bd2	MCP7B AHCI
-product NVIDIA MCP7B_AHCI_12	0x0bd3	MCP7B AHCI
-product NVIDIA MCP7B_HDA_1	0x0bd4	MCP7B HD Audio
-product NVIDIA MCP7B_HDA_2	0x0bd5	MCP7B HD Audio
-product NVIDIA MCP7B_HDA_3	0x0bd6	MCP7B HD Audio
-product NVIDIA MCP7B_HDA_4	0x0bd7	MCP7B HD Audio
+product NVIDIA MCP89_LAN	0x0d7d	MCP89 LAN
+product NVIDIA MCP89_AHCI_1	0x0d84	MCP89 AHCI
+product NVIDIA MCP89_AHCI_2	0x0d85	MCP89 AHCI
+product NVIDIA MCP89_AHCI_3	0x0d86	MCP89 AHCI
+product NVIDIA MCP89_AHCI_4	0x0d87	MCP89 AHCI
+product NVIDIA MCP89_AHCI_5	0x0d88	MCP89 AHCI
+product NVIDIA MCP89_AHCI_6	0x0d89	MCP89 AHCI
+product NVIDIA MCP89_AHCI_7	0x0d8a	MCP89 AHCI
+product NVIDIA MCP89_AHCI_8	0x0d8b	MCP89 AHCI
+product NVIDIA MCP89_AHCI_9	0x0d8c	MCP89 AHCI
+product NVIDIA MCP89_AHCI_10	0x0d8d	MCP89 AHCI
+product NVIDIA MCP89_AHCI_11	0x0d8e	MCP89 AHCI
+product NVIDIA MCP89_AHCI_12	0x0d8f	MCP89 AHCI
+product NVIDIA MCP89_HDA_1	0x0d94	MCP89 HD Audio
+product NVIDIA MCP89_HDA_2	0x0d95	MCP89 HD Audio
+product NVIDIA MCP89_HDA_3	0x0d96	MCP89 HD Audio
+product NVIDIA MCP89_HDA_4	0x0d97	MCP89 HD Audio
 
 /* Oak Technologies products */
 product OAKTECH OTI1007		0x0107	OTI107