From owner-svn-src-head@freebsd.org  Wed Aug  5 21:22:26 2015
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 1C9EC9B4C26;
 Wed,  5 Aug 2015 21:22:26 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0DA8915ED;
 Wed,  5 Aug 2015 21:22:26 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75LMPHp045422;
 Wed, 5 Aug 2015 21:22:25 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75LMPWa045421;
 Wed, 5 Aug 2015 21:22:25 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201508052122.t75LMPWa045421@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 5 Aug 2015 21:22:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286343 - head/sys/dev/ath
X-SVN-Group: head
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Aug 2015 21:22:26 -0000

Author: adrian
Date: Wed Aug  5 21:22:25 2015
New Revision: 286343
URL: https://svnweb.freebsd.org/changeset/base/286343

Log:
  Add a hack-around to this fatal taskqueue running whilst the NIC
  is detaching.
  
  This mostly fixes a panic - the reset path shouldn't run whilst
  the NIC is being torn down.
  
  It's not locked, so it's "mostly" ok, but most of the rest of
  the driver doesn't read sc->invalid with sensible locking. Grr.
  
  The real solution is to cleanly tear down taskqueues in the detach/suspend
  phase, but ..

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Wed Aug  5 21:16:12 2015	(r286342)
+++ head/sys/dev/ath/if_ath.c	Wed Aug  5 21:22:25 2015	(r286343)
@@ -2318,6 +2318,9 @@ ath_fatal_proc(void *arg, int pending)
 	u_int32_t len;
 	void *sp;
 
+	if (sc->sc_invalid)
+		return;
+
 	device_printf(sc->sc_dev, "hardware error; resetting\n");
 	/*
 	 * Fatal errors are unrecoverable.  Typically these