1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error

Sean Rhodes posted 1 patch 1 year, 11 months ago
Failed in applying to current master (apply log)
MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
[edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error
Posted by Sean Rhodes 1 year, 11 months ago 
Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in PortChangeStatus
when XhcPollPortStatusChange fails

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
---
 MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 461b2cd9b5..d8fa41f68f 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -471,7 +471,16 @@ XhcGetRootHubPortStatus (
   // For those devices behind hub, we get its attach/detach event by hooking Get_Port_Status request at control transfer for those hub.
   //
   ParentRouteChart.Dword = 0;
-  XhcPollPortStatusChange (Xhc, ParentRouteChart, PortNumber, PortStatus);
+  Status                 = XhcPollPortStatusChange (Xhc, ParentRouteChart, PortNumber, PortStatus);
+
+  //
+  // Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in PortChangeStatus
+  // when XhcPollPortStatusChange fails
+  //
+  if (EFI_ERROR (Status)) {
+    PortStatus->PortChangeStatus &= ~(USB_PORT_STAT_C_RESET);
+    Status                        = EFI_SUCCESS;
+  }
 
 ON_EXIT:
   gBS->RestoreTPL (OldTpl);
-- 
2.37.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97683): https://edk2.groups.io/g/devel/message/97683
Mute This Topic: https://groups.io/mt/95802798/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error
Posted by Wu, Hao A 1 year, 11 months ago 
Sorry,

The CI tests failed for the proposed patch:
https://github.com/tianocore/edk2/pull/3824

Could you help to check and resolve? Thanks.

Best Regards,
Hao Wu

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean
> Rhodes
> Sent: Wednesday, December 21, 2022 4:15 PM
> To: devel@edk2.groups.io
> Cc: Rhodes, Sean <sean@starlabs.systems>
> Subject: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the
> port if status change returns an error
> 
> Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in
> PortChangeStatus
> when XhcPollPortStatusChange fails
> 
> Signed-off-by: Sean Rhodes <sean@starlabs.systems>
> ---
>  MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> index 461b2cd9b5..d8fa41f68f 100644
> --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> @@ -471,7 +471,16 @@ XhcGetRootHubPortStatus (
>    // For those devices behind hub, we get its attach/detach event by hooking
> Get_Port_Status request at control transfer for those hub.
> 
>    //
> 
>    ParentRouteChart.Dword = 0;
> 
> -  XhcPollPortStatusChange (Xhc, ParentRouteChart, PortNumber, PortStatus);
> 
> +  Status                 = XhcPollPortStatusChange (Xhc, ParentRouteChart,
> PortNumber, PortStatus);
> 
> +
> 
> +  //
> 
> +  // Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in
> PortChangeStatus
> 
> +  // when XhcPollPortStatusChange fails
> 
> +  //
> 
> +  if (EFI_ERROR (Status)) {
> 
> +    PortStatus->PortChangeStatus &= ~(USB_PORT_STAT_C_RESET);
> 
> +    Status                        = EFI_SUCCESS;
> 
> +  }
> 
> 
> 
>  ON_EXIT:
> 
>    gBS->RestoreTPL (OldTpl);
> 
> --
> 2.37.2
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#97683): https://edk2.groups.io/g/devel/message/97683
> Mute This Topic: https://groups.io/mt/95802798/1768737
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@intel.com]
> -=-=-=-=-=-=
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97728): https://edk2.groups.io/g/devel/message/97728
Mute This Topic: https://groups.io/mt/95802798/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error
Posted by Sean Rhodes 1 year, 11 months ago 
Hi Hao

This PR has passed CI - https://github.com/tianocore/edk2/pull/3353

Thanks

Sean

On Fri, 23 Dec 2022 at 08:56, Wu, Hao A <hao.a.wu@intel.com> wrote:

> Sorry,
>
> The CI tests failed for the proposed patch:
> https://github.com/tianocore/edk2/pull/3824
>
> Could you help to check and resolve? Thanks.
>
> Best Regards,
> Hao Wu
>
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean
> > Rhodes
> > Sent: Wednesday, December 21, 2022 4:15 PM
> > To: devel@edk2.groups.io
> > Cc: Rhodes, Sean <sean@starlabs.systems>
> > Subject: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the
> > port if status change returns an error
> >
> > Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in
> > PortChangeStatus
> > when XhcPollPortStatusChange fails
> >
> > Signed-off-by: Sean Rhodes <sean@starlabs.systems>
> > ---
> >  MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 11 ++++++++++-
> >  1 file changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > index 461b2cd9b5..d8fa41f68f 100644
> > --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > @@ -471,7 +471,16 @@ XhcGetRootHubPortStatus (
> >    // For those devices behind hub, we get its attach/detach event by
> hooking
> > Get_Port_Status request at control transfer for those hub.
> >
> >    //
> >
> >    ParentRouteChart.Dword = 0;
> >
> > -  XhcPollPortStatusChange (Xhc, ParentRouteChart, PortNumber,
> PortStatus);
> >
> > +  Status                 = XhcPollPortStatusChange (Xhc,
> ParentRouteChart,
> > PortNumber, PortStatus);
> >
> > +
> >
> > +  //
> >
> > +  // Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit
> in
> > PortChangeStatus
> >
> > +  // when XhcPollPortStatusChange fails
> >
> > +  //
> >
> > +  if (EFI_ERROR (Status)) {
> >
> > +    PortStatus->PortChangeStatus &= ~(USB_PORT_STAT_C_RESET);
> >
> > +    Status                        = EFI_SUCCESS;
> >
> > +  }
> >
> >
> >
> >  ON_EXIT:
> >
> >    gBS->RestoreTPL (OldTpl);
> >
> > --
> > 2.37.2
> >
> >
> >
> > -=-=-=-=-=-=
> > Groups.io Links: You receive all messages sent to this group.
> > View/Reply Online (#97683): https://edk2.groups.io/g/devel/message/97683
> > Mute This Topic: https://groups.io/mt/95802798/1768737
> > Group Owner: devel+owner@edk2.groups.io
> > Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@intel.com]
> > -=-=-=-=-=-=
> >
>
>
>
> 
>
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97729): https://edk2.groups.io/g/devel/message/97729
Mute This Topic: https://groups.io/mt/95802798/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error
Posted by Wu, Hao A 1 year, 10 months ago 
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

From: Sean Rhodes <sean@starlabs.systems>
Sent: Friday, December 23, 2022 6:22 PM
To: devel@edk2.groups.io; Wu, Hao A <hao.a.wu@intel.com>
Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error

Hi Hao

This PR has passed CI - https://github.com/tianocore/edk2/pull/3353

Thanks

Sean

On Fri, 23 Dec 2022 at 08:56, Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>> wrote:
Sorry,

The CI tests failed for the proposed patch:
https://github.com/tianocore/edk2/pull/3824

Could you help to check and resolve? Thanks.

Best Regards,
Hao Wu

> -----Original Message-----
> From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Sean
> Rhodes
> Sent: Wednesday, December 21, 2022 4:15 PM
> To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> Cc: Rhodes, Sean <sean@starlabs.systems<mailto:sean@starlabs.systems>>
> Subject: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the
> port if status change returns an error
>
> Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in
> PortChangeStatus
> when XhcPollPortStatusChange fails
>
> Signed-off-by: Sean Rhodes <sean@starlabs.systems<mailto:sean@starlabs.systems>>
> ---
>  MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> index 461b2cd9b5..d8fa41f68f 100644
> --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> @@ -471,7 +471,16 @@ XhcGetRootHubPortStatus (
>    // For those devices behind hub, we get its attach/detach event by hooking
> Get_Port_Status request at control transfer for those hub.
>
>    //
>
>    ParentRouteChart.Dword = 0;
>
> -  XhcPollPortStatusChange (Xhc, ParentRouteChart, PortNumber, PortStatus);
>
> +  Status                 = XhcPollPortStatusChange (Xhc, ParentRouteChart,
> PortNumber, PortStatus);
>
> +
>
> +  //
>
> +  // Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in
> PortChangeStatus
>
> +  // when XhcPollPortStatusChange fails
>
> +  //
>
> +  if (EFI_ERROR (Status)) {
>
> +    PortStatus->PortChangeStatus &= ~(USB_PORT_STAT_C_RESET);
>
> +    Status                        = EFI_SUCCESS;
>
> +  }
>
>
>
>  ON_EXIT:
>
>    gBS->RestoreTPL (OldTpl);
>
> --
> 2.37.2
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#97683): https://edk2.groups.io/g/devel/message/97683
> Mute This Topic: https://groups.io/mt/95802798/1768737
> Group Owner: devel+owner@edk2.groups.io<mailto:devel%2Bowner@edk2.groups.io>
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>]
> -=-=-=-=-=-=
>







-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97847): https://edk2.groups.io/g/devel/message/97847
Mute This Topic: https://groups.io/mt/95802798/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error
Posted by Wu, Hao A 1 year, 10 months ago 
Pushed via:
PR - https://github.com/tianocore/edk2/pull/3848
Commit  - https://github.com/tianocore/edk2/commit/992d5451d19b93635d52db293bab680e32142776

Best Regards,
Hao Wu

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Hao A
Sent: Tuesday, January 3, 2023 9:25 AM
To: Rhodes, Sean <sean@starlabs.systems>; devel@edk2.groups.io
Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error

Reviewed-by: Hao A Wu <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>

Best Regards,
Hao Wu

From: Sean Rhodes <sean@starlabs.systems<mailto:sean@starlabs.systems>>
Sent: Friday, December 23, 2022 6:22 PM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>
Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the port if status change returns an error

Hi Hao

This PR has passed CI - https://github.com/tianocore/edk2/pull/3353

Thanks

Sean

On Fri, 23 Dec 2022 at 08:56, Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>> wrote:
Sorry,

The CI tests failed for the proposed patch:
https://github.com/tianocore/edk2/pull/3824

Could you help to check and resolve? Thanks.

Best Regards,
Hao Wu

> -----Original Message-----
> From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Sean
> Rhodes
> Sent: Wednesday, December 21, 2022 4:15 PM
> To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> Cc: Rhodes, Sean <sean@starlabs.systems<mailto:sean@starlabs.systems>>
> Subject: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Reset the
> port if status change returns an error
>
> Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in
> PortChangeStatus
> when XhcPollPortStatusChange fails
>
> Signed-off-by: Sean Rhodes <sean@starlabs.systems<mailto:sean@starlabs.systems>>
> ---
>  MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> index 461b2cd9b5..d8fa41f68f 100644
> --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> @@ -471,7 +471,16 @@ XhcGetRootHubPortStatus (
>    // For those devices behind hub, we get its attach/detach event by hooking
> Get_Port_Status request at control transfer for those hub.
>
>    //
>
>    ParentRouteChart.Dword = 0;
>
> -  XhcPollPortStatusChange (Xhc, ParentRouteChart, PortNumber, PortStatus);
>
> +  Status                 = XhcPollPortStatusChange (Xhc, ParentRouteChart,
> PortNumber, PortStatus);
>
> +
>
> +  //
>
> +  // Force resetting the port by clearing the USB_PORT_STAT_C_RESET bit in
> PortChangeStatus
>
> +  // when XhcPollPortStatusChange fails
>
> +  //
>
> +  if (EFI_ERROR (Status)) {
>
> +    PortStatus->PortChangeStatus &= ~(USB_PORT_STAT_C_RESET);
>
> +    Status                        = EFI_SUCCESS;
>
> +  }
>
>
>
>  ON_EXIT:
>
>    gBS->RestoreTPL (OldTpl);
>
> --
> 2.37.2
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#97683): https://edk2.groups.io/g/devel/message/97683
> Mute This Topic: https://groups.io/mt/95802798/1768737
> Group Owner: devel+owner@edk2.groups.io<mailto:devel%2Bowner@edk2.groups.io>
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>]
> -=-=-=-=-=-=
>







-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97904): https://edk2.groups.io/g/devel/message/97904
Mute This Topic: https://groups.io/mt/95802798/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.