From owner-svn-src-all@freebsd.org  Wed Jul 18 18:28:18 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BECB102D079;
 Wed, 18 Jul 2018 18:28:18 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 20BEE86BB5;
 Wed, 18 Jul 2018 18:28:18 +0000 (UTC)
 (envelope-from eugen@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 023521DF55;
 Wed, 18 Jul 2018 18:28:18 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6IISH4o041502;
 Wed, 18 Jul 2018 18:28:17 GMT (envelope-from eugen@FreeBSD.org)
Received: (from eugen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6IISHOJ041501;
 Wed, 18 Jul 2018 18:28:17 GMT (envelope-from eugen@FreeBSD.org)
Message-Id: <201807181828.w6IISHOJ041501@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eugen set sender to
 eugen@FreeBSD.org using -f
From: Eugene Grosbein <eugen@FreeBSD.org>
Date: Wed, 18 Jul 2018 18:28:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336461 - head/sys/dev/bge
X-SVN-Group: head
X-SVN-Commit-Author: eugen
X-SVN-Commit-Paths: head/sys/dev/bge
X-SVN-Commit-Revision: 336461
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.27
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, 18 Jul 2018 18:28:18 -0000

Author: eugen
Date: Wed Jul 18 18:28:17 2018
New Revision: 336461
URL: https://svnweb.freebsd.org/changeset/base/336461

Log:
  bge(4): disable MSI for BGE_ASICREV_BCM5784/BGE_CHIPREV_5784_AX
  found in some MacBook Pro.
  
  PR:		229727
  Reported by:	Stephan Neuhaus <sten@artdecode.de> and others
  Tested by:	Stephan Neuhaus <sten@artdecode.de>
  Approved by:	mav (mentor)
  MFC after:	1 month

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Wed Jul 18 17:58:17 2018	(r336460)
+++ head/sys/dev/bge/if_bge.c	Wed Jul 18 18:28:17 2018	(r336461)
@@ -3212,6 +3212,14 @@ bge_can_use_msi(struct bge_softc *sc)
 		    sc->bge_chiprev != BGE_CHIPREV_5750_BX)
 			can_use_msi = 1;
 		break;
+	case BGE_ASICREV_BCM5784:
+		/*
+		 * Prevent infinite "watchdog timeout" errors
+		 * in some MacBook Pro and make it work out-of-the-box.
+		 */
+		if (sc->bge_chiprev == BGE_CHIPREV_5784_AX)
+			break;
+		/* FALLTHROUGH */
 	default:
 		if (BGE_IS_575X_PLUS(sc))
 			can_use_msi = 1;