diff options
| author | Feng Tian <feng.tian@intel.com> | 2017-03-13 11:20:41 +0800 |
|---|---|---|
| committer | Feng Tian <feng.tian@intel.com> | 2017-03-13 21:41:46 +0800 |
| commit | ec86d28558d4f9f325926be1444b2d4ce32a0dc2 (patch) | |
| tree | f1569fa712cead79fe0ce47241707c92701692c2 /MdeModulePkg/Bus/Sd | |
| parent | 1c3ac4b91efaa366d899cbe23451a0b2906d4d13 (diff) | |
| download | edk2-ec86d28558d4f9f325926be1444b2d4ce32a0dc2.tar.gz edk2-ec86d28558d4f9f325926be1444b2d4ce32a0dc2.tar.bz2 edk2-ec86d28558d4f9f325926be1444b2d4ce32a0dc2.zip | |
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>
Diffstat (limited to 'MdeModulePkg/Bus/Sd')
| -rw-r--r-- | MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c | 10 | ||||
| -rw-r--r-- | MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c index 2c0baca3e3..7c40892da0 100644 --- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c +++ b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c @@ -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);
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c index 23e6563d49..eebadd79bc 100644 --- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c +++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c @@ -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);
//
|