svn commit: r228126 - stable/9/sys/sparc64/pci

[Marius Strobl]

Author: marius
Date: Tue Nov 29 09:59:51 2011
New Revision: 228126
URL: http://svn.freebsd.org/changeset/base/228126

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
  
  Approved by:	re (bz)

Modified:
  stable/9/sys/sparc64/pci/schizo.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/sparc64/pci/schizo.c
==============================================================================
--- stable/9/sys/sparc64/pci/schizo.c	Tue Nov 29 08:43:04 2011	(r228125)
+++ stable/9/sys/sparc64/pci/schizo.c	Tue Nov 29 09:59:51 2011	(r228126)
@@ -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,