tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 16:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/SdMmcPciHcDxe: Robust improvements for SD card 1.8V switch

Browse Source 
This changes is by adding 50ms delay during voltage switching from 3.3V to
1.8V, plus adding a goto Voltage33Retry for 3.3V checking and retrying.

Change is for Enabling OS boot from SD card through UEFI payload.

Signed-off-by: Aiman Rosli <muhammad.aiman.rosli@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Aiman Rosli 2022-01-21 02:53:24 +08:00 committed by mergify[bot]
parent 21320ef669
commit 7e5c603cba
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1213,9 +1213,14 @@ SdCardIdentification (
UINT32 PresentState; UINT32 PresentState;
UINT8 HostCtrl2; UINT8 HostCtrl2;
UINTN Retry; UINTN Retry;
BOOLEAN ForceVoltage33;
ForceVoltage33 = FALSE;
PciIo = Private->PciIo; PciIo = Private->PciIo;
PassThru = &Private->PassThru; PassThru = &Private->PassThru;
Voltage33Retry:
// //
// 1. Send Cmd0 to the device // 1. Send Cmd0 to the device
// //
@ -1294,6 +1299,13 @@ SdCardIdentification (
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
//
// 1.8V had failed in the previous run, forcing a retry with 3.3V instead
//
if (ForceVoltage33 == TRUE) {
S18r = FALSE;
}
// //
// 5. Repeatly send Acmd41 with supply voltage window to the device. // 5. Repeatly send Acmd41 with supply voltage window to the device.
// Note here we only support the cards complied with SD physical // Note here we only support the cards complied with SD physical
@ -1366,9 +1378,30 @@ SdCardIdentification (
SdMmcHcRwMmio (PciIo, Slot, SD_MMC_HC_PRESENT_STATE, TRUE, sizeof (PresentState), &PresentState); SdMmcHcRwMmio (PciIo, Slot, SD_MMC_HC_PRESENT_STATE, TRUE, sizeof (PresentState), &PresentState);
if (((PresentState >> 20) & 0xF) != 0xF) { if (((PresentState >> 20) & 0xF) != 0xF) {
DEBUG ((DEBUG_ERROR, "SdCardIdentification: SwitchVoltage fails with PresentState = 0x%x, It should be 0xF\n", PresentState)); //
Status = EFI_DEVICE_ERROR; // Delay 50 milliseconds in order for clock to stabilize, retry reading the SD_MMC_HC_PRESENT_STATE
goto Error; //
gBS->Stall (50000);
SdMmcHcRwMmio (PciIo, Slot, SD_MMC_HC_PRESENT_STATE, TRUE, sizeof (PresentState), &PresentState);
if (((PresentState >> 20) & 0xF) != 0xF) {
DEBUG ((DEBUG_ERROR, "SdCardIdentification: SwitchVoltage fails with PresentState = 0x%x, It should be 0xF\n", PresentState));
//
// Reset and reinitialize the slot before the 3.3V retry.
//
Status = SdMmcHcReset (Private, Slot);
if (EFI_ERROR (Status)) {
goto Error;
}
Status = SdMmcHcInitHost (Private, Slot);
if (EFI_ERROR (Status)) {
goto Error;
}
DEBUG ((DEBUG_ERROR, "SdCardIdentification: Switching to 1.8V failed, forcing a retry with 3.3V instead\n"));
ForceVoltage33 = TRUE;
goto Voltage33Retry;
}
} }
} }