Date: Wed, 10 Mar 2010 07:55:56 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204947 - in user/jmallett/octeon: . sbin/newfs secure/libexec sys/conf sys/dev/mii Message-ID: <201003100755.o2A7tuYL074034@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Wed Mar 10 07:55:55 2010 New Revision: 204947 URL: http://svn.freebsd.org/changeset/base/204947 Log: Merge build un-breakage from head. Modified: user/jmallett/octeon/UPDATING user/jmallett/octeon/sbin/newfs/newfs.8 user/jmallett/octeon/secure/libexec/Makefile user/jmallett/octeon/sys/conf/newvers.sh user/jmallett/octeon/sys/dev/mii/brgphy.c Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/sys/contrib/x86emu/ (props changed) Modified: user/jmallett/octeon/UPDATING ============================================================================== --- user/jmallett/octeon/UPDATING Wed Mar 10 07:49:17 2010 (r204946) +++ user/jmallett/octeon/UPDATING Wed Mar 10 07:55:55 2010 (r204947) @@ -497,7 +497,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. 20090313: The k8temp(4) driver has been renamed to amdtemp(4) since - support for K10 and K11 CPU families was added. + support for Family 10 and Family 11 CPU families was added. 20090309: IGMPv3 and Source-Specific Multicast (SSM) have been merged @@ -983,7 +983,7 @@ COMMON ITEMS: mergemaster -p [5] make installworld make delete-old - mergemaster [4] + mergemaster -i [4] <reboot> @@ -1054,7 +1054,8 @@ COMMON ITEMS: system. Attempting to do it by hand is not recommended and those that pursue this avenue should read this file carefully, as well as the archives of freebsd-current and freebsd-hackers mailing lists - for potential gotchas. + for potential gotchas. The -U option is also useful to consider. + See mergemaster(8) for more information. [5] Usually this step is a noop. However, from time to time you may need to do this if you get unknown user in the following Modified: user/jmallett/octeon/sbin/newfs/newfs.8 ============================================================================== --- user/jmallett/octeon/sbin/newfs/newfs.8 Wed Mar 10 07:49:17 2010 (r204946) +++ user/jmallett/octeon/sbin/newfs/newfs.8 Wed Mar 10 07:55:55 2010 (r204947) @@ -78,10 +78,10 @@ The following options define the general .It Fl E Erase the content of the disk before making the filesystem. The reserved area in front of the superblock (for bootcode) will not be erased. - +.Pp This is a relevant option for flash based storage devices that use wear levelling algorithms. - +.Pp NB: Erasing may take as long time as writing every sector on the disk. .It Fl J Enable journaling on the new file system via gjournal. Modified: user/jmallett/octeon/secure/libexec/Makefile ============================================================================== --- user/jmallett/octeon/secure/libexec/Makefile Wed Mar 10 07:49:17 2010 (r204946) +++ user/jmallett/octeon/secure/libexec/Makefile Wed Mar 10 07:55:55 2010 (r204947) @@ -4,7 +4,7 @@ SUBDIR= .if ${MK_OPENSSH} != "no" -SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper +SUBDIR+=sftp-server ssh-keysign .endif .include <bsd.subdir.mk> Modified: user/jmallett/octeon/sys/conf/newvers.sh ============================================================================== --- user/jmallett/octeon/sys/conf/newvers.sh Wed Mar 10 07:49:17 2010 (r204946) +++ user/jmallett/octeon/sys/conf/newvers.sh Wed Mar 10 07:55:55 2010 (r204947) @@ -88,15 +88,15 @@ v=`cat version` u=${USER:-root} d=`pwd` i=`${MAKE:-make} -V KERN_IDENT` case "$d" in -*/compile/*) +*/sys/*) SRCDIR=${d##*obj} if [ -n "$MACHINE" ]; then SRCDIR=${SRCDIR##/$MACHINE} fi - SRCDIR=$(cd ${SRCDIR%%/compile/*}/.. && pwd) + SRCDIR=${SRCDIR%%/sys/*} for dir in /bin /usr/bin /usr/local/bin; do - if [ -d "${SRCDIR}/.svn" -a -x "${dir}/svnversion" ] ; then + if [ -d "${SRCDIR}/sys/.svn" -a -x "${dir}/svnversion" ] ; then svnversion=${dir}/svnversion break fi @@ -107,7 +107,7 @@ case "$d" in done if [ -n "$svnversion" ] ; then - svn=" r`cd ${SRCDIR} && $svnversion`" + svn=" r`cd ${SRCDIR}/sys && $svnversion`" fi if [ -n "$git_cmd" ] ; then git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null` Modified: user/jmallett/octeon/sys/dev/mii/brgphy.c ============================================================================== --- user/jmallett/octeon/sys/dev/mii/brgphy.c Wed Mar 10 07:49:17 2010 (r204946) +++ user/jmallett/octeon/sys/dev/mii/brgphy.c Wed Mar 10 07:55:55 2010 (r204947) @@ -66,14 +66,17 @@ __FBSDID("$FreeBSD$"); static int brgphy_probe(device_t); static int brgphy_attach(device_t); +#define BCM5708S_BAD_CHIPID 0x57081021 + struct brgphy_softc { struct mii_softc mii_sc; int mii_oui; int mii_model; int mii_rev; int serdes_flags; /* Keeps track of the serdes type used */ -#define BRGPHY_5706S 0x0001 -#define BRGPHY_5708S 0x0002 +#define BRGPHY_5706S 0x0001 +#define BRGPHY_5708S 0x0002 +#define BRGPHY_NOANWAIT 0x0004 int bce_phy_flags; /* PHY flags transferred from the MAC driver */ }; @@ -291,6 +294,19 @@ brgphy_attach(device_t dev) if (bce_sc && (bce_sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG)) { ADD(IFM_MAKEWORD(IFM_ETHER, IFM_2500_SX, IFM_FDX, sc->mii_inst), 0); printf("2500baseSX-FDX, "); + } else if ((bsc->serdes_flags & BRGPHY_5708S) && bce_sc && + (bce_sc->bce_chipid == BCM5708S_BAD_CHIPID)) { + /* + * There appears to be certain silicon revision + * usually used in blades that is having issues with + * this driver wating for the auto-negotiation to + * complete. This happens with a specific chip id + * only and when the 1000baseSX-FDX is the only + * mode. Workaround this issue since it's unlikely + * to be ever addressed. + */ + printf("auto-neg workaround, "); + bsc->serdes_flags |= BRGPHY_NOANWAIT; } } @@ -544,7 +560,8 @@ brgphy_status(struct mii_softc *sc) /* Autoneg is still in progress. */ if ((bmcr & BRGPHY_BMCR_AUTOEN) && - (bmsr & BRGPHY_BMSR_ACOMP) == 0) { + (bmsr & BRGPHY_BMSR_ACOMP) == 0 && + (bsc->serdes_flags & BRGPHY_NOANWAIT) == 0) { /* Erg, still trying, I guess... */ mii->mii_media_active |= IFM_NONE; goto brgphy_status_exit;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003100755.o2A7tuYL074034>