Merged via:
PR - https://github.com/tianocore/edk2/pull/3806
Commit -
https://github.com/tianocore/edk2/commit/01c2fb0d2260d4de898e4e91e48770ffa5510153
Best Regards,
Hao Wu
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Hao
> A
> Sent: Monday, December 19, 2022 2:16 PM
> To: Rhodes, Sean <sean@starlabs.systems>; devel@edk2.groups.io
> Cc: Matt DeVillier <matt.devill...@gmail.com>; Ni, Ray <ray...@intel.com>;
> Rhodes, Sean <sean@starlabs.systems>
> Subject: Re: [edk2-devel] [PATCH 2/3] MdeModulePkg/XhciDxe/Xhci: Don't
> check for invalid PSIV
>
> Reviewed-by: Hao A Wu <hao.a...@intel.com>
>
> Best Regards,
> Hao Wu
>
> > -----Original Message-----
> > From: Sean Rhodes <sean@starlabs.systems>
> > Sent: Friday, December 16, 2022 4:58 PM
> > To: devel@edk2.groups.io
> > Cc: Matt DeVillier <matt.devill...@gmail.com>; Wu, Hao A
> > <hao.a...@intel.com>; Ni, Ray <ray...@intel.com>; Rhodes, Sean
> > <sean@starlabs.systems>
> > Subject: [PATCH 2/3] MdeModulePkg/XhciDxe/Xhci: Don't check for
> > invalid PSIV
> >
> > From: Matt DeVillier <matt.devill...@gmail.com>
> >
> > PSID matching relies on comparing the PSIV against the PortSpeed
> > value. This patch stops edk2 from checking for a PSIV of 0, as it is
> > not valid; this reduces the number of register access by approximately
> > 6 per second.
> >
> > Cc: Hao A Wu <hao.a...@intel.com>
> > Cc: Ray Ni <ray...@intel.com>
> > Reviewed-by: Sean Rhodes <sean@starlabs.systems>
> > Signed-off-by: Matt DeVillier <matt.devill...@gmail.com>
> > Change-Id: If15c55ab66d2e7faa832ce8576d2e5b47157cc9a
> > ---
> > MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 44
> > ++++++++++++++++-------------
> > 1 file changed, 25 insertions(+), 19 deletions(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > index 15fb49f28f..8dd7a8fbb7 100644
> > --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
> > @@ -371,6 +371,7 @@ XhcGetRootHubPortStatus (
> > UINT32 TotalPort;
> >
> > UINTN Index;
> >
> > UINTN MapSize;
> >
> > + UINT8 PortSpeed;
> >
> > EFI_STATUS Status;
> >
> > USB_DEV_ROUTE ParentRouteChart;
> >
> > EFI_TPL OldTpl;
> >
> > @@ -397,32 +398,37 @@ XhcGetRootHubPortStatus (
> >
> >
> > State = XhcReadOpReg (Xhc, Offset);
> >
> >
> >
> > + PortSpeed = (State & XHC_PORTSC_PS) >> 10;
> >
> > +
> >
> > //
> >
> > // According to XHCI 1.1 spec November 2017,
> >
> > // Section 7.2 xHCI Support Protocol Capability
> >
> > //
> >
> > - PortStatus->PortStatus = XhcCheckUsbPortSpeedUsedPsic (Xhc, ((State
> > &
> > XHC_PORTSC_PS) >> 10));
> >
> > - if (PortStatus->PortStatus == 0) {
> >
> > - //
> >
> > - // According to XHCI 1.1 spec November 2017,
> >
> > - // bit 10~13 of the root port status register identifies the speed of
> > the
> > attached device.
> >
> > - //
> >
> > - switch ((State & XHC_PORTSC_PS) >> 10) {
> >
> > - case 2:
> >
> > - PortStatus->PortStatus |= USB_PORT_STAT_LOW_SPEED;
> >
> > - break;
> >
> > + if (PortSpeed > 0) {
> >
> > + PortStatus->PortStatus = XhcCheckUsbPortSpeedUsedPsic (Xhc,
> > PortSpeed);
> >
> > + // If no match found in ext cap reg, fall back to PORTSC
> >
> > + if (PortStatus->PortStatus == 0) {
> >
> > + //
> >
> > + // According to XHCI 1.1 spec November 2017,
> >
> > + // bit 10~13 of the root port status register identifies the
> > + speed of the
> > attached device.
> >
> > + //
> >
> > + switch (PortSpeed) {
> >
> > + case 2:
> >
> > + PortStatus->PortStatus |= USB_PORT_STAT_LOW_SPEED;
> >
> > + break;
> >
> >
> >
> > - case 3:
> >
> > - PortStatus->PortStatus |= USB_PORT_STAT_HIGH_SPEED;
> >
> > - break;
> >
> > + case 3:
> >
> > + PortStatus->PortStatus |= USB_PORT_STAT_HIGH_SPEED;
> >
> > + break;
> >
> >
> >
> > - case 4:
> >
> > - case 5:
> >
> > - PortStatus->PortStatus |= USB_PORT_STAT_SUPER_SPEED;
> >
> > - break;
> >
> > + case 4:
> >
> > + case 5:
> >
> > + PortStatus->PortStatus |= USB_PORT_STAT_SUPER_SPEED;
> >
> > + break;
> >
> >
> >
> > - default:
> >
> > - break;
> >
> > + default:
> >
> > + break;
> >
> > + }
> >
> > }
> >
> > }
> >
> >
> >
> > --
> > 2.37.2
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97639): https://edk2.groups.io/g/devel/message/97639
Mute This Topic: https://groups.io/mt/95569298/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
