From owner-svn-src-all@FreeBSD.ORG Sat Oct 25 21:42:43 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C970B1065680; Sat, 25 Oct 2008 21:42:43 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B41F08FC0C; Sat, 25 Oct 2008 21:42:43 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9PLghLP054048; Sat, 25 Oct 2008 21:42:43 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9PLghfx054036; Sat, 25 Oct 2008 21:42:43 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200810252142.m9PLghfx054036@svn.freebsd.org> From: Stanislav Sedov Date: Sat, 25 Oct 2008 21:42:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184267 - in stable/7: share/man/man4 sys sys/conf sys/dev/ae sys/dev/mii sys/modules sys/modules/ae usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Oct 2008 21:42:43 -0000 Author: stas Date: Sat Oct 25 21:42:43 2008 New Revision: 184267 URL: http://svn.freebsd.org/changeset/base/184267 Log: - MFC ae(4) Attansic FastEthernet controller driver. Approved by: re (kensmith), kib (mentor) Added: stable/7/share/man/man4/ae.4 - copied, changed from r183602, head/share/man/man4/ae.4 stable/7/sys/dev/ae/ - copied from r183567, head/sys/dev/ae/ stable/7/sys/modules/ae/ - copied from r183567, head/sys/modules/ae/ Modified: stable/7/share/man/man4/ (props changed) stable/7/share/man/man4/Makefile stable/7/share/man/man4/vlan.4 stable/7/sys/ (props changed) stable/7/sys/conf/NOTES stable/7/sys/conf/files stable/7/sys/dev/ae/if_ae.c stable/7/sys/dev/mii/atphy.c stable/7/sys/dev/mii/miidevs stable/7/sys/modules/Makefile stable/7/usr.sbin/sysinstall/ (props changed) stable/7/usr.sbin/sysinstall/devices.c Modified: stable/7/share/man/man4/Makefile ============================================================================== --- stable/7/share/man/man4/Makefile Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/share/man/man4/Makefile Sat Oct 25 21:42:43 2008 (r184267) @@ -8,6 +8,7 @@ MAN= aac.4 \ acpi_video.4 \ adv.4 \ adw.4 \ + ae.4 \ age.4 \ agp.4 \ aha.4 \ Copied and modified: stable/7/share/man/man4/ae.4 (from r183602, head/share/man/man4/ae.4) ============================================================================== --- head/share/man/man4/ae.4 Sat Oct 4 14:21:54 2008 (r183602, copy source) +++ stable/7/share/man/man4/ae.4 Sat Oct 25 21:42:43 2008 (r184267) @@ -24,12 +24,12 @@ .\" .\" $FreeBSD$ .\" -.Dd October 04, 2008 +.Dd October 4, 2008 .Dt AE 4 .Os .Sh NAME .Nm ae -.Nd Attansic/Atheros L2 FastEthernet controller driver +.Nd "Attansic/Atheros L2 FastEthernet controller driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: @@ -84,7 +84,8 @@ For more information on configuring this .Sh HARDWARE The .Nm -driver is known to support the following hardware: +driver supports Attansic/Atheros L2 PCIe FastEthernet controllers, and +is known to support the following hardware: .Pp .Bl -bullet -compact .It @@ -149,4 +150,4 @@ driver and this manual page was written .An Stanislav Sedov .Aq stas@FreeBSD.org . It first appeared in -.Fx 8.0 . +.Fx 7.1 . Modified: stable/7/share/man/man4/vlan.4 ============================================================================== --- stable/7/share/man/man4/vlan.4 Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/share/man/man4/vlan.4 Sat Oct 25 21:42:43 2008 (r184267) @@ -122,6 +122,7 @@ The whole issue is very specific to a pa .Pp By now, the list of physical interfaces able of full VLAN processing in the hardware is limited to the following devices: +.Xr ae 4 , .Xr age 4 , .Xr bce 4 , .Xr bge 4 , Modified: stable/7/sys/conf/NOTES ============================================================================== --- stable/7/sys/conf/NOTES Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/sys/conf/NOTES Sat Oct 25 21:42:43 2008 (r184267) @@ -1716,6 +1716,8 @@ device puc # individual driver. device miibus +# ae: Support for gigabit ethernet adapters based on the Attansic/Atheros +# L2 PCI-Express FastEthernet controllers. # an: Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA, # PCI and ISA varieties. # awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and @@ -1864,6 +1866,7 @@ device wi device xe # PCI Ethernet NICs that use the common MII bus controller code. +device ae # Attansic/Atheros L2 FastEthernet device age # Attansic/Atheros L1 Gigabit Ethernet device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet device bfe # Broadcom BCM440x 10/100 Ethernet Modified: stable/7/sys/conf/files ============================================================================== --- stable/7/sys/conf/files Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/sys/conf/files Sat Oct 25 21:42:43 2008 (r184267) @@ -426,6 +426,7 @@ dev/advansys/adw_pci.c optional adw pci dev/advansys/adwcam.c optional adw dev/advansys/adwlib.c optional adw dev/advansys/adwmcode.c optional adw +dev/ae/if_ae.c optional ae pci dev/age/if_age.c optional age pci dev/aha/aha.c optional aha dev/aha/aha_isa.c optional aha isa Modified: stable/7/sys/dev/ae/if_ae.c ============================================================================== --- head/sys/dev/ae/if_ae.c Fri Oct 3 10:31:31 2008 (r183567) +++ stable/7/sys/dev/ae/if_ae.c Sat Oct 25 21:42:43 2008 (r184267) @@ -380,10 +380,8 @@ ae_attach(device_t dev) ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); - if (pci_find_extcap(dev, PCIY_PMG, &pmc) == 0) { - ifp->if_capabilities |= IFCAP_WOL_MAGIC; + if (pci_find_extcap(dev, PCIY_PMG, &pmc) == 0) sc->flags |= AE_FLAG_PMG; - } ifp->if_capenable = ifp->if_capabilities; /* @@ -1334,7 +1332,6 @@ ae_pm_init(ae_softc_t *sc) struct ifnet *ifp; uint32_t val; uint16_t pmstat; - struct mii_data *mii; int pmc; AE_LOCK_ASSERT(sc); @@ -1346,40 +1343,7 @@ ae_pm_init(ae_softc_t *sc) return; } - /* - * Configure WOL if enabled. - */ - if ((ifp->if_capenable & IFCAP_WOL) != 0) { - mii = device_get_softc(sc->miibus); - mii_pollstat(mii); - if ((mii->mii_media_status & IFM_AVALID) != 0 && - (mii->mii_media_status & IFM_ACTIVE) != 0) { - AE_WRITE_4(sc, AE_WOL_REG, AE_WOL_MAGIC | \ - AE_WOL_MAGIC_PME); - - /* - * Configure MAC. - */ - val = AE_MAC_RX_EN | AE_MAC_CLK_PHY | \ - AE_MAC_TX_CRC_EN | AE_MAC_TX_AUTOPAD | \ - ((AE_HALFBUF_DEFAULT << AE_HALFBUF_SHIFT) & \ - AE_HALFBUF_MASK) | \ - ((AE_MAC_PREAMBLE_DEFAULT << \ - AE_MAC_PREAMBLE_SHIFT) & AE_MAC_PREAMBLE_MASK) | \ - AE_MAC_BCAST_EN | AE_MAC_MCAST_EN; - if ((IFM_OPTIONS(mii->mii_media_active) & \ - IFM_FDX) != 0) - val |= AE_MAC_FULL_DUPLEX; - AE_WRITE_4(sc, AE_MAC_REG, val); - - } else { /* No link. */ - AE_WRITE_4(sc, AE_WOL_REG, AE_WOL_LNKCHG | \ - AE_WOL_LNKCHG_PME); - AE_WRITE_4(sc, AE_MAC_REG, 0); - } - } else { - ae_powersave_enable(sc); - } + ae_powersave_enable(sc); /* * PCIE hacks. Magic numbers. @@ -1397,8 +1361,6 @@ ae_pm_init(ae_softc_t *sc) pci_find_extcap(sc->dev, PCIY_PMG, &pmc); pmstat = pci_read_config(sc->dev, pmc + PCIR_POWER_STATUS, 2); pmstat &= ~(PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE); - if ((ifp->if_capenable & IFCAP_WOL) != 0) - pmstat |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE; pci_write_config(sc->dev, pmc + PCIR_POWER_STATUS, pmstat, 2); } Modified: stable/7/sys/dev/mii/atphy.c ============================================================================== --- stable/7/sys/dev/mii/atphy.c Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/sys/dev/mii/atphy.c Sat Oct 25 21:42:43 2008 (r184267) @@ -86,6 +86,7 @@ static int atphy_auto(struct mii_softc * static const struct mii_phydesc atphys[] = { MII_PHY_DESC(ATHEROS, F1), + MII_PHY_DESC(ATHEROS, F2), MII_PHY_END }; Modified: stable/7/sys/dev/mii/miidevs ============================================================================== --- stable/7/sys/dev/mii/miidevs Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/sys/dev/mii/miidevs Sat Oct 25 21:42:43 2008 (r184267) @@ -121,6 +121,7 @@ model xxAMD 79C873 0x0000 Am79C873/DM91 /* Atheros Communications/Attansic PHYs. */ model ATHEROS F1 0x0001 Atheros F1 10/100/1000 PHY +model ATHEROS F2 0x0002 Atheros F2 10/100 PHY /* Broadcom Corp. PHYs. */ model BROADCOM 3C905B 0x0012 3c905B 10/100 internal PHY Modified: stable/7/sys/modules/Makefile ============================================================================== --- stable/7/sys/modules/Makefile Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/sys/modules/Makefile Sat Oct 25 21:42:43 2008 (r184267) @@ -8,6 +8,7 @@ SUBDIR= ${_3dfx} \ accf_data \ accf_http \ ${_acpi} \ + ae \ age \ ${_agp} \ aha \ Modified: stable/7/usr.sbin/sysinstall/devices.c ============================================================================== --- stable/7/usr.sbin/sysinstall/devices.c Sat Oct 25 20:42:10 2008 (r184266) +++ stable/7/usr.sbin/sysinstall/devices.c Sat Oct 25 21:42:43 2008 (r184267) @@ -93,6 +93,7 @@ static struct _devname { DISK("mfid%d", "LSI MegaRAID SAS array", 4), FLOPPY("fd%d", "floppy drive unit A", 4), SERIAL("cuad%d", "%s on device %s (COM%d)", 16), + NETWORK("ae", "Attansic/Atheros L2 FastEthernet"), NETWORK("age", "Attansic/Atheros L1 Gigabit Ethernet"), NETWORK("an", "Aironet 4500/4800 802.11 wireless adapter"), NETWORK("ath", "Atheros IEEE 802.11 wireless adapter"),