Revision: 16326
http://sourceforge.net/p/edk2/code/16326
Author: oliviermartin
Date: 2014-11-11 00:49:50 +0000 (Tue, 11 Nov 2014)
Log Message:
-----------
EmbeddedPkg/Lan9118Dxe: Remove link check in SNP initialization
The UEFI specification does not require the initialisation and reset
interface to check if an Ethernet cable is connected or not, and provides
the GetStatus() interface to do this. Furthermore, the 'Managed Network
Protocol' take care of the cable connection check in edk2 network stack.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <[email protected]>
Reviewed-by: Olivier Martin <[email protected]>
Modified Paths:
--------------
trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
Modified: trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c 2014-11-11
00:43:03 UTC (rev 16325)
+++ trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c 2014-11-11
00:49:50 UTC (rev 16326)
@@ -283,7 +283,7 @@
}
// Initiate a PHY reset
- Status = PhySoftReset (PHY_RESET_PMT | PHY_RESET_CHECK_LINK, Snp);
+ Status = PhySoftReset (PHY_RESET_PMT, Snp);
if (EFI_ERROR (Status)) {
Snp->Mode->State = EfiSimpleNetworkStopped;
DEBUG ((EFI_D_WARN, "Warning: Link not ready after TimeOut. Check ethernet
cable\n"));
@@ -403,7 +403,7 @@
}
// Initiate a PHY reset
- Status = PhySoftReset (PHY_RESET_PMT | PHY_RESET_CHECK_LINK, Snp);
+ Status = PhySoftReset (PHY_RESET_PMT, Snp);
if (EFI_ERROR (Status)) {
Snp->Mode->State = EfiSimpleNetworkStopped;
return EFI_NOT_STARTED;
Modified: trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c 2014-11-11
00:43:03 UTC (rev 16325)
+++ trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c 2014-11-11
00:49:50 UTC (rev 16326)
@@ -491,7 +491,6 @@
)
{
UINT32 PmtCtrl = 0;
- UINT32 LinkTo = 0;
// PMT PHY reset takes precedence over BCR
if (Flags & PHY_RESET_PMT) {
@@ -513,20 +512,6 @@
}
}
- // Check the link status
- if (Flags & PHY_RESET_CHECK_LINK) {
- LinkTo = 100000; // 2 second (could be 50% more)
- while (EFI_ERROR (CheckLinkStatus (0, Snp)) && (LinkTo > 0)) {
- gBS->Stall (LAN9118_STALL);
- LinkTo--;
- }
-
- // Timed out
- if (LinkTo <= 0) {
- return EFI_TIMEOUT;
- }
- }
-
// Clear and acknowledge all interrupts
if (Flags & PHY_SOFT_RESET_CLEAR_INT) {
MmioWrite32 (LAN9118_INT_EN, 0);
Modified: trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
===================================================================
--- trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h 2014-11-11
00:43:03 UTC (rev 16325)
+++ trunk/edk2/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h 2014-11-11
00:49:50 UTC (rev 16326)
@@ -115,8 +115,7 @@
// Flags for PHY reset
#define PHY_RESET_PMT BIT0
#define PHY_RESET_BCR BIT1
-#define PHY_RESET_CHECK_LINK BIT2
-#define PHY_SOFT_RESET_CLEAR_INT BIT3
+#define PHY_SOFT_RESET_CLEAR_INT BIT2
// Perform PHY software reset
EFI_STATUS
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
