The following diff adds initial support for the new
NVIDIA MCP89 chipset and removes any support for the
MCP7B chipset which has been canceled.
Device ID info from Peer Chen @ NVIDIA via Linux
Index: pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1477
diff -u -p -r1.1477 pcidevs
--- pcidevs 4 Jun 2009 05:01:17 -0000 1.1477
+++ pcidevs 17 Jun 2009 03:22:57 -0000
@@ -4089,23 +4090,23 @@ product NVIDIA MCP77_AHCI_9 0x0ad8 MCP77
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
Index: azalia.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.139
diff -u -p -r1.139 azalia.c
--- azalia.c 9 Jun 2009 05:16:42 -0000 1.139
+++ azalia.c 16 Jun 2009 04:17:43 -0000
@@ -411,10 +411,10 @@ azalia_pci_attach(struct device *parent,
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;
Index: if_nfe.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_nfe.c,v
retrieving revision 1.88
diff -u -p -r1.88 if_nfe.c
--- if_nfe.c 29 Mar 2009 21:53:52 -0000 1.88
+++ if_nfe.c 16 Jun 2009 04:07:12 -0000
@@ -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
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;
Index: nviic.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/nviic.c,v
retrieving revision 1.13
diff -u -p -r1.13 nviic.c
--- nviic.c 22 May 2008 05:27:01 -0000 1.13
+++ nviic.c 17 Jun 2009 03:22:49 -0000
@@ -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
Index: azalia.4
===================================================================
RCS file: /cvs/src/share/man/man4/azalia.4,v
retrieving revision 1.19
diff -u -p -r1.19 azalia.4
--- azalia.4 31 Dec 2008 13:55:37 -0000 1.19
+++ azalia.4 17 Jun 2009 03:12:24 -0000
@@ -53,7 +53,7 @@ ATI SB450, SB600, SB700
.It
Intel 82801FB/GB/H/I/JI (ICH6, ICH7, ICH8, ICH9, ICH10)
.It
-NVIDIA MCP51/MCP55/MCP61/MCP65/MCP67/MCP73/MCP77/MCP79/MCP7B
+NVIDIA MCP51/MCP55/MCP61/MCP65/MCP67/MCP73/MCP77/MCP79/MCP89
.It
Silicon Integrated System 966/966L
.It
Index: nfe.4
===================================================================
RCS file: /cvs/src/share/man/man4/nfe.4,v
retrieving revision 1.17
diff -u -p -r1.17 nfe.4
--- nfe.4 28 Oct 2008 06:27:28 -0000 1.17
+++ nfe.4 17 Jun 2009 03:28:21 -0000
@@ -33,14 +33,14 @@ The
driver supports Fast Ethernet and Gigabit Ethernet adapters based
on the NVIDIA nForce Media and Communications Processors (MCP),
the nForce, nForce 2, nForce 3, CK804, MCP04, MCP51, MCP55,
-MCP61, MCP65, MCP67, MCP73, MCP77 and MCP79 Ethernet
+MCP61, MCP65, MCP67, MCP73, MCP77, MCP79 and MCP89 Ethernet
controller chips.
.Pp
The
.Nm
driver supports IPv4 transmit/receive IP/TCP/UDP checksum offload
-with the nForce 3, CK804, MCP55, MCP77 and MCP79 chipsets and VLAN
-tag insertion and stripping with the MCP55 chipset.
+with the nForce 3, CK804, MCP55, MCP77, MCP79 and MCP89 chipsets
+and VLAN tag insertion and stripping with the MCP55 chipset.
.Pp
The
.Nm
Index: nviic.4
===================================================================
RCS file: /cvs/src/share/man/man4/nviic.4,v
retrieving revision 1.10
diff -u -p -r1.10 nviic.4
--- nviic.4 22 May 2008 05:27:55 -0000 1.10
+++ nviic.4 17 Jun 2009 03:25:08 -0000
@@ -27,7 +27,7 @@
The
.Nm
driver provides support for the NVIDIA nForce2/3/4
-and MCP51/55/61/65/67/73/77/79/7B SMBus
+and MCP51/55/61/65/67/73/77/79 SMBus
host interface to be used with the
.Xr iic 4
framework.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
