From owner-svn-src-stable@freebsd.org  Fri Nov  8 07:35:33 2019
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 468291A9CE0;
 Fri,  8 Nov 2019 07:35:33 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 478X9x14jPz40WW;
 Fri,  8 Nov 2019 07:35:33 +0000 (UTC) (envelope-from avg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08DEE22C9B;
 Fri,  8 Nov 2019 07:35:33 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA87ZWpE057290;
 Fri, 8 Nov 2019 07:35:32 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA87ZW8G057289;
 Fri, 8 Nov 2019 07:35:32 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201911080735.xA87ZW8G057289@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 8 Nov 2019 07:35:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r354529 - stable/12/sys/dev/ow
X-SVN-Group: stable-12
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: stable/12/sys/dev/ow
X-SVN-Commit-Revision: 354529
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Nov 2019 07:35:33 -0000

Author: avg
Date: Fri Nov  8 07:35:32 2019
New Revision: 354529
URL: https://svnweb.freebsd.org/changeset/base/354529

Log:
  MFC r354069: owc_gpiobus_read_data: disable preemption earlier

Modified:
  stable/12/sys/dev/ow/owc_gpiobus.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/ow/owc_gpiobus.c
==============================================================================
--- stable/12/sys/dev/ow/owc_gpiobus.c	Fri Nov  8 06:40:17 2019	(r354528)
+++ stable/12/sys/dev/ow/owc_gpiobus.c	Fri Nov  8 07:35:32 2019	(r354529)
@@ -279,6 +279,8 @@ owc_gpiobus_read_data(device_t dev, struct ow_timing *
 	if (error != 0)
 		return (error);
 
+	critical_enter();
+
 	/* Force low for t_lowr microseconds */
 	then = sbinuptime();
 	OUTPIN(sc);
@@ -291,7 +293,6 @@ owc_gpiobus_read_data(device_t dev, struct ow_timing *
 	 * master's pushing the line low.
 	 */
 	INPIN(sc);
-	critical_enter();
 	do {
 		now = sbinuptime();
 		GETPIN(sc, &sample);