From: "Xianglei Cai" <xianglei.cai@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"Cai, Xianglei" <xianglei.cai@intel.com>
Cc: "Wu, Hao A" <hao.a.wu@intel.com>, "Ni, Ray" <ray.ni@intel.com>,
"Wang, Jian J" <jian.j.wang@intel.com>,
"Gao, Liming" <gaoliming@byosoft.com.cn>,
"Shih, More" <more.shih@intel.com>
Subject: Re: [edk2-devel] [PATCH 1/1] MdeModulePkg\XhciDxe: Command Abort when times out
Date: Wed, 20 Sep 2023 03:07:10 +0000 [thread overview]
Message-ID: <MN0PR11MB60348F9F9922A54095FFC73293F9A@MN0PR11MB6034.namprd11.prod.outlook.com> (raw)
In-Reply-To: <1786073BDD30B479.9824@groups.io>
Hi All,
Could you please help review this patch. Very appreciated!
Thanks,
Xianglei
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Xianglei Cai
Sent: Monday, September 18, 2023 2:57 PM
To: devel@edk2.groups.io
Cc: Cai, Xianglei <xianglei.cai@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Wang, Jian J <jian.j.wang@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Shih, More <more.shih@intel.com>
Subject: [edk2-devel] [PATCH 1/1] MdeModulePkg\XhciDxe: Command Abort when times out
https://bugzilla.tianocore.org/show_bug.cgi?id=4552
CC: Hao A Wu <hao.a.wu@intel.com>
CC: Ray Ni <ray.ni@intel.com>
CC: Jian J Wang <jian.j.wang@intel.com>
CC: Liming Gao <gaoliming@byosoft.com.cn>
CC: More Shih <more.shih@intel.com>
Signed-off-by: Xianglei Cai <xianglei.cai@intel.com>
---
MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 35 ++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 53421e64a850..5024d5e3acb9 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -2121,6 +2121,29 @@ RingIntTransferDoorBell (
return EFI_SUCCESS;
}
+/**
+ Set Command abort
+
+ @param Xhc The XHCI Instance.
+ @param SlotId The slot id to be disabled.
+
+ @retval EFI_SUCCESS Successfully disable the device slot.
+
+**/
+VOID
+XhcCmdRingCmdAbort (
+ IN USB_XHCI_INSTANCE *Xhc,
+ IN UINT8 SlotId
+ )
+{
+ //
+ // Some 3rd party XHCI external cards don't support single 64-bytes
+width register access,
+ // So divide it to two 32-bytes width register access.
+ //
+ DEBUG ((DEBUG_INFO, "Command Ring Control set Command Abort, SlotId:
+%d!\n", SlotId));
+ XhcSetOpRegBit (Xhc, XHC_CRCR_OFFSET, XHC_CRCR_CA); }
+
/**
Assign and initialize the device slot for a new device.
@@ -2331,6 +2354,12 @@ XhcInitializeDeviceSlot (
Xhc->UsbDevContext[SlotId].XhciDevAddr = DeviceAddress;
} else {
DEBUG ((DEBUG_ERROR, " Slot %d address not assigned successfully. Status = %r\n", SlotId, Status));
+ //
+ // Software need abort the command if a command times out in xHCI spec 4.6.
+ //
+ if (Status == EFI_TIMEOUT) {
+ XhcCmdRingCmdAbort (Xhc, SlotId);
+ }
XhcDisableSlotCmd (Xhc, SlotId);
}
@@ -2547,6 +2576,12 @@ XhcInitializeDeviceSlot64 (
Xhc->UsbDevContext[SlotId].XhciDevAddr = DeviceAddress;
} else {
DEBUG ((DEBUG_ERROR, " Slot %d address not assigned successfully. Status = %r\n", SlotId, Status));
+ //
+ // Software need abort the command if a command times out in xHCI spec 4.6.
+ //
+ if (Status == EFI_TIMEOUT) {
+ XhcCmdRingCmdAbort (Xhc, SlotId);
+ }
XhcDisableSlotCmd64 (Xhc, SlotId);
}
--
2.42.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108895): https://edk2.groups.io/g/devel/message/108895
Mute This Topic: https://groups.io/mt/101435621/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
prev parent reply other threads:[~2023-09-20 3:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1695020158.git.xianglei.cai@intel.com>
2023-09-18 6:56 ` [edk2-devel] [PATCH 1/1] MdeModulePkg\XhciDxe: Command Abort when times out Xianglei Cai
2023-09-20 8:19 ` Wu, Hao A
[not found] ` <1786073BDD30B479.9824@groups.io>
2023-09-20 3:07 ` Xianglei Cai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MN0PR11MB60348F9F9922A54095FFC73293F9A@MN0PR11MB6034.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox