From nobody Mon May 6 02:13:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97222+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1670676789102671.5029271855713; Sat, 10 Dec 2022 04:53:09 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id BZ4jYY1788612x7T5G0dV0Pv; Sat, 10 Dec 2022 04:53:08 -0800 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.75]) by mx.groups.io with SMTP id smtpd.web11.14231.1670676788105612850 for ; Sat, 10 Dec 2022 04:53:08 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DIHz5w2pHNurE3pw4acVIElEOMggIoi0DGowMpVFtuuAAA4hCG23BrABd3Lxn27LJ9ZevWbczwfKcPWnVVncz2f+0tUxZDXiYvqo7fc6NW85I7HS3mXFKDzudCnwxEAHuMZMPCSTrwvZmrnwOdKRsKTz0900iT3U6I+qinhOrgayW4xdvVHNnsRDxMw5grnAqipPoOt8K58gRNC6+FnBHcV4d/ddJAaRgv2ONMi8ce7rfzJo2NYLCM+0T+BlfvdiJKIj5+C94VM5u3/sLWd7pkqy/1clGhaGPTnvWbb/7YSsCwXeVsW+pXwzWWz0dwvb0YPwWf68622s3k21HmZmfg== 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=KKcHWGU8hxme5uBZIiyzKCuk/67kR+hz4xt5Xk9kbYw=; b=FaAnBN3xYE688XsN2XUPNIZbslDPXJchidMvVF0xmCLFhi1JluDYKh3ECaWqorF5g5nDzSOWit3mwvHX0MDW7Lqx2QeJTk2bv7savab+cdMYyFx5LzTRGPeINmapaK3qCYztvXC1ZlJ1OrZm3wBZJdvRfESbCbHoHMXsvvaxJX663gN0/ptKZLiN3JFbMzFnO/InT0LAGkg44bumvsD1wHy3tyw/wK0QzOHO4MzxMidQdbD3fZgBejmPVC6aSs9RgjxbMSiylfWONSrQR3X67FiqttQ9ucddZMuytJaCgDgGIIvySw554aDBTRSTlLwuclHbnw6Q/OYCMkhHDMVo6w== 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 X-Received: from DM6PR02CA0052.namprd02.prod.outlook.com (2603:10b6:5:177::29) by IA1PR12MB6018.namprd12.prod.outlook.com (2603:10b6:208:3d6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Sat, 10 Dec 2022 12:53:05 +0000 X-Received: from DM6NAM11FT109.eop-nam11.prod.protection.outlook.com (2603:10b6:5:177:cafe::e7) by DM6PR02CA0052.outlook.office365.com (2603:10b6:5:177::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19 via Frontend Transport; Sat, 10 Dec 2022 12:53:05 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97222+1787277+3901457@groups.io; helo=mail02.groups.io; 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 X-Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT109.mail.protection.outlook.com (10.13.173.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5901.17 via Frontend Transport; Sat, 10 Dec 2022 12:53:05 +0000 X-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; Sat, 10 Dec 2022 06:53:02 -0600 From: "Chang, Abner via groups.io" To: CC: , Hao A Wu , Ray Ni , Garrett Kirkendall , "Abner Chang" Subject: [edk2-devel] [PATCH] MdeModulePkg/Usb: Read a large number of blocks Date: Sat, 10 Dec 2022 20:52:40 +0800 Message-ID: <20221210125240.1270-1-abner.chang@amd.com> MIME-Version: 1.0 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: DM6NAM11FT109:EE_|IA1PR12MB6018:EE_ X-MS-Office365-Filtering-Correlation-Id: f6f63666-0623-4cc7-d494-08dadaad7ad4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: tkKgILtEYHl0QPah3oAjqCLtTd9PAPZrP2Cepu0Jmz6DgI3Yeg29C2F/BSGBs7Y/GPbzfaSk9Q8WNwoj4Fm3/aJ762tyA6V1uMV8iyQmQN74hX65PmDqO2Oo+eJgPF7efY33v/3nUWaeayu4ewvFZhYtpTZs8XKNXiAqZb+S2vOYvRdFlJWGhShWp5c5WLk5x/y80hMBgq/9HSe0hoAAlz4XiaTKCVSEQKPCYVB/0UHM4Xgj0straeWaj/lSG2aK9fowHwer/uBt6M9vFsINaHPfKIj6eIess55Ek0CvhNsYXsMD5+5cg2WzdLK91Zvdlwj73bQoI9zs5JFrgblnX+1c+oomcWwuL/qkTBwxXoJAkTgjvwC8FbMfsIAL8QeZh5rFEpDho1aeY5AfayvjRDTpcYewWR+eSqG2J9l613/wEgHbaABc2MZRaJmI6HGXre3RIp9inS9PlSCDs4r3kRh1jzbrUYP+SyygJNeMtET0zTd4eDwUTYFOluFxUUJoEkk31Xun2QALg4EXTA71v7Z+GJ/NG2gTQ+1TVH7ZHWF0bHqy2x1FpPS0ZXWf7b0CqUWIYFGsaOJY6soIJdS0AUv/ODc69ezcIP60QcH+YFNmI5hmmv/cxm3au1i71HgpKCPMngHoifV6DZNH5wg4MSoecJfv+qccU5bjUzgEA6vQWcG8tIqz7DaP4OOJRvT1NQV1vc7sPSUy0P4D7eldrXp+e95zj++N+ggmS/3EYFg= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2022 12:53:05.0531 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6f63666-0623-4cc7-d494-08dadaad7ad4 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: DM6NAM11FT109.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6018 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@amd.com X-Gm-Message-State: Oq6Tx1KedVqT7ulfgks9Hdmgx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670676788; bh=L+gqkFCDp/Jpcs7tBSReSqu4wyeCKkmxwyLFVl9ZAEo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=voeppDkMcz02f/tNZX12u3bNXvL6YIcya3Oj9A+TtgJOWzFDjvPbzLSqi4QonULUch4 SXyEWJ6AMzXCzlEdbh6ZLOQ/r6d1CZZJjNviKFWYeSjzvczKgmOwNYUk5WhE20MyUhZWv uctwzTetGJPUVEExIG94ey6XPLjCczGaAdM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670676790549100001 Content-Type: text/plain; charset="utf-8" From: Abner Chang 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 --- MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c b/MdeModulePkg/Bus/U= sb/UsbBotPei/PeiAtapi.c index 422ac5fec99..35b79804879 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c @@ -382,14 +382,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 +401,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 +432,7 @@ PeiUsbRead10 ( =20 ByteCount =3D SectorCount * BlockSize; =20 - TimeOut =3D (UINT16)(SectorCount * 2000); + TimeOut =3D SectorCount * 2000; =20 // // send command packet @@ -448,16 +445,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 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97222): https://edk2.groups.io/g/devel/message/97222 Mute This Topic: https://groups.io/mt/95580608/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-