From: "Guomin Jiang" <guomin.jiang@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"jeremy.linton@arm.com" <jeremy.linton@arm.com>
Cc: "Wu, Hao A" <hao.a.wu@intel.com>, "Ni, Ray" <ray.ni@intel.com>,
"Kinney, Michael D" <michael.d.kinney@intel.com>,
"Tian, Feng" <feng.tian@intel.com>,
"Wang, Jian J" <jian.j.wang@intel.com>,
"ard.biesheuvel@arm.com" <ard.biesheuvel@arm.com>
Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/UsbBusDxe: On reset rebuild descriptor table
Date: Tue, 28 Apr 2020 01:03:30 +0000 [thread overview]
Message-ID: <DM6PR11MB2955E91374E95A56F5C28EF89DAC0@DM6PR11MB2955.namprd11.prod.outlook.com> (raw)
In-Reply-To: <2153b0dc-e6d8-4483-7f11-48c24ee24ed3@arm.com>
Hi Jeremy,
Let move the discussion into https://edk2.groups.io/g/devel/message/58125, and I will add history in that message.
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Jeremy
> Linton
> Sent: Tuesday, April 28, 2020 8:44 AM
> To: Jiang, Guomin <guomin.jiang@intel.com>; devel@edk2.groups.io
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Kinney,
> Michael D <michael.d.kinney@intel.com>; Tian, Feng <feng.tian@intel.com>;
> Wang, Jian J <jian.j.wang@intel.com>; ard.biesheuvel@arm.com
> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/UsbBusDxe: On reset
> rebuild descriptor table
>
> Hi!
>
> On 4/27/20 7:15 PM, Jiang, Guomin wrote:
> > Hi Jeremy,
> >
> > You can refer https://edk2.groups.io/g/devel/message/58125 for discussion
> about this solution.
>
> Oh fun, odd how a bug can exist in a code base for years and then this
> happens.. I will move the discussion there.
>
> Thanks,
>
> >
> > Two issue I found:
> > 1. Memory leakage may occur if doing so and I am investigating it.
>
> It seems our solutions differ a bit?
Memory leakage will happened when invoke UsbBuildDescTable(), because the old allocated buffer haven't been freed but allocated new
>
> > 2. It test pass with OVMF but fail in real platform, and I am figuring out the
> flow.
>
> Hmm, I've been seeing this on a RPI with an attached USB3 hub and 5 bay USB
> JBOD. (there is another problem but the reset crash is keeps the machine
> from booting).
>
>
>
>
> >
> > Best Regards
> > Guomin
> >
> >> -----Original Message-----
> >> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> Jeremy
> >> Linton
> >> Sent: Tuesday, April 28, 2020 6:16 AM
> >> To: devel@edk2.groups.io
> >> Cc: Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>;
> >> Kinney, Michael D <michael.d.kinney@intel.com>; Tian, Feng
> >> <feng.tian@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> >> ard.biesheuvel@arm.com; Jeremy Linton <jeremy.linton@arm.com>
> >> Subject: [edk2-devel] [PATCH] MdeModulePkg/UsbBusDxe: On reset
> >> rebuild descriptor table
> >>
> >> During port reset, the device descriptors should be checked before
> >> attempting to set an endpoint configuration.
> >>
> >> In particular this fixes a crash due to ASSERT(TrsRing != NULL) in
> >> XhcSyncTrsRing(). That crash happens during error recovery on devices
> >> attached to XHCI hosts. This is because the port disable clears and
> >> deallocats all the EP data structures. When the port is reconfigured
> >> without first requesting the EP descriptors,
> >> XhcSetConfigCmd[64]() is not being called because the
> >> NumConfigurations remains 0.
> >>
> >> We could attempt to rebuild the EP descriptions directly from the
> >> XHCI driver. OTOH, its probably good practice to assure the device
> >> description is what we expect from within the core USB subsystem
> >> during reset.
> >>
> >> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
> >> ---
> >> MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c | 8 ++++++++
> >> 1 file changed, 8 insertions(+)
> >>
> >> diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
> >> b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
> >> index 4b4915c019..17bb691bf8 100644
> >> --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
> >> +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
> >> @@ -874,6 +874,14 @@ UsbIoPortReset (
> >> // is in CONFIGURED state.
> >>
> >> //
> >>
> >> if (Dev->ActiveConfig != NULL) {
> >>
> >> + Status = UsbBuildDescTable (Dev);
> >>
> >> +
> >>
> >> + if (EFI_ERROR (Status)) {
> >>
> >> + DEBUG ((EFI_D_ERROR, "UsbIoPortReset: failed to build
> >> + descriptor table
> >> for %d - %r\n",
> >>
> >> + Dev->Address, Status));
> >>
> >> + goto ON_EXIT;
> >>
> >> + }
> >>
> >> +
> >>
> >> Status = UsbSetConfig (Dev,
> >> Dev->ActiveConfig->Desc.ConfigurationValue);
> >>
> >>
> >>
> >> if (EFI_ERROR (Status)) {
> >>
> >> --
> >> 2.24.1
> >>
> >>
> >> -=-=-=-=-=-=
> >> Groups.io Links: You receive all messages sent to this group.
> >>
> >> View/Reply Online (#58193):
> >> https://edk2.groups.io/g/devel/message/58193
> >> Mute This Topic: https://groups.io/mt/73315690/4399222
> >> Group Owner: devel+owner@edk2.groups.io
> >> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> >> [guomin.jiang@intel.com] -=-=-=-=-=-=
> >
>
>
>
prev parent reply other threads:[~2020-04-28 1:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 22:16 [PATCH] MdeModulePkg/UsbBusDxe: On reset rebuild descriptor table Jeremy Linton
2020-04-28 0:15 ` [edk2-devel] " Guomin Jiang
2020-04-28 0:44 ` Jeremy Linton
2020-04-28 1:03 ` Guomin Jiang [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=DM6PR11MB2955E91374E95A56F5C28EF89DAC0@DM6PR11MB2955.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