From owner-svn-src-all@freebsd.org  Wed Feb 28 20:51:21 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 C01CEF44B08;
 Wed, 28 Feb 2018 20:51:21 +0000 (UTC)
 (envelope-from kevans@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 736758CD7D;
 Wed, 28 Feb 2018 20:51:21 +0000 (UTC)
 (envelope-from kevans@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 6D69E1EA61;
 Wed, 28 Feb 2018 20:51:21 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1SKpLc9045558;
 Wed, 28 Feb 2018 20:51:21 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1SKpL01045557;
 Wed, 28 Feb 2018 20:51:21 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201802282051.w1SKpL01045557@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 28 Feb 2018 20:51:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r330128 - head/sys/arm/allwinner
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/sys/arm/allwinner
X-SVN-Commit-Revision: 330128
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.25
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, 28 Feb 2018 20:51:21 -0000

Author: kevans
Date: Wed Feb 28 20:51:21 2018
New Revision: 330128
URL: https://svnweb.freebsd.org/changeset/base/330128

Log:
  Revert r328964: if_awg: Skip emac reset if configured for internal PHY
  
  This broke EFI boots consistently, and emac reset is sometimes needed if
  things get into a bad state -- this won't be done without a full powercycle.

Modified:
  head/sys/arm/allwinner/if_awg.c

Modified: head/sys/arm/allwinner/if_awg.c
==============================================================================
--- head/sys/arm/allwinner/if_awg.c	Wed Feb 28 20:06:03 2018	(r330127)
+++ head/sys/arm/allwinner/if_awg.c	Wed Feb 28 20:51:21 2018	(r330128)
@@ -1834,11 +1834,9 @@ awg_attach(device_t dev)
 	awg_get_eaddr(dev, eaddr);
 
 	/* Soft reset EMAC core */
-	if (!awg_has_internal_phy(dev)) {
-		error = awg_reset(dev);
-		if (error != 0)
-			return (error);
-	}
+	error = awg_reset(dev);
+	if (error != 0)
+		return (error);
 
 	/* Setup DMA descriptors */
 	error = awg_setup_dma(dev);