From owner-svn-src-stable-6@FreeBSD.ORG Sun Nov 23 17:34:00 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 376B3106567C; Sun, 23 Nov 2008 17:34:00 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 27DE78FC17; Sun, 23 Nov 2008 17:34:00 +0000 (UTC) (envelope-from marcel@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 mANHY0vk058472; Sun, 23 Nov 2008 17:34:00 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mANHY0Q1058471; Sun, 23 Nov 2008 17:34:00 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <200811231734.mANHY0Q1058471@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 23 Nov 2008 17:34:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185213 - stable/6/sys/dev/puc X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2008 17:34:00 -0000 Author: marcel Date: Sun Nov 23 17:33:59 2008 New Revision: 185213 URL: http://svn.freebsd.org/changeset/base/185213 Log: Correct the Device ID of the NetMos quad UART. PR: 128931 Approved by: re (kensmith) Modified: stable/6/sys/dev/puc/pucdata.c Modified: stable/6/sys/dev/puc/pucdata.c ============================================================================== --- stable/6/sys/dev/puc/pucdata.c Sun Nov 23 17:10:04 2008 (r185212) +++ stable/6/sys/dev/puc/pucdata.c Sun Nov 23 17:33:59 2008 (r185213) @@ -955,7 +955,7 @@ const struct puc_device_description puc_ /* NetMos 4S0P PCI: 4S, 0P */ { "NetMos NM9845 Quad UART", - { 0x9710, 0x9845, 0, 0x0014 }, + { 0x9710, 0x9845, 0, 0x0004 }, { 0xffff, 0xffff, 0, 0xffff }, { { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, From owner-svn-src-stable-6@FreeBSD.ORG Mon Nov 24 17:39:41 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43C891065674; Mon, 24 Nov 2008 17:39:41 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 31E408FC1F; Mon, 24 Nov 2008 17:39:41 +0000 (UTC) (envelope-from cperciva@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 mAOHdfkJ093597; Mon, 24 Nov 2008 17:39:41 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAOHdfVU093595; Mon, 24 Nov 2008 17:39:41 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <200811241739.mAOHdfVU093595@svn.freebsd.org> From: Colin Percival Date: Mon, 24 Nov 2008 17:39:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185254 - head/sys/dev/random releng/6.3 releng/6.3/sys/conf releng/6.3/sys/dev/random releng/6.4 releng/6.4/sys/dev/random releng/7.0 releng/7.0/sys/conf releng/7.0/sys/dev/random stab... X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2008 17:39:41 -0000 Author: cperciva Date: Mon Nov 24 17:39:39 2008 New Revision: 185254 URL: http://svn.freebsd.org/changeset/base/185254 Log: Make sure arc4random(9) is properly seeded when /etc/rc.d/initrandom returns. Approved by: so (cperciva) Approved by: re (kensmith) Security: FreeBSD-SA-08:11.arc4random Modified: stable/6/sys/dev/random/randomdev.c stable/6/sys/dev/random/randomdev_soft.c Changes in other areas also in this revision: Modified: head/sys/dev/random/randomdev.c head/sys/dev/random/randomdev_soft.c releng/6.3/UPDATING releng/6.3/sys/conf/newvers.sh releng/6.3/sys/dev/random/randomdev.c releng/6.3/sys/dev/random/randomdev_soft.c releng/6.4/UPDATING releng/6.4/sys/dev/random/randomdev.c releng/6.4/sys/dev/random/randomdev_soft.c releng/7.0/UPDATING releng/7.0/sys/conf/newvers.sh releng/7.0/sys/dev/random/randomdev.c releng/7.0/sys/dev/random/randomdev_soft.c stable/7/sys/dev/random/randomdev.c stable/7/sys/dev/random/randomdev_soft.c Modified: stable/6/sys/dev/random/randomdev.c ============================================================================== --- stable/6/sys/dev/random/randomdev.c Mon Nov 24 17:34:00 2008 (r185253) +++ stable/6/sys/dev/random/randomdev.c Mon Nov 24 17:39:39 2008 (r185254) @@ -89,6 +89,7 @@ random_close(struct cdev *dev __unused, && (securelevel_gt(td->td_ucred, 0) == 0)) { (*random_systat.reseed)(); random_systat.seeded = 1; + arc4rand(NULL, 0, 1); /* Reseed arc4random as well. */ } return (0); Modified: stable/6/sys/dev/random/randomdev_soft.c ============================================================================== --- stable/6/sys/dev/random/randomdev_soft.c Mon Nov 24 17:34:00 2008 (r185253) +++ stable/6/sys/dev/random/randomdev_soft.c Mon Nov 24 17:39:39 2008 (r185254) @@ -61,6 +61,7 @@ random_harvest_internal(u_int64_t, const u_int, u_int, enum esource); static int random_yarrow_poll(int event,struct thread *td); static int random_yarrow_block(int flag); +static void random_yarrow_flush_reseed(void); struct random_systat random_yarrow = { .ident = "Software, Yarrow", @@ -70,7 +71,7 @@ struct random_systat random_yarrow = { .read = random_yarrow_read, .write = random_yarrow_write, .poll = random_yarrow_poll, - .reseed = random_yarrow_reseed, + .reseed = random_yarrow_flush_reseed, .seeded = 1, }; @@ -96,7 +97,7 @@ static struct entropyfifo emptyfifo; /* Harvested entropy */ static struct entropyfifo harvestfifo[ENTROPYSOURCE]; -/* <0 to end the kthread, 0 to let it run */ +/* <0 to end the kthread, 0 to let it run, 1 to flush the harvest queues */ static int random_kthread_control = 0; static struct proc *random_kthread_proc; @@ -247,7 +248,7 @@ random_kthread(void *arg __unused) local_count = 0; /* Process until told to stop */ - for (; random_kthread_control == 0;) { + for (; random_kthread_control >= 0;) { active = 0; @@ -282,6 +283,13 @@ random_kthread(void *arg __unused) KASSERT(local_count == 0, ("random_kthread: local_count %d", local_count)); + /* + * If a queue flush was commanded, it has now happened, + * and we can mark this by resetting the command. + */ + if (random_kthread_control == 1) + random_kthread_control = 0; + /* Found nothing, so don't belabour the issue */ if (!active) tsleep(&harvestfifo, 0, "-", hz / 10); @@ -406,3 +414,15 @@ random_yarrow_block(int flag) return error; } + +/* Helper routine to perform explicit reseeds */ +static void +random_yarrow_flush_reseed(void) +{ + /* Command a entropy queue flush and wait for it to finish */ + random_kthread_control = 1; + while (random_kthread_control) + tsleep(&harvestfifo, 0, "-", hz / 10); + + random_yarrow_reseed(); +} From owner-svn-src-stable-6@FreeBSD.ORG Mon Nov 24 21:18:40 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 695EC1065672; Mon, 24 Nov 2008 21:18:40 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5BBAB8FC13; Mon, 24 Nov 2008 21:18:40 +0000 (UTC) (envelope-from marius@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 mAOLIeXE098581; Mon, 24 Nov 2008 21:18:40 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAOLIemj098580; Mon, 24 Nov 2008 21:18:40 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200811242118.mAOLIemj098580@svn.freebsd.org> From: Marius Strobl Date: Mon, 24 Nov 2008 21:18:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185263 - stable/6/sys/pci X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2008 21:18:40 -0000 Author: marius Date: Mon Nov 24 21:18:40 2008 New Revision: 185263 URL: http://svn.freebsd.org/changeset/base/185263 Log: Revert r182461 except for the introduction of the DC_HAS_BROKEN_RXSTATE() macro for the upcoming release as doing MII-operations on DM9102A while the link is up has turned out to occasionally cause panics. This again prevents the link state form ever being checked once it's up, which is considered less worse than the panics tough. Approved by: re (kensmith) Modified: stable/6/sys/pci/if_dc.c Modified: stable/6/sys/pci/if_dc.c ============================================================================== --- stable/6/sys/pci/if_dc.c Mon Nov 24 21:10:08 2008 (r185262) +++ stable/6/sys/pci/if_dc.c Mon Nov 24 21:18:40 2008 (r185263) @@ -2916,12 +2916,8 @@ dc_tick(void *xsc) if (sc->dc_link == 0) mii_tick(mii); } else { - /* - * For NICs which never report DC_RXSTATE_WAIT, we - * have to bite the bullet... - */ - if ((DC_HAS_BROKEN_RXSTATE(sc) || (CSR_READ_4(sc, - DC_ISR) & DC_ISR_RX_STATE) == DC_RXSTATE_WAIT) && + r = CSR_READ_4(sc, DC_ISR); + if ((r & DC_ISR_RX_STATE) == DC_RXSTATE_WAIT && sc->dc_cdata.dc_tx_cnt == 0) { mii_tick(mii); if (!(mii->mii_media_status & IFM_ACTIVE)) From owner-svn-src-stable-6@FreeBSD.ORG Fri Nov 28 22:06:31 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE048106573C; Fri, 28 Nov 2008 22:06:31 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C84908FC17; Fri, 28 Nov 2008 22:06:31 +0000 (UTC) (envelope-from kensmith@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 mASM6Vb9031053; Fri, 28 Nov 2008 22:06:31 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mASM6Vos031052; Fri, 28 Nov 2008 22:06:31 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <200811282206.mASM6Vos031052@svn.freebsd.org> From: Ken Smith Date: Fri, 28 Nov 2008 22:06:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185414 - stable/6/sys/conf X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2008 22:06:32 -0000 Author: kensmith Date: Fri Nov 28 22:06:31 2008 New Revision: 185414 URL: http://svn.freebsd.org/changeset/base/185414 Log: 6.4-RELEASE is done so shift stable/6 over to 6.4-STABLE. Approved by: re (implicit) Modified: stable/6/sys/conf/newvers.sh Modified: stable/6/sys/conf/newvers.sh ============================================================================== --- stable/6/sys/conf/newvers.sh Fri Nov 28 20:47:48 2008 (r185413) +++ stable/6/sys/conf/newvers.sh Fri Nov 28 22:06:31 2008 (r185414) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="6.4" -BRANCH="PRERELEASE" +BRANCH="STABLE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi