diff -r b242b9fcb135 usr/src/pkgdefs/SUNWnge/postinstall --- a/usr/src/pkgdefs/SUNWnge/postinstall Sun May 24 14:10:58 2009 -0700 +++ b/usr/src/pkgdefs/SUNWnge/postinstall Mon May 25 11:30:35 2009 +0900 @@ -129,4 +129,4 @@ check_add_drv -b "${BASEDIR}" -i \ '"pci10de,56" "pci10de,57" "pci10de,269" "pci10de,268" "pci10de,373" "pci10de,372" - "pci10de,37" "pci10de,38" "pci10de,3ee" "pci10de,3ef" "pci10de,760" "pci10de,e6" "pci10de,df"' nge + "pci10de,37" "pci10de,38" "pci10de,3ee" "pci10de,3ef" "pci10de,760" "pci10de,e6" "pci10de,df" "pci10de,ab0"' nge diff -r b242b9fcb135 usr/src/uts/common/io/nge/nge_chip.c --- a/usr/src/uts/common/io/nge/nge_chip.c Sun May 24 14:10:58 2009 -0700 +++ b/usr/src/uts/common/io/nge/nge_chip.c Mon May 25 11:30:35 2009 +0900 @@ -512,6 +512,14 @@ case DEVICE_ID_MCP61_3EE: case DEVICE_ID_MCP61_3EF: + case DEVICE_ID_MCP67_54C: + case DEVICE_ID_MCP67_54D: + case DEVICE_ID_MCP67_54E: + case DEVICE_ID_MCP67_54F: + case DEVICE_ID_MCP73_7DC: + case DEVICE_ID_MCP73_7DD: + case DEVICE_ID_MCP73_7DE: + case DEVICE_ID_MCP73_7DF: dev_param_p->msi = B_FALSE; dev_param_p->msi_x = B_FALSE; dev_param_p->vlan = B_FALSE; @@ -547,6 +555,48 @@ dev_param_p->nge_split = NGE_SPLIT_32; break; + case DEVICE_ID_MCP65_450: + case DEVICE_ID_MCP65_451: + case DEVICE_ID_MCP65_452: + case DEVICE_ID_MCP65_453: + dev_param_p->msi = B_TRUE; + dev_param_p->advanced_pm = B_TRUE; + dev_param_p->tx_pause_frame = B_TRUE; + dev_param_p->rx_pause_frame = B_TRUE; + dev_param_p->jumbo = B_TRUE; + dev_param_p->tx_rx_64byte = B_TRUE; + dev_param_p->rx_hw_checksum = B_TRUE; + dev_param_p->tx_hw_checksum = HCKSUM_IPHDRCKSUM; + dev_param_p->desc_type = DESC_HOT; + dev_param_p->rx_desc_num = NGE_RECV_SLOTS_DESC_3072; + dev_param_p->tx_desc_num = NGE_SEND_SLOTS_DESC_3072; + dev_param_p->nge_split = NGE_SPLIT_96; + break; + + case DEVICE_ID_MCP77_761: + case DEVICE_ID_MCP77_762: + case DEVICE_ID_MCP77_763: + case DEVICE_ID_MCP79_AB0: + case DEVICE_ID_MCP79_AB1: + case DEVICE_ID_MCP79_AB2: + case DEVICE_ID_MCP79_AB3: + dev_param_p->msi = B_TRUE; + dev_param_p->msi_x = B_TRUE; + dev_param_p->vlan = B_TRUE; + dev_param_p->advanced_pm = B_TRUE; + dev_param_p->mac_addr_order = B_TRUE; + dev_param_p->tx_pause_frame = B_TRUE; + dev_param_p->rx_pause_frame = B_TRUE; + dev_param_p->jumbo = B_TRUE; + dev_param_p->tx_rx_64byte = B_TRUE; + dev_param_p->rx_hw_checksum = B_TRUE; + dev_param_p->tx_hw_checksum = HCKSUM_IPHDRCKSUM; + dev_param_p->desc_type = DESC_HOT; + dev_param_p->rx_desc_num = NGE_RECV_SLOTS_DESC_1024; + dev_param_p->tx_desc_num = NGE_SEND_SLOTS_DESC_1024; + dev_param_p->nge_split = NGE_SPLIT_32; + break; + default: dev_param_p->msi = B_FALSE; dev_param_p->msi_x = B_FALSE; @@ -588,6 +638,8 @@ NGE_TRACE(("nge_chip_cfg_init($%p, $%p, %d)", (void *)ngep, (void *)infop, reset)); + nge_init_dev_spec_param(ngep); + /* * save PCI cache line size and subsystem vendor ID * diff -r b242b9fcb135 usr/src/uts/common/io/nge/nge_chip.h --- a/usr/src/uts/common/io/nge/nge_chip.h Sun May 24 14:10:58 2009 -0700 +++ b/usr/src/uts/common/io/nge/nge_chip.h Mon May 25 11:30:35 2009 +0900 @@ -48,6 +48,27 @@ #define DEVICE_ID_MCP77_760 0x760 #define DEVICE_ID_NF3_E6 0xe6 #define DEVICE_ID_NF3_DF 0xdf +#define DEVICE_ID_MCP65_450 0x450 +#define DEVICE_ID_MCP65_451 0x451 +#define DEVICE_ID_MCP65_452 0x452 +#define DEVICE_ID_MCP65_453 0x453 +#define DEVICE_ID_MCP67_54C 0x54c +#define DEVICE_ID_MCP67_54D 0x54d +#define DEVICE_ID_MCP67_54E 0x54e +#define DEVICE_ID_MCP67_54F 0x54f +#define DEVICE_ID_MCP73_7DC 0x7dc +#define DEVICE_ID_MCP73_7DD 0x7dd +#define DEVICE_ID_MCP73_7DE 0x7de +#define DEVICE_ID_MCP73_7DF 0x7df +#define DEVICE_ID_MCP77_761 0x761 +#define DEVICE_ID_MCP77_762 0x762 +#define DEVICE_ID_MCP77_763 0x763 +#define DEVICE_ID_MCP79_AB0 0xab0 +#define DEVICE_ID_MCP79_AB1 0xab1 +#define DEVICE_ID_MCP79_AB2 0xab2 +#define DEVICE_ID_MCP79_AB3 0xab3 + + /* Private PCI configuration register for bus config of ck804/mcp55 */ #define PCI_CONF_HT_INTERNAL 0x4c @@ -649,6 +670,8 @@ #define REVERSE_MAC_ELITE 0x211900ULL #define REVERSE_MAC_GIGABYTE 0xe61600ULL #define REVERSE_MAC_ASUS 0x601d00ULL +#define REVERSE_MAC_APPLE_MB51 0xdf2300ULL + /* * Low 32 bit multicast address diff -r b242b9fcb135 usr/src/uts/common/io/nge/nge_main.c --- a/usr/src/uts/common/io/nge/nge_main.c Sun May 24 14:10:58 2009 -0700 +++ b/usr/src/uts/common/io/nge/nge_main.c Mon May 25 11:30:35 2009 +0900 @@ -153,7 +153,7 @@ nge_hot_txd_check, }; -static char nge_ident[] = "nVidia 1Gb Ethernet"; +static char nge_ident[] = "nVidia 1Gb Ethernet b116 + MacBook5,1 "; static char clsize_propname[] = "cache-line-size"; static char latency_propname[] = "latency-timer"; static char debug_propname[] = "nge-debug-flags";