From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.84]) by mx.groups.io with SMTP id smtpd.web11.41440.1671504223718528619 for ; Mon, 19 Dec 2022 18:43:44 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=Z8m060V6; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.94.84, mailfrom: abner.chang@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b7etVNMas1hol4pCVtYRX++nvOhbYSBGIPPRdvVebzHEybHaGbyezwDXO+hygqJwg7OdtEFMdvq1jwlN6e45VA0IOyBHVm8Bwe21t2D58bO/x+FC9TqvTSoiuwCAWcJsHKUQknM+Zndduuu4NYiLUu6swBwHWiAjfMYbL14MkoceM8znIWLDtVFXue5tFAb8dwsN1Br714nTzbEFvYFRNwOYO6aC6OMiP5b76XjO3dP6UnHCE2kNXaPTZBcki8rtPEZBcZ3/X8e8n2Q62AwDl935R1Cojjob9cAjHlS26Swrd3lgS+4fw17+Fz33V2dKgyxdevj9lysBHNOUcqOAKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3kBN1Qy69oU2D/9FrAj5f+nKT3Ob5ISs0n2P7hcGf4M=; b=RBsANWk7kmQ+QeiSRNN/vOLiKOiOVR0qbm69Z6TL0s1WP4sTWrBzm0kYFbE+UNU2No60YOKm3vePV/8h0HlzFNoSUH4XP4Fg6idLTpW9LvUO19pp0TXqJ7MA8uwqRrx3z9MOl5MTcAq8QFgFNpLdzpnGuO3P3StjO+sjPos3aAv45Z4VvU9jyH0KcmAUwa93JlNiKK9gtktc5NYLvI58590oVVAnHHzjxGxbZyRd4To9M6ACoxD8+gapdIGwkdIFXDBgub7lZKjg5Fupcov2O/IDETsZCI+SkcRXtobJC8AUEJC9+bb8froFfqx+sfWKCGk706DSlbRQ+KepfMcWxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3kBN1Qy69oU2D/9FrAj5f+nKT3Ob5ISs0n2P7hcGf4M=; b=Z8m060V6x49No8hHq+0DNg2fDrZIqBIlUFF5sVoPJtSM3YxSflBHemFDhDIBpjwCskJD8m4IazWBiMnCxZLv1vyyL7HaX5aF3J4ai4OYv7YI02W0rfNoMx2vpkwceY01DL5Ezh6J0D4iA7k3tnDwF8xFNfQ6dSBkvX6CTuXrPuU= Received: from MW2PR16CA0030.namprd16.prod.outlook.com (2603:10b6:907::43) by MW3PR12MB4346.namprd12.prod.outlook.com (2603:10b6:303:58::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 02:43:40 +0000 Received: from CO1NAM11FT106.eop-nam11.prod.protection.outlook.com (2603:10b6:907:0:cafe::40) by MW2PR16CA0030.outlook.office365.com (2603:10b6:907::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 02:43:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT106.mail.protection.outlook.com (10.13.175.44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5924.16 via Frontend Transport; Tue, 20 Dec 2022 02:43:40 +0000 Received: from TPE-L1-ABNCHANG.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 19 Dec 2022 20:43:36 -0600 From: "Chang, Abner" To: CC: Hao A Wu , Ray Ni , "Garrett Kirkendall" , Abner Chang , Jiangang He Subject: [PATCH V3] MdeModulePkg/Usb: Read a large number of blocks Date: Tue, 20 Dec 2022 10:42:34 +0800 Message-ID: <20221220024234.1623-1-abner.chang@amd.com> X-Mailer: git-send-email 2.37.1.windows.1 MIME-Version: 1.0 Return-Path: Abner.Chang@amd.com X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT106:EE_|MW3PR12MB4346:EE_ X-MS-Office365-Filtering-Correlation-Id: 80c243b5-2b90-44ae-7789-08dae2340091 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NRPmQpCI3loHpeLS+jCr7mfMtI8s2d//LMtgbDzBBRFTL+Dq2HHHqA9Mwu/8PgviePcIteQh0l0FoH+Wbk5aLmKaVeOnNAmVir0QzQwncM5U9GfwAmmrfEo60oqfeFYKGBxhs9bF+DKgbIQDvGw8VN3Eo1UQdz45fIfCJZ5DXxhq+jdut9yre97iN6GMkc7d/tHeHRSP9bQFQBJcYCykW8itTm2c6zBUmFdZpR+KaWAkx0r82BxWJix2bm/JetyigczT8DsNCw8/kbJOVii33RdVtG1fdNNyw4KGr7oeneJTvHrGWtePBp79qcu3GP7GZaOsG0horz+kaFrek9Owc/QtTmAlVQe/5424xoiZOF0YjP51wwTSNgchvB1Jqztr30Re0bjOv5mjYvm48I3vdGfURd+X9x+A0Y92NdqQXS2NqhGMYrKjnLNGRES6EezYeCDKGqj5x053BmeM5Jr3TM2s5uLQnEOF7TkCPuSTw/5L2ZMIT1NmLWWhQmq3dt8PnTGIHFBzlJcbwABQYI7xRnNlbMsp1l3uhbmU/Z3rhydq7zHuirHAQNUIwHygnhXbumk1mCW9Let4MDEBuMAqWIckgYfdvWgXdXNJ5D7C+VuGnAMMGVZCL+6rjP+VdzSjzOOMCT3wOKIaPrcTO1L4Qx2BITUDPXl9YcGC9qVbjLfMwVwnEBiYTNAfJvK6+NkoxZpvvxXSPffvP9WnJNQ96ufw/MpRWNaECEJmbr9GiJc= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(396003)(376002)(346002)(451199015)(36840700001)(46966006)(40470700004)(7696005)(54906003)(6916009)(316002)(36860700001)(82310400005)(82740400003)(478600001)(40460700003)(81166007)(4326008)(8676002)(1076003)(70206006)(36756003)(356005)(86362001)(70586007)(2616005)(40480700001)(83380400001)(426003)(47076005)(8936002)(2876002)(336012)(2906002)(5660300002)(186003)(16526019)(26005)(41300700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 02:43:40.0337 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80c243b5-2b90-44ae-7789-08dae2340091 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT106.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4346 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Abner Chang In V3: Address Uncrustify check errors. In V2: Add AMD copyright. Changes to allow reading blocks that greater than 65535 sectors. Signed-off-by: Kuei-Hung Lin Cc: Hao A Wu Cc: Ray Ni Cc: Garrett Kirkendall Cc: Abner Chang Cc: Jiangang He --- MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c | 25 +++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c b/MdeModulePkg/Bus/U= sb/UsbBotPei/PeiAtapi.c index 422ac5fec99..5111e4579e2 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c @@ -2,6 +2,7 @@ Pei USB ATAPI command implementations. =20 Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.
+Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -382,14 +383,14 @@ PeiUsbRead10 ( ATAPI_PACKET_COMMAND Packet; ATAPI_READ10_CMD *Read10Packet; UINT16 MaxBlock; - UINT16 BlocksRemaining; - UINT16 SectorCount; + UINT32 BlocksRemaining; + UINT32 SectorCount; UINT32 Lba32; UINT32 BlockSize; UINT32 ByteCount; VOID *PtrBuffer; EFI_STATUS Status; - UINT16 TimeOut; + UINT32 TimeOut; =20 // // prepare command packet for the Inquiry Packet Command. @@ -401,16 +402,13 @@ PeiUsbRead10 ( =20 BlockSize =3D (UINT32)PeiBotDevice->Media.BlockSize; =20 - MaxBlock =3D (UINT16)(65535 / BlockSize); - BlocksRemaining =3D (UINT16)NumberOfBlocks; + MaxBlock =3D (UINT16)(MAX_UINT16 / BlockSize); + ASSERT (NumberOfBlocks < MAX_UINT32); + BlocksRemaining =3D (UINT32)NumberOfBlocks; =20 Status =3D EFI_SUCCESS; while (BlocksRemaining > 0) { - if (BlocksRemaining <=3D MaxBlock) { - SectorCount =3D BlocksRemaining; - } else { - SectorCount =3D MaxBlock; - } + SectorCount =3D MIN (BlocksRemaining, MaxBlock); =20 // // fill the Packet data structure @@ -435,7 +433,7 @@ PeiUsbRead10 ( =20 ByteCount =3D SectorCount * BlockSize; =20 - TimeOut =3D (UINT16)(SectorCount * 2000); + TimeOut =3D SectorCount * 2000; =20 // // send command packet @@ -448,16 +446,17 @@ PeiUsbRead10 ( (VOID *)PtrBuffer, ByteCount, EfiUsbDataIn, - TimeOut + (UINT16)MIN (TimeOut, MAX_UINT16) ); =20 if (Status !=3D EFI_SUCCESS) { return Status; } =20 + ASSERT (Lba32 <=3D (MAX_UINT32-SectorCount)); Lba32 +=3D SectorCount; PtrBuffer =3D (UINT8 *)PtrBuffer + SectorCount * BlockSize; - BlocksRemaining =3D (UINT16)(BlocksRemaining - SectorCount); + BlocksRemaining =3D BlocksRemaining - SectorCount; } =20 return Status; --=20 2.37.1.windows.1