From owner-svn-src-all@freebsd.org  Sat Apr  9 20:18:35 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0008B091A2;
 Sat,  9 Apr 2016 20:18:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B71A61ABC;
 Sat,  9 Apr 2016 20:18:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u39KIYhm096160;
 Sat, 9 Apr 2016 20:18:34 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39KIYf3096159;
 Sat, 9 Apr 2016 20:18:34 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201604092018.u39KIYf3096159@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 9 Apr 2016 20:18:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297762 - head/sys/dev/ichiic
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Apr 2016 20:18:36 -0000

Author: jhb
Date: Sat Apr  9 20:18:34 2016
New Revision: 297762
URL: https://svnweb.freebsd.org/changeset/base/297762

Log:
  Use DELAY() instead of sleeping during boot-time attach.
  
  Tested by:	Wolfgang Zenker <wolfgang@lyxys.ka.sub.org>

Modified:
  head/sys/dev/ichiic/ig4_iic.c

Modified: head/sys/dev/ichiic/ig4_iic.c
==============================================================================
--- head/sys/dev/ichiic/ig4_iic.c	Sat Apr  9 20:05:39 2016	(r297761)
+++ head/sys/dev/ichiic/ig4_iic.c	Sat Apr  9 20:18:34 2016	(r297762)
@@ -117,7 +117,10 @@ set_controller(ig4iic_softc_t *sc, uint3
 			error = 0;
 			break;
 		}
-		mtx_sleep(sc, &sc->io_lock, 0, "i2cslv", 1);
+		if (cold)
+			DELAY(1000);
+		else
+			mtx_sleep(sc, &sc->io_lock, 0, "i2cslv", 1);
 	}
 	return (error);
 }