From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03261C4CEC9 for ; Wed, 18 Sep 2019 06:28:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD9F521906 for ; Wed, 18 Sep 2019 06:28:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568788120; bh=qdtwGZDPXIN3FGN4rtkThrJOq5eRZP0MNAE0Hs7iF2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Odpwiy4pZ7ppzAi2kcspXR/2U6KhX+GiXQH9AI/AAyd/tMRW7+A8XyhTSCvCxMOyx rRtNO1hxo1Lqv5vp9Fj/7zvBUcNJxiLBAIIHfCh7ktwTP1QdWvMoKLJk1yY3KWFJBg rx82DqVi4y+jxZmyBvWzoDpSfHva+h5t3HkCw4PI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730476AbfIRG1P (ORCPT ); Wed, 18 Sep 2019 02:27:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:48986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730480AbfIRG1O (ORCPT ); Wed, 18 Sep 2019 02:27:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8640521924; Wed, 18 Sep 2019 06:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568788033; bh=qdtwGZDPXIN3FGN4rtkThrJOq5eRZP0MNAE0Hs7iF2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nGSyH5A89UKhSlssWVpZtucwYVfGHQ8DfLWl1b2iDKlxxGrQTiRFhKoVrWPFapNd5 Q/bvcmDIXglvVQieb7Zs9UKVdUA+VaeXFFviBG3HHByEfgIaFf4rIBO+8u7mmNdqaQ ISlY/F575xoi7T8CYgQXzvk6auVh+rm6ku/pFMbk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bastien Nocera , Christian Kellner , Sukumar Ghorai , Mario Limonciello , Marcel Holtmann Subject: [PATCH 5.2 74/85] Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature" Date: Wed, 18 Sep 2019 08:19:32 +0200 Message-Id: <20190918061237.740906398@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061234.107708857@linuxfoundation.org> References: <20190918061234.107708857@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mario Limonciello commit 1ffdb51f28e8ec6be0a2b812c1765b5cf5c44a8f upstream. This reverts commit a0085f2510e8976614ad8f766b209448b385492f. This commit has caused regressions in notebooks that support suspend to idle such as the XPS 9360, XPS 9370 and XPS 9380. These notebooks will wakeup from suspend to idle from an unsolicited advertising packet from an unpaired BLE device. In a bug report it was sugggested that this is caused by a generic lack of LE privacy support. Revert this commit until that behavior can be avoided by the kernel. Fixes: a0085f2510e8 ("Bluetooth: btusb: driver to enable the usb-wakeup feature") BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=200039 Link: https://marc.info/?l=linux-bluetooth&m=156441081612627&w=2 Link: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/750073/ CC: Bastien Nocera CC: Christian Kellner CC: Sukumar Ghorai Signed-off-by: Mario Limonciello Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman --- drivers/bluetooth/btusb.c | 5 ----- 1 file changed, 5 deletions(-) --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -1162,10 +1162,6 @@ static int btusb_open(struct hci_dev *hd } data->intf->needs_remote_wakeup = 1; - /* device specific wakeup source enabled and required for USB - * remote wakeup while host is suspended - */ - device_wakeup_enable(&data->udev->dev); if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags)) goto done; @@ -1229,7 +1225,6 @@ static int btusb_close(struct hci_dev *h goto failed; data->intf->needs_remote_wakeup = 0; - device_wakeup_disable(&data->udev->dev); usb_autopm_put_interface(data->intf); failed: