From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1F4EC740037 for ; Thu, 28 Sep 2023 02:07:34 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=WzlHRKfqa4fnKVoLzsw1nZvq4Cen8mnK1935eB62h4s=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results: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:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1695866853; v=1; b=H9Mg6GKB68uezH0TcNqpZjiDN0TDgogrRFBeX+hyT3DBb+RDFqfozgNlSmXaNRcrSLJG0IKs rMdECWJUXfzldSx2+gFRbu2CWV5b3XXCFl7OUqRwUy2mB+RjQCy1ansi5risIoxTgwpIaWxkjFZ H8t1ejmPYMgyvD+M+NRzr3cc= X-Received: by 127.0.0.2 with SMTP id ld3IYY7687511xPIWCUkQ4OO; Wed, 27 Sep 2023 19:07:33 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.5700.1695866852740684029 for ; Wed, 27 Sep 2023 19:07:33 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10846"; a="385833317" X-IronPort-AV: E=Sophos;i="6.03,182,1694761200"; d="scan'208";a="385833317" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 19:07:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10846"; a="923039148" X-IronPort-AV: E=Sophos;i="6.03,182,1694761200"; d="scan'208";a="923039148" X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 27 Sep 2023 19:07:31 -0700 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Wed, 27 Sep 2023 19:07:31 -0700 X-Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32 via Frontend Transport; Wed, 27 Sep 2023 19:07:31 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.42) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.32; Wed, 27 Sep 2023 19:07:30 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ghc0YqI8XOagw/Wqcj8faVCktA6+W2PDYzu+pfwRC9Xcdad4lWXr89/0pgWqNYQMvZXCL58Hnn30eCfz/oXeaXbvyEq5qgdkOLlDz5zltQQpPWBTIzdSeThLOswluvff1bDTk6jdUBnhrxsLkCqPzetN3LpE92xmdBGGwU7N3Qm5VZKhdb+GUpRZ4XckA2CGIQKpgqS2w/9vv/xrwbMMMaf49ykBXezDq6yqJzsCvjt1Ms82PDDwdnl30IPJRnetRRcF/0wOw4A3McBNIVmb+Jj4Zbw9Pzu+Dcx760X6Jp2shjeVgE3Q3zE4rZcvflHVSgARZXlG0rlwCoDJK2hAgg== 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=llavw4C44RhmwYF7rd3VUqJ1Vo05eg+Cpf1fvvNI48U=; b=Tm+ZEGHTiDn2JVrQbOlbYM8vlc6Mlgcc+2ww1Z7Zp5qQeGF55dm9JiSHYflnBKk6k60GqkURVgZEl/tjD+xj15c/VfjWu4+HKlns3JW1wnuiDuH0cS7QNbFHpDB13txxh4nwRQXDPGDcHHEP3GaaDodT0q88WKyToALTln+mVrlOfMZSzXAobp0o+9w5AVU+b96IegNW8Oa30sJ8/VxN8qqBNthyvVomsSlnKXuZ3WF/VoLKOKdcpwhcbuynL+SKJqlE2rNpjfa69hKmRy8p/RG+Vtcl9uMrcVHutq5SJzVUEEuOKtDrJrILRViRa+e/naWjIjWuE5KPaTq92DiX8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from DM6PR11MB4025.namprd11.prod.outlook.com (2603:10b6:5:197::31) by IA1PR11MB6465.namprd11.prod.outlook.com (2603:10b6:208:3a7::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.21; Thu, 28 Sep 2023 02:07:27 +0000 X-Received: from DM6PR11MB4025.namprd11.prod.outlook.com ([fe80::38c3:ed7c:3562:2e18]) by DM6PR11MB4025.namprd11.prod.outlook.com ([fe80::38c3:ed7c:3562:2e18%4]) with mapi id 15.20.6813.027; Thu, 28 Sep 2023 02:07:20 +0000 From: "Wu, Hao A" To: "devel@edk2.groups.io" , "Wu, Hao A" , "Cheng, Gao" CC: "Ni, Ray" , "Wang, Jian J" , "Gao, Liming" Subject: Re: [edk2-devel] [PATCH v2] MdeModulePkg/Xhci: Skip size round up for TRB during address translation Thread-Topic: [edk2-devel] [PATCH v2] MdeModulePkg/Xhci: Skip size round up for TRB during address translation Thread-Index: AQHZ8FL2syMuy4p+40KOjhRL3qZXO7At3JVAgAGjrWA= Date: Thu, 28 Sep 2023 02:07:20 +0000 Message-ID: References: <3f126940d742db17c161127670de2f933ae62789.1695716554.git.gao.cheng@intel.com> In-Reply-To: Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB4025:EE_|IA1PR11MB6465:EE_ x-ms-office365-filtering-correlation-id: baec186e-a794-41fd-6a63-08dbbfc7a5c3 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: xp2VfaJyBjpR+4Z3jd4dVXhesTgadA4GKaWGmda9pWM80GkfNRkIIMtmrBEZzlSAQmHWfIjwuKY0+dlMLl/R8Mvakp3xGj8d/S+qmrKozIxc50ILJTi+v9Fp6a/Z8K6m32Yq/tYMM/nOEAWx24b/6AgpMw7YxJikUWxzuJ0LIHhrgieHfKNOD8Eg1NdQQIIaWfcwpgZ4vcf9KPBgIA4/74IZFiHxl5DY+H/JQPXw31G46AGp6m5uCrl/u96bBkdIeUAnTEOglDRKrF3q7xFNQlV3HqLq+3S2L81OLJtekOWzvUEV5XDXqPMJ2JCYoo1EIk4887wD7bB7yDOA6XdhD7MUQttp/LWVVLtH8Uh8SbQxM/WeetZhmXxEvObZS+n09sfLbslGVRpNyDcdAR1AqftTZX4U69pOZlGcQafuXylntaXZ+7LKsOo8brpShcrgbfcrKEs198PIAcSYPN2KbKbF4ky11oyR5DXYzx/HzQW5ekxKpRQ6O+nxWbtf0c2bIvCf+ndnlAseDsNinbMNukXPVCkoJM+Nc5uzMyPrfrvHQAyWodNkfiF85gD0vjmd+f7C+enb9l6125JYZkUL5B5fATsu7kP+aWtq5GPR235UVl9aWJ54nHyhN9LX4hwaDM/85HqPA4o81YbW7FM8QQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?54NEQgOb1XFziJFEiniGEJHMwx8UXgp7/GZAy+y4omgUY4zS0fyDaAIS7dHT?= =?us-ascii?Q?zvx54BNubmC3aaErgFQ+piKfuvuJBF8i9uRk0dqDHQ2bcm3Lm7k/3P2IDDbt?= =?us-ascii?Q?7AMJ5HIUK6gCifdMvWdeV80o5DUCqzZCGJNQQ2obVwSjSNMCcuBEpHkrfsK6?= =?us-ascii?Q?JXGHaNOH/NxdWiV8U377j4R+Citfogequw4uaTHYsT9WsxcIj3YbXXzX2OmN?= =?us-ascii?Q?9Zm66nhrFENW1VB5zm7hzWybvi1fXDvKuOsIu3LtYlyV2x1ctVJqn9I+Nq9X?= =?us-ascii?Q?xf4ztqmM5QnPRenWf6zebkIig/O3bsIha6lcNS9Ai/UcYa5UKOgFsizCUn/h?= =?us-ascii?Q?in9oiLxBsXAHj6lfo2BPBItDFtlb8RNd4RNzKQz4eaXUg8IhQ8SkkXuJTv2b?= =?us-ascii?Q?JZoWy8gNl6ZGKzFtT8l/TEpxStN+Yl0xnGShDvPw6C6VHVSzbIOLVdxQlxKe?= =?us-ascii?Q?rs8NCLtDIBTz0cihsmGocswt0ozT7lFZga42Grhp0ciyxArDu/LXziOeaclz?= =?us-ascii?Q?ZS6vDEs3fOMKM9xjJCFNDjrhV6QDdPDTr7EvjkKen/44GWqiztBYT9Hre8jq?= =?us-ascii?Q?w83XM88dTTARIslEdeXBd89WynmGMZctrS/WGfQPcA+vbxTUfFW5XQkV/Uee?= =?us-ascii?Q?c228VjSAVBn4CsZ44bkBWF34s8VaIrw3TygYY/XBxC3O39Ipv5NVUdwnzoLN?= =?us-ascii?Q?2XIgtQtSvZeITWrgRDO76MxCcMXiXAlnMON7KEQ1E/c1WSl9HtQ0gzAY5bWG?= =?us-ascii?Q?UdqUW4fHwqNNpjC0XJwf/6ytCMU0pk1sVMzKetUVJC+03AwekkgnPKUU/Pyz?= =?us-ascii?Q?dv2wf9jMn+snr3AAI+hFdHRhxPPR4GDbokyKE3NdJgUH1lHuZYsOhf0L98F1?= =?us-ascii?Q?oTi5x08pebX3jvigld7rTm4P5uiDUJASNPAlj9XG/5EzXM1SDKHZ1A9+Oh37?= =?us-ascii?Q?Ol2oNf2ghpogAO/XoyQ8u0Re2pu4yw7socVHxmQk2ZAlea4z44veu7Cy0HAU?= =?us-ascii?Q?eyMtwFeSbug+Jklw5MvYJP8vbVSen36yy2GTbg+oM5rPnsjHOqLGKdIpBKpx?= =?us-ascii?Q?8eXuB8oG/EB5sn1ZQnbtUTwNXjl9K4nbuHdBMC5g9LHSzfEypLYKjP5YNM1P?= =?us-ascii?Q?lSRXAq5Vy+yce+gZ0P1TKyOm7KF/98ONWQlsbgT04jB0bwbndqr+5Mm1ypdY?= =?us-ascii?Q?9ECVzvvBX6sYRsyqavu3eNU7DqCnczuMxhOM0HoYUU/Xr0cwtltFUFw5oEz6?= =?us-ascii?Q?yaHdiIjI0HoHVURDzvOlQnCWjW/1QOzsx20Tzx2uqycNH2lUXjaVails9z9E?= =?us-ascii?Q?dcs043CtyhZ2rutMmRGGoFW9JCt2hl3vC4tbkhMgLhjSYtQLW+TwGFuIdXZj?= =?us-ascii?Q?PFTC3Tk0rw3rYFn28xdAwO1RvROcdRUVK0vUVbP6sJvKrpW5BgDD4qvzjc/z?= =?us-ascii?Q?arrBquOvBeBBIPXGRuz92TX7WLoMKAbFdcEaEm+GYKZMHvIa/yOOIBoCNYnE?= =?us-ascii?Q?ZKPOiaszAaODKC0faIN8WzbOq227uM+arAIdBjsy6kibN8NGDtrkl5a6wMAH?= =?us-ascii?Q?a5K3vdojmwUH0cR3f/sv0j8FjnYVbqX/OysP4bVV?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4025.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: baec186e-a794-41fd-6a63-08dbbfc7a5c3 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Sep 2023 02:07:20.3365 (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: EYyJzw8C7q5w7npuemvr8SDTkTmzHtCKYrEh+WJz/cPp+U11ARxthUKl+4/MJSC8KeBGtCK1kNHJaCpaOJtI+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6465 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 Reply-To: devel@edk2.groups.io,hao.a.wu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: N2p50Xiz6S2xvSrzNbw5jZexx7686176AA= 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=20140610 header.b=H9Mg6GKB; 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 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Patch merged via: PR - https://github.com/tianocore/edk2/pull/4875 Commit - https://github.com/tianocore/edk2/commit/f36e1ec1f0a5fd3be84913e09= 181d7813444b620 Best Regards, Hao Wu > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Wu, Hao > A > Sent: Wednesday, September 27, 2023 9:05 AM > To: Cheng, Gao ; devel@edk2.groups.io > Cc: Ni, Ray ; Wang, Jian J ; Gao= , > Liming > Subject: Re: [edk2-devel] [PATCH v2] MdeModulePkg/Xhci: Skip size round u= p > for TRB during address translation >=20 > Reviewed-by: Hao A Wu >=20 > Best Regards, > Hao Wu >=20 > > -----Original Message----- > > From: Cheng, Gao > > Sent: Tuesday, September 26, 2023 4:25 PM > > To: devel@edk2.groups.io > > Cc: Cheng, Gao ; Wu, Hao A > ; > > Ni, Ray ; Wang, Jian J ; Gao, > > Liming > > Subject: [PATCH v2] MdeModulePkg/Xhci: Skip size round up for TRB durin= g > > address translation > > > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4560 > > > > > > > > TRB Template is 16 bytes. When boundary checking is 64 bytes for xHCI > > > > device/host memory address, it may exceed xHCI host memory pool and > > > > cause unwanted DXE_ASSERT. Introduce a new input parameter to indicate > > > > whether to enforce 64byte size alignment and round up. For TRB case, > > > > should set it to FALSE to skip the size round up. > > > > > > > > Signed-off-by: Gao Cheng > > > > Cc: Hao A Wu > > > > Cc: Ray Ni > > > > Cc: Jian J Wang > > > > Cc: Liming Gao > > > > --- > > > > MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c | 24 ++++++++--- > > > > MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h | 8 +++- > > > > MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 54 +++++++++++++----------- > > > > MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c | 24 ++++++++--- > > > > MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h | 8 +++- > > > > MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c | 48 +++++++++++---------- > > > > 6 files changed, 103 insertions(+), 63 deletions(-) > > > > > > > > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c > > b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c > > > > index d0ad1582e4..b54187ec22 100644 > > > > --- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c > > > > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c > > > > @@ -226,6 +226,7 @@ UsbHcAllocMemFromBlock ( > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to host memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The pci memory address > > > > > > > > @@ -234,7 +235,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetPciAddrForHostAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ) > > > > { > > > > USBHC_MEM_BLOCK *Head; > > > > @@ -243,8 +245,12 @@ UsbHcGetPciAddrForHostAddr ( > > > > EFI_PHYSICAL_ADDRESS PhyAddr; > > > > UINTN Offset; > > > > > > > > - Head =3D Pool->Head; > > > > - AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + Head =3D Pool->Head; > > > > + if (Alignment) { > > > > + AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + } else { > > > > + AllocSize =3D Size; > > > > + } > > > > > > > > if (Mem =3D=3D NULL) { > > > > return 0; > > > > @@ -275,6 +281,7 @@ UsbHcGetPciAddrForHostAddr ( > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to pci memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The host memory address > > > > > > > > @@ -283,7 +290,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetHostAddrForPciAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ) > > > > { > > > > USBHC_MEM_BLOCK *Head; > > > > @@ -292,8 +300,12 @@ UsbHcGetHostAddrForPciAddr ( > > > > EFI_PHYSICAL_ADDRESS HostAddr; > > > > UINTN Offset; > > > > > > > > - Head =3D Pool->Head; > > > > - AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + Head =3D Pool->Head; > > > > + if (Alignment) { > > > > + AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + } else { > > > > + AllocSize =3D Size; > > > > + } > > > > > > > > if (Mem =3D=3D NULL) { > > > > return 0; > > > > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h > > b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h > > > > index c85b0b919f..b21bf9da3e 100644 > > > > --- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h > > > > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h > > > > @@ -129,6 +129,7 @@ UsbHcFreeMem ( > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to host memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The pci memory address > > > > > > > > @@ -137,7 +138,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetPciAddrForHostAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ); > > > > > > > > /** > > > > @@ -146,6 +148,7 @@ UsbHcGetPciAddrForHostAddr ( > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to pci memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The host memory address > > > > > > > > @@ -154,7 +157,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetHostAddrForPciAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ); > > > > > > > > /** > > > > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c > > b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c > > > > index 53421e64a8..c2be171780 100644 > > > > --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c > > > > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c > > > > @@ -588,7 +588,7 @@ XhcInitSched ( > > > > // Some 3rd party XHCI external cards don't support single 64-bytes = width > > register access, > > > > // So divide it to two 32-bytes width register access. > > > > // > > > > - DcbaaPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Dcbaa, > Entries); > > > > + DcbaaPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Dcbaa, > Entries, > > TRUE); > > > > XhcWriteOpReg (Xhc, XHC_DCBAAP_OFFSET, XHC_LOW_32BIT > (DcbaaPhy)); > > > > XhcWriteOpReg (Xhc, XHC_DCBAAP_OFFSET + 4, XHC_HIGH_32BIT > > (DcbaaPhy)); > > > > > > > > @@ -607,7 +607,7 @@ XhcInitSched ( > > > > // So we set RCS as inverted PCS init value to let Command Ring empt= y > > > > // > > > > CmdRing =3D (UINT64)(UINTN)Xhc->CmdRing.RingSeg0; > > > > - CmdRingPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, (VOID > > *)(UINTN)CmdRing, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER); > > > > + CmdRingPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, (VOID > > *)(UINTN)CmdRing, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER, > > TRUE); > > > > ASSERT ((CmdRingPhy & 0x3F) =3D=3D 0); > > > > CmdRingPhy |=3D XHC_CRCR_RCS; > > > > // > > > > @@ -809,7 +809,7 @@ CreateEventRing ( > > > > EventRing->EventRingDequeue =3D (TRB_TEMPLATE *)EventRing- > > >EventRingSeg0; > > > > EventRing->EventRingEnqueue =3D (TRB_TEMPLATE *)EventRing- > > >EventRingSeg0; > > > > > > > > - DequeuePhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size); > > > > + DequeuePhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size, > > TRUE); > > > > > > > > // > > > > // Software maintains an Event Ring Consumer Cycle State (CCS) bit, > > initializing it to '1' > > > > @@ -829,7 +829,7 @@ CreateEventRing ( > > > > ERSTBase->PtrHi =3D XHC_HIGH_32BIT (DequeuePhy); > > > > ERSTBase->RingTrbSize =3D EVENT_RING_TRB_NUMBER; > > > > > > > > - ERSTPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, ERSTBase, > Size); > > > > + ERSTPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, ERSTBase, > Size, > > TRUE); > > > > > > > > // > > > > // Program the Interrupter Event Ring Segment Table Size (ERSTSZ) re= gister > > (5.5.2.3.1) > > > > @@ -913,7 +913,7 @@ CreateTransferRing ( > > > > // > > > > EndTrb =3D (LINK_TRB *)((UINTN)Buf + sizeof (TRB_TEMPLATE) * > (TrbNum > > - 1)); > > > > EndTrb->Type =3D TRB_TYPE_LINK; > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, siz= eof > > (TRB_TEMPLATE) * TrbNum); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, siz= eof > > (TRB_TEMPLATE) * TrbNum, TRUE); > > > > EndTrb->PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > EndTrb->PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > // > > > > @@ -1045,7 +1045,7 @@ IsTransferRingTrb ( > > > > if (CheckedTrb->Type =3D=3D TRB_TYPE_LINK) { > > > > LinkTrb =3D (LINK_TRB *)CheckedTrb; > > > > PhyAddr =3D (EFI_PHYSICAL_ADDRESS)(LinkTrb->PtrLo | LShiftU64 > > ((UINT64)LinkTrb->PtrHi, 32)); > > > > - CheckedTrb =3D (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr > > (Xhc->MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE)); > > > > + CheckedTrb =3D (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr > > (Xhc->MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE), FALSE); > > > > ASSERT (CheckedTrb =3D=3D Urb->Ring->RingSeg0); > > > > } > > > > } > > > > @@ -1154,7 +1154,7 @@ XhcCheckUrbResult ( > > > > // Need convert pci device address to host address > > > > // > > > > PhyAddr =3D (EFI_PHYSICAL_ADDRESS)(EvtTrb->TRBPtrLo | LShiftU64 > > ((UINT64)EvtTrb->TRBPtrHi, 32)); > > > > - TRBPtr =3D (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc= - > > >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE)); > > > > + TRBPtr =3D (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc= - > > >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE), FALSE); > > > > > > > > // > > > > // Update the status of URB including the pending URB, the URB tha= t is > > currently checked, > > > > @@ -1259,7 +1259,7 @@ EXIT: > > > > High =3D XhcReadRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4); > > > > XhcDequeue =3D (UINT64)(LShiftU64 ((UINT64)High, 32) | Low); > > > > > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc- > > >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc- > > >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE), FALSE); > > > > > > > > if ((XhcDequeue & (~0x0F)) !=3D (PhyAddr & (~0x0F))) { > > > > // > > > > @@ -2280,7 +2280,8 @@ XhcInitializeDeviceSlot ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[0])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > InputContext->EP[0].PtrLo =3D XHC_LOW_32BIT (PhyAddr) | BIT0; > > > > InputContext->EP[0].PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > @@ -2298,7 +2299,7 @@ XhcInitializeDeviceSlot ( > > > > // 7) Load the appropriate (Device Slot ID) entry in the Device Cont= ext > Base > > Address Array (5.4.6) with > > > > // a pointer to the Output Device Context data structure (6.2.1). > > > > // > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT), TRUE); > > > > // > > > > // Fill DCBAA with PCI device address > > > > // > > > > @@ -2313,7 +2314,7 @@ XhcInitializeDeviceSlot ( > > > > // > > > > gBS->Stall (XHC_RESET_RECOVERY_DELAY); > > > > ZeroMem (&CmdTrbAddr, sizeof (CmdTrbAddr)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbAddr.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbAddr.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbAddr.CycleBit =3D 1; > > > > @@ -2496,7 +2497,8 @@ XhcInitializeDeviceSlot64 ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[0])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > InputContext->EP[0].PtrLo =3D XHC_LOW_32BIT (PhyAddr) | BIT0; > > > > InputContext->EP[0].PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > @@ -2514,7 +2516,7 @@ XhcInitializeDeviceSlot64 ( > > > > // 7) Load the appropriate (Device Slot ID) entry in the Device Cont= ext > Base > > Address Array (5.4.6) with > > > > // a pointer to the Output Device Context data structure (6.2.1). > > > > // > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT_64), TRUE); > > > > // > > > > // Fill DCBAA with PCI device address > > > > // > > > > @@ -2529,7 +2531,7 @@ XhcInitializeDeviceSlot64 ( > > > > // > > > > gBS->Stall (XHC_RESET_RECOVERY_DELAY); > > > > ZeroMem (&CmdTrbAddr, sizeof (CmdTrbAddr)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbAddr.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbAddr.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbAddr.CycleBit =3D 1; > > > > @@ -2964,7 +2966,8 @@ XhcInitializeEndpointContext ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > PhyAddr &=3D ~((EFI_PHYSICAL_ADDRESS)0x0F); > > > > PhyAddr |=3D (EFI_PHYSICAL_ADDRESS)((TRANSFER= _RING > > *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])- > > >RingPCS; > > > > @@ -3166,7 +3169,8 @@ XhcInitializeEndpointContext64 ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > PhyAddr &=3D ~((EFI_PHYSICAL_ADDRESS)0x0F); > > > > PhyAddr |=3D (EFI_PHYSICAL_ADDRESS)((TRANSFER= _RING > > *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])- > > >RingPCS; > > > > @@ -3248,7 +3252,7 @@ XhcSetConfigCmd ( > > > > // configure endpoint > > > > // > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -3339,7 +3343,7 @@ XhcSetConfigCmd64 ( > > > > // configure endpoint > > > > // > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -3513,7 +3517,7 @@ XhcSetTrDequeuePointer ( > > > > // Send stop endpoint command to transit Endpoint from running to st= op > > state > > > > // > > > > ZeroMem (&CmdSetTRDeq, sizeof (CmdSetTRDeq)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, U= rb- > > >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, U= rb- > > >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER), TRUE); > > > > CmdSetTRDeq.PtrLo =3D XHC_LOW_32BIT (PhyAddr) | Urb->Ring- > >RingPCS; > > > > CmdSetTRDeq.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdSetTRDeq.CycleBit =3D 1; > > > > @@ -3713,7 +3717,7 @@ XhcSetInterface ( > > > > // 5) Issue and successfully complete a Configure Endpoint Command= . > > > > // > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -3919,7 +3923,7 @@ XhcSetInterface64 ( > > > > // 5) Issue and successfully complete a Configure Endpoint Command= . > > > > // > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -3986,7 +3990,7 @@ XhcEvaluateContext ( > > > > InputContext->EP[0].EPState =3D 0; > > > > > > > > ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbEvalu.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbEvalu.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbEvalu.CycleBit =3D 1; > > > > @@ -4047,7 +4051,7 @@ XhcEvaluateContext64 ( > > > > InputContext->EP[0].EPState =3D 0; > > > > > > > > ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbEvalu.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbEvalu.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbEvalu.CycleBit =3D 1; > > > > @@ -4116,7 +4120,7 @@ XhcConfigHubContext ( > > > > InputContext->Slot.MTT =3D MTT; > > > > > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -4185,7 +4189,7 @@ XhcConfigHubContext64 ( > > > > InputContext->Slot.MTT =3D MTT; > > > > > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > diff --git a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c > > b/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c > > > > index e779a31138..88db5fe46e 100644 > > > > --- a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c > > > > +++ b/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c > > > > @@ -190,6 +190,7 @@ UsbHcAllocMemFromBlock ( > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to host memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The pci memory address > > > > > > > > @@ -198,7 +199,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetPciAddrForHostAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ) > > > > { > > > > USBHC_MEM_BLOCK *Head; > > > > @@ -207,8 +209,12 @@ UsbHcGetPciAddrForHostAddr ( > > > > EFI_PHYSICAL_ADDRESS PhyAddr; > > > > UINTN Offset; > > > > > > > > - Head =3D Pool->Head; > > > > - AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + Head =3D Pool->Head; > > > > + if (Alignment) { > > > > + AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + } else { > > > > + AllocSize =3D Size; > > > > + } > > > > > > > > if (Mem =3D=3D NULL) { > > > > return 0; > > > > @@ -239,6 +245,7 @@ UsbHcGetPciAddrForHostAddr ( > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to pci memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The host memory address > > > > > > > > @@ -247,7 +254,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetHostAddrForPciAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ) > > > > { > > > > USBHC_MEM_BLOCK *Head; > > > > @@ -256,8 +264,12 @@ UsbHcGetHostAddrForPciAddr ( > > > > EFI_PHYSICAL_ADDRESS HostAddr; > > > > UINTN Offset; > > > > > > > > - Head =3D Pool->Head; > > > > - AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + Head =3D Pool->Head; > > > > + if (Alignment) { > > > > + AllocSize =3D USBHC_MEM_ROUND (Size); > > > > + } else { > > > > + AllocSize =3D Size; > > > > + } > > > > > > > > if (Mem =3D=3D NULL) { > > > > return 0; > > > > diff --git a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h > > b/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h > > > > index 2b4c8b19fc..8f760e084e 100644 > > > > --- a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h > > > > +++ b/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h > > > > @@ -68,6 +68,7 @@ typedef struct _USBHC_MEM_POOL { > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to host memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The pci memory address > > > > > > > > @@ -76,7 +77,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetPciAddrForHostAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ); > > > > > > > > /** > > > > @@ -85,6 +87,7 @@ UsbHcGetPciAddrForHostAddr ( > > > > @param Pool The memory pool of the host controller. > > > > @param Mem The pointer to pci memory. > > > > @param Size The size of the memory region. > > > > + @param Alignment Alignment the size to USBHC_MEM_UNIT bytes. > > > > > > > > @return The host memory address > > > > > > > > @@ -93,7 +96,8 @@ EFI_PHYSICAL_ADDRESS > > > > UsbHcGetHostAddrForPciAddr ( > > > > IN USBHC_MEM_POOL *Pool, > > > > IN VOID *Mem, > > > > - IN UINTN Size > > > > + IN UINTN Size, > > > > + IN BOOLEAN Alignment > > > > ); > > > > > > > > /** > > > > diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c > > b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c > > > > index 8400c90f7a..53272f62dd 100644 > > > > --- a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c > > > > +++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c > > > > @@ -675,7 +675,7 @@ XhcPeiCheckUrbResult ( > > > > // Need convert pci device address to host address > > > > // > > > > PhyAddr =3D (EFI_PHYSICAL_ADDRESS)(EvtTrb->TRBPtrLo | LShiftU64 > > ((UINT64)EvtTrb->TRBPtrHi, 32)); > > > > - TRBPtr =3D (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc= - > > >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE)); > > > > + TRBPtr =3D (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc= - > > >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE), FALSE); > > > > > > > > // > > > > // Update the status of Urb according to the finished event regard= less of > > whether > > > > @@ -766,7 +766,7 @@ EXIT: > > > > High =3D XhcPeiReadRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4); > > > > XhcDequeue =3D (UINT64)(LShiftU64 ((UINT64)High, 32) | Low); > > > > > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc- > > >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc- > > >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE), FALSE); > > > > > > > > if ((XhcDequeue & (~0x0F)) !=3D (PhyAddr & (~0x0F))) { > > > > // > > > > @@ -1213,7 +1213,8 @@ XhcPeiInitializeDeviceSlot ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[0])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > InputContext->EP[0].PtrLo =3D XHC_LOW_32BIT (PhyAddr) | BIT0; > > > > InputContext->EP[0].PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > @@ -1231,7 +1232,7 @@ XhcPeiInitializeDeviceSlot ( > > > > // 7) Load the appropriate (Device Slot ID) entry in the Device Cont= ext > Base > > Address Array (5.4.6) with > > > > // a pointer to the Output Device Context data structure (6.2.1). > > > > // > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT), TRUE); > > > > // > > > > // Fill DCBAA with PCI device address > > > > // > > > > @@ -1246,7 +1247,7 @@ XhcPeiInitializeDeviceSlot ( > > > > // > > > > MicroSecondDelay (XHC_RESET_RECOVERY_DELAY); > > > > ZeroMem (&CmdTrbAddr, sizeof (CmdTrbAddr)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbAddr.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbAddr.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbAddr.CycleBit =3D 1; > > > > @@ -1427,7 +1428,8 @@ XhcPeiInitializeDeviceSlot64 ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[0])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > InputContext->EP[0].PtrLo =3D XHC_LOW_32BIT (PhyAddr) | BIT0; > > > > InputContext->EP[0].PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > @@ -1445,7 +1447,7 @@ XhcPeiInitializeDeviceSlot64 ( > > > > // 7) Load the appropriate (Device Slot ID) entry in the Device Cont= ext > Base > > Address Array (5.4.6) with > > > > // a pointer to the Output Device Context data structure (6.2.1). > > > > // > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > OutputContext, > > sizeof (DEVICE_CONTEXT_64), TRUE); > > > > // > > > > // Fill DCBAA with PCI device address > > > > // > > > > @@ -1460,7 +1462,7 @@ XhcPeiInitializeDeviceSlot64 ( > > > > // > > > > MicroSecondDelay (XHC_RESET_RECOVERY_DELAY); > > > > ZeroMem (&CmdTrbAddr, sizeof (CmdTrbAddr)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xh= c- > > >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbAddr.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbAddr.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbAddr.CycleBit =3D 1; > > > > @@ -1882,7 +1884,8 @@ XhcPeiSetConfigCmd ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > PhyAddr &=3D ~((EFI_PHYSICAL_ADDRESS)0x0F); > > > > PhyAddr |=3D (EFI_PHYSICAL_ADDRESS)((TRANSF= ER_RING > > *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])- > > >RingPCS; > > > > @@ -1901,7 +1904,7 @@ XhcPeiSetConfigCmd ( > > > > // configure endpoint > > > > // > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -2108,7 +2111,8 @@ XhcPeiSetConfigCmd64 ( > > > > PhyAddr =3D UsbHcGetPciAddrForHostAddr ( > > > > Xhc->MemPool, > > > > ((TRANSFER_RING *)(UINTN)Xhc- > > >UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0, > > > > - sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER > > > > + sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER, > > > > + TRUE > > > > ); > > > > > > > > PhyAddr &=3D ~((EFI_PHYSICAL_ADDRESS)0x0F); > > > > @@ -2129,7 +2133,7 @@ XhcPeiSetConfigCmd64 ( > > > > // configure endpoint > > > > // > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -2184,7 +2188,7 @@ XhcPeiEvaluateContext ( > > > > InputContext->EP[0].MaxPacketSize =3D MaxPacketSize; > > > > > > > > ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbEvalu.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbEvalu.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbEvalu.CycleBit =3D 1; > > > > @@ -2239,7 +2243,7 @@ XhcPeiEvaluateContext64 ( > > > > InputContext->EP[0].MaxPacketSize =3D MaxPacketSize; > > > > > > > > ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbEvalu.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbEvalu.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbEvalu.CycleBit =3D 1; > > > > @@ -2308,7 +2312,7 @@ XhcPeiConfigHubContext ( > > > > InputContext->Slot.MTT =3D MTT; > > > > > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -2377,7 +2381,7 @@ XhcPeiConfigHubContext64 ( > > > > InputContext->Slot.MTT =3D MTT; > > > > > > > > ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, > > InputContext, sizeof (INPUT_CONTEXT_64), TRUE); > > > > CmdTrbCfgEP.PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > CmdTrbCfgEP.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdTrbCfgEP.CycleBit =3D 1; > > > > @@ -2522,7 +2526,7 @@ XhcPeiSetTrDequeuePointer ( > > > > // Send stop endpoint command to transit Endpoint from running to st= op > > state > > > > // > > > > ZeroMem (&CmdSetTRDeq, sizeof (CmdSetTRDeq)); > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, U= rb- > > >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER)); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, U= rb- > > >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER), TRUE); > > > > CmdSetTRDeq.PtrLo =3D XHC_LOW_32BIT (PhyAddr) | Urb->Ring- > >RingPCS; > > > > CmdSetTRDeq.PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > CmdSetTRDeq.CycleBit =3D 1; > > > > @@ -2682,7 +2686,7 @@ XhcPeiCreateEventRing ( > > > > ASSERT (((UINTN)Buf & 0x3F) =3D=3D 0); > > > > ZeroMem (Buf, Size); > > > > > > > > - DequeuePhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size); > > > > + DequeuePhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size, > > TRUE); > > > > > > > > EventRing->EventRingSeg0 =3D Buf; > > > > EventRing->TrbNumber =3D EVENT_RING_TRB_NUMBER; > > > > @@ -2707,7 +2711,7 @@ XhcPeiCreateEventRing ( > > > > ERSTBase->PtrHi =3D XHC_HIGH_32BIT (DequeuePhy); > > > > ERSTBase->RingTrbSize =3D EVENT_RING_TRB_NUMBER; > > > > > > > > - ERSTPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size); > > > > + ERSTPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size, > TRUE); > > > > > > > > // > > > > // Program the Interrupter Event Ring Segment Table Size (ERSTSZ) re= gister > > (5.5.2.3.1) > > > > @@ -2855,7 +2859,7 @@ XhcPeiCreateTransferRing ( > > > > // > > > > EndTrb =3D (LINK_TRB *)((UINTN)Buf + sizeof (TRB_TEMPLATE) * > (TrbNum > > - 1)); > > > > EndTrb->Type =3D TRB_TYPE_LINK; > > > > - PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, siz= eof > > (TRB_TEMPLATE) * TrbNum); > > > > + PhyAddr =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, siz= eof > > (TRB_TEMPLATE) * TrbNum, TRUE); > > > > EndTrb->PtrLo =3D XHC_LOW_32BIT (PhyAddr); > > > > EndTrb->PtrHi =3D XHC_HIGH_32BIT (PhyAddr); > > > > // > > > > @@ -2988,7 +2992,7 @@ XhcPeiInitSched ( > > > > // Some 3rd party XHCI external cards don't support single 64-bytes = width > > register access, > > > > // So divide it to two 32-bytes width register access. > > > > // > > > > - DcbaaPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Dcbaa, Size); > > > > + DcbaaPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Dcbaa, Size, > > TRUE); > > > > XhcPeiWriteOpReg (Xhc, XHC_DCBAAP_OFFSET, XHC_LOW_32BIT > > (DcbaaPhy)); > > > > XhcPeiWriteOpReg (Xhc, XHC_DCBAAP_OFFSET + 4, XHC_HIGH_32BIT > > (DcbaaPhy)); > > > > > > > > @@ -3006,7 +3010,7 @@ XhcPeiInitSched ( > > > > // Transfer Ring it checks for a Cycle bit transition. If a transiti= on detected, > > the ring is empty. > > > > // So we set RCS as inverted PCS init value to let Command Ring empt= y > > > > // > > > > - CmdRingPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc- > > >CmdRing.RingSeg0, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER); > > > > + CmdRingPhy =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc- > > >CmdRing.RingSeg0, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER, > > TRUE); > > > > ASSERT ((CmdRingPhy & 0x3F) =3D=3D 0); > > > > CmdRingPhy |=3D XHC_CRCR_RCS; > > > > // > > > > -- > > > > 2.42.0.windows.2 > > > > >=20 >=20 >=20 >=20 >=20 -=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 (#109133): https://edk2.groups.io/g/devel/message/109133 Mute This Topic: https://groups.io/mt/101591675/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-