Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

EmbeddedPkg/MmcDxe: Align the ExtCSD buffer 

ExtCSD structure may be read via DMA. So align it to
page to avoid data corruption.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jun Nie <jun.nie@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Jun Nie 2017-07-04 23:43:16 +08:00 committed by Leif Lindholm
parent e4129b0e58
commit 7bb5fad566
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EmbeddedPkg/Universal/MmcDxe/Mmc.c
View File

@ -171,6 +171,9 @@ EFI_STATUS DestroyMmcHostInstance (
if (MmcHostInstance->BlockIo.Media) { if (MmcHostInstance->BlockIo.Media) {
FreePool(MmcHostInstance->BlockIo.Media); FreePool(MmcHostInstance->BlockIo.Media);
} }
if (MmcHostInstance->CardInfo.ECSDData) {
FreePages (MmcHostInstance->CardInfo.ECSDData, EFI_SIZE_TO_PAGES (sizeof (ECSD)));
}
FreePool (MmcHostInstance); FreePool (MmcHostInstance);
return Status; return Status;

2
EmbeddedPkg/Universal/MmcDxe/Mmc.h
View File

@ -319,7 +319,7 @@ typedef struct {
OCR OCRData; OCR OCRData;
CID CIDData; CID CIDData;
CSD CSDData; CSD CSDData;
ECSD ECSDData; // MMC V4 extended card specific ECSD *ECSDData; // MMC V4 extended card specific
} CARD_INFO; } CARD_INFO;
typedef struct _MMC_HOST_INSTANCE { typedef struct _MMC_HOST_INSTANCE {

19
EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
View File

@ -13,6 +13,7 @@
**/ **/
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h> #include <Library/TimerLib.h>
#include "Mmc.h" #include "Mmc.h"
@ -210,15 +211,19 @@ EmmcIdentificationMode (
} }
// Fetch ECSD // Fetch ECSD
MmcHostInstance->CardInfo.ECSDData = AllocatePages (EFI_SIZE_TO_PAGES (sizeof (ECSD)));
if (MmcHostInstance->CardInfo.ECSDData == NULL) {
return EFI_OUT_OF_RESOURCES;
}
Status = Host->SendCommand (Host, MMC_CMD8, 0); Status = Host->SendCommand (Host, MMC_CMD8, 0);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD fetch error, Status=%r.\n", Status)); DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD fetch error, Status=%r.\n", Status));
} }
Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)&(MmcHostInstance->CardInfo.ECSDData)); Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)MmcHostInstance->CardInfo.ECSDData);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD read error, Status=%r.\n", Status)); DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD read error, Status=%r.\n", Status));
return Status; goto FreePageExit;
} }
// Make sure device exiting data mode // Make sure device exiting data mode
@ -226,7 +231,7 @@ EmmcIdentificationMode (
Status = EmmcGetDeviceState (MmcHostInstance, &State); Status = EmmcGetDeviceState (MmcHostInstance, &State);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Failed to get device state, Status=%r.\n", Status)); DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Failed to get device state, Status=%r.\n", Status));
return Status; goto FreePageExit;
} }
} while (State == EMMC_DATA_STATE); } while (State == EMMC_DATA_STATE);
@ -237,12 +242,16 @@ EmmcIdentificationMode (
Media->LogicalBlocksPerPhysicalBlock = 1; Media->LogicalBlocksPerPhysicalBlock = 1;
Media->IoAlign = 4; Media->IoAlign = 4;
// Compute last block using bits [215:212] of the ECSD // Compute last block using bits [215:212] of the ECSD
Media->LastBlock = MmcHostInstance->CardInfo.ECSDData.SECTOR_COUNT - 1; // eMMC isn't supposed to report this for Media->LastBlock = MmcHostInstance->CardInfo.ECSDData->SECTOR_COUNT - 1; // eMMC isn't supposed to report this for
// Cards <2GB in size, but the model does. // Cards <2GB in size, but the model does.
// Setup card type // Setup card type
MmcHostInstance->CardInfo.CardType = EMMC_CARD; MmcHostInstance->CardInfo.CardType = EMMC_CARD;
return EFI_SUCCESS; return EFI_SUCCESS;
FreePageExit:
FreePages (MmcHostInstance->CardInfo.ECSDData, EFI_SIZE_TO_PAGES (sizeof (ECSD)));
return Status;
} }
STATIC STATIC
@ -258,7 +267,7 @@ InitializeEmmcDevice (
UINT32 TimingMode[4] = {EMMCHS52DDR1V2, EMMCHS52DDR1V8, EMMCHS52, EMMCHS26}; UINT32 TimingMode[4] = {EMMCHS52DDR1V2, EMMCHS52DDR1V8, EMMCHS52, EMMCHS26};
Host = MmcHostInstance->MmcHost; Host = MmcHostInstance->MmcHost;
ECSDData = &MmcHostInstance->CardInfo.ECSDData; ECSDData = MmcHostInstance->CardInfo.ECSDData;
if (ECSDData->DEVICE_TYPE == EMMCBACKWARD) if (ECSDData->DEVICE_TYPE == EMMCBACKWARD)
return EFI_SUCCESS; return EFI_SUCCESS;