\r
#include "Lan9118Dxe.h"\r
\r
-\r
typedef struct {\r
MAC_ADDR_DEVICE_PATH Lan9118;\r
EFI_DEVICE_PATH_PROTOCOL End;\r
// Power up the device so we can find the MAC address\r
Status = Lan9118Initialize (Snp);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((EFI_D_ERROR, "Lan9118: Error initialising hardware\n"));\r
+ DEBUG ((EFI_D_ERROR, "LAN9118: Error initialising hardware\n"));\r
return EFI_DEVICE_ERROR;\r
}\r
\r
// Do auto-negotiation if supported\r
Status = AutoNegotiate (AUTO_NEGOTIATE_ADVERTISE_ALL, Snp);\r
if (EFI_ERROR(Status)) {\r
- DEBUG ((EFI_D_WARN, "Lan9118: Auto Negociation not supported.\n"));\r
+ DEBUG ((EFI_D_WARN, "LAN9118: Auto Negotiation failed.\n"));\r
}\r
\r
// Configure flow control depending on speed capabilities\r
MmioWrite32 (LAN9118_PMT_CTRL, PmConf);\r
gBS->Stall (LAN9118_STALL);\r
\r
+ // Reactivate the LEDs\r
+ Status = ConfigureHardware (HW_CONF_USE_LEDS, Snp);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
// Check that a buffer size was specified in SnpInitialize\r
if (gTxBuffer != 0) {\r
HwConf = MmioRead32 (LAN9118_HW_CFG); // Read the HW register\r
New = (EFI_MAC_ADDRESS *) PermAddr;\r
Lan9118SetMacAddress ((EFI_MAC_ADDRESS *) PermAddr, Snp);\r
} else {\r
- DEBUG ((EFI_D_ERROR, "Lan9118: Warning: No valid MAC address in EEPROM, using fallback\n"));\r
+ DEBUG ((EFI_D_ERROR, "LAN9118: Warning: No valid MAC address in EEPROM, using fallback\n"));\r
New = (EFI_MAC_ADDRESS*) (FixedPcdGet64 (PcdLan9118DefaultMacAddress));\r
}\r
} else {\r
if (Interrupts & INSTS_TXE) {\r
DEBUG ((EFI_D_ERROR, "LAN9118: Transmitter error. Restarting..."));\r
\r
- // Initiate a software reset\r
+ // Software reset, the TXE interrupt is cleared by the reset.\r
Status = SoftReset (0, Snp);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "\n\tSoft Reset Failed: Hardware Error\n"));\r
return EFI_DEVICE_ERROR;\r
}\r
\r
- // Acknowledge the TXE\r
- MmioWrite32 (LAN9118_INT_STS, INSTS_TXE);\r
- gBS->Stall (LAN9118_STALL);\r
+ // Reactivate the LEDs\r
+ Status = ConfigureHardware (HW_CONF_USE_LEDS, Snp);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
\r
- // Restart the transmitter\r
+ //\r
+ // Restart the transmitter and if necessary the receiver.\r
+ // Do not ask for FIFO reset as it has already been done\r
+ // by SoftReset().\r
+ //\r
StartTx (START_TX_MAC | START_TX_CFG, Snp);\r
+ if (Snp->Mode->ReceiveFilterSetting != 0) {\r
+ StartRx (0, Snp);\r
+ }\r
}\r
\r
// Update the media status\r
)\r
{\r
LAN9118_DRIVER *LanDriver;\r
+ UINT32 IntSts;\r
UINT32 RxFifoStatus;\r
UINT32 NumPackets;\r
UINT32 RxCfgValue;\r
return EFI_NOT_STARTED;\r
}\r
\r
+ //\r
+ // If the receiver raised the RXE error bit, check if the receiver status\r
+ // FIFO is full and if not just acknowledge the error. The two other\r
+ // conditions to get a RXE error are :\r
+ // . the RX data FIFO is read whereas being empty.\r
+ // . the RX status FIFO is read whereas being empty.\r
+ // The RX data and status FIFO are read by this driver only in the following\r
+ // code of this function. After the readings, the RXE error bit is checked\r
+ // and if raised, the controller is reset. Thus, at this point, we consider\r
+ // that the only valid reason to get an RXE error is the receiver status\r
+ // FIFO being full. And if this is not the case, we consider that this is\r
+ // a spurious error and we just get rid of it. We experienced such 'spurious'\r
+ // errors when running the driver on an A57 on Juno. No valid reason to\r
+ // explain those errors has been found so far and everything seems to\r
+ // work perfectly when they are just ignored.\r
+ //\r
+ IntSts = MmioRead32 (LAN9118_INT_STS);\r
+ if ((IntSts & INSTS_RXE) && (!(IntSts & INSTS_RSFF))) {\r
+ MmioWrite32 (LAN9118_INT_STS, INSTS_RXE);\r
+ }\r
+\r
// Count dropped frames\r
DroppedFrames = MmioRead32 (LAN9118_RX_DROP);\r
LanDriver->Stats.RxDroppedFrames += DroppedFrames;\r
PLength = GET_RXSTATUS_PACKET_LENGTH(RxFifoStatus);\r
LanDriver->Stats.RxTotalBytes += (PLength - 4);\r
\r
- // Check buffer size\r
- if (*BuffSize < PLength) {\r
- *BuffSize = PLength;\r
- return EFI_BUFFER_TOO_SMALL;\r
- }\r
-\r
// If padding is applied, read more DWORDs\r
if (PLength % 4) {\r
Padding = 4 - (PLength % 4);\r
Padding = 0;\r
}\r
\r
+ // Check buffer size\r
+ if (*BuffSize < (PLength + Padding)) {\r
+ *BuffSize = PLength + Padding;\r
+ return EFI_BUFFER_TOO_SMALL;\r
+ }\r
+\r
// Set the amount of data to be transfered out of FIFO for THIS packet\r
// This can be used to trigger an interrupt, and status can be checked\r
RxCfgValue = MmioRead32 (LAN9118_RX_CFG);\r
RawData[Count] = MmioRead32 (LAN9118_RX_DATA);\r
}\r
\r
- // Check for Rx errors (worst possible error)\r
- if (MmioRead32 (LAN9118_INT_STS) & INSTS_RXE) {\r
- DEBUG ((EFI_D_WARN, "Warning: Receiver Error. Restarting...\n"));\r
-\r
- // Initiate a software reset\r
- Status = SoftReset (0, Snp);\r
- if (EFI_ERROR (Status)) {\r
- DEBUG ((EFI_D_ERROR, "Error: Soft Reset Failed: Hardware Error.\n"));\r
- return EFI_DEVICE_ERROR;\r
- }\r
-\r
- // Acknowledge the RXE\r
- MmioWrite32 (LAN9118_INT_STS, INSTS_RXE);\r
- gBS->Stall (LAN9118_STALL);\r
-\r
- // Restart the rx (and do not clear FIFO)\r
- StartRx (0, Snp);\r
-\r
- // Say that command could not be sent\r
- return EFI_DEVICE_ERROR;\r
- }\r
-\r
// Get the destination address\r
if (DstAddr != NULL) {\r
Dst.Addr[0] = (RawData[0] & 0xFF);\r
Src.Addr[3] = (RawData[2] & 0xFF00) >> 8;\r
Src.Addr[4] = (RawData[2] & 0xFF0000) >> 16;\r
Src.Addr[5] = (RawData[2] & 0xFF000000) >> 24;\r
- CopyMem (SrcAddr,&Src, NET_ETHER_ADDR_LEN);\r
+ CopyMem (SrcAddr, &Src, NET_ETHER_ADDR_LEN);\r
}\r
\r
// Get the protocol\r
*Protocol = NTOHS (RawData[3] & 0xFFFF);\r
}\r
\r
+ // Check for Rx errors (worst possible error)\r
+ if (MmioRead32 (LAN9118_INT_STS) & INSTS_RXE) {\r
+ DEBUG ((EFI_D_WARN, "Warning: Receiver Error. Restarting...\n"));\r
+\r
+ // Software reset, the RXE interrupt is cleared by the reset.\r
+ Status = SoftReset (0, Snp);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "Error: Soft Reset Failed: Hardware Error.\n"));\r
+ return EFI_DEVICE_ERROR;\r
+ }\r
+\r
+ // Reactivate the LEDs\r
+ Status = ConfigureHardware (HW_CONF_USE_LEDS, Snp);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
+ //\r
+ // Restart the receiver and the transmitter without reseting the FIFOs\r
+ // as it has been done by SoftReset().\r
+ //\r
+ StartRx (0, Snp);\r
+ StartTx (START_TX_MAC | START_TX_CFG, Snp);\r
+\r
+ // Say that command could not be sent\r
+ return EFI_DEVICE_ERROR;\r
+ }\r
+\r
#if defined(EVAL_PERFORMANCE)\r
UINT64 EndClock = GetPerformanceCounter ();\r
DEBUG ((EFI_D_ERROR, "Receive Time processing: %d counts @ %d Hz\n", StartClock - EndClock,Perf));\r
projects / mirror_edk2.git / blobdiff