From owner-svn-src-head@FreeBSD.ORG Fri Nov 26 23:44:32 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D7931065673 for ; Fri, 26 Nov 2010 23:44:32 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx23.fluidhosting.com [204.14.89.6]) by mx1.freebsd.org (Postfix) with ESMTP id 222C38FC44 for ; Fri, 26 Nov 2010 23:44:31 +0000 (UTC) Received: (qmail 20081 invoked by uid 399); 26 Nov 2010 23:44:31 -0000 Received: from localhost (HELO doug-optiplex.ka9q.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 26 Nov 2010 23:44:31 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4CF0465D.3040501@FreeBSD.org> Date: Fri, 26 Nov 2010 15:44:29 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.12) Gecko/20101028 Thunderbird/3.1.6 MIME-Version: 1.0 To: Attilio Rao References: <201011261535.oAQFZ8FT051259@svn.freebsd.org> In-Reply-To: <201011261535.oAQFZ8FT051259@svn.freebsd.org> X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r215868 - head/sys/dev/ichwd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Nov 2010 23:44:32 -0000 The tinderbox seems to think that this broke the build. Doug On 11/26/2010 07:35, Attilio Rao wrote: > Author: attilio > Date: Fri Nov 26 15:35:08 2010 > New Revision: 215868 > URL: http://svn.freebsd.org/changeset/base/215868 > > Log: > - Advertise when the reboot came from a watchdog-induced reset. > - Fix a bug where TCO_BOOT_STS was supposed to be cleared after > TCO_SECOND_TO_STS and not before. > > Sponsored by: Sandvine Incorporated > Submitted by: Mark Johnston > Reviewed by: des > MFC after: 10 days > > Modified: > head/sys/dev/ichwd/ichwd.c > > Modified: head/sys/dev/ichwd/ichwd.c > ============================================================================== > --- head/sys/dev/ichwd/ichwd.c Fri Nov 26 15:33:09 2010 (r215867) > +++ head/sys/dev/ichwd/ichwd.c Fri Nov 26 15:35:08 2010 (r215868) > @@ -225,12 +225,12 @@ ichwd_sts_reset(struct ichwd_softc *sc) > * by writing a 1, not a 0. > */ > ichwd_write_tco_2(sc, TCO1_STS, TCO_TIMEOUT); > - /* > - * XXX The datasheet says that TCO_SECOND_TO_STS must be cleared > - * before TCO_BOOT_STS, not the other way around. > + /* > + * According to Intel's docs, clearing SECOND_TO_STS and BOOT_STS must > + * be done in two separate operations. > */ > - ichwd_write_tco_2(sc, TCO2_STS, TCO_BOOT_STS); > ichwd_write_tco_2(sc, TCO2_STS, TCO_SECOND_TO_STS); > + ichwd_write_tco_2(sc, TCO2_STS, TCO_BOOT_STS); > } > > /* > @@ -520,11 +520,12 @@ ichwd_attach(device_t dev) > device_get_desc(dev), sc->ich_version); > > /* > - * XXX we should check the status registers (specifically, the > - * TCO_SECOND_TO_STS bit in the TCO2_STS register) to see if we > - * just came back from a watchdog-induced reset, and let the user > - * know. > + * Determine if we are coming up after a watchdog-induced reset. > + * This bit is cleared in ichwd_sts_reset(). > */ > + if ((ich_read_tco_2(sc, TCO2_STS)& TCO_SECOND_TO_STS) != 0) > + device_printf(dev, > + "resuming after hardware watchdog timeout\n"); > > /* reset the watchdog status registers */ > ichwd_sts_reset(sc); > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/