tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/SdMmcPciHcDxe: Error handling enhance on tuning procedure 

Enhance the code to reset tuning circuit when tuning error case happens.

Cc: Wu, Hao A <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
This commit is contained in:
Feng Tian 2016-05-03 09:49:47 +08:00
parent e7e89b0861
commit 8c983d3e06
4 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
This file provides some helper functions which are specific for EMMC device. This file provides some helper functions which are specific for EMMC device.
Copyright (c) 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -540,17 +540,25 @@ EmmcTuningClkForHs200 (
return Status; return Status;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) { if ((HostCtrl2 & (BIT6 | BIT7)) == 0) {
break; break;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) {
return EFI_SUCCESS;
}
} while (++Retry < 40); } while (++Retry < 40);
if (Retry == 40) { DEBUG ((EFI_D_ERROR, "EmmcTuningClkForHs200: Send tuning block fails at %d times with HostCtrl2 %02x\n", Retry, HostCtrl2));
Status = EFI_TIMEOUT; //
DEBUG ((EFI_D_ERROR, "EmmcTuningClkForHs200: Send tuning block exceeds 40 times\n")); // Abort the tuning procedure and reset the tuning circuit.
//
HostCtrl2 = (UINT8)~(BIT6 | BIT7);
Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
if (EFI_ERROR (Status)) {
return Status;
} }
return EFI_DEVICE_ERROR;
return Status;
} }
/** /**

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

@ -787,17 +787,24 @@ SdCardTuningClock (
return Status; return Status;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) { if ((HostCtrl2 & (BIT6 | BIT7)) == 0) {
break; break;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) {
return EFI_SUCCESS;
}
} while (++Retry < 40); } while (++Retry < 40);
if (Retry == 40) { DEBUG ((EFI_D_ERROR, "SdCardTuningClock: Send tuning block fails at %d times with HostCtrl2 %02x\n", Retry, HostCtrl2));
Status = EFI_TIMEOUT; //
DEBUG ((EFI_D_ERROR, "SdCardTuningClock: Send tuning block exceeds 40 times\n")); // Abort the tuning procedure and reset the tuning circuit.
//
HostCtrl2 = (UINT8)~(BIT6 | BIT7);
Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
if (EFI_ERROR (Status)) {
return Status;
} }
return EFI_DEVICE_ERROR;
return Status;
} }
/** /**

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

@ -2305,15 +2305,25 @@ EmmcPeimTuningClkForHs200 (
return Status; return Status;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) { if ((HostCtrl2 & (BIT6 | BIT7)) == 0) {
break; break;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) {
return EFI_SUCCESS;
}
} while (++Retry < 40); } while (++Retry < 40);
if (Retry == 40) { DEBUG ((EFI_D_ERROR, "EmmcPeimTuningClkForHs200: Send tuning block fails at %d times with HostCtrl2 %02x\n", Retry, HostCtrl2));
Status = EFI_TIMEOUT; //
// Abort the tuning procedure and reset the tuning circuit.
//
HostCtrl2 = (UINT8)~(BIT6 | BIT7);
Status = EmmcPeimHcAndMmio (Slot->EmmcHcBase + EMMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
if (EFI_ERROR (Status)) {
return Status;
} }
return Status; return EFI_DEVICE_ERROR;
} }
/** /**

18
MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
View File

@ -2523,15 +2523,25 @@ SdPeimTuningClock (
return Status; return Status;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) { if ((HostCtrl2 & (BIT6 | BIT7)) == 0) {
break; break;
} }
if ((HostCtrl2 & (BIT6 | BIT7)) == BIT7) {
return EFI_SUCCESS;
}
} while (++Retry < 40); } while (++Retry < 40);
if (Retry == 40) { DEBUG ((EFI_D_ERROR, "SdPeimTuningClock: Send tuning block fails at %d times with HostCtrl2 %02x\n", Retry, HostCtrl2));
Status = EFI_TIMEOUT; //
// Abort the tuning procedure and reset the tuning circuit.
//
HostCtrl2 = (UINT8)~(BIT6 | BIT7);
Status = SdPeimHcAndMmio (Slot->SdHcBase + SD_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
if (EFI_ERROR (Status)) {
return Status;
} }
return Status; return EFI_DEVICE_ERROR;
} }
/** /**