sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2827,6 +2827,7 @@ EmmcPeimIdentification (
EFI_STATUS Status;
UINT32 Ocr;
UINT32 Rca;
UINTN Retry;
Status = EmmcPeimReset (Slot);
if (EFI_ERROR (Status)) {
@@ -2834,13 +2835,20 @@ EmmcPeimIdentification (
return Status;
}
Ocr = 0;
Ocr = 0;
Retry = 0;
do {
Status = EmmcPeimGetOcr (Slot, &Ocr);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EmmcPeimIdentification: EmmcPeimGetOcr fails with %r\n", 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);
Status = EmmcPeimGetAllCid (Slot);