From b5cdd987a8722cbc19d762c15c24c160a181c228 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Wed, 28 Feb 2018 20:51:21 +0000 Subject: [PATCH] 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. --- sys/arm/allwinner/if_awg.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index cb3dc171c77a..6f0cef88b185 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -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);