From owner-svn-src-all@FreeBSD.ORG Sat Aug 22 09:17:50 2009 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 1FD9F106564A; Sat, 22 Aug 2009 09:17:50 +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 0F59A8FC17; Sat, 22 Aug 2009 09:17:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7M9HnBa049588; Sat, 22 Aug 2009 09:17:49 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7M9HnSJ049586; Sat, 22 Aug 2009 09:17:49 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200908220917.n7M9HnSJ049586@svn.freebsd.org> From: Stanislav Sedov Date: Sat, 22 Aug 2009 09:17:49 +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: r196431 - in stable/7/sys: . arm/at91 contrib/pf 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, 22 Aug 2009 09:17:50 -0000 Author: stas Date: Sat Aug 22 09:17:49 2009 New Revision: 196431 URL: http://svn.freebsd.org/changeset/base/196431 Log: - MFC r196246: - Proprely intialize UART parameters at probe stage, so uart(4) will initialize the FIFO memory correctly on attach. Before that this values was intialized in only in at91_usart_bus_attach which is called after the uart(4) memory allocation happens. Modified: stable/7/sys/ (props changed) stable/7/sys/arm/at91/uart_dev_at91usart.c stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/arm/at91/uart_dev_at91usart.c ============================================================================== --- stable/7/sys/arm/at91/uart_dev_at91usart.c Sat Aug 22 09:09:44 2009 (r196430) +++ stable/7/sys/arm/at91/uart_dev_at91usart.c Sat Aug 22 09:17:49 2009 (r196431) @@ -305,6 +305,10 @@ static kobj_method_t at91_usart_methods[ int at91_usart_bus_probe(struct uart_softc *sc) { + + sc->sc_txfifosz = USART_BUFFER_SIZE; + sc->sc_rxfifosz = USART_BUFFER_SIZE; + sc->sc_hwiflow = 0; return (0); } @@ -342,10 +346,6 @@ at91_usart_bus_attach(struct uart_softc atsc->flags |= HAS_TIMEOUT; WR4(&sc->sc_bas, USART_IDR, 0xffffffff); - sc->sc_txfifosz = USART_BUFFER_SIZE; - sc->sc_rxfifosz = USART_BUFFER_SIZE; - sc->sc_hwiflow = 0; - #ifndef SKYEYE_WORKAROUNDS /* * Allocate DMA tags and maps