tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 23:24:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/SdMmc: Add break to avoid dead loop when polling OCR Reg

Browse Source 
At worst case, OCR register may always not set BIT31. It will cause
original code enter to dead loop. Adding a break for such case.

Cc: Hao Wu <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
This commit is contained in:
Feng Tian 2017-03-13 11:20:41 +08:00
parent 1c3ac4b91e
commit ec86d28558
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
View File

@ -1109,6 +1109,7 @@ EmmcIdentification (
EFI_SD_MMC_PASS_THRU_PROTOCOL *PassThru; EFI_SD_MMC_PASS_THRU_PROTOCOL *PassThru;
UINT32 Ocr; UINT32 Ocr;
UINT16 Rca; UINT16 Rca;
UINTN Retry;
PciIo = Private->PciIo; PciIo = Private->PciIo;
PassThru = &Private->PassThru; PassThru = &Private->PassThru;
@ -1119,7 +1120,8 @@ EmmcIdentification (
return Status; return Status;
} }
Ocr = 0; Ocr = 0;
Retry = 0;
do { do {
Status = EmmcGetOcr (PassThru, Slot, &Ocr); Status = EmmcGetOcr (PassThru, Slot, &Ocr);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
@ -1127,6 +1129,12 @@ EmmcIdentification (
return Status; return Status;
} }
Ocr |= BIT30; Ocr |= BIT30;
if (Retry++ == 100) {
DEBUG ((DEBUG_VERBOSE, "EmmcIdentification: Executing Cmd1 fails too many times\n"));
return EFI_DEVICE_ERROR;
}
gBS->Stall(10 * 1000);
} while ((Ocr & BIT31) == 0); } while ((Ocr & BIT31) == 0);
Status = EmmcGetAllCid (PassThru, Slot); Status = EmmcGetAllCid (PassThru, Slot);

9
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
View File

@ -1017,6 +1017,7 @@ SdCardIdentification (
UINT8 PowerCtrl; UINT8 PowerCtrl;
UINT32 PresentState; UINT32 PresentState;
UINT8 HostCtrl2; UINT8 HostCtrl2;
UINTN Retry;
PciIo = Private->PciIo; PciIo = Private->PciIo;
PassThru = &Private->PassThru; PassThru = &Private->PassThru;
@ -1097,12 +1098,20 @@ SdCardIdentification (
// Note here we only support the cards complied with SD physical // Note here we only support the cards complied with SD physical
// layer simplified spec version 2.0 and version 3.0 and above. // layer simplified spec version 2.0 and version 3.0 and above.
// //
Ocr = 0;
Retry = 0;
do { do {
Status = SdCardSendOpCond (PassThru, Slot, 0, Ocr, S18r, Xpc, TRUE, &Ocr); Status = SdCardSendOpCond (PassThru, Slot, 0, Ocr, S18r, Xpc, TRUE, &Ocr);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "SdCardIdentification: SdCardSendOpCond fails with %r Ocr %x, S18r %x, Xpc %x\n", Status, Ocr, S18r, Xpc)); DEBUG ((DEBUG_ERROR, "SdCardIdentification: SdCardSendOpCond fails with %r Ocr %x, S18r %x, Xpc %x\n", Status, Ocr, S18r, Xpc));
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
} }
if (Retry++ == 100) {
DEBUG ((DEBUG_ERROR, "SdCardIdentification: SdCardSendOpCond fails too many times\n"));
return EFI_DEVICE_ERROR;
}
gBS->Stall(10 * 1000);
} while ((Ocr & BIT31) == 0); } while ((Ocr & BIT31) == 0);
// //

10
MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c
View File

@ -2827,6 +2827,7 @@ EmmcPeimIdentification (
EFI_STATUS Status; EFI_STATUS Status;
UINT32 Ocr; UINT32 Ocr;
UINT32 Rca; UINT32 Rca;
UINTN Retry;
Status = EmmcPeimReset (Slot); Status = EmmcPeimReset (Slot);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
@ -2834,13 +2835,20 @@ EmmcPeimIdentification (
return Status; return Status;
} }
Ocr = 0; Ocr = 0;
Retry = 0;
do { do {
Status = EmmcPeimGetOcr (Slot, &Ocr); Status = EmmcPeimGetOcr (Slot, &Ocr);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EmmcPeimIdentification: EmmcPeimGetOcr fails with %r\n", Status)); DEBUG ((EFI_D_ERROR, "EmmcPeimIdentification: EmmcPeimGetOcr fails with %r\n", Status));
return Status; return Status;
} }
if (Retry++ == 100) {
DEBUG ((EFI_D_ERROR, "EmmcPeimIdentification: EmmcPeimGetOcr fails too many times\n"));
return EFI_DEVICE_ERROR;
}
MicroSecondDelay (10 * 1000);
} while ((Ocr & BIT31) == 0); } while ((Ocr & BIT31) == 0);
Status = EmmcPeimGetAllCid (Slot); Status = EmmcPeimGetAllCid (Slot);

10
MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
View File

@ -2754,7 +2754,7 @@ SdPeimIdentification (
UINT32 PresentState; UINT32 PresentState;
UINT8 HostCtrl2; UINT8 HostCtrl2;
SD_HC_SLOT_CAP Capability; SD_HC_SLOT_CAP Capability;
UINTN Retry;
// //
// 1. Send Cmd0 to the device // 1. Send Cmd0 to the device
// //
@ -2842,12 +2842,20 @@ SdPeimIdentification (
// Note here we only support the cards complied with SD physical // Note here we only support the cards complied with SD physical
// layer simplified spec version 2.0 and version 3.0 and above. // layer simplified spec version 2.0 and version 3.0 and above.
// //
Ocr = 0;
Retry = 0;
do { do {
Status = SdPeimSendOpCond (Slot, 0, Ocr, S18r, Xpc, TRUE, &Ocr); Status = SdPeimSendOpCond (Slot, 0, Ocr, S18r, Xpc, TRUE, &Ocr);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "SdPeimIdentification: SdPeimSendOpCond fails with %r Ocr %x, S18r %x, Xpc %x\n", Status, Ocr, S18r, Xpc)); DEBUG ((EFI_D_ERROR, "SdPeimIdentification: SdPeimSendOpCond fails with %r Ocr %x, S18r %x, Xpc %x\n", Status, Ocr, S18r, Xpc));
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
} }
if (Retry++ == 100) {
DEBUG ((EFI_D_ERROR, "SdPeimIdentification: SdPeimSendOpCond fails too many times\n"));
return EFI_DEVICE_ERROR;
}
MicroSecondDelay (10 * 1000);
} while ((Ocr & BIT31) == 0); } while ((Ocr & BIT31) == 0);
// //