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

EmbeddedPkg/MmcDxe: Added MaxBlock Transfer Limit 65535 in R/W. 

Moved BlockCount calculation below BufferSize Validation checks.
First Ensure Buffersize is Not Zero and multiple of Media BlockSize.
then calculate BlockCount and perform Block checks.

Corrected BlockCount calculation, as BufferSize is multiple of BlockSize,
So adding (BlockSize-1) bytes to BufferSize and
then divide by BlockSize will have no impact on BlockCount.

Reading Large Images from MMC causes errors.
As per SD Host Controller Spec version 4.20,
Restriction of 16-bit Block Count transfer is 65535.
Max block transfer limit in single cmd is 65535 blocks.
Added Max Block check that can be processed is 0xFFFF.
then Update BlockCount on the basis of MaxBlock.

Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
Reviewed-by: "Loh, Tien Hock" <tien.hock.loh@intel.com>
This commit is contained in:
Gaurav Jain 2020-04-03 14:54:07 +05:30 committed by mergify[bot]
parent a4cfb842fc
commit 567bc4b4ae
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
View File

@ -242,6 +242,8 @@ MmcIoBlocks (
UINTN BytesRemainingToBeTransfered;
UINTN BlockCount;
UINTN ConsumeSize;
UINT32 MaxBlock;
UINTN RemainingBlock;
BlockCount = 1;
MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS (This);
@ -262,8 +264,18 @@ MmcIoBlocks (
return EFI_NO_MEDIA;
}
// Reading 0 Byte is valid
if (BufferSize == 0) {
return EFI_SUCCESS;
}
// The buffer size must be an exact multiple of the block size
if ((BufferSize % This->Media->BlockSize) != 0) {
return EFI_BAD_BUFFER_SIZE;
}
if (MMC_HOST_HAS_ISMULTIBLOCK(MmcHost) && MmcHost->IsMultiBlock(MmcHost)) {
BlockCount = (BufferSize + This->Media->BlockSize - 1) / This->Media->BlockSize;
BlockCount = BufferSize / This->Media->BlockSize;
}
// All blocks must be within the device
@ -275,24 +287,23 @@ MmcIoBlocks (
return EFI_WRITE_PROTECTED;
}
// Reading 0 Byte is valid
if (BufferSize == 0) {
return EFI_SUCCESS;
}
// The buffer size must be an exact multiple of the block size
if ((BufferSize % This->Media->BlockSize) != 0) {
return EFI_BAD_BUFFER_SIZE;
}
// Check the alignment
if ((This->Media->IoAlign > 2) && (((UINTN)Buffer & (This->Media->IoAlign - 1)) != 0)) {
return EFI_INVALID_PARAMETER;
}
// Max block number in single cmd is 65535 blocks.
MaxBlock = 0xFFFF;
RemainingBlock = BlockCount;
BytesRemainingToBeTransfered = BufferSize;
while (BytesRemainingToBeTransfered > 0) {
if (RemainingBlock <= MaxBlock) {
BlockCount = RemainingBlock;
} else {
BlockCount = MaxBlock;
}
// Check if the Card is in Ready status
CmdArg = MmcHostInstance->CardInfo.RCA << 16;
Response[0] = 0;
@ -338,6 +349,7 @@ MmcIoBlocks (
DEBUG ((EFI_D_ERROR, "%a(): Failed to transfer block and Status:%r\n", __func__, Status));
}
RemainingBlock -= BlockCount;
BytesRemainingToBeTransfered -= ConsumeSize;
if (BytesRemainingToBeTransfered > 0) {
Lba += BlockCount;