diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-05 12:53:15 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-05 12:53:15 -0700 |
| commit | dfb07b47513fe1bc4297b678f1b6da10fdf1a3b9 (patch) | |
| tree | e81d3bbba4fd99d1c8d1b4239f358c1e09955ba1 | |
| parent | db0304e69e43641417d40b25d70600b8e891694d (diff) | |
| parent | 77fe3a11fab686a3f8c796e2590d214edc896fb1 (diff) | |
| download | OpenPlatformPkg-dfb07b47513fe1bc4297b678f1b6da10fdf1a3b9.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp
| -rw-r--r-- | Drivers/Mmc/DwSdDxe/DwSdDxe.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Drivers/Mmc/DwSdDxe/DwSdDxe.c b/Drivers/Mmc/DwSdDxe/DwSdDxe.c index 3eb8b1e..cbe6b77 100644 --- a/Drivers/Mmc/DwSdDxe/DwSdDxe.c +++ b/Drivers/Mmc/DwSdDxe/DwSdDxe.c @@ -37,6 +37,8 @@ #define DWSD_DMA_THRESHOLD 16 +#define MAX_IDLE_LOOPS 1000000 + typedef struct { UINT32 Des0; UINT32 Des1; @@ -165,7 +167,7 @@ DwSdSetClock ( IN UINTN ClockFreq ) { - UINT32 Divider, Rate, Data; + UINT32 Divider, Rate, Data, Count; EFI_STATUS Status; BOOLEAN Found = FALSE; @@ -180,8 +182,11 @@ DwSdSetClock ( return EFI_NOT_FOUND; // Wait until MMC is idle + Count = 0; do { Data = MmioRead32 (DWSD_STATUS); + if (Count++ > MAX_IDLE_LOOPS) + break; } while (Data & DWSD_STS_DATA_BUSY); // Disable MMC clock first @@ -282,14 +287,17 @@ SendCommand ( IN UINT32 Argument ) { - UINT32 Data, ErrMask; + UINT32 Data, ErrMask, Count; MmioWrite32 (DWSD_RINTSTS, ~0); MmioWrite32 (DWSD_CMDARG, Argument); MicroSecondDelay(500); // Wait until MMC is idle + Count = 0; do { Data = MmioRead32 (DWSD_STATUS); + if (Count++ > MAX_IDLE_LOOPS) + break; } while (Data & DWSD_STS_DATA_BUSY); MmioWrite32 (DWSD_CMD, MmcCmd); |