Message ID | 4012b464ef167a4d02292214509be48f73282c38.1522429370.git.joseph.salisbury@canonical.com |
---|---|
State | New |
Headers | show |
Series | Revert "Bluetooth: btusb: fix QCA Rome suspend/resume" | expand |
Acked-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Joseph Salisbury <joseph.salisbury@canonical.com> wrote: > From: Kai-Heng Feng <kai.heng.feng@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1759821 > > This reverts commit fd865802c66bc451dc515ed89360f84376ce1a56. > > This commit causes a regression on some QCA ROME chips. The USB device > reset happens in btusb_open(), hence firmware loading gets interrupted. > > Furthermore, this commit stops working after commit > ("a0085f2510e8976614ad8f766b209448b385492f Bluetooth: btusb: driver to > enable the usb-wakeup feature"). Reset-resume quirk only gets enabled in > btusb_suspend() when it's not a wakeup source. > > If we really want to reset the USB device, we need to do it before > btusb_open(). Let's handle it in drivers/usb/core/quirks.c. > > Cc: stable@vger.kernel.org > Cc: Leif Liddy <leif.linux@gmail.com> > Cc: Matthias Kaehlcke <mka@chromium.org> > Cc: Brian Norris <briannorris@chromium.org> > Cc: Daniel Drake <drake@endlessm.com> > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > Reviewed-by: Brian Norris <briannorris@chromium.org> > Tested-by: Brian Norris <briannorris@chromium.org> > Signed-off-by: Marcel Holtmann <marcel@holtmann.org> > (cherry picked from commit 7d06d5895c159f64c46560dc258e553ad8670fe0) > Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com> > --- > drivers/bluetooth/btusb.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 7c076cf..4346223 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -2989,12 +2989,6 @@ static int btusb_probe(struct usb_interface *intf, > if (id->driver_info & BTUSB_QCA_ROME) { > data->setup_on_usb = btusb_setup_qca; > hdev->set_bdaddr = btusb_set_bdaddr_ath3012; > - > - /* QCA Rome devices lose their updated firmware over suspend, > - * but the USB hub doesn't notice any status change. > - * Explicitly request a device reset on resume. > - */ > - set_bit(BTUSB_RESET_RESUME, &data->flags); > } > > #ifdef CONFIG_BT_HCIBTUSB_RTL > -- > 2.7.4 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 7c076cf..4346223 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2989,12 +2989,6 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_QCA_ROME) { data->setup_on_usb = btusb_setup_qca; hdev->set_bdaddr = btusb_set_bdaddr_ath3012; - - /* QCA Rome devices lose their updated firmware over suspend, - * but the USB hub doesn't notice any status change. - * Explicitly request a device reset on resume. - */ - set_bit(BTUSB_RESET_RESUME, &data->flags); } #ifdef CONFIG_BT_HCIBTUSB_RTL