From owner-svn-src-all@freebsd.org  Wed Jul 26 01:15:32 2017
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 5F8D8DAD321;
 Wed, 26 Jul 2017 01:15:32 +0000 (UTC)
 (envelope-from davidcs@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 2B13B6EF90;
 Wed, 26 Jul 2017 01:15:32 +0000 (UTC)
 (envelope-from davidcs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6Q1FVs7092026;
 Wed, 26 Jul 2017 01:15:31 GMT (envelope-from davidcs@FreeBSD.org)
Received: (from davidcs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6Q1FVY3092025;
 Wed, 26 Jul 2017 01:15:31 GMT (envelope-from davidcs@FreeBSD.org)
Message-Id: <201707260115.v6Q1FVY3092025@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: davidcs set sender to
 davidcs@FreeBSD.org using -f
From: David C Somayajulu <davidcs@FreeBSD.org>
Date: Wed, 26 Jul 2017 01:15:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r321495 - stable/11/sys/dev/qlxgbe
X-SVN-Group: stable-11
X-SVN-Commit-Author: davidcs
X-SVN-Commit-Paths: stable/11/sys/dev/qlxgbe
X-SVN-Commit-Revision: 321495
X-SVN-Commit-Repository: base
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.23
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: Wed, 26 Jul 2017 01:15:32 -0000

Author: davidcs
Date: Wed Jul 26 01:15:31 2017
New Revision: 321495
URL: https://svnweb.freebsd.org/changeset/base/321495

Log:
  MFC 320705
    Release mtx hw_lock before calling pause() in qla_stop() and
    qla_error_recovery()

Modified:
  stable/11/sys/dev/qlxgbe/ql_os.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- stable/11/sys/dev/qlxgbe/ql_os.c	Wed Jul 26 01:12:28 2017	(r321494)
+++ stable/11/sys/dev/qlxgbe/ql_os.c	Wed Jul 26 01:15:31 2017	(r321495)
@@ -1519,8 +1519,11 @@ qla_stop(qla_host_t *ha)
 
 	ha->flags.qla_watchdog_pause = 1;
 
-	while (!ha->qla_watchdog_paused)
+	while (!ha->qla_watchdog_paused) {
+		QLA_UNLOCK(ha);
 		qla_mdelay(__func__, 1);
+		QLA_LOCK(ha);
+	}
 
 	ha->flags.qla_interface_up = 0;
 
@@ -1915,7 +1918,10 @@ qla_error_recovery(void *context, int pending)
 	if (ha->flags.qla_interface_up) {
 
 		ha->hw.imd_compl = 1;
+
+		QLA_UNLOCK(ha);
 		qla_mdelay(__func__, 300);
+		QLA_LOCK(ha);
 
 	        ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE | IFF_DRV_RUNNING);