EmbeddedPkg/Lan9118Dxe: Remove link check in SNP initialization

[mirror_edk2.git] / EmbeddedPkg / Drivers / Lan9118Dxe / Lan9118DxeUtil.c

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
index 99c3ff0cec518207020fceec054162df052b235b..9531b0ba2a463f6c9896a211b104f4d531ec004c 100644 (file)
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
@@ -14,7 +14,7 @@
 \r
 #include "Lan9118Dxe.h"\r
 \r
-STATIC EFI_MAC_ADDRESS mZeroMac = { 0 };\r
+STATIC EFI_MAC_ADDRESS mZeroMac = { { 0 } };\r
 \r
 /**\r
   This internal function reverses bits for 32bit data.\r
@@ -320,8 +320,6 @@ Lan9118SetMacAddress (
                       (UINT32)(Mac->Addr[4] & 0xFF) |\r
                       ((Mac->Addr[5] & 0xFF) << 8)\r
                     );\r
-\r
-  CopyMem (&Snp->Mode->CurrentAddress, &Mac, NET_ETHER_ADDR_LEN);\r
 }\r
 \r
 VOID\r
@@ -398,6 +396,7 @@ Lan9118Initialize (
       DEBUG ((EFI_D_WARN, "Warning: using driver-default MAC address\n"));\r
       DefaultMacAddress = FixedPcdGet64 (PcdLan9118DefaultMacAddress);\r
       Lan9118SetMacAddress((EFI_MAC_ADDRESS *) &DefaultMacAddress, Snp);\r
+      CopyMem (&Snp->Mode->CurrentAddress, &DefaultMacAddress, NET_ETHER_ADDR_LEN);\r
     }\r
   } else {\r
     // Store the MAC address that was loaded from EEPROM\r
@@ -485,14 +484,13 @@ SoftReset (
 \r
 \r
 // Perform PHY software reset\r
-INT32\r
+EFI_STATUS\r
 PhySoftReset (\r
   UINT32 Flags,\r
   EFI_SIMPLE_NETWORK_PROTOCOL *Snp\r
   )\r
 {\r
   UINT32 PmtCtrl = 0;\r
-  UINT32 LinkTo = 0;\r
 \r
   // PMT PHY reset takes precedence over BCR\r
   if (Flags & PHY_RESET_PMT) {\r
@@ -505,7 +503,7 @@ PhySoftReset (
       gBS->Stall (LAN9118_STALL);\r
     }\r
   // PHY Basic Control Register reset\r
-  } else if (Flags & PHY_RESET_PMT) {\r
+  } else if (Flags & PHY_RESET_BCR) {\r
     IndirectPHYWrite32 (PHY_INDEX_BASIC_CTRL, PHYCR_RESET);\r
 \r
     // Wait for completion\r
@@ -514,20 +512,6 @@ PhySoftReset (
     }\r
   }\r
 \r
-  // Check the link status\r
-  if (Flags & PHY_RESET_CHECK_LINK) {\r
-    LinkTo = 100000; // 2 second (could be 50% more)\r
-    while (EFI_ERROR (CheckLinkStatus (0, Snp)) && (LinkTo > 0)) {\r
-      gBS->Stall (LAN9118_STALL);\r
-      LinkTo--;\r
-    }\r
-\r
-    // Timed out\r
-    if (LinkTo <= 0) {\r
-      return -1;\r
-    }\r
-  }\r
-\r
   // Clear and acknowledge all interrupts\r
   if (Flags & PHY_SOFT_RESET_CLEAR_INT) {\r
     MmioWrite32 (LAN9118_INT_EN, 0);\r
@@ -535,7 +519,7 @@ PhySoftReset (
     MmioWrite32 (LAN9118_INT_STS, 0xFFFFFFFF);\r
   }\r
 \r
-  return 0;\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 \r