devel@edk2.groups.io | [PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle incorrect PSIV indices

Home Messages Hashtags Subgroups Calendar

Date Date 1 - 7 of 7

[PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle incorrect PSIV indices

Sean Rhodes #96843 From: Matt DeVillier <matt.devillier@...> On some platforms, including Sky Lake and Kaby Lake, the PSIV (Protocol Speed ID Value) indicesare shared between Protocol Speed ID DWORD' in the extended capabilities registers for both USB2 (Full Speed) and USB3 (Super Speed). An example can be found below: XhcCheckUsbPortSpeedUsedPsic: checking for USB2 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 2 PLT 0 PSIM 12 XhciPsivGetPsid: PSIV 2 PSIE 1 PLT 0 PSIM 1500 XhciPsivGetPsid: PSIV 3 PSIE 2 PLT 0 PSIM 480 XhcCheckUsbPortSpeedUsedPsic: checking for USB3 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 3 PLT 0 PSIM 5 XhciPsivGetPsid: PSIV 2 PSIE 3 PLT 0 PSIM 10 XhciPsivGetPsid: PSIV 34 PSIE 2 PLT 0 PSIM 1248 The result is edk2 detecting USB2 devices as USB3 devices, which consequently causes enumeration to fail. To avoid incorrect detection, check the extended capability registers for USB2 before USB3. If edk2 finds a match for a USB 2 device, don't check for USB 3. Cc: Hao A Wu <hao.a.wu@...> Cc: Ray Ni <ray.ni@...> Reviewed-by: Sean Rhodes <sean@...> Signed-off-by: Matt DeVillier <matt.devillier@...> Change-Id: I5bcf32105ce85fda95b4ba98a5e420e8f522374c --- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c \| 36 +++++++++++++++----------- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h \| 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/= XhciDxe/XhciReg.c index 2b4a4b2444..c992323443 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c @@ -698,25 +698,11 @@ XhcCheckUsbPortSpeedUsedPsic ( SpField.Dword =3D 0;=0D UsbSpeedIdMap =3D 0;=0D =0D - //=0D - // Check xHCI Supported Protocol Capability, find the PSIV field to matc= h=0D - // PortSpeed definition when the Major Revision is 03h.=0D - //=0D - if (Xhc->Usb3SupOffset !=3D 0xFFFFFFFF) {=0D - SpField.Dword =3D XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed)= ;=0D - if (SpField.Dword !=3D 0) {=0D - //=0D - // Found the corresponding PORTSC value in PSIV field of USB3 offset= .=0D - //=0D - UsbSpeedIdMap =3D USB_PORT_STAT_SUPER_SPEED;=0D - }=0D - }=0D -=0D //=0D // Check xHCI Supported Protocol Capability, find the PSIV field to matc= h=0D // PortSpeed definition when the Major Revision is 02h.=0D //=0D - if ((UsbSpeedIdMap =3D=3D 0) && (Xhc->Usb2SupOffset !=3D 0xFFFFFFFF)) {= =0D + if (Xhc->Usb2SupOffset !=3D 0xFFFFFFFF) {=0D SpField.Dword =3D XhciPsivGetPsid (Xhc, Xhc->Usb2SupOffset, PortSpeed)= ;=0D if (SpField.Dword !=3D 0) {=0D //=0D @@ -733,6 +719,12 @@ XhcCheckUsbPortSpeedUsedPsic ( // PSIM shows as default High-speed protocol, apply to High-spee= d mapping=0D //=0D UsbSpeedIdMap =3D USB_PORT_STAT_HIGH_SPEED;=0D + } else if (SpField.Data.Psim =3D=3D XHC_SUPPORTED_PROTOCOL_USB2_FU= LL_SPEED_PSIM) {=0D + //=0D + // PSIM shows as default Full-speed protocol, return 0=0D + // to ensure no port status set=0D + //=0D + return 0;=0D }=0D } else if (SpField.Data.Psie =3D=3D 1) {=0D //=0D @@ -750,6 +742,20 @@ XhcCheckUsbPortSpeedUsedPsic ( }=0D }=0D =0D + //=0D + // Check xHCI Supported Protocol Capability, find the PSIV field to matc= h=0D + // PortSpeed definition when the Major Revision is 03h.=0D + //=0D + if ((UsbSpeedIdMap =3D=3D 0) && (Xhc->Usb3SupOffset !=3D 0xFFFFFFFF)) {= =0D + SpField.Dword =3D XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed)= ;=0D + if (SpField.Dword !=3D 0) {=0D + //=0D + // Found the corresponding PORTSC value in PSIV field of USB3 offset= .=0D + //=0D + UsbSpeedIdMap =3D USB_PORT_STAT_SUPER_SPEED;=0D + }=0D + }=0D +=0D return UsbSpeedIdMap;=0D }=0D =0D diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/MdeModulePkg/Bus/Pci/= XhciDxe/XhciReg.h index 5fe2ba4f0e..74ac6297ba 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h @@ -85,6 +85,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define XHC_SUPPORTED_PROTOCOL_DW2_OFFSET 0x08=0D #define XHC_SUPPORTED_PROTOCOL_PSI_OFFSET 0x10=0D #define XHC_SUPPORTED_PROTOCOL_USB2_HIGH_SPEED_PSIM 480=0D +#define XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM 12=0D #define XHC_SUPPORTED_PROTOCOL_USB2_LOW_SPEED_PSIM 1500=0D =0D #pragma pack (1)=0D --=20 2.37.2
More All Messages By This Member
Wu, Hao A #96887 Hello, I saw there are several CI check failures for this 4 patches: https://github.com/tianocore/edk2/pull/3702 Could you help to resolve them? Thanks. Best Regards, Hao Wu toggle quoted message Show quoted text -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean Rhodes Sent: Friday, December 2, 2022 4:25 AM To: devel@edk2.groups.io Cc: Matt DeVillier <matt.devillier@...>; Wu, Hao A <hao.a.wu@...>; Ni, Ray <ray.ni@...>; Rhodes, Sean <sean@...> Subject: [edk2-devel] [PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle incorrect PSIV indices From: Matt DeVillier <matt.devillier@...> On some platforms, including Sky Lake and Kaby Lake, the PSIV (Protocol Speed ID Value) indicesare shared between Protocol Speed ID DWORD' in the extended capabilities registers for both USB2 (Full Speed) and USB3 (Super Speed). An example can be found below: XhcCheckUsbPortSpeedUsedPsic: checking for USB2 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 2 PLT 0 PSIM 12 XhciPsivGetPsid: PSIV 2 PSIE 1 PLT 0 PSIM 1500 XhciPsivGetPsid: PSIV 3 PSIE 2 PLT 0 PSIM 480 XhcCheckUsbPortSpeedUsedPsic: checking for USB3 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 3 PLT 0 PSIM 5 XhciPsivGetPsid: PSIV 2 PSIE 3 PLT 0 PSIM 10 XhciPsivGetPsid: PSIV 34 PSIE 2 PLT 0 PSIM 1248 The result is edk2 detecting USB2 devices as USB3 devices, which consequently causes enumeration to fail. To avoid incorrect detection, check the extended capability registers for USB2 before USB3. If edk2 finds a match for a USB 2 device, don't check for USB 3. Cc: Hao A Wu <hao.a.wu@...> Cc: Ray Ni <ray.ni@...> Reviewed-by: Sean Rhodes <sean@...> Signed-off-by: Matt DeVillier <matt.devillier@...> Change-Id: I5bcf32105ce85fda95b4ba98a5e420e8f522374c --- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c \| 36 +++++++++++++++----------- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h \| 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c index 2b4a4b2444..c992323443 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c @@ -698,25 +698,11 @@ XhcCheckUsbPortSpeedUsedPsic ( SpField.Dword = 0; UsbSpeedIdMap = 0; - //- // Check xHCI Supported Protocol Capability, find the PSIV field to match- // PortSpeed definition when the Major Revision is 03h.- //- if (Xhc->Usb3SupOffset != 0xFFFFFFFF) {- SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);- if (SpField.Dword != 0) {- //- // Found the corresponding PORTSC value in PSIV field of USB3 offset.- //- UsbSpeedIdMap = USB_PORT_STAT_SUPER_SPEED;- }- }- // // Check xHCI Supported Protocol Capability, find the PSIV field to match // PortSpeed definition when the Major Revision is 02h. //- if ((UsbSpeedIdMap == 0) && (Xhc->Usb2SupOffset != 0xFFFFFFFF)) {+ if (Xhc->Usb2SupOffset != 0xFFFFFFFF) { SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb2SupOffset, PortSpeed); if (SpField.Dword != 0) { //@@ -733,6 +719,12 @@ XhcCheckUsbPortSpeedUsedPsic ( // PSIM shows as default High-speed protocol, apply to High-speed mapping // UsbSpeedIdMap = USB_PORT_STAT_HIGH_SPEED;+ } else if (SpField.Data.Psim == XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM) {+ //+ // PSIM shows as default Full-speed protocol, return 0+ // to ensure no port status set+ //+ return 0; } } else if (SpField.Data.Psie == 1) { //@@ -750,6 +742,20 @@ XhcCheckUsbPortSpeedUsedPsic ( } } + //+ // Check xHCI Supported Protocol Capability, find the PSIV field to match+ // PortSpeed definition when the Major Revision is 03h.+ //+ if ((UsbSpeedIdMap == 0) && (Xhc->Usb3SupOffset != 0xFFFFFFFF)) {+ SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);+ if (SpField.Dword != 0) {+ //+ // Found the corresponding PORTSC value in PSIV field of USB3 offset.+ //+ UsbSpeedIdMap = USB_PORT_STAT_SUPER_SPEED;+ }+ }+ return UsbSpeedIdMap; } diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h index 5fe2ba4f0e..74ac6297ba 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h @@ -85,6 +85,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define XHC_SUPPORTED_PROTOCOL_DW2_OFFSET 0x08 #define XHC_SUPPORTED_PROTOCOL_PSI_OFFSET 0x10 #define XHC_SUPPORTED_PROTOCOL_USB2_HIGH_SPEED_PSIM 480+#define XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM 12 #define XHC_SUPPORTED_PROTOCOL_USB2_LOW_SPEED_PSIM 1500 #pragma pack (1)-- 2.37.2 -=-=-=-=-=-= Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96843): https://edk2.groups.io/g/devel/message/96843 Mute This Topic: https://groups.io/mt/95391831/1768737 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@...] -=-=- =-=-=-=
More All Messages By This Member
Sean Rhodes #96915 Hi Hao They are now resolved Thanks Sean toggle quoted message Show quoted text On Fri, 2 Dec 2022 at 06:25, Wu, Hao A <hao.a.wu@...> wrote: Hello, I saw there are several CI check failures for this 4 patches: https://github.com/tianocore/edk2/pull/3702 Could you help to resolve them? Thanks. Best Regards, Hao Wu > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean > Rhodes > Sent: Friday, December 2, 2022 4:25 AM > To: devel@edk2.groups.io > Cc: Matt DeVillier <matt.devillier@...>; Wu, Hao A > <hao.a.wu@...>; Ni, Ray <ray.ni@...>; Rhodes, Sean > <sean@...> > Subject: [edk2-devel] [PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle > incorrect PSIV indices > > From: Matt DeVillier <matt.devillier@...> > > On some platforms, including Sky Lake and Kaby Lake, the PSIV (Protocol Speed > ID Value) indicesare shared between Protocol Speed ID DWORD' in the > extended capabilities registers for both USB2 (Full Speed) and USB3 (Super > Speed). > > An example can be found below: > > XhcCheckUsbPortSpeedUsedPsic: checking for USB2 ext caps > XhciPsivGetPsid: found 3 PSID entries > XhciPsivGetPsid: looking for port speed 1 > XhciPsivGetPsid: PSIV 1 PSIE 2 PLT 0 PSIM 12 > XhciPsivGetPsid: PSIV 2 PSIE 1 PLT 0 PSIM 1500 > XhciPsivGetPsid: PSIV 3 PSIE 2 PLT 0 PSIM 480 > XhcCheckUsbPortSpeedUsedPsic: checking for USB3 ext caps > XhciPsivGetPsid: found 3 PSID entries > XhciPsivGetPsid: looking for port speed 1 > XhciPsivGetPsid: PSIV 1 PSIE 3 PLT 0 PSIM 5 > XhciPsivGetPsid: PSIV 2 PSIE 3 PLT 0 PSIM 10 > XhciPsivGetPsid: PSIV 34 PSIE 2 PLT 0 PSIM 1248 > > The result is edk2 detecting USB2 devices as USB3 devices, which consequently > causes enumeration to fail. > > To avoid incorrect detection, check the extended capability registers for USB2 > before USB3. If edk2 finds a match for a USB 2 device, don't check for USB 3. > > Cc: Hao A Wu <hao.a.wu@...> > Cc: Ray Ni <ray.ni@...> > Reviewed-by: Sean Rhodes <sean@...> > Signed-off-by: Matt DeVillier <matt.devillier@...> > Change-Id: I5bcf32105ce85fda95b4ba98a5e420e8f522374c > --- > MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c \| 36 +++++++++++++++----------- > MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h \| 1 + > 2 files changed, 22 insertions(+), 15 deletions(-) > > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > index 2b4a4b2444..c992323443 100644 > --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > @@ -698,25 +698,11 @@ XhcCheckUsbPortSpeedUsedPsic ( > SpField.Dword = 0; UsbSpeedIdMap = 0; - //- // Check xHCI Supported > Protocol Capability, find the PSIV field to match- // PortSpeed definition when > the Major Revision is 03h.- //- if (Xhc->Usb3SupOffset != 0xFFFFFFFF) {- > SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);- if > (SpField.Dword != 0) {- //- // Found the corresponding PORTSC value in > PSIV field of USB3 offset.- //- UsbSpeedIdMap = > USB_PORT_STAT_SUPER_SPEED;- }- }- // // Check xHCI Supported Protocol > Capability, find the PSIV field to match // PortSpeed definition when the Major > Revision is 02h. //- if ((UsbSpeedIdMap == 0) && (Xhc->Usb2SupOffset != > 0xFFFFFFFF)) {+ if (Xhc->Usb2SupOffset != 0xFFFFFFFF) { SpField.Dword = > XhciPsivGetPsid (Xhc, Xhc->Usb2SupOffset, PortSpeed); if (SpField.Dword != 0) > { //@@ -733,6 +719,12 @@ XhcCheckUsbPortSpeedUsedPsic ( > // PSIM shows as default High-speed protocol, apply to High-speed > mapping // UsbSpeedIdMap = > USB_PORT_STAT_HIGH_SPEED;+ } else if (SpField.Data.Psim == > XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM) {+ //+ // > PSIM shows as default Full-speed protocol, return 0+ // to ensure no port > status set+ //+ return 0; } } else if (SpField.Data.Psie == 1) > { //@@ -750,6 +742,20 @@ XhcCheckUsbPortSpeedUsedPsic ( > } } + //+ // Check xHCI Supported Protocol Capability, find the PSIV field to > match+ // PortSpeed definition when the Major Revision is 03h.+ //+ if > ((UsbSpeedIdMap == 0) && (Xhc->Usb3SupOffset != 0xFFFFFFFF)) {+ > SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);+ if > (SpField.Dword != 0) {+ //+ // Found the corresponding PORTSC value in > PSIV field of USB3 offset.+ //+ UsbSpeedIdMap = > USB_PORT_STAT_SUPER_SPEED;+ }+ }+ return UsbSpeedIdMap; } diff --git > a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > index 5fe2ba4f0e..74ac6297ba 100644 > --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > @@ -85,6 +85,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #define XHC_SUPPORTED_PROTOCOL_DW2_OFFSET 0x08 #define > XHC_SUPPORTED_PROTOCOL_PSI_OFFSET 0x10 #define > XHC_SUPPORTED_PROTOCOL_USB2_HIGH_SPEED_PSIM 480+#define > XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM 12 #define > XHC_SUPPORTED_PROTOCOL_USB2_LOW_SPEED_PSIM 1500 #pragma > pack (1)-- > 2.37.2 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#96843): https://edk2.groups.io/g/devel/message/96843 > Mute This Topic: https://groups.io/mt/95391831/1768737 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@...] -=-=- > =-=-=-= >
More All Messages By This Member
Wu, Hao A #96931 Hello, Could you help to send a V2 series of the patches? Also, a CI link with passed results will be appreciated. Best Regards, Hao Wu toggle quoted message Show quoted text From: Sean Rhodes <sean@...> Sent: Saturday, December 3, 2022 12:38 AM To: devel@edk2.groups.io; Wu, Hao A <hao.a.wu@...> Cc: Matt DeVillier <matt.devillier@...>; Ni, Ray <ray.ni@...> Subject: Re: [edk2-devel] [PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle incorrect PSIV indices Hi Hao They are now resolved Thanks Sean On Fri, 2 Dec 2022 at 06:25, Wu, Hao A <hao.a.wu@...> wrote: Hello, I saw there are several CI check failures for this 4 patches: https://github.com/tianocore/edk2/pull/3702 Could you help to resolve them? Thanks. Best Regards, Hao Wu > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean > Rhodes > Sent: Friday, December 2, 2022 4:25 AM > To: devel@edk2.groups.io > Cc: Matt DeVillier <matt.devillier@...>; Wu, Hao A > <hao.a.wu@...>; Ni, Ray <ray.ni@...>; Rhodes, Sean > <sean@...> > Subject: [edk2-devel] [PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle > incorrect PSIV indices > > From: Matt DeVillier <matt.devillier@...> > > On some platforms, including Sky Lake and Kaby Lake, the PSIV (Protocol Speed > ID Value) indicesare shared between Protocol Speed ID DWORD' in the > extended capabilities registers for both USB2 (Full Speed) and USB3 (Super > Speed). > > An example can be found below: > > XhcCheckUsbPortSpeedUsedPsic: checking for USB2 ext caps > XhciPsivGetPsid: found 3 PSID entries > XhciPsivGetPsid: looking for port speed 1 > XhciPsivGetPsid: PSIV 1 PSIE 2 PLT 0 PSIM 12 > XhciPsivGetPsid: PSIV 2 PSIE 1 PLT 0 PSIM 1500 > XhciPsivGetPsid: PSIV 3 PSIE 2 PLT 0 PSIM 480 > XhcCheckUsbPortSpeedUsedPsic: checking for USB3 ext caps > XhciPsivGetPsid: found 3 PSID entries > XhciPsivGetPsid: looking for port speed 1 > XhciPsivGetPsid: PSIV 1 PSIE 3 PLT 0 PSIM 5 > XhciPsivGetPsid: PSIV 2 PSIE 3 PLT 0 PSIM 10 > XhciPsivGetPsid: PSIV 34 PSIE 2 PLT 0 PSIM 1248 > > The result is edk2 detecting USB2 devices as USB3 devices, which consequently > causes enumeration to fail. > > To avoid incorrect detection, check the extended capability registers for USB2 > before USB3. If edk2 finds a match for a USB 2 device, don't check for USB 3. > > Cc: Hao A Wu <hao.a.wu@...> > Cc: Ray Ni <ray.ni@...> > Reviewed-by: Sean Rhodes <sean@...> > Signed-off-by: Matt DeVillier <matt.devillier@...> > Change-Id: I5bcf32105ce85fda95b4ba98a5e420e8f522374c > --- > MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c \| 36 +++++++++++++++----------- > MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h \| 1 + > 2 files changed, 22 insertions(+), 15 deletions(-) > > diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > index 2b4a4b2444..c992323443 100644 > --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c > @@ -698,25 +698,11 @@ XhcCheckUsbPortSpeedUsedPsic ( > SpField.Dword = 0; UsbSpeedIdMap = 0; - //- // Check xHCI Supported > Protocol Capability, find the PSIV field to match- // PortSpeed definition when > the Major Revision is 03h.- //- if (Xhc->Usb3SupOffset != 0xFFFFFFFF) {- > SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);- if > (SpField.Dword != 0) {- //- // Found the corresponding PORTSC value in > PSIV field of USB3 offset.- //- UsbSpeedIdMap = > USB_PORT_STAT_SUPER_SPEED;- }- }- // // Check xHCI Supported Protocol > Capability, find the PSIV field to match // PortSpeed definition when the Major > Revision is 02h. //- if ((UsbSpeedIdMap == 0) && (Xhc->Usb2SupOffset != > 0xFFFFFFFF)) {+ if (Xhc->Usb2SupOffset != 0xFFFFFFFF) { SpField.Dword = > XhciPsivGetPsid (Xhc, Xhc->Usb2SupOffset, PortSpeed); if (SpField.Dword != 0) > { //@@ -733,6 +719,12 @@ XhcCheckUsbPortSpeedUsedPsic ( > // PSIM shows as default High-speed protocol, apply to High-speed > mapping // UsbSpeedIdMap = > USB_PORT_STAT_HIGH_SPEED;+ } else if (SpField.Data.Psim == > XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM) {+ //+ // > PSIM shows as default Full-speed protocol, return 0+ // to ensure no port > status set+ //+ return 0; } } else if (SpField.Data.Psie == 1) > { //@@ -750,6 +742,20 @@ XhcCheckUsbPortSpeedUsedPsic ( > } } + //+ // Check xHCI Supported Protocol Capability, find the PSIV field to > match+ // PortSpeed definition when the Major Revision is 03h.+ //+ if > ((UsbSpeedIdMap == 0) && (Xhc->Usb3SupOffset != 0xFFFFFFFF)) {+ > SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);+ if > (SpField.Dword != 0) {+ //+ // Found the corresponding PORTSC value in > PSIV field of USB3 offset.+ //+ UsbSpeedIdMap = > USB_PORT_STAT_SUPER_SPEED;+ }+ }+ return UsbSpeedIdMap; } diff --git > a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > index 5fe2ba4f0e..74ac6297ba 100644 > --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h > @@ -85,6 +85,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #define XHC_SUPPORTED_PROTOCOL_DW2_OFFSET 0x08 #define > XHC_SUPPORTED_PROTOCOL_PSI_OFFSET 0x10 #define > XHC_SUPPORTED_PROTOCOL_USB2_HIGH_SPEED_PSIM 480+#define > XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM 12 #define > XHC_SUPPORTED_PROTOCOL_USB2_LOW_SPEED_PSIM 1500 #pragma > pack (1)-- > 2.37.2 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#96843): https://edk2.groups.io/g/devel/message/96843 > Mute This Topic: https://groups.io/mt/95391831/1768737 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@...] -=-=- > =-=-=-= >
More All Messages By This Member
Sean Rhodes #96950 From: Matt DeVillier <matt.devillier@...> On some platforms, including Sky Lake and Kaby Lake, the PSIV (Protocol Speed ID Value) indices are shared between Protocol Speed ID DWORD' in the extended capabilities registers for both USB2 (Full Speed) and USB3 (Super Speed). An example can be found below: XhcCheckUsbPortSpeedUsedPsic: checking for USB2 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 2 PLT 0 PSIM 12 XhciPsivGetPsid: PSIV 2 PSIE 1 PLT 0 PSIM 1500 XhciPsivGetPsid: PSIV 3 PSIE 2 PLT 0 PSIM 480 XhcCheckUsbPortSpeedUsedPsic: checking for USB3 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 3 PLT 0 PSIM 5 XhciPsivGetPsid: PSIV 2 PSIE 3 PLT 0 PSIM 10 XhciPsivGetPsid: PSIV 34 PSIE 2 PLT 0 PSIM 1248 The result is edk2 detecting USB2 devices as USB3 devices, which consequently causes enumeration to fail. To avoid incorrect detection, check the extended capability registers for USB2 before USB3. If edk2 finds a match for a USB 2 device, don't check for USB 3. Cc: Hao A Wu <hao.a.wu@...> Cc: Ray Ni <ray.ni@...> Reviewed-by: Sean Rhodes <sean@...> Signed-off-by: Matt DeVillier <matt.devillier@...> Change-Id: I5bcf32105ce85fda95b4ba98a5e420e8f522374c --- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c \| 36 +++++++++++++++----------- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h \| 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/= XhciDxe/XhciReg.c index 2b4a4b2444..c992323443 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c @@ -698,25 +698,11 @@ XhcCheckUsbPortSpeedUsedPsic ( SpField.Dword =3D 0;=0D UsbSpeedIdMap =3D 0;=0D =0D - //=0D - // Check xHCI Supported Protocol Capability, find the PSIV field to matc= h=0D - // PortSpeed definition when the Major Revision is 03h.=0D - //=0D - if (Xhc->Usb3SupOffset !=3D 0xFFFFFFFF) {=0D - SpField.Dword =3D XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed)= ;=0D - if (SpField.Dword !=3D 0) {=0D - //=0D - // Found the corresponding PORTSC value in PSIV field of USB3 offset= .=0D - //=0D - UsbSpeedIdMap =3D USB_PORT_STAT_SUPER_SPEED;=0D - }=0D - }=0D -=0D //=0D // Check xHCI Supported Protocol Capability, find the PSIV field to matc= h=0D // PortSpeed definition when the Major Revision is 02h.=0D //=0D - if ((UsbSpeedIdMap =3D=3D 0) && (Xhc->Usb2SupOffset !=3D 0xFFFFFFFF)) {= =0D + if (Xhc->Usb2SupOffset !=3D 0xFFFFFFFF) {=0D SpField.Dword =3D XhciPsivGetPsid (Xhc, Xhc->Usb2SupOffset, PortSpeed)= ;=0D if (SpField.Dword !=3D 0) {=0D //=0D @@ -733,6 +719,12 @@ XhcCheckUsbPortSpeedUsedPsic ( // PSIM shows as default High-speed protocol, apply to High-spee= d mapping=0D //=0D UsbSpeedIdMap =3D USB_PORT_STAT_HIGH_SPEED;=0D + } else if (SpField.Data.Psim =3D=3D XHC_SUPPORTED_PROTOCOL_USB2_FU= LL_SPEED_PSIM) {=0D + //=0D + // PSIM shows as default Full-speed protocol, return 0=0D + // to ensure no port status set=0D + //=0D + return 0;=0D }=0D } else if (SpField.Data.Psie =3D=3D 1) {=0D //=0D @@ -750,6 +742,20 @@ XhcCheckUsbPortSpeedUsedPsic ( }=0D }=0D =0D + //=0D + // Check xHCI Supported Protocol Capability, find the PSIV field to matc= h=0D + // PortSpeed definition when the Major Revision is 03h.=0D + //=0D + if ((UsbSpeedIdMap =3D=3D 0) && (Xhc->Usb3SupOffset !=3D 0xFFFFFFFF)) {= =0D + SpField.Dword =3D XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed)= ;=0D + if (SpField.Dword !=3D 0) {=0D + //=0D + // Found the corresponding PORTSC value in PSIV field of USB3 offset= .=0D + //=0D + UsbSpeedIdMap =3D USB_PORT_STAT_SUPER_SPEED;=0D + }=0D + }=0D +=0D return UsbSpeedIdMap;=0D }=0D =0D diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/MdeModulePkg/Bus/Pci/= XhciDxe/XhciReg.h index 5fe2ba4f0e..74ac6297ba 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h @@ -85,6 +85,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define XHC_SUPPORTED_PROTOCOL_DW2_OFFSET 0x08=0D #define XHC_SUPPORTED_PROTOCOL_PSI_OFFSET 0x10=0D #define XHC_SUPPORTED_PROTOCOL_USB2_HIGH_SPEED_PSIM 480=0D +#define XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM 12=0D #define XHC_SUPPORTED_PROTOCOL_USB2_LOW_SPEED_PSIM 1500=0D =0D #pragma pack (1)=0D --=20 2.37.2
More All Messages By This Member
Chiu, Ian #97122 Hi Sean, Matt DeVillier, I checked the patch 0001-0004, we are find and agree with 0002-0004. For the patch 0001-MdeModulePkg-XhciDxe-XhciReg-Handle-incorrect-PSIV-indices. The case you mention below with same PSIV in USB3/USB2. We consider if there exist a case that actually want to go with USB3 speed, then will fail when data transmit. Since USB3 protocol is different than USB2. Otherwise we may need to fix it again, once issue coming out. We think about a solution to using the "Compatible Port Count" & "Compatible Port Offset" to ensure the port is supported this protocol or not. Would you able to dump the xHCI Supported Protocol Capability raw data and check if this solution works with you case. Attach sample code snippet and data dump from my side. Thanks, Ian Chiu toggle quoted message Show quoted text -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean Rhodes Sent: Monday, December 5, 2022 5:18 PM To: devel@edk2.groups.io Cc: Matt DeVillier <matt.devillier@...>; Wu, Hao A <hao.a.wu@...>; Ni, Ray <ray.ni@...>; Rhodes, Sean <sean@...> Subject: [edk2-devel] [PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle incorrect PSIV indices From: Matt DeVillier <matt.devillier@...> On some platforms, including Sky Lake and Kaby Lake, the PSIV (Protocol Speed ID Value) indices are shared between Protocol Speed ID DWORD' in the extended capabilities registers for both USB2 (Full Speed) and USB3 (Super Speed). An example can be found below: XhcCheckUsbPortSpeedUsedPsic: checking for USB2 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 2 PLT 0 PSIM 12 XhciPsivGetPsid: PSIV 2 PSIE 1 PLT 0 PSIM 1500 XhciPsivGetPsid: PSIV 3 PSIE 2 PLT 0 PSIM 480 XhcCheckUsbPortSpeedUsedPsic: checking for USB3 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 3 PLT 0 PSIM 5 XhciPsivGetPsid: PSIV 2 PSIE 3 PLT 0 PSIM 10 XhciPsivGetPsid: PSIV 34 PSIE 2 PLT 0 PSIM 1248 The result is edk2 detecting USB2 devices as USB3 devices, which consequently causes enumeration to fail. To avoid incorrect detection, check the extended capability registers for USB2 before USB3. If edk2 finds a match for a USB 2 device, don't check for USB 3. Cc: Hao A Wu <hao.a.wu@...> Cc: Ray Ni <ray.ni@...> Reviewed-by: Sean Rhodes <sean@...> Signed-off-by: Matt DeVillier <matt.devillier@...> Change-Id: I5bcf32105ce85fda95b4ba98a5e420e8f522374c --- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c \| 36 +++++++++++++++----------- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h \| 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c index 2b4a4b2444..c992323443 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c @@ -698,25 +698,11 @@ XhcCheckUsbPortSpeedUsedPsic ( SpField.Dword = 0; UsbSpeedIdMap = 0; - //- // Check xHCI Supported Protocol Capability, find the PSIV field to match- // PortSpeed definition when the Major Revision is 03h.- //- if (Xhc->Usb3SupOffset != 0xFFFFFFFF) {- SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);- if (SpField.Dword != 0) {- //- // Found the corresponding PORTSC value in PSIV field of USB3 offset.- //- UsbSpeedIdMap = USB_PORT_STAT_SUPER_SPEED;- }- }- // // Check xHCI Supported Protocol Capability, find the PSIV field to match // PortSpeed definition when the Major Revision is 02h. //- if ((UsbSpeedIdMap == 0) && (Xhc->Usb2SupOffset != 0xFFFFFFFF)) {+ if (Xhc->Usb2SupOffset != 0xFFFFFFFF) { SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb2SupOffset, PortSpeed); if (SpField.Dword != 0) { //@@ -733,6 +719,12 @@ XhcCheckUsbPortSpeedUsedPsic ( // PSIM shows as default High-speed protocol, apply to High-speed mapping // UsbSpeedIdMap = USB_PORT_STAT_HIGH_SPEED;+ } else if (SpField.Data.Psim == XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM) {+ //+ // PSIM shows as default Full-speed protocol, return 0+ // to ensure no port status set+ //+ return 0; } } else if (SpField.Data.Psie == 1) { //@@ -750,6 +742,20 @@ XhcCheckUsbPortSpeedUsedPsic ( } } + //+ // Check xHCI Supported Protocol Capability, find the PSIV field to match+ // PortSpeed definition when the Major Revision is 03h.+ //+ if ((UsbSpeedIdMap == 0) && (Xhc->Usb3SupOffset != 0xFFFFFFFF)) {+ SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);+ if (SpField.Dword != 0) {+ //+ // Found the corresponding PORTSC value in PSIV field of USB3 offset.+ //+ UsbSpeedIdMap = USB_PORT_STAT_SUPER_SPEED;+ }+ }+ return UsbSpeedIdMap; } diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h index 5fe2ba4f0e..74ac6297ba 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h @@ -85,6 +85,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define XHC_SUPPORTED_PROTOCOL_DW2_OFFSET 0x08 #define XHC_SUPPORTED_PROTOCOL_PSI_OFFSET 0x10 #define XHC_SUPPORTED_PROTOCOL_USB2_HIGH_SPEED_PSIM 480+#define XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM 12 #define XHC_SUPPORTED_PROTOCOL_USB2_LOW_SPEED_PSIM 1500 #pragma pack (1)-- 2.37.2 -=-=-=-=-=-= Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96950): https://edk2.groups.io/g/devel/message/96950 Mute This Topic: https://groups.io/mt/95391831/5427408 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [ian.chiu@...] -=-=-=-=-=-= CompatiblePortOffset&Count.zip CompatiblePortOffset&Count.zip
More All Messages By This Member
Sean Rhodes #97212 Thank you :) toggle quoted message Show quoted text On Thu, 8 Dec 2022 at 07:06, Chiu, Ian <ian.chiu@...> wrote: Hi Sean, Matt DeVillier, I checked the patch 0001-0004, we are find and agree with 0002-0004. For the patch 0001-MdeModulePkg-XhciDxe-XhciReg-Handle-incorrect-PSIV-indices. The case you mention below with same PSIV in USB3/USB2. We consider if there exist a case that actually want to go with USB3 speed, then will fail when data transmit. Since USB3 protocol is different than USB2. Otherwise we may need to fix it again, once issue coming out. We think about a solution to using the "Compatible Port Count" & "Compatible Port Offset" to ensure the port is supported this protocol or not. Would you able to dump the xHCI Supported Protocol Capability raw data and check if this solution works with you case. Attach sample code snippet and data dump from my side. Thanks, Ian Chiu -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean Rhodes Sent: Monday, December 5, 2022 5:18 PM To: devel@edk2.groups.io Cc: Matt DeVillier <matt.devillier@...>; Wu, Hao A <hao.a.wu@...>; Ni, Ray <ray.ni@...>; Rhodes, Sean <sean@...> Subject: [edk2-devel] [PATCH 1/4] MdeModulePkg/XhciDxe/XhciReg: Handle incorrect PSIV indices From: Matt DeVillier <matt.devillier@...> On some platforms, including Sky Lake and Kaby Lake, the PSIV (Protocol Speed ID Value) indices are shared between Protocol Speed ID DWORD' in the extended capabilities registers for both USB2 (Full Speed) and USB3 (Super Speed). An example can be found below: XhcCheckUsbPortSpeedUsedPsic: checking for USB2 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 2 PLT 0 PSIM 12 XhciPsivGetPsid: PSIV 2 PSIE 1 PLT 0 PSIM 1500 XhciPsivGetPsid: PSIV 3 PSIE 2 PLT 0 PSIM 480 XhcCheckUsbPortSpeedUsedPsic: checking for USB3 ext caps XhciPsivGetPsid: found 3 PSID entries XhciPsivGetPsid: looking for port speed 1 XhciPsivGetPsid: PSIV 1 PSIE 3 PLT 0 PSIM 5 XhciPsivGetPsid: PSIV 2 PSIE 3 PLT 0 PSIM 10 XhciPsivGetPsid: PSIV 34 PSIE 2 PLT 0 PSIM 1248 The result is edk2 detecting USB2 devices as USB3 devices, which consequently causes enumeration to fail. To avoid incorrect detection, check the extended capability registers for USB2 before USB3. If edk2 finds a match for a USB 2 device, don't check for USB 3. Cc: Hao A Wu <hao.a.wu@...> Cc: Ray Ni <ray.ni@...> Reviewed-by: Sean Rhodes <sean@...> Signed-off-by: Matt DeVillier <matt.devillier@...> Change-Id: I5bcf32105ce85fda95b4ba98a5e420e8f522374c --- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c \| 36 +++++++++++++++----------- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h \| 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c index 2b4a4b2444..c992323443 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c @@ -698,25 +698,11 @@ XhcCheckUsbPortSpeedUsedPsic ( SpField.Dword = 0; UsbSpeedIdMap = 0; - //- // Check xHCI Supported Protocol Capability, find the PSIV field to match- // PortSpeed definition when the Major Revision is 03h.- //- if (Xhc->Usb3SupOffset != 0xFFFFFFFF) {- SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);- if (SpField.Dword != 0) {- //- // Found the corresponding PORTSC value in PSIV field of USB3 offset.- //- UsbSpeedIdMap = USB_PORT_STAT_SUPER_SPEED;- }- }- // // Check xHCI Supported Protocol Capability, find the PSIV field to match // PortSpeed definition when the Major Revision is 02h. //- if ((UsbSpeedIdMap == 0) && (Xhc->Usb2SupOffset != 0xFFFFFFFF)) {+ if (Xhc->Usb2SupOffset != 0xFFFFFFFF) { SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb2SupOffset, PortSpeed); if (SpField.Dword != 0) { //@@ -733,6 +719,12 @@ XhcCheckUsbPortSpeedUsedPsic ( // PSIM shows as default High-speed protocol, apply to High-speed mapping // UsbSpeedIdMap = USB_PORT_STAT_HIGH_SPEED;+ } else if (SpField.Data.Psim == XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM) {+ //+ // PSIM shows as default Full-speed protocol, return 0+ // to ensure no port status set+ //+ return 0; } } else if (SpField.Data.Psie == 1) { //@@ -750,6 +742,20 @@ XhcCheckUsbPortSpeedUsedPsic ( } } + //+ // Check xHCI Supported Protocol Capability, find the PSIV field to match+ // PortSpeed definition when the Major Revision is 03h.+ //+ if ((UsbSpeedIdMap == 0) && (Xhc->Usb3SupOffset != 0xFFFFFFFF)) {+ SpField.Dword = XhciPsivGetPsid (Xhc, Xhc->Usb3SupOffset, PortSpeed);+ if (SpField.Dword != 0) {+ //+ // Found the corresponding PORTSC value in PSIV field of USB3 offset.+ //+ UsbSpeedIdMap = USB_PORT_STAT_SUPER_SPEED;+ }+ }+ return UsbSpeedIdMap; } diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h index 5fe2ba4f0e..74ac6297ba 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h @@ -85,6 +85,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define XHC_SUPPORTED_PROTOCOL_DW2_OFFSET 0x08 #define XHC_SUPPORTED_PROTOCOL_PSI_OFFSET 0x10 #define XHC_SUPPORTED_PROTOCOL_USB2_HIGH_SPEED_PSIM 480+#define XHC_SUPPORTED_PROTOCOL_USB2_FULL_SPEED_PSIM 12 #define XHC_SUPPORTED_PROTOCOL_USB2_LOW_SPEED_PSIM 1500 #pragma pack (1)-- 2.37.2 -=-=-=-=-=-= Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96950): https://edk2.groups.io/g/devel/message/96950 Mute This Topic: https://groups.io/mt/95391831/5427408 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [ian.chiu@...] -=-=-=-=-=-=
More All Messages By This Member

1 - 7 of 7

1

Previous Topic Next Topic

Home Hashtags Subgroups Calendar About Features Pricing Updates Terms Help Twitter