From patchwork Sun Jan 7 18:02:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jonas_Dre=C3=9Fler?= X-Patchwork-Id: 185753 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp646288dyq; Sun, 7 Jan 2024 10:04:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IEAeNH5LTDtLAQ8UIwAXnFx+xpwL6WrhztxvlLH6OXvkRcknRb65WJEF+fIHsNKnlSpGb93 X-Received: by 2002:a05:6a20:2586:b0:199:ad39:d415 with SMTP id k6-20020a056a20258600b00199ad39d415mr992386pzd.81.1704650652706; Sun, 07 Jan 2024 10:04:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704650652; cv=none; d=google.com; s=arc-20160816; b=PsXV79XDhqr2loBc5EffCvjfy6U+cBI/nS6lRBKxmggqrNJbwiSCreEKvTv9AoOqBw rWDo8+QV5HRQpbt8oOvtjTXnbO7pPw+ELdh+1NQcgxHPG8VxHBZCPov8WRnzKfcXOwmF FB/AaU8OMd4SSFnZ/230a1+xdHp+yg3KWqJku8JuJ8d1JFgVc0+kNz4D76wCK82Hn5b1 1gguSAazfeo+ejbokwLK045s6FJV4yoTTpwXN+B6t/7loCA9PZT8javHyBuMDjIZ9PwM 6plRckF6YB5tHRRROuKGCg31bBddshpDzIlmXunVNPP71Cs8AwiSa1fqfldIgsXqDlKm sGQA== 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=xFGvZRiDbQXjqxd2rppyOAzZOIsqJn9Ls1auXbQVx7s=; fh=S5rf2bc7VLlSXYQ0EqFAIodb1qEiUfsxulvZhQKZRws=; b=kb/CD5UkQe/ZbOxKWZ27tMUxDqIYf4VvqBM6R+8d9wSqdFtyxkxjDcCWWCNDsihWtY 2G9v5BopBLbVKemNRicVm8RcWJPwYxk+OJI2SyB1ow2Fgal2IMRLmvfwhiTXxq/sim7Z i+NaGT4UmoWcIyKyJKqjZBlvyhrtqfMpd3xmac7O8/dJSpVTgNuAntaxLbPQkwvmjzCO irasXZcmvx5JZ4Wu5RSsODlKJ5UzAus89CYJna9DAhpsAA/dAmDQW5bXG5uFWKtzwUcZ pImq5bUlP6eB1VhFxrQpYzlAKZbLGFP8SRdkyZXCwk3Zs92oX1+rV4LbHJV5/AafDi2W YCbA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-18942-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18942-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id s3-20020a637703000000b005bdbd1b52d4si4750352pgc.270.2024.01.07.10.04.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 10:04:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18942-ouuuleilei=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-18942-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18942-ouuuleilei=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 7884F281F9E for ; Sun, 7 Jan 2024 18:04:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1EBDE21374; Sun, 7 Jan 2024 18:03:18 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (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 80CB714273; Sun, 7 Jan 2024 18:03:13 +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 smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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-102.mailbox.org (Postfix) with ESMTPS id 4T7Q603S65z9t8h; Sun, 7 Jan 2024 19:03:04 +0100 (CET) From: =?utf-8?q?Jonas_Dre=C3=9Fler?= To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: =?utf-8?q?Jonas_Dre=C3=9Fler?= , asahi@lists.linux.dev, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3 2/4] Bluetooth: mgmt: Remove leftover queuing of power_off work Date: Sun, 7 Jan 2024 19:02:48 +0100 Message-ID: <20240107180252.73436-3-verdre@v0yd.nl> In-Reply-To: <20240107180252.73436-1-verdre@v0yd.nl> References: <20240107180252.73436-1-verdre@v0yd.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4T7Q603S65z9t8h X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787455763017134743 X-GMAIL-MSGID: 1787455763017134743 Queuing of power_off work was introduced in these functions with commits 8b064a3ad377 ("Bluetooth: Clean up HCI state when doing power off") and c9910d0fb4fc ("Bluetooth: Fix disconnecting connections in non-connected states") in an effort to clean up state and do things like disconnecting devices before actually powering off the device. After that, commit a3172b7eb4a2 ("Bluetooth: Add timer to force power off") introduced a timeout to ensure that the device actually got powered off, even if some of the cleanup work would never complete. This code later got refactored with commit cf75ad8b41d2 ("Bluetooth: hci_sync: Convert MGMT_SET_POWERED"), which made powering off the device synchronous and removed the need for initiating the power_off work from other places. The timeout mentioned above got removed too, because we now also made use of the command timeout during power on/off. These days the power_off work still exists, but it only seems to only be used for HCI_AUTO_OFF functionality, which is why we never noticed those two leftover places where we queue power_off work. So let's remove that code. Signed-off-by: Jonas Dreßler --- net/bluetooth/mgmt.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index d4498037f..c5291e139 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -9760,14 +9760,6 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, struct mgmt_ev_device_disconnected ev; struct sock *sk = NULL; - /* The connection is still in hci_conn_hash so test for 1 - * instead of 0 to know if this is the last one. - */ - if (mgmt_powering_down(hdev) && hci_conn_count(hdev) == 1) { - cancel_delayed_work(&hdev->power_off); - queue_work(hdev->req_workqueue, &hdev->power_off.work); - } - if (!mgmt_connected) return; @@ -9824,14 +9816,6 @@ void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, { struct mgmt_ev_connect_failed ev; - /* The connection is still in hci_conn_hash so test for 1 - * instead of 0 to know if this is the last one. - */ - if (mgmt_powering_down(hdev) && hci_conn_count(hdev) == 1) { - cancel_delayed_work(&hdev->power_off); - queue_work(hdev->req_workqueue, &hdev->power_off.work); - } - bacpy(&ev.addr.bdaddr, bdaddr); ev.addr.type = link_to_bdaddr(link_type, addr_type); ev.status = mgmt_status(status);