Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp6704765rdb; Tue, 2 Jan 2024 10:21:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGPs+sOXD5gihzil1HuAVB2QrCCdrO3gb3aNV7d1Bn66Kjusm9cTvsnbMthylAZHMQtPhKt X-Received: by 2002:a17:902:b205:b0:1d4:3dfd:7e34 with SMTP id t5-20020a170902b20500b001d43dfd7e34mr15842186plr.121.1704219695328; Tue, 02 Jan 2024 10:21:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704219695; cv=none; d=google.com; s=arc-20160816; b=S907CGVETPnx/14Tmw2UOQScR1/Emn/kWJFDwAFbkri12sc6e5YCCp1DnD0hkI1Ple WEIYvG1gN8yWMv3LBnECFqQKXtIah3GrVcD02+9vevjz7GlKBiDlAjJ7QMiQ1kgf7j3J eDqhZAXQ3zTE/Diki4yvT6Ymz8iJOjIZrIGHlzdRbSJHtoekMSnI8FWcBCbhFYS6lx8X 6G17xHmzAvssj3dqLWpWwD37VTcM8cT0utOsLpe9h0bjJWcbPQDKY/OFgT/06jB0VU7e qAPFQBF06dSyDBizTmuuMLjtUJKUkZK6bgRwuuNblmAowuZRXcRjHtvxnTOQCuYi3Vmg ozZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=v1LJcC9ZvAsWCtzIkp4ijtyBiT7HQFW99bxrW6L9QN0=; fh=S5rf2bc7VLlSXYQ0EqFAIodb1qEiUfsxulvZhQKZRws=; b=yxmyosxSnlp7Ei19yStyiMRCK9MftKNXnYm30akWgM2btfV4rzvdTV9vnqg+Gv41Y2 chFEpXOmz4IBhxAYce4J64YBxZ/PKKBdJNHyIpUAPsw5XHTHNzAdwxQ8bDAlRR2+DHcS qATR0RDTgt7UTX/JDj++CeeZopUex4tgX6axJszVbTLdYuQHVOf0TRDfqu8HUoU0GcJ5 xYPhZcDBEqmeHQ29gRWqfuEdEog57VGDAmRMPTX6tasGYAITHJ3/BKwcpi6rEnkfPWmB 8N4HF32O4/1l+zQIM4FoaWhOmTB9yHiSdCdqt+KCl4U1+AfnkHtgMdPMLwBGrp/5jvzY ddvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14704-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14704-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id e15-20020a170902ed8f00b001cc692bf120si19956886plj.61.2024.01.02.10.21.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 10:21:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14704-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14704-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14704-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 0188628433B for ; Tue, 2 Jan 2024 18:21:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2C179168C3; Tue, 2 Jan 2024 18:20:01 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2304F1641A; Tue, 2 Jan 2024 18:19:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=v0yd.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=v0yd.nl Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4T4Ljl5CxWz9snC; Tue, 2 Jan 2024 19:19:55 +0100 (CET) From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= , asahi@lists.linux.dev, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 4/4] Bluetooth: Queue a HCI power-off command before rfkilling adapters Date: Tue, 2 Jan 2024 19:19:20 +0100 Message-ID: <20240102181946.57288-5-verdre@v0yd.nl> In-Reply-To: <20240102181946.57288-1-verdre@v0yd.nl> References: <20240102181946.57288-1-verdre@v0yd.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On a lot of platforms (at least the MS Surface devices, M1 macbooks, and a few ThinkPads) firmware doesn't do its job when rfkilling a device and the bluetooth adapter is not actually shut down on rfkill. This leads to connected devices remaining in connected state and the bluetooth connection eventually timing out after rfkilling an adapter. Use the rfkill hook in the HCI driver to actually power the device off before rfkilling it. Note that the wifi subsystem is doing something similar by calling cfg80211_shutdown_all_interfaces() in it's rfkill set_block callback (see cfg80211_rfkill_set_block). Signed-off-by: Jonas Dreßler --- net/bluetooth/hci_core.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 1ec83985f..1c91d02f7 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -543,6 +543,23 @@ int hci_dev_open(__u16 dev) return err; } +static int set_powered_off_sync(struct hci_dev *hdev, void *data) +{ + return hci_set_powered_sync(hdev, false); +} + +static void set_powered_off_sync_complete(struct hci_dev *hdev, void *data, int err) +{ + if (err) + bt_dev_err(hdev, "Powering HCI device off before rfkilling failed (%d)", err); +} + +static int hci_dev_do_poweroff(struct hci_dev *hdev) +{ + return hci_cmd_sync_queue(hdev, set_powered_off_sync, + NULL, set_powered_off_sync_complete); +} + int hci_dev_do_close(struct hci_dev *hdev) { int err; @@ -943,17 +960,27 @@ int hci_get_dev_info(void __user *arg) static int hci_rfkill_set_block(void *data, bool blocked) { struct hci_dev *hdev = data; + int err; BT_DBG("%p name %s blocked %d", hdev, hdev->name, blocked); if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) return -EBUSY; + if (blocked == hci_dev_test_flag(hdev, HCI_RFKILLED)) + return 0; + if (blocked) { - hci_dev_set_flag(hdev, HCI_RFKILLED); if (!hci_dev_test_flag(hdev, HCI_SETUP) && - !hci_dev_test_flag(hdev, HCI_CONFIG)) - hci_dev_do_close(hdev); + !hci_dev_test_flag(hdev, HCI_CONFIG)) { + err = hci_dev_do_poweroff(hdev); + if (err) { + bt_dev_err(hdev, "Powering off device before rfkilling failed (%d)", + err); + } + } + + hci_dev_set_flag(hdev, HCI_RFKILLED); } else { hci_dev_clear_flag(hdev, HCI_RFKILLED); } -- 2.43.0