From nobody Thu Jun 11 23:00:19 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6F513AE6FC for ; Wed, 13 May 2026 19:35:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778700937; cv=none; b=PpE2btbc0JygWdwfaRFcaBx8mgVtQw1wrBPwInK4pU6bTc4CLISvREnD5aMphh0PstsBa1jwh7icoFHa+MNU/6taOuL6XL2oWu6eL+i65inKL289R3L7t9PgCFq9rOhhavM8sC/hoNo4KNU5nrFixmKhB8ZL6PRpzcV4SWANT8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778700937; c=relaxed/simple; bh=vA6RpUdKopEs6oycVJjkV0lI8fBKY0jLi9rmCr31vFw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RzGhgbP/6UNjOddo+dQXhKxVL/V9KNnDeMiZ9zJZMSmb4X0xp/iloUJ8YbMy3KUExVHpwv1TvsIjIHP5uW4kHXrdFr2XdnxvjdECf2cGA6z32wcblhjgaH9b9vjVXsKsreZLM+NxGUOq2eBi2+YsBF/kHiiWxzupoRmthmz7LTQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems; spf=pass smtp.mailfrom=starlabs.systems; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b=h5Ik+tNl; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b="h5Ik+tNl" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-488af96f6b2so85730215e9.0 for ; Wed, 13 May 2026 12:35:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1778700934; x=1779305734; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JvAe1DPpB6I0psi9WiBtsI+tM6xWmLP/jLbbUynVL7k=; b=h5Ik+tNlvjBHehG+DQNYaBnvU3vpqXhBjC4Wpw9MRbGtDoTnVgJEl4E9uKLpRyW2Q+ 8mVbsUUcNgfb55jY6/T+ph8rPr8FjkHk1Gm+gc4khJf+IBn76EkrgNnP7DjkbiURdmca xRugY7raiGBij9wljMPocW9kshmGjpV29JXa1d9LJvhslrZ3zVIdS1AI73q4Kkm6NcW+ +tx9T4+CaJRg/B6bYVz9NJSWVGi0Gx38+CFyJVhDj3VPxmAPsygUmF095jQaH3OENPdQ oI0zsWvH+utiSqwOkUGjLXtdokBub2QodrZv1k2MvZN7hadl0Ehc1Cp0ZgiEQ4OHWT07 LoWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778700934; x=1779305734; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JvAe1DPpB6I0psi9WiBtsI+tM6xWmLP/jLbbUynVL7k=; b=dhXrJt/SVO4HQUzg1eQ0MOpYSQEocEoVUgWLs7H93EuyPVOt74ZIeXcLemqbT/ck9M BdpzSP88BkezIw2p2Rliy+zqYYWlJtyOjyNRXDIqNe1jU01eN343hucXME1rx0MSdu1t Y9PwRYCguF5HJOT2JwXfxOXo4LOuMQKEB8H1JrfZs4vO8WOspVbbolvCKlmv8sg9/qza sfksn5lBeCMOAHrmALzYQ1jV7eJ3JXFXplr7ZTKDTP1/UgvBhoyjtCEPPkEhDhfMEHHw NFsfp39C/r6wQKlDkVrX6vFDANzoGLtWlWc1nOQYg/jQ+rQqp/nk2rpNyeT+eYrgUFle Uxuw== X-Gm-Message-State: AOJu0YwvjhnpgHHXQhNFS2rdxUaxOJwOANZzPZ3kCxu8ItzD9zTxbo4X deIuoLfYRlNi1dbuppa9SWeoY/2NqKATK1rithypghUS/ocaODuwemHy+XlvvvS5kKQQfg61DIU LcQU/H51h X-Gm-Gg: Acq92OFor9ZZxPWgZ9vklScA9N1KUTGYWkewcrkpyc2Hi0YtprlY0ueN45rcb/tGxzC Zu+xWDoU/UOCremV4KXURhfEFduGpiDWCpeVPcuTn9B6enePaMdQMw/IAyBaOw3s+PnHVNmAjur rf50utBVH48w8mpomThdTvCqyIWCwjhWKpCfRUtPBAAR91T69CzEC2J7YtU8DKcCmXoTV/W0La6 TKM+OHpUbe+bhpFWO2n6YtvfYIKpAoEJcevlL5Jn/7KwUO7d2qKo1VXFIx1lVKyTGO3fQ4Whnt+ yzuDrG1r0QJIrLlqtEw3arLg1j9lqFbg30OszwXqfVKIvAWOxg9aVyoQRdDMeULc9PtxkxUk9Cf fvjBg6cWS4AIOI8qYgdZojgPS9t/oXt9FYNY5eu9wBKslsaG+0fRYaXk8dbjAGOU9o9xFCbvjRs Tj/ZYmYqp8nv7vNgXkVw1ejiIE/BpF+397iP7+c5z/mn3rRBKRBg== X-Received: by 2002:a05:600c:8716:b0:48f:d5d7:df63 with SMTP id 5b1f17b1804b1-48fd5d7e0b1mr25261675e9.27.1778700933717; Wed, 13 May 2026 12:35:33 -0700 (PDT) Received: from horizon ([217.155.46.38]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fd64d9f63sm10160775e9.12.2026.05.13.12.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 12:35:33 -0700 (PDT) From: Sean Rhodes To: linux-kernel@vger.kernel.org Cc: Marcel Holtmann , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, Paul Menzel Subject: [PATCH v2] Bluetooth: btusb: clear remote wake on idle Intel ACPI paths Date: Wed, 13 May 2026 20:35:31 +0100 Message-ID: <19a2b7d308f5cdfa651fee727c1423833380ea1b.1778700929.git.sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 8020c41b39f5 ("usb: core: allow ACPI-managed hard-wired ports to power off") allows internal USB devices on ACPI-managed hard-wired ports to use the existing runtime power-off path. For Intel combined USB Bluetooth controllers, btusb still keeps runtime remote wake enabled for as long as the adapter is open, which prevents the USB PM core from dropping the last child reference and powering the port off while idle. Only keep runtime remote wake enabled while the controller is expected to signal activity on its own: established links, discovery, LE scan, LE advertising, or BR/EDR page/inquiry scan. When those are idle, clear needs_remote_wakeup so autosuspend can power-manage the port and a later host-initiated command can resume the device again. Cache the BTUSB_INTEL_COMBINED match flag in btusb_data so the runtime wake decision can be made from the open and receive paths, where the usb_device_id used during probe is no longer available. Signed-off-by: Sean Rhodes --- drivers/bluetooth/btusb.c | 50 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 7f5fce93d984..8e30c968fd6a 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -950,6 +950,7 @@ struct btusb_data { unsigned long flags; =20 bool poll_sync; + bool intel_combined; int intr_interval; struct work_struct work; struct work_struct waker; @@ -1007,6 +1008,9 @@ struct btusb_data { struct qca_dump_info qca_dump; }; =20 +static bool btusb_intel_idle_power_manageable(struct btusb_data *data); +static bool btusb_needs_runtime_remote_wakeup(struct btusb_data *data); + static void btusb_reset(struct hci_dev *hdev) { struct btusb_data *data; @@ -1218,12 +1222,19 @@ static inline void btusb_free_frags(struct btusb_da= ta *data) =20 static int btusb_recv_event(struct btusb_data *data, struct sk_buff *skb) { + int err; + if (data->intr_interval) { /* Trigger dequeue immediately if an event is received */ schedule_delayed_work(&data->rx_work, 0); } =20 - return data->recv_event(data->hdev, skb); + err =3D data->recv_event(data->hdev, skb); + if (!err) + data->intf->needs_remote_wakeup =3D + btusb_needs_runtime_remote_wakeup(data); + + return err; } =20 static int btusb_recv_intr(struct btusb_data *data, void *buffer, int coun= t) @@ -1991,7 +2002,8 @@ static int btusb_open(struct hci_dev *hdev) goto setup_fail; } =20 - data->intf->needs_remote_wakeup =3D 1; + data->intf->needs_remote_wakeup =3D + btusb_needs_runtime_remote_wakeup(data); =20 if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags)) goto done; @@ -2034,6 +2046,38 @@ static void btusb_stop_traffic(struct btusb_data *da= ta) usb_kill_anchored_urbs(&data->ctrl_anchor); } =20 +static bool btusb_intel_idle_power_manageable(struct btusb_data *data) +{ + struct usb_device *udev =3D data->udev; + + return data->intel_combined && udev->parent && + usb_acpi_power_manageable(udev->parent, udev->portnum - 1); +} + +static bool btusb_needs_runtime_remote_wakeup(struct btusb_data *data) +{ + struct hci_dev *hdev =3D data->hdev; + + if (!btusb_intel_idle_power_manageable(data)) + return true; + + if (hci_conn_count(hdev)) + return true; + + if (hdev->discovery.state =3D=3D DISCOVERY_FINDING || + hdev->discovery.state =3D=3D DISCOVERY_RESOLVING) + return true; + + if (hci_dev_test_flag(hdev, HCI_LE_SCAN) || + hci_dev_test_flag(hdev, HCI_LE_ADV) || + hci_dev_test_flag(hdev, HCI_ADVERTISING) || + test_bit(HCI_PSCAN, &hdev->flags) || + test_bit(HCI_ISCAN, &hdev->flags)) + return true; + + return false; +} + static int btusb_close(struct hci_dev *hdev) { struct btusb_data *data =3D hci_get_drvdata(hdev); @@ -4118,6 +4162,8 @@ static int btusb_probe(struct usb_interface *intf, data->recv_bulk =3D btusb_recv_bulk; =20 if (id->driver_info & BTUSB_INTEL_COMBINED) { + data->intel_combined =3D true; + /* Allocate extra space for Intel device */ priv_size +=3D sizeof(struct btintel_data);