From patchwork Tue Sep 17 08:21:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1163237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QSUiHWIk"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46XbgY3ty8z9sP3; Tue, 17 Sep 2019 18:22:00 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iA8kG-0007SB-B2; Tue, 17 Sep 2019 08:21:56 +0000 Received: from mail-wm1-f68.google.com ([209.85.128.68]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iA8kE-0007Rr-98 for kernel-team@lists.ubuntu.com; Tue, 17 Sep 2019 08:21:54 +0000 Received: by mail-wm1-f68.google.com with SMTP id g207so2154430wmg.5 for ; Tue, 17 Sep 2019 01:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=b7aCyB8vwfZRfaDJ9z7eqT6k6l4U8C43xSH67HdpEpo=; b=QSUiHWIkQDbzxf9XbQ4Bi54ppHM3mchFTWWOwWONMkjzz57f9k0eah8XHpUlkRwzSu w+l3YfFydVw69/UL1U9W5iDAraF7mgte4JCC750jZLtF3brq6z6Vh6wpDFlF/UClLTuA uX7WRBXZF4wQO5NWljUivTjd4zXpXiTglwkreatOaNVOl5DUJEkJk0g6F5iUawvWK6bW lpwrF8152QqcXoKKg1rt5L3VXsVYDPedxeo/r9ffRrotlSlziw4ESuIGvnijW9CJeywN YvMNvpmNQYiYm47HfhC4E/GlmifSNeCUWHTKsrDgB71ixnnPUuH2EVc5n55pW6tWmkZV G31A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=b7aCyB8vwfZRfaDJ9z7eqT6k6l4U8C43xSH67HdpEpo=; b=mSzmLukIqktb4I1qZyQQQf7EJ+Uvur/UOHSLv6/yNTgszu1W6GprT09wuplWJF/Okw EVZdenJ+Nws6MjjC4nYYwkfnCo7QW0v40JjhkzS7oYTko1zGZ0bvXynIwl9XxhGGAQB9 InsP1RCi2zWQ6ZY/v35Du23yWhnvnjXVZ6Sypu/It7w+aRqsca+Jf4t/to1z681bUiLU Kjpi8k3f09ZoZgLECn4CuDH/cslsVFDUvWsTl1WbdTE1M3nhIHm/7D41ZUITCuaahLhq /mOMXX83Bv3PHqALbj31nbsVgJcRJGUq+NMylAQTQxpB5/HtnxP+xe7gWqdb/5uMsj5V tJmw== X-Gm-Message-State: APjAAAUpgKg80OZ4m007TVRqaVSuOcmaE2QUuQjmsfmSErKSQKQ9dNU3 E1nhbPLz3kY+/IpdSHRAImcXfr1hqyTOog== X-Google-Smtp-Source: APXvYqzdLrcD8VTeVJislPhmXbysP4c4hgPVdoxFn80Q7g9MeoN7WlWP5a/qcgpmrvDOtezhoKijlA== X-Received: by 2002:a7b:c5ce:: with SMTP id n14mr2321096wmk.17.1568708513315; Tue, 17 Sep 2019 01:21:53 -0700 (PDT) Received: from localhost (static-dcd-cqq-121001.business.bouyguestelecom.com. [212.194.121.1]) by smtp.gmail.com with ESMTPSA id z142sm3060144wmc.24.2019.09.17.01.21.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Sep 2019 01:21:52 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][B][D][E][Unstable] Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature" Date: Tue, 17 Sep 2019 16:21:51 +0800 Message-Id: <20190917082151.13829-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190917082151.13829-1-acelan.kao@canonical.com> References: <20190917082151.13829-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Mario Limonciello BugLink: https://bugs.launchpad.net/bugs/1844247 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 (cherry picked from commit 1ffdb51f28e8ec6be0a2b812c1765b5cf5c44a8f) Signed-off-by: AceLan Kao Acked-by: Kai-Heng Feng Acked-By: You-Sheng Yang Acked-by: Connor Kuehl --- drivers/bluetooth/btusb.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 21e8071257b9..5c5f67dea4bd 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -1128,10 +1128,6 @@ static int btusb_open(struct hci_dev *hdev) } 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; @@ -1195,7 +1191,6 @@ static int btusb_close(struct hci_dev *hdev) goto failed; data->intf->needs_remote_wakeup = 0; - device_wakeup_disable(&data->udev->dev); usb_autopm_put_interface(data->intf); failed: