svn commit: r228146 - stable/7/sys/sparc64/pci

[Marius Strobl]

Author: marius
Date: Tue Nov 29 19:49:11 2011
New Revision: 228146
URL: http://svn.freebsd.org/changeset/base/228146

Log:
  MFC: r227960
  
  Increase the CDMA sync timeout for Schizo bridges to 15 seconds as used by
  OpenSolaris. One second turned out to be not enough for certain loads while
  10 seconds were sufficient.
  Reported by: Peter Jeremy

Modified:
  stable/7/sys/sparc64/pci/schizo.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/pci/schizo.c
==============================================================================
--- stable/7/sys/sparc64/pci/schizo.c	Tue Nov 29 19:49:09 2011	(r228145)
+++ stable/7/sys/sparc64/pci/schizo.c	Tue Nov 29 19:49:11 2011	(r228146)
@@ -1171,7 +1171,7 @@ schizo_dmamap_sync(bus_dma_tag_t dt, bus
 			;
 		SCHIZO_PCI_WRITE_8(sc, sc->sc_cdma_clr, INTCLR_RECEIVED);
 		microuptime(&cur);
-		end.tv_sec = 1;
+		end.tv_sec = 15;
 		end.tv_usec = 0;
 		timevaladd(&end, &cur);
 		for (; (res = atomic_cmpset_rel_32(&sc->sc_cdma_state,