From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.92.19.38]) by mx.groups.io with SMTP id smtpd.web12.17778.1586462790462317687 for ; Thu, 09 Apr 2020 13:06:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=lqBAmK2+; spf=pass (domain: outlook.com, ip: 40.92.19.38, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RnVUZRJHlM134IpFNwbfktnloKH2rXyEPcSNHQU8dLXITii3adQFPQxBggyu+VVPXAodfS5NM6bOvRhnoT3+AfqzXlcMrL6FnIB6vay8AfqEYCcJe4ietOefKnDy72W3A9DuE0G5PMOy3QuR5fUyxk2LU0/0XtcdOwJMe0WlPRQjhsbIxu6hANz4k+Bf1K3ZtvZqQ7aTXKaHaGlkia4R5OOMwLGRqDjqHPrr662NO7X6DiT54T2TiwUKdP4VXboMlKtTEdSZ9IZ3JgxY2OquZWBUYLY5NOGCB5bf825P8oSKyqeDC8ya+dqhO7qWuFtA4vFgpDeypuTd0z1tYDArIw== 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-SenderADCheck; bh=+aYWoi6/C82emSPHEaYsyW0kBf1GWMKkdoVEPgS1mKE=; b=MFU6B0bBKOOY9RQdPYTqpCiNzdS+LqbtRuey1OuiSWHcQYjMS2Iuokt5DB8DN0i15dDrXNjnzlY+eCVZixAr93M4KBBD4+z/8so9RPVbEZOWd2UYDH2skWz1KLBRJOZacmCDcm/BU23xPJn8zBC693Uu2sT2TSrl5CM4cb6nECpoVnuw3TktV/Uw6pYZ/eeenOMdQk6484vYs4qdvt6Qc7h33Bp2P8WS7qsN2YjyP8R46HkTsgkvHACvIdFD45p2Lw6eZfvF/9zJQ9JpSqHN5LAB0CC+sjFZUcw7wFnS8I4L16FfR2kVdnHhHOGV9JwYKMQeWFzRI+aY0kS91u2tXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=outlook.com; dmarc=pass action=none header.from=outlook.com; dkim=pass header.d=outlook.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+aYWoi6/C82emSPHEaYsyW0kBf1GWMKkdoVEPgS1mKE=; b=lqBAmK2+jKGo3T9qOiM89NY1kwL4S7Yiq6Iwvs9g9/jusaP6BR410wLyeOqlb/y7Y8wvKuPcLZEEwITk2JBFY7q7mD4/gnDMFDaLmPf1duCNZFoPXMPghqisNybABgpF9gfy2BMYluviXZs3UU3kq6WuI9RdnGzZAWbXI/4JGw+X4Z2W2fPuLNMFM5zlKzisyqNHT6e8vuaMMRhzNwTx8fmPUdAGUHXtxjZvDbd8EMA82UC22gsu1P1x+OZdXP4L9CIoFq+qJvgOvGTRwyCgOFo/loxBuhCQpJWDvRWksscJWkNhRiSGr6iKQ/bHT4iBsxa32Q5p5blULmgFZFcrmA== Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::4d) by BN8NAM11HT104.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::287) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.18; Thu, 9 Apr 2020 20:06:29 +0000 Received: from DM5PR07MB3435.namprd07.prod.outlook.com (2a01:111:e400:fc4b::44) by BN8NAM11FT019.mail.protection.outlook.com (2a01:111:e400:fc4b::158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.18 via Frontend Transport; Thu, 9 Apr 2020 20:06:29 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:E9C83DE0B6E066E00215F40993E5F998B7BCA4133BF1F75803A16717BB39CD70;UpperCasedChecksum:68175ABE5D7081FF9EFF7A4417B2FC19D18878B286312AFC14AA0C157E917CEF;SizeAsReceived:7884;Count:49 Received: from DM5PR07MB3435.namprd07.prod.outlook.com ([fe80::801e:fde0:da7d:191f]) by DM5PR07MB3435.namprd07.prod.outlook.com ([fe80::801e:fde0:da7d:191f%6]) with mapi id 15.20.2900.015; Thu, 9 Apr 2020 20:06:29 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Dandan Bi , Hao A Wu , Jian J Wang , Liming Gao , Ray Ni , Sean Brogan Subject: [PATCH v1 4/7] MdeModulePkg/XhciDxe: Use BaseLib linked list iteration macros Date: Thu, 9 Apr 2020 13:05:11 -0700 Message-ID: X-Mailer: git-send-email 2.16.3.windows.1 In-Reply-To: <20200409200514.32796-1-michael.kubacki@outlook.com> References: <20200409200514.32796-1-michael.kubacki@outlook.com> X-ClientProxiedBy: MWHPR10CA0062.namprd10.prod.outlook.com (2603:10b6:300:2c::24) To DM5PR07MB3435.namprd07.prod.outlook.com (2603:10b6:4:67::14) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200409200514.32796-5-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:7:9d66:7f00:4b99:db3e) by MWHPR10CA0062.namprd10.prod.outlook.com (2603:10b6:300:2c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Thu, 9 Apr 2020 20:06:28 +0000 X-Mailer: git-send-email 2.16.3.windows.1 X-Microsoft-Original-Message-ID: <20200409200514.32796-5-michael.kubacki@outlook.com> X-TMN: [mJPjG6CZtJub6Sq1oNrSoh/akjSZSeNaJL/YxQNeaYyhOwqPqfhl5fRVWo6IuIZq] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: fca63dd8-71a2-4991-9152-08d7dcc17d73 X-MS-TrafficTypeDiagnostic: BN8NAM11HT104: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vnTLxjTGTAU1Wl/yTgJfFDCFz4XWBvJ+Y33cIBqs8BCI+P5T1S8lentLAuAU1+7456SIq1Zb1dLP/Zc74P7oQdGP4L2zv+DdR6FAkqqsZiYMfWjnUwL0Cf6dREUf+Mrf82gWexIN8NG9yMK+so0bWTK+ye/lUE/JhLlFRlniPAlRERNZgLl53eXmlKzLbuYjDo5KGWuJwKhozOgVN37+eLXfAGvAMjxiptttVNHq7UM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR07MB3435.namprd07.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: DRMwJmEVVjvdW0sp2ZPnHyJn8vlu3jVmfapW48H0gGVI06EcaY+KXpgGibqHbvUCGwiFvXinnU6K1TOZV5bjENmavFn//3P/wbMZE0IaSUFPuR2WJorcMs3w971GzGXKhpMs0c3UnIFIuDB2QR7rNad4tPofkU76e33490oHQC2CGsHJy6Jk2AYKPqWPLHxuZhnlHsTM8f8d/Ns11lVzzA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fca63dd8-71a2-4991-9152-08d7dcc17d73 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2020 20:06:28.9967 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8NAM11HT104 Content-Type: text/plain From: Michael Kubacki REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1959 Replaces usage of the linked list iteration macros defined in Xhci.h with the common definition in BaseLib.h. Cc: Dandan Bi Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Cc: Sean Brogan Signed-off-by: Michael Kubacki --- MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 9 +++++---- MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h | 9 +-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c index c0c374fc4758..ab8957c546ee 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c @@ -3,6 +3,7 @@ XHCI transfer scheduling routines. Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -1051,7 +1052,7 @@ IsAsyncIntTrb ( LIST_ENTRY *Next; URB *CheckedUrb; - EFI_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { + BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { CheckedUrb = EFI_LIST_CONTAINER (Entry, URB, UrbList); if (IsTransferRingTrb (Xhc, Trb, CheckedUrb)) { *Urb = CheckedUrb; @@ -1346,7 +1347,7 @@ XhciDelAsyncIntTransfer ( Urb = NULL; - EFI_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { + BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { Urb = EFI_LIST_CONTAINER (Entry, URB, UrbList); if ((Urb->Ep.BusAddr == BusAddr) && (Urb->Ep.EpAddr == EpNum) && @@ -1386,7 +1387,7 @@ XhciDelAllAsyncIntTransfers ( URB *Urb; EFI_STATUS Status; - EFI_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { + BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { Urb = EFI_LIST_CONTAINER (Entry, URB, UrbList); // @@ -1578,7 +1579,7 @@ XhcMonitorAsyncRequests ( Xhc = (USB_XHCI_INSTANCE*) Context; - EFI_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { + BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) { Urb = EFI_LIST_CONTAINER (Entry, URB, UrbList); // diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h index 72b4e084f14d..3285eb8798c0 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h @@ -3,6 +3,7 @@ Provides some data structure definitions used by the XHCI host controller driver. Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -82,14 +83,6 @@ typedef struct _USB_DEV_CONTEXT USB_DEV_CONTEXT; #define INT_INTER 3 #define INT_INTER_ASYNC 4 -// -// Iterate through the double linked list. This is delete-safe. -// Don't touch NextEntry -// -#define EFI_LIST_FOR_EACH_SAFE(Entry, NextEntry, ListHead) \ - for (Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\ - Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink) - #define EFI_LIST_CONTAINER(Entry, Type, Field) BASE_CR(Entry, Type, Field) #define XHC_LOW_32BIT(Addr64) ((UINT32)(((UINTN)(Addr64)) & 0xFFFFFFFF)) -- 2.16.3.windows.1