mirror of https://github.com/acidanthera/audk.git
MdeModulePkg/EhciDxe: fix host controller reset condition in BindingStart
Commit09943f5ecc
("MdeModulePkg: Skip to manage usb debug port in EDKII EHCI driver if it's used by usb debug port driver", 2012-04-28) made the host controller reset in EhcDriverBindingStart() conditional. The intent was to avoid the reset when - one of the USB ports on the host controller was a Debug Port, AND - the Debug Port was in use. This translates to the following positive condition: reset the controller only if: - no USB port on the host controller is a Debug Port, OR - the Debug Port is not in use. Commit09943f5ecc
failed to implement the first subcondition, and thus the result is too strict now (for resetting the host controller). Relax it to the correct condition. This issue was found by Steven Shi on QEMU. QEMU's EHCI device model does not have a Debug Port. In repeated disconnect / connect cycles, the controller is never reset in EhcDriverBindingStart(), therefore the devices on the controller are never re-enumerated after a disconnect. Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Ruiyu Ni <ruiyu.ni@intel.com> Cc: Star Zeng <star.zeng@intel.com> Cc: Steven Shi <steven.shi@intel.com> Reported-by: Steven Shi <steven.shi@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1129 Fixes:09943f5ecc
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Star Zeng <star.zeng@intel.com> Tested-by: Steven Shi <steven.shi@intel.com>
This commit is contained in:
parent
8a204b2aca
commit
c3d5d800d7
|
@ -1918,7 +1918,9 @@ EhcDriverBindingStart (
|
|||
EhcClearLegacySupport (Ehc);
|
||||
}
|
||||
|
||||
if (Ehc->DebugPortNum != 0) {
|
||||
if (Ehc->DebugPortNum == 0) {
|
||||
EhcResetHC (Ehc, EHC_RESET_TIMEOUT);
|
||||
} else {
|
||||
State = EhcReadDbgRegister(Ehc, 0);
|
||||
if ((State & (USB_DEBUG_PORT_IN_USE | USB_DEBUG_PORT_OWNER)) != (USB_DEBUG_PORT_IN_USE | USB_DEBUG_PORT_OWNER)) {
|
||||
EhcResetHC (Ehc, EHC_RESET_TIMEOUT);
|
||||
|
|
Loading…
Reference in New Issue