From owner-svn-src-all@freebsd.org Tue May 17 15:44:56 2016 Return-Path: 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 158DEB3F763; Tue, 17 May 2016 15:44:56 +0000 (UTC) (envelope-from jim.harris@gmail.com) Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AC00167726; Tue, 17 May 2016 15:44:55 +0000 (UTC) (envelope-from jim.harris@gmail.com) Received: by mail-wm0-x22a.google.com with SMTP id a17so38337279wme.0; Tue, 17 May 2016 08:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=rxkuSn2+wsR3st/WX++7vk81Y+Ym0ybBHRJwULx0LCQ=; b=WgxBqoZKuFkWD0YeTl1kLD0kqFa54ViYec0V2zuetDUGLNDiZxjzhQdUjgbQ+zOXaX lA6UGs8bVUl2ZO07pa/TGZGq6dKlmhLvB3gvZwpElf3igmQ3dXnrVWIOo1Wg9T6cKAOf 794Lz7UJ4Koty8NCBdD6W+3Pv5F7GHK8jGpaKkoLrradGl5JUtVtVlrBnu0+mLp7S6FE BmeHrFsNMn4MEhJiiXiqaxTyMWWKmCx7lk+AsV+792YiTwewq4UHqMEpMfay19mezB6T wH7wTC6QEpggROKjNSMMI+L0cF/tXYyin38hTGg55CFMWCXvlfwb5qXxIoTkNzSc4hzy J0YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=rxkuSn2+wsR3st/WX++7vk81Y+Ym0ybBHRJwULx0LCQ=; b=Ec/FjvczoxmGf3b4kUwRw1AEhaqngX7HZySqNlbQBof8RN5IQn3D4jFJAm4KIBJd2u GJxPZPiR/h33rj3H7GWbFifHa/jE0Vdyk9t5e5pnajiSlyVvNS67eoSOmsR9lMU6Jdhl 2oQ8L8MDfDbMgRpIeaSS8C/3P2yYUbjqWiZFNWuvwvJwZ2fvzYCHkVrEWgCSIH7kBvpU 2lFSXFtopQYr8Z/pSM1m+ay1mNWs9FE/GWbfVgi/PtClkS+u6AuZWOBt3MKCEKz1E8XI e18R7rMPyQblEhNv4Se94drhhULMODy2yd0rH1pKrq70WN1cYLbcZMFoB+Q9yPZEUHev s/LA== X-Gm-Message-State: AOPr4FUtlNrfKgvysguEZtxR5g3q/XVL315bBI8I/pZJtF5FZ4Zwd+eFuCcZTSRtzBNASMhrfyC4Gay4zBKCBA== MIME-Version: 1.0 X-Received: by 10.28.138.13 with SMTP id m13mr2378101wmd.3.1463499894297; Tue, 17 May 2016 08:44:54 -0700 (PDT) Received: by 10.194.161.4 with HTTP; Tue, 17 May 2016 08:44:54 -0700 (PDT) In-Reply-To: <201605162133.u4GLXV3S048795@repo.freebsd.org> References: <201605162133.u4GLXV3S048795@repo.freebsd.org> Date: Tue, 17 May 2016 08:44:54 -0700 Message-ID: Subject: Re: svn commit: r299977 - head/sys/dev/acpica/Osd From: Jim Harris To: John Baldwin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Tue, 17 May 2016 15:44:56 -0000 On Mon, May 16, 2016 at 2:33 PM, John Baldwin wrote: > Author: jhb > Date: Mon May 16 21:33:31 2016 > New Revision: 299977 > URL: https://svnweb.freebsd.org/changeset/base/299977 > > Log: > Use polling spin loops for timeouts during early boot. > > Some ACPI operations such as mutex acquires and event waits accept a > timeout. The ACPI OSD layer implements these timeouts by using regular > sleep timeouts. However, this doesn't work during early boot before > event timers are setup. Instead, use polling combined with DELAY() > to spin. > > This fixes booting on upcoming Intel systems with Kaby Lake processors. > Thanks! > > Tested by: "Jeffrey E Pieper" > Reviewed by: jimharris > MFC after: 1 week > > Modified: > head/sys/dev/acpica/Osd/OsdSynch.c > > Modified: head/sys/dev/acpica/Osd/OsdSynch.c > > ============================================================================== > --- head/sys/dev/acpica/Osd/OsdSynch.c Mon May 16 20:26:30 2016 > (r299976) > +++ head/sys/dev/acpica/Osd/OsdSynch.c Mon May 16 21:33:31 2016 > (r299977) > @@ -188,6 +188,23 @@ AcpiOsWaitSemaphore(ACPI_SEMAPHORE Handl > } > break; > default: > + if (cold) { > + /* > + * Just spin polling the semaphore once a > + * millisecond. > + */ > + while (!ACPISEM_AVAIL(as, Units)) { > + if (Timeout == 0) { > + status = AE_TIME; > + break; > + } > + Timeout--; > + mtx_unlock(&as->as_lock); > + DELAY(1000); > + mtx_lock(&as->as_lock); > + } > + break; > + } > tmo = timeout2hz(Timeout); > while (!ACPISEM_AVAIL(as, Units)) { > prevtick = ticks; > @@ -381,6 +398,23 @@ AcpiOsAcquireMutex(ACPI_MUTEX Handle, UI > } > break; > default: > + if (cold) { > + /* > + * Just spin polling the mutex once a > + * millisecond. > + */ > + while (!ACPIMTX_AVAIL(am)) { > + if (Timeout == 0) { > + status = AE_TIME; > + break; > + } > + Timeout--; > + mtx_unlock(&am->am_lock); > + DELAY(1000); > + mtx_lock(&am->am_lock); > + } > + break; > + } > tmo = timeout2hz(Timeout); > while (!ACPIMTX_AVAIL(am)) { > prevtick = ticks; > >