svn commit: r196247 - in stable/8/sys: . amd64/include/xen arm/at91 cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/ata dev/cxgb dev/xen/netfront dev/xen/xenpci modules/dtrace/dtnfsclien...

[Stanislav Sedov]

Author: stas
Date: Sat Aug 15 15:18:29 2009
New Revision: 196247
URL: http://svn.freebsd.org/changeset/base/196247

Log:
  - Merge 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.
  
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/arm/at91/uart_dev_at91usart.c
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/ata/   (props changed)
  stable/8/sys/dev/cxgb/   (props changed)
  stable/8/sys/dev/xen/netfront/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/modules/dtrace/dtnfsclient/   (props changed)
  stable/8/sys/modules/ip6_mroute_mod/   (props changed)
  stable/8/sys/modules/ipmi/ipmi_linux/   (props changed)
  stable/8/sys/netinet/ipfw/ip_dummynet.c   (props changed)
  stable/8/sys/netinet/ipfw/ip_fw2.c   (props changed)
  stable/8/sys/netinet/ipfw/ip_fw_nat.c   (props changed)
  stable/8/sys/netinet/ipfw/ip_fw_pfil.c   (props changed)
  stable/8/sys/netipx/spx_reass.c   (props changed)
  stable/8/sys/xen/evtchn.h   (props changed)
  stable/8/sys/xen/hypervisor.h   (props changed)
  stable/8/sys/xen/xen_intr.h   (props changed)

Modified: stable/8/sys/arm/at91/uart_dev_at91usart.c
==============================================================================
--- stable/8/sys/arm/at91/uart_dev_at91usart.c	Sat Aug 15 15:15:20 2009	(r196246)
+++ stable/8/sys/arm/at91/uart_dev_at91usart.c	Sat Aug 15 15:18:29 2009	(r196247)
@@ -307,6 +307,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);
 }
 
@@ -344,10 +348,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