发件人: Shih, More <more.shih@intel.com>
发送时间: 2024年5月6日 11:34
收件人: Cai, Xianglei <xianglei.cai@intel.com>; gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
抄送: Ni, Ray <ray.ni@intel.com>; Lewandowski, Krzysztof <krzysztof.lewandowski@intel.com>; Huang, Jenny <jenny.huang@intel.com>
主题: Re: [edk2-devel] [PATCH V2 1/1] MdeModulePkg/XhciDxe: Reset endpoint while USB Transaction error

I have no access to push PR. But I tried with my personal fork, it can pass CI.

Thanks,
Xianglei

-----Original Message-----
From: gaoliming <gaoliming@byosoft.com.cn>
Sent: Friday, April 26, 2024 4:44 PM
To: devel@edk2.groups.io; Cai, Xianglei <xianglei.cai@intel.com>
Cc: Ni, Ray <ray.ni@intel.com>; Lewandowski, Krzysztof <krzysztof.lewandowski@intel.com>; Huang, Jenny <jenny.huang@intel.com>; Shih, More <more.shih@intel.com>
Subject: 回复: [edk2-devel] [PATCH V2 1/1] MdeModulePkg/XhciDxe: Reset endpoint while USB Transaction error

Can you create PR for this patch? If it passes CI, I will add push label.

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Xianglei Cai
> 发送时间: 2024年4月25日 17:58
> 收件人: gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
> 抄送: Ni, Ray <ray.ni@intel.com>; Lewandowski, Krzysztof
> <krzysztof.lewandowski@intel.com>; Huang, Jenny
> <jenny.huang@intel.com>; Shih, More <more.shih@intel.com>
> 主题: Re: [edk2-devel] [PATCH V2 1/1] MdeModulePkg/XhciDxe: Reset
> endpoint while USB Transaction error
>
> Hi @gaoliming
>
> Could you provide the eta when the patch can be merged?
>
> Thanks,
> Xianglei
>
> -----Original Message-----
> From: Cai, Xianglei
> Sent: Thursday, April 18, 2024 4:59 PM
> To: gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Lewandowski, Krzysztof
> <krzysztof.lewandowski@intel.com>; Huang, Jenny
> <jenny.huang@intel.com>; Shih, More <more.shih@intel.com>
> Subject: RE: [edk2-devel] [PATCH V2 1/1] MdeModulePkg/XhciDxe: Reset
> endpoint while USB Transaction error
>
> Hi Liming,
>
> Could you help pick the change to the master branch?
>
> Thanks,
> Xianglei
>
> -----Original Message-----
> From: gaoliming <gaoliming@byosoft.com.cn>
> Sent: Monday, April 15, 2024 5:52 PM
> To: devel@edk2.groups.io; Cai, Xianglei <xianglei.cai@intel.com>
> Cc: Ni, Ray <ray.ni@intel.com>; Lewandowski, Krzysztof
> <krzysztof.lewandowski@intel.com>; Huang, Jenny
> <jenny.huang@intel.com>; Shih, More <more.shih@intel.com>
> Subject: 回复: [edk2-devel] [PATCH V2 1/1] MdeModulePkg/XhciDxe: Reset
> endpoint while USB Transaction error
>
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
>
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Xianglei
> Cai
> > 发送时间: 2024年4月15日 14:55
> > 收件人: devel@edk2.groups.io
> > 抄送: Xianglei Cai <xianglei.cai@intel.com>; Ray Ni
> > <ray.ni@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Krzysztof
> > Lewandowski <krzysztof.lewandowski@intel.com>; Jenny Huang
> > <jenny.huang@intel.com>; More Shih <more.shih@intel.com>
> > 主题: [edk2-devel] [PATCH V2 1/1] MdeModulePkg/XhciDxe: Reset
> endpoint
> > while USB Transaction error
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=4556
> >
> > Based on XHCI spec 4.8.3, software should do the reset endpoint
> > while USB Transaction occur.
> > Add the error code for USB Transaction error since UEFI spec don't
> > have the related definition.
> >
> > Cc: Ray Ni                  <ray.ni@intel.com>
> > Cc: Liming Gao              <gaoliming@byosoft.com.cn>
> > Cc: Krzysztof Lewandowski   <krzysztof.lewandowski@intel.com>
> > Cc: Jenny Huang             <jenny.huang@intel.com>
> > Cc: More Shih               <more.shih@intel.com>
> > Signed-off-by: Xianglei Cai <xianglei.cai@intel.com>
> > Reviewed-by: Krzysztof Lewandowski <krzysztof.lewandowski@intel.com>
> > ---
> >  MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c      | 5 ++++-
> >  MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 5 ++++-
> > MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h | 7 +++++++
> >  3 files changed, 15 insertions(+), 2 deletions(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > index f4e61d223c1b..cf6b32959e68 100644
> > --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > @@ -825,7 +825,10 @@ XhcTransfer (
> >    *TransferResult = Urb->Result;
> >    *DataLength     = Urb->Completed;
> >
> > -  if ((*TransferResult == EFI_USB_ERR_STALL) || (*TransferResult ==
> > EFI_USB_ERR_BABBLE)) {
> > +  //
> > +  // Based on XHCI spec 4.8.3, software should do the reset
> > + endpoint
> while
> > USB Transaction occur.
> > +  //
> > +  if ((*TransferResult == EFI_USB_ERR_STALL) || (*TransferResult ==
> > EFI_USB_ERR_BABBLE) || (*TransferResult ==
> > EDKII_USB_ERR_TRANSACTION)) {
> >      ASSERT (Status == EFI_DEVICE_ERROR);
> >      RecoveryStatus = XhcRecoverHaltedEndpoint (Xhc, Urb);
> >      if (EFI_ERROR (RecoveryStatus)) { diff --git
> > a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
> > b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
> > index 5d735008ba31..a97ed44dbfc3 100644
> > --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
> > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
> > @@ -1192,8 +1192,11 @@ XhcCheckUrbResult (
> >          DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: ERR_BUFFER!
> > Completecode = %x\n", EvtTrb->Completecode));
> >          goto EXIT;
> >
> > +      //
> > +      // Based on XHCI spec 4.8.3, software should do the reset
> > + endpoint
> > while USB Transaction occur.
> > +      //
> >        case TRB_COMPLETION_USB_TRANSACTION_ERROR:
> > -        CheckedUrb->Result  |= EFI_USB_ERR_TIMEOUT;
> > +        CheckedUrb->Result  |= EDKII_USB_ERR_TRANSACTION;
> >          CheckedUrb->Finished = TRUE;
> >          DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult:
> > TRANSACTION_ERROR! Completecode = %x\n", EvtTrb->Completecode));
> >          goto EXIT;
> > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
> > b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
> > index 7c85f7993b5c..e606e212a1d3 100644
> > --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
> > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
> > @@ -78,6 +78,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #define TRB_COMPLETION_STOPPED                 26
> >  #define TRB_COMPLETION_STOPPED_LENGTH_INVALID  27
> >
> > +//
> > +// USB Transfer Results Internal Definition // Based on XHCI spec
> > +4.8.3, software should do the reset endpoint while
> > USB Transaction occur.
> > +// Add the error code for USB Transaction error since UEFI spec
> > +don't
> have
> > the related definition.
> > +//
> > +#define EDKII_USB_ERR_TRANSACTION  0x200
> > +
> >  //
> >  // The topology string used to present usb device location  //
> > --
> > 2.42.0.windows.2
> >
> >
> >
> >
> >
>
>
>
>
>
>
>