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

MdeModulePkg/Usb: Read a large number of blocks 

Changes to allow reading blocks that greater than 65535 sectors.

Signed-off-by: Jiangang He <jiangang.he@amd.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Garrett Kirkendall <garrett.kirkendall@amd.com>
Cc: Abner Chang <abner.chang@amd.com>
Cc: Kuei-Hung Lin <Kuei-Hung.Lin@amd.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Abner Chang 2023-01-11 11:10:07 +08:00 committed by mergify[bot]
parent 8147fe090f
commit be8d6ef385
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c
View File

@ -2,6 +2,7 @@
Pei USB ATAPI command implementations. Pei USB ATAPI command implementations.
Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -382,14 +383,14 @@ PeiUsbRead10 (
ATAPI_PACKET_COMMAND Packet; ATAPI_PACKET_COMMAND Packet;
ATAPI_READ10_CMD *Read10Packet; ATAPI_READ10_CMD *Read10Packet;
UINT16 MaxBlock; UINT16 MaxBlock;
UINT16 BlocksRemaining; UINT32 BlocksRemaining;
UINT16 SectorCount; UINT32 SectorCount;
UINT32 Lba32; UINT32 Lba32;
UINT32 BlockSize; UINT32 BlockSize;
UINT32 ByteCount; UINT32 ByteCount;
VOID *PtrBuffer; VOID *PtrBuffer;
EFI_STATUS Status; EFI_STATUS Status;
UINT16 TimeOut; UINT32 TimeOut;
// //
// prepare command packet for the Inquiry Packet Command. // prepare command packet for the Inquiry Packet Command.
@ -401,16 +402,13 @@ PeiUsbRead10 (
BlockSize = (UINT32)PeiBotDevice->Media.BlockSize; BlockSize = (UINT32)PeiBotDevice->Media.BlockSize;
MaxBlock = (UINT16)(65535 / BlockSize); MaxBlock = (UINT16)(MAX_UINT16 / BlockSize);
BlocksRemaining = (UINT16)NumberOfBlocks; ASSERT (NumberOfBlocks < MAX_UINT32);
BlocksRemaining = (UINT32)NumberOfBlocks;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
while (BlocksRemaining > 0) { while (BlocksRemaining > 0) {
if (BlocksRemaining <= MaxBlock) { SectorCount = MIN (BlocksRemaining, MaxBlock);
SectorCount = BlocksRemaining;
} else {
SectorCount = MaxBlock;
}
// //
// fill the Packet data structure // fill the Packet data structure
@ -435,7 +433,7 @@ PeiUsbRead10 (
ByteCount = SectorCount * BlockSize; ByteCount = SectorCount * BlockSize;
TimeOut = (UINT16)(SectorCount * 2000); TimeOut = SectorCount * 2000;
// //
// send command packet // send command packet
@ -448,16 +446,17 @@ PeiUsbRead10 (
(VOID *)PtrBuffer, (VOID *)PtrBuffer,
ByteCount, ByteCount,
EfiUsbDataIn, EfiUsbDataIn,
TimeOut (UINT16)MIN (TimeOut, MAX_UINT16)
); );
if (Status != EFI_SUCCESS) { if (Status != EFI_SUCCESS) {
return Status; return Status;
} }
ASSERT (Lba32 <= (MAX_UINT32-SectorCount));
Lba32 += SectorCount; Lba32 += SectorCount;
PtrBuffer = (UINT8 *)PtrBuffer + SectorCount * BlockSize; PtrBuffer = (UINT8 *)PtrBuffer + SectorCount * BlockSize;
BlocksRemaining = (UINT16)(BlocksRemaining - SectorCount); BlocksRemaining = BlocksRemaining - SectorCount;
} }
return Status; return Status;