From owner-svn-src-all@FreeBSD.ORG Thu May 29 20:47:01 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8804CDA8; Thu, 29 May 2014 20:47:01 +0000 (UTC) Received: from kanar.ci0.org (kanar.ci0.org [IPv6:2001:bc8:35e6::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FC2125F6; Thu, 29 May 2014 20:47:00 +0000 (UTC) Received: from kanar.ci0.org (pluxor@localhost [127.0.0.1]) by kanar.ci0.org (8.14.8/8.14.8) with ESMTP id s4TKkmfP006958; Thu, 29 May 2014 22:46:48 +0200 (CEST) (envelope-from cognet@ci0.org) Received: (from doginou@localhost) by kanar.ci0.org (8.14.8/8.14.8/Submit) id s4TKkmuf006957; Thu, 29 May 2014 22:46:48 +0200 (CEST) (envelope-from cognet@ci0.org) X-Authentication-Warning: kanar.ci0.org: doginou set sender to cognet@ci0.org using -f Date: Thu, 29 May 2014 22:46:48 +0200 From: Olivier Houchard To: John-Mark Gurney Subject: Re: svn commit: r266855 - head/sys/dev/uart Message-ID: <20140529204648.GA6936@ci0.org> References: <201405291957.s4TJvp07085910@svn.freebsd.org> <20140529204454.GB43976@funkthat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140529204454.GB43976@funkthat.com> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 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: Thu, 29 May 2014 20:47:01 -0000 On Thu, May 29, 2014 at 01:44:54PM -0700, John-Mark Gurney wrote: > Olivier Houchard wrote this message on Thu, May 29, 2014 at 19:57 +0000: > > Author: cognet > > Date: Thu May 29 19:57:51 2014 > > New Revision: 266855 > > URL: http://svnweb.freebsd.org/changeset/base/266855 > > > > Log: > > In the grab function, keep the bit 6 on in the IER, on XScale, using 0 > > turns the UART off, which is unfortunate if one want to use it as a console. > > > > Modified: > > head/sys/dev/uart/uart_dev_ns8250.c > > > > Modified: head/sys/dev/uart/uart_dev_ns8250.c > > ============================================================================== > > --- head/sys/dev/uart/uart_dev_ns8250.c Thu May 29 19:48:18 2014 (r266854) > > +++ head/sys/dev/uart/uart_dev_ns8250.c Thu May 29 19:57:51 2014 (r266855) > > @@ -929,6 +929,7 @@ void > > ns8250_bus_grab(struct uart_softc *sc) > > { > > struct uart_bas *bas = &sc->sc_bas; > > + struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; > > > > /* > > * turn off all interrupts to enter polling mode. Leave the > > @@ -936,7 +937,11 @@ ns8250_bus_grab(struct uart_softc *sc) > > * All pending interupt signals are reset when IER is set to 0. > > */ > > uart_lock(sc->sc_hwmtx); > > - uart_setreg(bas, REG_IER, 0); > > + /* > > + * On XScale, bit 6 (0x40) is the UART Unit Enable, removing it > > + * turns the UART completely off, so make sure it is stays there. > > + */ > > + uart_setreg(bas, REG_IER, ns8250->ier & 0x40); > > uart_barrier(bas); > > uart_unlock(sc->sc_hwmtx); > > } > > Should this be using ns8250->ier_mask instead of 0x40? > > It also looks like AVILA doesn't have the hints to set this like > GUMSTIX does, and maybe adding this will help? > Hmm you're right, this is probably better, I'll just do that :) Olivier