[edk2-devel] [PATCH] MdeModulePkg/Xhci: Skip size round up for TRB during address translation

Wu, Hao A hao.a.wu at intel.com
Tue Sep 26 03:14:26 UTC 2023


The proposed patch failed some CI tests.
Details can be referred at: https://github.com/tianocore/edk2/pull/4866. Could you help to resolve them?

Please help to follow the step 11 in page: https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Development-Process and check the CI test results for the upcoming patch?

Best Regards,
Hao Wu

> -----Original Message-----
> From: Cheng, Gao <gao.cheng at intel.com>
> Sent: Tuesday, September 26, 2023 10:12 AM
> To: devel at edk2.groups.io
> Cc: Cheng, Gao <gao.cheng at intel.com>; Wu, Hao A <hao.a.wu at intel.com>;
> Ni, Ray <ray.ni at intel.com>; Wang, Jian J <jian.j.wang at intel.com>; Gao,
> Liming <gaoliming at byosoft.com.cn>
> Subject: [PATCH] MdeModulePkg/Xhci: Skip size round up for TRB during
> address translation
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4560
> 
> 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 <gao.cheng at intel.com>
> Cc: Hao A Wu <hao.a.wu at intel.com>
> Cc: Ray Ni <ray.ni at intel.com>
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Liming Gao <gaoliming at byosoft.com.cn>
> ---
>  MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c  | 20 +++++++--
>  MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h  |  8 +++-
>  MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 54 +++++++++++++-----------
>  MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c  | 20 +++++++--
>  MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h  |  8 +++-
>  MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c | 48 +++++++++++----------
>  6 files changed, 99 insertions(+), 59 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
> b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
> index d0ad1582e4..8fea441fbc 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;
> @@ -244,7 +246,11 @@ UsbHcGetPciAddrForHostAddr (
>    UINTN                 Offset;
> 
>    Head      = Pool->Head;
> -  AllocSize = USBHC_MEM_ROUND (Size);
> +  if (Alignment) {
> +    AllocSize = USBHC_MEM_ROUND (Size);
> +  } else {
> +    AllocSize = Size;
> +  }
> 
>    if (Mem == 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;
> @@ -293,7 +301,11 @@ UsbHcGetHostAddrForPciAddr (
>    UINTN                 Offset;
> 
>    Head      = Pool->Head;
> -  AllocSize = USBHC_MEM_ROUND (Size);
> +  if (Alignment) {
> +    AllocSize = USBHC_MEM_ROUND (Size);
> +  } else {
> +    AllocSize = Size;
> +  }
> 
>    if (Mem == 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 = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Dcbaa, Entries);
> +  DcbaaPhy = 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 empty
>    //
>    CmdRing    = (UINT64)(UINTN)Xhc->CmdRing.RingSeg0;
> -  CmdRingPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, (VOID
> *)(UINTN)CmdRing, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER);
> +  CmdRingPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, (VOID
> *)(UINTN)CmdRing, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER,
> TRUE);
>    ASSERT ((CmdRingPhy & 0x3F) == 0);
>    CmdRingPhy |= XHC_CRCR_RCS;
>    //
> @@ -809,7 +809,7 @@ CreateEventRing (
>    EventRing->EventRingDequeue = (TRB_TEMPLATE *)EventRing-
> >EventRingSeg0;
>    EventRing->EventRingEnqueue = (TRB_TEMPLATE *)EventRing-
> >EventRingSeg0;
> 
> -  DequeuePhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size);
> +  DequeuePhy = 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       = XHC_HIGH_32BIT (DequeuePhy);
>    ERSTBase->RingTrbSize = EVENT_RING_TRB_NUMBER;
> 
> -  ERSTPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, ERSTBase, Size);
> +  ERSTPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, ERSTBase, Size,
> TRUE);
> 
>    //
>    // Program the Interrupter Event Ring Segment Table Size (ERSTSZ) register
> (5.5.2.3.1)
> @@ -913,7 +913,7 @@ CreateTransferRing (
>    //
>    EndTrb        = (LINK_TRB *)((UINTN)Buf + sizeof (TRB_TEMPLATE) * (TrbNum
> - 1));
>    EndTrb->Type  = TRB_TYPE_LINK;
> -  PhyAddr       = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, sizeof
> (TRB_TEMPLATE) * TrbNum);
> +  PhyAddr       = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, sizeof
> (TRB_TEMPLATE) * TrbNum, TRUE);
>    EndTrb->PtrLo = XHC_LOW_32BIT (PhyAddr);
>    EndTrb->PtrHi = XHC_HIGH_32BIT (PhyAddr);
>    //
> @@ -1045,7 +1045,7 @@ IsTransferRingTrb (
>      if (CheckedTrb->Type == TRB_TYPE_LINK) {
>        LinkTrb    = (LINK_TRB *)CheckedTrb;
>        PhyAddr    = (EFI_PHYSICAL_ADDRESS)(LinkTrb->PtrLo | LShiftU64
> ((UINT64)LinkTrb->PtrHi, 32));
> -      CheckedTrb = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr
> (Xhc->MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE));
> +      CheckedTrb = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr
> (Xhc->MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE), FALSE);
>        ASSERT (CheckedTrb == Urb->Ring->RingSeg0);
>      }
>    }
> @@ -1154,7 +1154,7 @@ XhcCheckUrbResult (
>      // Need convert pci device address to host address
>      //
>      PhyAddr = (EFI_PHYSICAL_ADDRESS)(EvtTrb->TRBPtrLo | LShiftU64
> ((UINT64)EvtTrb->TRBPtrHi, 32));
> -    TRBPtr  = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc-
> >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE));
> +    TRBPtr  = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc-
> >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE), FALSE);
> 
>      //
>      // Update the status of URB including the pending URB, the URB that is
> currently checked,
> @@ -1259,7 +1259,7 @@ EXIT:
>    High       = XhcReadRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4);
>    XhcDequeue = (UINT64)(LShiftU64 ((UINT64)High, 32) | Low);
> 
> -  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE));
> +  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE), FALSE);
> 
>    if ((XhcDequeue & (~0x0F)) != (PhyAddr & (~0x0F))) {
>      //
> @@ -2280,7 +2280,8 @@ XhcInitializeDeviceSlot (
>    PhyAddr = 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 = XHC_LOW_32BIT (PhyAddr) | BIT0;
>    InputContext->EP[0].PtrHi = XHC_HIGH_32BIT (PhyAddr);
> @@ -2298,7 +2299,7 @@ XhcInitializeDeviceSlot (
>    // 7) Load the appropriate (Device Slot ID) entry in the Device Context Base
> Address Array (5.4.6) with
>    //    a pointer to the Output Device Context data structure (6.2.1).
>    //
> -  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, OutputContext,
> sizeof (DEVICE_CONTEXT));
> +  PhyAddr = 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             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbAddr.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbAddr.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbAddr.CycleBit = 1;
> @@ -2496,7 +2497,8 @@ XhcInitializeDeviceSlot64 (
>    PhyAddr = 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 = XHC_LOW_32BIT (PhyAddr) | BIT0;
>    InputContext->EP[0].PtrHi = XHC_HIGH_32BIT (PhyAddr);
> @@ -2514,7 +2516,7 @@ XhcInitializeDeviceSlot64 (
>    // 7) Load the appropriate (Device Slot ID) entry in the Device Context Base
> Address Array (5.4.6) with
>    //    a pointer to the Output Device Context data structure (6.2.1).
>    //
> -  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, OutputContext,
> sizeof (DEVICE_CONTEXT_64));
> +  PhyAddr = 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             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbAddr.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbAddr.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbAddr.CycleBit = 1;
> @@ -2964,7 +2966,8 @@ XhcInitializeEndpointContext (
>      PhyAddr = 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                      &= ~((EFI_PHYSICAL_ADDRESS)0x0F);
>      PhyAddr                      |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING
> *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])-
> >RingPCS;
> @@ -3166,7 +3169,8 @@ XhcInitializeEndpointContext64 (
>      PhyAddr = 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                      &= ~((EFI_PHYSICAL_ADDRESS)0x0F);
>      PhyAddr                      |= (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              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> @@ -3339,7 +3343,7 @@ XhcSetConfigCmd64 (
>    // configure endpoint
>    //
>    ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> @@ -3513,7 +3517,7 @@ XhcSetTrDequeuePointer (
>    // Send stop endpoint command to transit Endpoint from running to stop
> state
>    //
>    ZeroMem (&CmdSetTRDeq, sizeof (CmdSetTRDeq));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Urb-
> >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Urb-
> >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER), TRUE);
>    CmdSetTRDeq.PtrLo    = XHC_LOW_32BIT (PhyAddr) | Urb->Ring->RingPCS;
>    CmdSetTRDeq.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdSetTRDeq.CycleBit = 1;
> @@ -3713,7 +3717,7 @@ XhcSetInterface (
>      // 5) Issue and successfully complete a Configure Endpoint Command.
>      //
>      ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -    PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT));
> +    PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT), TRUE);
>      CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>      CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>      CmdTrbCfgEP.CycleBit = 1;
> @@ -3919,7 +3923,7 @@ XhcSetInterface64 (
>      // 5) Issue and successfully complete a Configure Endpoint Command.
>      //
>      ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -    PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64));
> +    PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>      CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>      CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>      CmdTrbCfgEP.CycleBit = 1;
> @@ -3986,7 +3990,7 @@ XhcEvaluateContext (
>    InputContext->EP[0].EPState               = 0;
> 
>    ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbEvalu.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbEvalu.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbEvalu.CycleBit = 1;
> @@ -4047,7 +4051,7 @@ XhcEvaluateContext64 (
>    InputContext->EP[0].EPState               = 0;
> 
>    ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbEvalu.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbEvalu.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbEvalu.CycleBit = 1;
> @@ -4116,7 +4120,7 @@ XhcConfigHubContext (
>    InputContext->Slot.MTT     = MTT;
> 
>    ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> @@ -4185,7 +4189,7 @@ XhcConfigHubContext64 (
>    InputContext->Slot.MTT     = MTT;
> 
>    ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> diff --git a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c
> b/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c
> index e779a31138..e9cf53b122 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;
> @@ -208,7 +210,11 @@ UsbHcGetPciAddrForHostAddr (
>    UINTN                 Offset;
> 
>    Head      = Pool->Head;
> -  AllocSize = USBHC_MEM_ROUND (Size);
> +  if (Alignment) {
> +    AllocSize = USBHC_MEM_ROUND (Size);
> +  } else {
> +    AllocSize = Size;
> +  }
> 
>    if (Mem == 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;
> @@ -257,7 +265,11 @@ UsbHcGetHostAddrForPciAddr (
>    UINTN                 Offset;
> 
>    Head      = Pool->Head;
> -  AllocSize = USBHC_MEM_ROUND (Size);
> +  if (Alignment) {
> +    AllocSize = USBHC_MEM_ROUND (Size);
> +  } else {
> +    AllocSize = Size;
> +  }
> 
>    if (Mem == 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 = (EFI_PHYSICAL_ADDRESS)(EvtTrb->TRBPtrLo | LShiftU64
> ((UINT64)EvtTrb->TRBPtrHi, 32));
> -    TRBPtr  = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc-
> >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE));
> +    TRBPtr  = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc-
> >MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE), FALSE);
> 
>      //
>      // Update the status of Urb according to the finished event regardless of
> whether
> @@ -766,7 +766,7 @@ EXIT:
>    High       = XhcPeiReadRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4);
>    XhcDequeue = (UINT64)(LShiftU64 ((UINT64)High, 32) | Low);
> 
> -  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE));
> +  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE), FALSE);
> 
>    if ((XhcDequeue & (~0x0F)) != (PhyAddr & (~0x0F))) {
>      //
> @@ -1213,7 +1213,8 @@ XhcPeiInitializeDeviceSlot (
>    PhyAddr = 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 = XHC_LOW_32BIT (PhyAddr) | BIT0;
>    InputContext->EP[0].PtrHi = XHC_HIGH_32BIT (PhyAddr);
> @@ -1231,7 +1232,7 @@ XhcPeiInitializeDeviceSlot (
>    // 7) Load the appropriate (Device Slot ID) entry in the Device Context Base
> Address Array (5.4.6) with
>    //    a pointer to the Output Device Context data structure (6.2.1).
>    //
> -  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, OutputContext,
> sizeof (DEVICE_CONTEXT));
> +  PhyAddr = 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             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbAddr.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbAddr.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbAddr.CycleBit = 1;
> @@ -1427,7 +1428,8 @@ XhcPeiInitializeDeviceSlot64 (
>    PhyAddr = 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 = XHC_LOW_32BIT (PhyAddr) | BIT0;
>    InputContext->EP[0].PtrHi = XHC_HIGH_32BIT (PhyAddr);
> @@ -1445,7 +1447,7 @@ XhcPeiInitializeDeviceSlot64 (
>    // 7) Load the appropriate (Device Slot ID) entry in the Device Context Base
> Address Array (5.4.6) with
>    //    a pointer to the Output Device Context data structure (6.2.1).
>    //
> -  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, OutputContext,
> sizeof (DEVICE_CONTEXT_64));
> +  PhyAddr = 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             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbAddr.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbAddr.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbAddr.CycleBit = 1;
> @@ -1882,7 +1884,8 @@ XhcPeiSetConfigCmd (
>        PhyAddr = 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                      &= ~((EFI_PHYSICAL_ADDRESS)0x0F);
>        PhyAddr                      |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING
> *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])-
> >RingPCS;
> @@ -1901,7 +1904,7 @@ XhcPeiSetConfigCmd (
>    // configure endpoint
>    //
>    ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> @@ -2108,7 +2111,8 @@ XhcPeiSetConfigCmd64 (
>        PhyAddr = 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 &= ~((EFI_PHYSICAL_ADDRESS)0x0F);
> @@ -2129,7 +2133,7 @@ XhcPeiSetConfigCmd64 (
>    // configure endpoint
>    //
>    ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> @@ -2184,7 +2188,7 @@ XhcPeiEvaluateContext (
>    InputContext->EP[0].MaxPacketSize         = MaxPacketSize;
> 
>    ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbEvalu.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbEvalu.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbEvalu.CycleBit = 1;
> @@ -2239,7 +2243,7 @@ XhcPeiEvaluateContext64 (
>    InputContext->EP[0].MaxPacketSize         = MaxPacketSize;
> 
>    ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbEvalu.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbEvalu.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbEvalu.CycleBit = 1;
> @@ -2308,7 +2312,7 @@ XhcPeiConfigHubContext (
>    InputContext->Slot.MTT     = MTT;
> 
>    ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> @@ -2377,7 +2381,7 @@ XhcPeiConfigHubContext64 (
>    InputContext->Slot.MTT     = MTT;
> 
>    ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool,
> InputContext, sizeof (INPUT_CONTEXT_64), TRUE);
>    CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);
>    CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdTrbCfgEP.CycleBit = 1;
> @@ -2522,7 +2526,7 @@ XhcPeiSetTrDequeuePointer (
>    // Send stop endpoint command to transit Endpoint from running to stop
> state
>    //
>    ZeroMem (&CmdSetTRDeq, sizeof (CmdSetTRDeq));
> -  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Urb-
> >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER));
> +  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Urb-
> >Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER), TRUE);
>    CmdSetTRDeq.PtrLo    = XHC_LOW_32BIT (PhyAddr) | Urb->Ring->RingPCS;
>    CmdSetTRDeq.PtrHi    = XHC_HIGH_32BIT (PhyAddr);
>    CmdSetTRDeq.CycleBit = 1;
> @@ -2682,7 +2686,7 @@ XhcPeiCreateEventRing (
>    ASSERT (((UINTN)Buf & 0x3F) == 0);
>    ZeroMem (Buf, Size);
> 
> -  DequeuePhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size);
> +  DequeuePhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size,
> TRUE);
> 
>    EventRing->EventRingSeg0    = Buf;
>    EventRing->TrbNumber        = EVENT_RING_TRB_NUMBER;
> @@ -2707,7 +2711,7 @@ XhcPeiCreateEventRing (
>    ERSTBase->PtrHi       = XHC_HIGH_32BIT (DequeuePhy);
>    ERSTBase->RingTrbSize = EVENT_RING_TRB_NUMBER;
> 
> -  ERSTPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size);
> +  ERSTPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size, TRUE);
> 
>    //
>    // Program the Interrupter Event Ring Segment Table Size (ERSTSZ) register
> (5.5.2.3.1)
> @@ -2855,7 +2859,7 @@ XhcPeiCreateTransferRing (
>    //
>    EndTrb        = (LINK_TRB *)((UINTN)Buf + sizeof (TRB_TEMPLATE) * (TrbNum
> - 1));
>    EndTrb->Type  = TRB_TYPE_LINK;
> -  PhyAddr       = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, sizeof
> (TRB_TEMPLATE) * TrbNum);
> +  PhyAddr       = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, sizeof
> (TRB_TEMPLATE) * TrbNum, TRUE);
>    EndTrb->PtrLo = XHC_LOW_32BIT (PhyAddr);
>    EndTrb->PtrHi = 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 = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Dcbaa, Size);
> +  DcbaaPhy = 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 transition detected,
> the ring is empty.
>    // So we set RCS as inverted PCS init value to let Command Ring empty
>    //
> -  CmdRingPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >CmdRing.RingSeg0, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER);
> +  CmdRingPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc-
> >CmdRing.RingSeg0, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER,
> TRUE);
>    ASSERT ((CmdRingPhy & 0x3F) == 0);
>    CmdRingPhy |= XHC_CRCR_RCS;
>    //
> --
> 2.42.0.windows.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109058): https://edk2.groups.io/g/devel/message/109058
Mute This Topic: https://groups.io/mt/101588610/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-




More information about the edk2-devel-archive mailing list