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

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

View File

@@ -2754,7 +2754,7 @@ SdPeimIdentification (
UINT32 PresentState;
UINT8 HostCtrl2;
SD_HC_SLOT_CAP Capability;
UINTN Retry;
//
// 1. Send Cmd0 to the device
//
@@ -2842,12 +2842,20 @@ SdPeimIdentification (
// Note here we only support the cards complied with SD physical
// layer simplified spec version 2.0 and version 3.0 and above.
//
Ocr = 0;
Retry = 0;
do {
Status = SdPeimSendOpCond (Slot, 0, Ocr, S18r, Xpc, TRUE, &Ocr);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "SdPeimIdentification: SdPeimSendOpCond fails with %r Ocr %x, S18r %x, Xpc %x\n", Status, Ocr, S18r, Xpc));
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);
//