[edk2-devel] [PATCH] MdeModulePkg/XhciDxe: Increase 1ms extra delay for xHCI issue HCRST

[edk2-devel] [PATCH] MdeModulePkg/XhciDxe: Increase 1ms extra delay for xHCI issue HCRST

[Chiu, Ian]

From: Ian Chiu <ian.chiu@intel.com>

https://bugzilla.tianocore.org/show_bug.cgi?id=4727

More and more XHCI host controllers require to have extra 1ms
delay before accessing any MMIO register during reset.

Since PHY transition from P3 to P0 can take around 1.3ms and
the xHCI reset can take around 1.5ms.

Hence, need delay increase between issuing HCRST on xHCI
controller till first MMIO read for reset completion check.

Cc: Hao A Wu     <hao.a.wu@intel.com>
Cc: Ray Ni       <ray.ni@intel.com>
Cc: More Shih    <more.shih@intel.com>
Signed-off-by: Ian Chiu <ian.chiu@intel.com>
---
 MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
index 40f2f1f227..eafe4b0d11 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
@@ -861,10 +861,11 @@ XhcResetHC (
     XhcSetOpRegBit (Xhc, XHC_USBCMD_OFFSET, XHC_USBCMD_RESET);
     //
     // Some XHCI host controllers require to have extra 1ms delay before accessing any MMIO register during reset.
+    // PHY transition from P3 to P0 can take around 1.3ms and the xHCI reset can take around 1.5ms.
     // Otherwise there may have the timeout case happened.
-    // The below is a workaround to solve such problem.
+    // Stall for 2ms workaround to solve such problem.
     //
-    gBS->Stall (XHC_1_MILLISECOND);
+    gBS->Stall (XHC_1_MILLISECOND*2);
     Status = XhcWaitOpRegBit (Xhc, XHC_USBCMD_OFFSET, XHC_USBCMD_RESET, FALSE, Timeout);
 
     if (!EFI_ERROR (Status)) {
-- 
2.38.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116751): https://edk2.groups.io/g/devel/message/116751
Mute This Topic: https://groups.io/mt/104926466/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

回复: [edk2-devel] [PATCH] MdeModulePkg/XhciDxe: Increase 1ms extra delay for xHCI issue HCRST

[gaoliming via groups.io]

Seemly, this change has no other impact. I agree this change. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Chiu, Ian
> 发送时间: 2024年3月14日 21:40
> 收件人: devel@edk2.groups.io
> 抄送: Ian Chiu <ian.chiu@intel.com>; Hao A Wu <hao.a.wu@intel.com>; Ray
> Ni <ray.ni@intel.com>; More Shih <more.shih@intel.com>
> 主题: [edk2-devel] [PATCH] MdeModulePkg/XhciDxe: Increase 1ms extra
> delay for xHCI issue HCRST
> 
> From: Ian Chiu <ian.chiu@intel.com>
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=4727
> 
> More and more XHCI host controllers require to have extra 1ms
> delay before accessing any MMIO register during reset.
> 
> Since PHY transition from P3 to P0 can take around 1.3ms and
> the xHCI reset can take around 1.5ms.
> 
> Hence, need delay increase between issuing HCRST on xHCI
> controller till first MMIO read for reset completion check.
> 
> Cc: Hao A Wu     <hao.a.wu@intel.com>
> Cc: Ray Ni       <ray.ni@intel.com>
> Cc: More Shih    <more.shih@intel.com>
> Signed-off-by: Ian Chiu <ian.chiu@intel.com>
> ---
>  MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
> b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
> index 40f2f1f227..eafe4b0d11 100644
> --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
> +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
> @@ -861,10 +861,11 @@ XhcResetHC (
>      XhcSetOpRegBit (Xhc, XHC_USBCMD_OFFSET, XHC_USBCMD_RESET);
> 
>      //
> 
>      // Some XHCI host controllers require to have extra 1ms delay before
> accessing any MMIO register during reset.
> 
> +    // PHY transition from P3 to P0 can take around 1.3ms and the xHCI
> reset can take around 1.5ms.
> 
>      // Otherwise there may have the timeout case happened.
> 
> -    // The below is a workaround to solve such problem.
> 
> +    // Stall for 2ms workaround to solve such problem.
> 
>      //
> 
> -    gBS->Stall (XHC_1_MILLISECOND);
> 
> +    gBS->Stall (XHC_1_MILLISECOND*2);
> 
>      Status = XhcWaitOpRegBit (Xhc, XHC_USBCMD_OFFSET,
> XHC_USBCMD_RESET, FALSE, Timeout);
> 
> 
> 
>      if (!EFI_ERROR (Status)) {
> 
> --
> 2.38.1.windows.1
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#116751):
> https://edk2.groups.io/g/devel/message/116751
> Mute This Topic: https://groups.io/mt/104926466/4905953
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [gaoliming@byosoft.com.cn]
> -=-=-=-=-=-=
> 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117187): https://edk2.groups.io/g/devel/message/117187
Mute This Topic: https://groups.io/mt/105189543/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-