From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 86630941DEC for ; Thu, 18 Jul 2024 22:35:29 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=FO08ebMVLbD67P5qBxeK/HWVPCMAml+EvIQXjg307oU=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1721342129; v=1; b=tkf8z9ep95GUylL+QaLUU5sAzvFZDOOB0HIcNkrZ2ga70muDtATtSIIa2MlF24R79HcziMMs lNz1D1h3u5DDmYWR+EaISsDzqHc7muIHqWgqy5yFeLKPeLPq/blcd2w9XQSiGzD6UPbCmxaxe/v 032dgLBLRfirJF1L+sHHZjBKgoacYkCPGIPQlWLuV10Tav1sEvMqlyt8gSJ+LKsw58xot9H5YA0 JK/bth7dYNqzsdJS7zeG/cHAPTwQWcoyZP3NnoDz2FWEGb1BjkziAFfK6uLjPiiybkWPDkENoIj VtjCzAHdjavov6McG4FZcbTmBupSfaIjZJ+LPBdg9sZuQ== X-Received: by 127.0.0.2 with SMTP id EFosYY7687511xCUFjaEyc7o; Thu, 18 Jul 2024 15:35:27 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web11.6462.1721342122022520512 for ; Thu, 18 Jul 2024 15:35:22 -0700 X-CSE-ConnectionGUID: pbtXn6+oTmOMnGN/oFm4ow== X-CSE-MsgGUID: LGASdQfLRmyjdA5CW74Abg== X-IronPort-AV: E=McAfee;i="6700,10204,11137"; a="41463986" X-IronPort-AV: E=Sophos;i="6.09,219,1716274800"; d="scan'208";a="41463986" X-Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2024 15:35:22 -0700 X-CSE-ConnectionGUID: UiwErhaKSR6SMMCXSEI2mA== X-CSE-MsgGUID: eWxnYrXARbiGBJX7mvlBMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,219,1716274800"; d="scan'208";a="88410424" X-Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orviesa001.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 18 Jul 2024 15:35:21 -0700 X-Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 18 Jul 2024 15:35:21 -0700 X-Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 18 Jul 2024 15:35:20 -0700 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Thu, 18 Jul 2024 15:35:20 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 18 Jul 2024 15:35:20 -0700 X-Received: from SJ0PR11MB4783.namprd11.prod.outlook.com (2603:10b6:a03:2af::8) by BL3PR11MB6409.namprd11.prod.outlook.com (2603:10b6:208:3b8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Thu, 18 Jul 2024 22:35:11 +0000 X-Received: from SJ0PR11MB4783.namprd11.prod.outlook.com ([fe80::5b16:5a60:2dbb:e991]) by SJ0PR11MB4783.namprd11.prod.outlook.com ([fe80::5b16:5a60:2dbb:e991%5]) with mapi id 15.20.7762.027; Thu, 18 Jul 2024 22:35:11 +0000 From: "Chaganty, Rangasai V" To: "mikuback@linux.microsoft.com" , "devel@edk2.groups.io" CC: "Ni, Ray" , "S, Ashraf Ali" , "Lautner, Kenneth" Subject: Re: [edk2-devel] [edk2-platforms][PATCH v2 1/2] IntelSiliconPkg: Compiler and linker fixes Thread-Topic: [edk2-platforms][PATCH v2 1/2] IntelSiliconPkg: Compiler and linker fixes Thread-Index: AQHa2SeOPNV5WUYF5UyGAxBs/AH24LH9Ew5w Date: Thu, 18 Jul 2024 22:35:11 +0000 Message-ID: References: <20240718153035.1051-1-mikuback@linux.microsoft.com> <20240718153035.1051-2-mikuback@linux.microsoft.com> In-Reply-To: <20240718153035.1051-2-mikuback@linux.microsoft.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SJ0PR11MB4783:EE_|BL3PR11MB6409:EE_ x-ms-office365-filtering-correlation-id: 61d16699-5a90-4bda-edee-08dca779e2d5 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: =?us-ascii?Q?ojaR4QAT7hzk2ft804e1jTDT9BIQr2tQEfDS4+7dDbE+ziC7oqxOAjK7iAfZ?= =?us-ascii?Q?mVqJZFuOlwKDJN62J11eTqVpxLvIFAyrjEoWnrAEoc56c76ood/OOQgqyRMm?= =?us-ascii?Q?Ewb5j47baS3C9gz/k9MPGXgil8nTQ1AA8UtF1L1cbFmE5yFPeFObjP4MAOFy?= =?us-ascii?Q?58J7Ylm2ERT48d3FEykjSHEueSxKEhX+Ouaqijl5eKbFHt3XKYz6fxYGmvUr?= =?us-ascii?Q?Sg63itboR+VjB/loFtcs1MyJ5Uv+p3knFEw0BTJHtXFPT1tT3lKkFrbILK20?= =?us-ascii?Q?aqNXknufdojbuB8Jvc3IcYMq3K1U041CW8Z3N1uI3faNG8NpCLsil1pTHCuc?= =?us-ascii?Q?f8EGLz+ZwaXqoY13R2KahkojR3k3deHo0lJqVbSwvXqb10KwQymU4G3XhZZX?= =?us-ascii?Q?hCNZ9FNOsHxQ4aooXClTymFJDPtAoXbvnEB2nHsFBaVuGNdXJw3FhoWvMNSl?= =?us-ascii?Q?4koTWQBWVWzquInm1LHGYvadRVEdDiijUS6c09HUBCHpbGTscuQ9Z/oD/n6h?= =?us-ascii?Q?3RnTFwEvebiCu1C16fazi8ceKqfUXXpYvf/L78IhRZ2ceLqlKMXgs141Ifig?= =?us-ascii?Q?jRyiqADkStJCSk20GRFTS5rZzTdkrbOSFBevVvrzcU5cLot7u1v1et3Wiuy+?= =?us-ascii?Q?rdshKH40OfmMxs0u+98Zwhi+bwCVL30/qhzKIJCVnDdFK5cPuUctnJ8Mr7Ma?= =?us-ascii?Q?meDPnoaFXG+JzxaygBnnyJ9ck1rBDSHwcwY8IFLjl1rL0dyNP24bPuM85zo9?= =?us-ascii?Q?iHDmMAgu3fWn951dtNaLjMGVzhsoqV5ZyR0RmsryZdJnkJKRMAz3ZGF/B2t5?= =?us-ascii?Q?YmBMtXOyV6GKBC5iNKoI0va0yLWAVAxERb3q8l0TiTuv5bf+jTptP57FDZ1j?= =?us-ascii?Q?mKpyh5wxOKSQZAnPa3pUU7Ie8PFWdVE4sqYDVvjKqkVmuNczpdOGhnebHXrR?= =?us-ascii?Q?meFRpQnMmU4f7yxX9ux/OLkFwYHoztM5yVBmZ9ACnzZL+P4HC0Kn6rOamtgs?= =?us-ascii?Q?bHhoTePqQjdiESmJeo6iyzUhDV2XXH7z/YmKgi3PZCnWT7hw8eQo4udc/AqV?= =?us-ascii?Q?POWfCicWS/JBTKzTSI5gSVxigGRzsS2mGaSVuM76Jh4Y9WfnnsyWcJEw/tko?= =?us-ascii?Q?5vF1iEQRciO8W7gudTy6rgUup1c/4/iFYm5aQFuaxuCDdN3zex7HdqS+VmQb?= =?us-ascii?Q?zmHWWzU+U7ieOyQRyVHhaSCPvEDKliYuhXjsp0lKsSwqxtfLo7RHbJN+OpRO?= =?us-ascii?Q?V4zXd3TdftcAvIJ+pI+ZaZrCV8m1ZJVgvbp/jJZ5u4YRJNS1UfNi5ljY5Rgt?= =?us-ascii?Q?gfAHiPM/JZMQzCW/jcZb7VXYzxI/EPcoP2Ybl3Aw7akZPKYGPuhEGErCmq4E?= =?us-ascii?Q?zGiZU3P5s5XBpd4n5hB6ghEJcA6CN7sIpdIyLlVCBUkdzabesA=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?YEylURG6crHWwLf6C2Hlwq1OXehSrFcXQJENCQyhxuX1ymNWtpaxLoVZvFDN?= =?us-ascii?Q?aWaPU9+L/7PZIA16IGwpZs0mnPVteJsO+C5+oEzAYZlgwIRIDtALVeBavy0Z?= =?us-ascii?Q?Un40/dn5wzidnGcSLSYNcayB+ZEbHhLem4qHj/QSC/mHGQD7mwK418fXWBxu?= =?us-ascii?Q?m0701SZHJt93onezgGc38aNtCEluqQyc0sJlqzfBwn27CcflaPX5dj+e93qJ?= =?us-ascii?Q?Yj4/BYj38xiK3SWziZhxEEzK5I0ym7Lu4BrF22DcHHIqE3f6ZejCv91s/dsL?= =?us-ascii?Q?XmfYNBaVytEJ/vyh5ut+CYxO4nKKYjJgCa6/k56Fe+QX1EwqpH+ZQJNNsp/f?= =?us-ascii?Q?N6buv4UsbTS4n7i812w+1zWyH4JqX7x3lIVMCAOUFRs6QoSdTz96CKMvfkar?= =?us-ascii?Q?qeP0+MnNJ4ryEjzMZxa717XTvH26rtN54oFEV862ucAkXKoQIEx5QpAfWK+s?= =?us-ascii?Q?vHAx7kUr6/urPcaB9s7nhSj+ODgJgpeDOY9HGOV+6RmAXJu4JooXn8jHypv7?= =?us-ascii?Q?4Flu9p304aSHCEDCZq8UG7vc4mxn2YVkedVxhdbsRMIaxlWRUo3RAG0DNPDN?= =?us-ascii?Q?HUW2Wep3B0wAJlXNyx2DThEHbAEF4kDdWwcZXo3e3dyC4Aj4dl0GQcbPhVvV?= =?us-ascii?Q?/2wpoXwvyAxRiFRQHXfGzIKQetl3JnUtCB96C7nAIq8goIF/knU+L0pB9SO7?= =?us-ascii?Q?WnzpXHQBBU94kMqsGbeomkNKhn913PuIle9Y/zANbkySg4FFuSmkm0KeC6vm?= =?us-ascii?Q?jMzHOB8LKfDMjeRFRnIr3Lq/ML59D4KvvEPtv7ZJxWdKGoSBwwFxmGzfLy2D?= =?us-ascii?Q?/GWLbCyuIpli2YXJBzfYvsq04Z0LdMkCZsFz/H7ejq8x6tPNeX/cNd3AH+Xu?= =?us-ascii?Q?LKoqx8O5Ml1dQgtvrAD8yO3TLmd0GJH6ahIwlrhERuKmhmZLMehoVEgKf6ua?= =?us-ascii?Q?J/BX8ToOORo3dIXRR8aAhxXcsS9yzzlFAYZ7XFhSSmTwC9VvCDO5Cu4umswI?= =?us-ascii?Q?/M6lXD4jnkKshOSymgjOpu/KRtpS7kAN7jSg9SOX1jx8hhjYP9zMLjkMJ4zj?= =?us-ascii?Q?Yd5ofBQ+UhgH6e/7oP8yjJsFL4cg6ptco9WaOq9p53bvopH+p9u+yzmLhVRl?= =?us-ascii?Q?JOw5cc55NkhYzhcHn17qHzNDCVpKLH42IMkecng1+FKvrnaru5FavGtKvNU2?= =?us-ascii?Q?7ktJ/vdD4UQU2Q4z0WszLQT6IPsLtXoPt4tFtfyeiMP2Lr/U2NmKiphCYcVY?= =?us-ascii?Q?D+kMtGRN3NAlzFogTfIJSZjV0kk3YZjJMd6mdxrLxG76dvWERgFCdIx/PnZx?= =?us-ascii?Q?RSmYnMueSMIFntApYa3ATgCurO3d8kO+ftoIiQz/cnL548HBAJ2GiKN+zN+d?= =?us-ascii?Q?o2Xvq0u9zAMzm56WpOYrTe221zdBayWz+GoX3ksMPJQY//1+BudlcLfKCq0J?= =?us-ascii?Q?C5NMpdo3T4f2XMDtQy4UCA6mDgQm43J0idxU6Xtx90F/B9zd4dNL7aFXGqmn?= =?us-ascii?Q?U0M/gtRxV8ZHhA0TiJXbieCtW2SDCc/U11IZ9oJ7jW+xIFEt+uA3Nbr0xu4j?= =?us-ascii?Q?nK8fhWbmoWYilkkyHBAWzzpvhjy64zYzOsnEDZIf?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4783.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61d16699-5a90-4bda-edee-08dca779e2d5 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2024 22:35:11.8278 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: pT7b+cwkjaT0MgRbuEJtFgWc1QeBTipo03Pp1x1M4DWI8YLOqotnYil24NIL5CUIyEXLBF4hUJRJDybQHgFir7DurdUvzokzaz0f6RytfsU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6409 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 18 Jul 2024 15:35:22 -0700 Resent-From: rangasai.v.chaganty@intel.com Reply-To: devel@edk2.groups.io,rangasai.v.chaganty@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: SJM18aInCh5k5SAOoeEYAE1bx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=tkf8z9ep; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Sai Chaganty -----Original Message----- From: mikuback@linux.microsoft.com =20 Sent: Thursday, July 18, 2024 8:31 AM To: devel@edk2.groups.io Cc: Ni, Ray ; Chaganty, Rangasai V ; S, Ashraf Ali ; Lautner, Kenneth ; S Subject: [edk2-platforms][PATCH v2 1/2] IntelSiliconPkg: Compiler and linke= r fixes From: Michael Kubacki Some code is currently not being built in the package. This fixes GCC compi= ler errors and MSVC linker failures in the code so the package can build wi= th these modules included. Cc: Ray Ni Cc: Rangasai V Chaganty Cc: Ashraf Ali S Co-authored-by: Ken Lautner Signed-off-by: Michael Kubacki Reviewed-by: S, Ashraf Ali --- Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/BmDma.c = | 4 ++-- Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/VtdLog.c = | 12 ++++++------ Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCorePei/IntelVTdCorePei.= c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/BmDm= a.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/BmDma.c index 41917a004880..47fd3674cd56 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/BmDma.c +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/BmDma.c @@ -464,7 +464,7 @@ IoMmuAllocateBuffer ( if (!EFI_ERROR (Status)) { *HostAddress =3D (VOID *) (UINTN) PhysicalAddress; =20 - VTdLogAddEvent (VTDLOG_DXE_IOMMU_ALLOC_BUFFER, (UINT64) Pages, (UINT64= ) (*HostAddress)); + VTdLogAddEvent (VTDLOG_DXE_IOMMU_ALLOC_BUFFER, (UINT64) Pages,=20 + (UINT64) (UINTN) (*HostAddress)); } =20 DEBUG ((DEBUG_VERBOSE, "IoMmuAllocateBuffer: 0x%08x <=3D=3D\n", *HostAdd= ress)); @@ -494,7 +494,7 @@ IoMmuFreeBuffer ( { DEBUG ((DEBUG_VERBOSE, "IoMmuFreeBuffer: 0x%\n", Pages)); =20 - VTdLogAddEvent (VTDLOG_DXE_IOMMU_FREE_BUFFER, Pages, (UINT64) HostAddres= s); + VTdLogAddEvent (VTDLOG_DXE_IOMMU_FREE_BUFFER, Pages, (UINT64) (UINTN)=20 + HostAddress); =20 return gBS->FreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress, Pages= ); } diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDx= e/VtdLog.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/VtdL= og.c index 91c27e2a1f2c..6a44424395c9 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/VtdLog.c +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/VtdLog.c @@ -77,7 +77,7 @@ VTdLogAddEvent ( Item->Data2 =3D Data2; =20 Item->Header.DataSize =3D sizeof (VTDLOG_EVENT_2PARAM); - Item->Header.LogType =3D (UINT64) 1 << EventType; + Item->Header.LogType =3D LShiftU64 (1, EventType); Item->Header.Timestamp =3D AsmReadTsc (); } } @@ -117,11 +117,11 @@ VTdLogAddDataEvent ( CopyMem (Item->Data, Data, DataSize); =20 Item->Header.DataSize =3D EventSize; - Item->Header.LogType =3D (UINT64) 1 << EventType; + Item->Header.LogType =3D LShiftU64 (1, EventType); Item->Header.Timestamp =3D AsmReadTsc (); } } - =20 + /** Get Event Items From Pei Pre-Mem Buffer =20 @@ -154,10 +154,10 @@ VTdGetEventItemsFromPeiPreMemBuffer ( Event.Header.DataSize =3D sizeof (VTDLOG_EVENT_2PARAM); Event.Header.Timestamp =3D 0; =20 - Event.Header.LogType =3D ((UINT64) 1) << VTDLOG_PEI_PRE_MEM_DMA_PROT= ECT; + Event.Header.LogType =3D LShiftU64 (1,=20 + VTDLOG_PEI_PRE_MEM_DMA_PROTECT); Event.Data1 =3D InfoBuffer[Index].BarAddress; Event.Data2 =3D InfoBuffer[Index].Mode; - Event.Data2 |=3D InfoBuffer[Index].Status<<8; + Event.Data2 |=3D LShiftU64 (InfoBuffer[Index].Status, 8); CallbackHandle (Context, &Event.Header); } EventCount++; @@ -231,7 +231,7 @@ VTdGenerateStateEvent ( Item.Data2 =3D Data2; =20 Item.Header.DataSize =3D sizeof (VTDLOG_EVENT_2PARAM); - Item.Header.LogType =3D (UINT64) 1 << EventType; + Item.Header.LogType =3D LShiftU64 (1, EventType); Item.Header.Timestamp =3D 0; =20 if (CallbackHandle) { diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCorePei/Inte= lVTdCorePei.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCorePei/I= ntelVTdCorePei.c index 0160c3604541..563913bd866b 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCorePei/IntelVTdCor= ePei.c +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCorePei/IntelVTd +++ CorePei.c @@ -111,7 +111,7 @@ VTdLogAddEvent ( Item->Data1 =3D Data1; Item->Data2 =3D Data2; Item->Header.DataSize =3D sizeof (VTDLOG_EVENT_2PARAM); - Item->Header.LogType =3D (UINT64) (1 << EventType); + Item->Header.LogType =3D LShiftU64 (1, EventType); Item->Header.Timestamp =3D AsmReadTsc (); } } @@ -151,8 +151,8 @@ VTdLogAddDataEvent ( CopyMem (Item->Data, Data, DataSize); =20 Item->Header.DataSize =3D EventSize; - Item->Header.LogType =3D (UINT64) (1 << EventType); - Item->Header.Timestamp =3D AsmReadTsc (); =20 + Item->Header.LogType =3D LShiftU64 (1, EventType); + Item->Header.Timestamp =3D AsmReadTsc (); } } /** @@ -372,7 +372,7 @@ PeiIoMmuMap ( ); } =20 - VTdLogAddEvent (VTDLOG_PEI_PPI_MAP, (UINT64) HostAddress, Length); + VTdLogAddEvent (VTDLOG_PEI_PPI_MAP, (UINT64) (UINTN) HostAddress,=20 + Length); return EFI_SUCCESS; } =20 @@ -498,7 +498,7 @@ PeiIoMmuAllocateBuffer ( =20 DEBUG ((DEBUG_INFO, "PeiIoMmuAllocateBuffer - allocate - %x\n", *HostAdd= ress)); =20 - VTdLogAddEvent (VTDLOG_PEI_PPI_ALLOC_BUFFER, (UINT64) (*HostAddress), Le= ngth); + VTdLogAddEvent (VTDLOG_PEI_PPI_ALLOC_BUFFER, (UINT64) (UINTN)=20 + (*HostAddress), Length); =20 return EFI_SUCCESS; } -- 2.45.2.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 (#119975): https://edk2.groups.io/g/devel/message/119975 Mute This Topic: https://groups.io/mt/107418947/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-