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.53]) by mx.groups.io with SMTP id smtpd.web10.21872.1671637366204975410 for ; Wed, 21 Dec 2022 07:42:46 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=3uPf16v+; 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.53, mailfrom: abner.chang@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hM/7/1Vb5WDep4hAhsJuLngEn9nUcQYfMXitOlx+LM5kKxQ8JpIq7pNui6Jgqg0uZZV+8N5LXi/Nzs4Qf3+MjmN0OvVLxHa8EQ/Jj1M0orZzMYzKCEEfim7fjdUJ0xxceB+Ro9atqZc6Mnhg8IbTihcTW/1YpUKLjDSe1pn8xy1yhptlb0YinwZ9HG72q2vBTs4y2f2rpd/n6itxzbcfEG0JkwACTgDo8vsX529AAUPP2l5lHLrWgcmtRL6LapjzHvhEjbERX3VPVCXIjTMr4yPXLUr5vS6kjYAdLVWYAlXyr+vvZjvWX/pCN9jIFJYfsOXXjauln4Jj0eBgB3FFVA== 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=TxS3SVMCdwR0tKO5INXrjseBFPdb46K10J2vdmsIRXY=; b=MPYMKOPLRnhBjs+J0ETtPg35KpRCKFnOAan+oqiV+L87fI5X1cTt5llsNCBdl2/J3g1L4Cs9pSvff1zpbjWEiWspgpkTfFxX4i8M1GApLAqj4i1McaMQb1wVqlZGDbwf0sUTxhGgLcxkP4QB3IKqp1yLm1LEC6SEiB9N88vQV40yc8lnNP+bdDzUue9gKth2NOKrlcTftnCo8l0famap+47pPX15ghOWrgDVcNO/hEA5SH4XT4Q+1Ph2fETjMwX3yJydDDaWid/Z0cCakRbx1S+MO0LqehctJ29WtaxoP/+lg0E+43qC6ilUOdZQ5MhQej7dg2WQUO6VD19OCROWsg== 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=TxS3SVMCdwR0tKO5INXrjseBFPdb46K10J2vdmsIRXY=; b=3uPf16v+MoLodzfcFMHXsTlTJhn4G6vryzZLwLSXrnsK8zvpYSSDWmSFyKyFEP0e9f357OKZXkNxu7HtvfYq5GeiUTQScfxqvOu91nBb+MISobohDH9l3VoMG86QV+xw6fybkIhlgQKNSmRkPs5o56pBXSqBqIaA9MVU90roKAo= Received: from DM6PR11CA0003.namprd11.prod.outlook.com (2603:10b6:5:190::16) by DM6PR12MB4403.namprd12.prod.outlook.com (2603:10b6:5:2ab::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Wed, 21 Dec 2022 15:42:44 +0000 Received: from DS1PEPF0000E630.namprd02.prod.outlook.com (2603:10b6:5:190:cafe::e) by DM6PR11CA0003.outlook.office365.com (2603:10b6:5:190::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Wed, 21 Dec 2022 15:42:44 +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 DS1PEPF0000E630.mail.protection.outlook.com (10.167.17.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5944.8 via Frontend Transport; Wed, 21 Dec 2022 15:42:44 +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; Wed, 21 Dec 2022 09:42:41 -0600 From: "Chang, Abner" To: CC: Hao A Wu , Ray Ni , "Garrett Kirkendall" , Abner Chang , Kuei-Hung Lin Subject: [PATCH 3/3] MdeModulePkg/XhciPei: Unlinked XhciPei memory block Date: Wed, 21 Dec 2022 23:42:17 +0800 Message-ID: <20221221154218.1624-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: DS1PEPF0000E630:EE_|DM6PR12MB4403:EE_ X-MS-Office365-Filtering-Correlation-Id: 13ac8105-ca6e-421e-a7a0-08dae36a00c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ol9pAHpKBCPohfZDzPDkDlQ+SueIf0wNtO2cVT6XwcZg0ypXWqkKFcDr1WU3ytgFqdh7fSEgmRi6BwfCaYx21aMDiV5QkXpCsMhySYO2cztCWVXP4HesomhtWkggwxJNJFrY668hkGUNy2AjFAFBnH4b1HjwX87oXVeJJgD7SGy9pSRJGJUdUOgNtQs5PSsvr0SEPoIP8d22l6kRcOtzYhw8PwKPd61NtS+PcX085s0CIV5QfCs9dTvR+nk2StPMmIH4Nqsb+QLn97cXnwJKnGJL91g44KFgvDS6Piv86U1lQLqwZ8QXyMqD9aaqljRm09jKSv2pg3MDKxrXs2jH9urP9s44uXks0dm3xKI9NFIw28OYm/Gpgs1AfQROSQa60bHZfPMyltUMgzpT2IdklZSe3MRILsqfSE/BlUWOEX9tp1JEsCqIT+/1o+1fUj6M+uObMvtVBCoXq68tsXt1xMrHtaOm3HtMTX8Kq3sIHDwsYXZvKXq0zn/muOuf+Z/d6mysuyL07d7Nyp3Cq9Kl0XdzYJAwUXHu4Pyv8t5hFEqw0WKSfAM8Fj5j/tTv2IxtG+fbQjDd1UQRSGQNBpGvRrCr82tdSPyHoo5t2wJYp2yVBerHTFJ6bJXCkdCst7vSNQ9K5TGLYmq60f9ZD/rtnk24Q+sk6T/nIT+f/WsNEQMa+xiN+mlLJn13shkobAxcIzDj495Qki3UYYxw5FZ3zOlANxmMYKGrcM6s3s9/UEU= 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)(376002)(136003)(346002)(39860400002)(396003)(451199015)(46966006)(40470700004)(36840700001)(47076005)(83380400001)(8936002)(82740400003)(7696005)(36756003)(82310400005)(2876002)(40480700001)(336012)(81166007)(19627235002)(41300700001)(478600001)(356005)(54906003)(2906002)(426003)(70586007)(186003)(40460700003)(8676002)(6666004)(16526019)(26005)(5660300002)(6916009)(36860700001)(316002)(4326008)(70206006)(1076003)(2616005)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2022 15:42:44.4360 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13ac8105-ca6e-421e-a7a0-08dae36a00c2 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: DS1PEPF0000E630.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4403 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Abner Chang Unlink the XhciPei memory block when it has been freed. Signed-off-by: Jiangang He Cc: Hao A Wu Cc: Ray Ni Cc: Garrett Kirkendall Cc: Abner Chang Cc: Kuei-Hung Lin --- MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c | 29 ++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c b/MdeModulePkg/Bus/Pci= /XhciPei/UsbHcMem.c index c64b38fcfc8..7dc014e465d 100644 --- a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c +++ b/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c @@ -3,6 +3,7 @@ PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPei= UsbControllerPpiGuid which is used to enable recovery function from USB Drivers. =20 Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -365,6 +366,32 @@ UsbHcInitMemPool ( return Pool; } =20 +/** + Unlink the memory block from the pool's list. + + @param Head The block list head of the memory's pool. + @param BlockToUnlink The memory block to unlink. + +**/ +VOID +UsbHcUnlinkMemBlock ( + IN USBHC_MEM_BLOCK *Head, + IN USBHC_MEM_BLOCK *BlockToUnlink + ) +{ + USBHC_MEM_BLOCK *Block; + + ASSERT ((Head !=3D NULL) && (BlockToUnlink !=3D NULL)); + + for (Block =3D Head; Block !=3D NULL; Block =3D Block->Next) { + if (Block->Next =3D=3D BlockToUnlink) { + Block->Next =3D BlockToUnlink->Next; + BlockToUnlink->Next =3D NULL; + break; + } + } +} + /** Release the memory management pool. =20 @@ -386,7 +413,7 @@ UsbHcFreeMemPool ( // first block. // for (Block =3D Pool->Head->Next; Block !=3D NULL; Block =3D Pool->Head->= Next) { - // UsbHcUnlinkMemBlock (Pool->Head, Block); + UsbHcUnlinkMemBlock (Pool->Head, Block); UsbHcFreeMemBlock (Pool, Block); } =20 --=20 2.37.1.windows.1