From owner-svn-src-head@freebsd.org  Thu Jul  6 05:16:07 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 7DC36D9E77A;
 Thu,  6 Jul 2017 05:16:07 +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 4C8F8804CD;
 Thu,  6 Jul 2017 05:16:07 +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 v665G6s3009842;
 Thu, 6 Jul 2017 05:16:06 GMT (envelope-from davidcs@FreeBSD.org)
Received: (from davidcs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v665G6tk009841;
 Thu, 6 Jul 2017 05:16:06 GMT (envelope-from davidcs@FreeBSD.org)
Message-Id: <201707060516.v665G6tk009841@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: Thu, 6 Jul 2017 05:16:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320705 - head/sys/dev/qlxgbe
X-SVN-Group: head
X-SVN-Commit-Author: davidcs
X-SVN-Commit-Paths: head/sys/dev/qlxgbe
X-SVN-Commit-Revision: 320705
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jul 2017 05:16:07 -0000

Author: davidcs
Date: Thu Jul  6 05:16:06 2017
New Revision: 320705
URL: https://svnweb.freebsd.org/changeset/base/320705

Log:
  Release mtx hw_lock before calling pause() in qla_stop() and
  qla_error_recovery()
  
  MFC after: 5 days

Modified:
  head/sys/dev/qlxgbe/ql_os.c

Modified: head/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- head/sys/dev/qlxgbe/ql_os.c	Thu Jul  6 04:56:23 2017	(r320704)
+++ head/sys/dev/qlxgbe/ql_os.c	Thu Jul  6 05:16:06 2017	(r320705)
@@ -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);