From patchwork Mon Apr 24 12:48:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 87018 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2721173vqo; Mon, 24 Apr 2023 05:55:02 -0700 (PDT) X-Google-Smtp-Source: AKy350Yzuuno5TCXUAgc4GTqk3Vzx9IkvwFfQhZzlZMx4/gN8dWAJlb5Vhg+cXbuJQB0dvtxhCj1 X-Received: by 2002:a17:902:ea03:b0:1a6:961e:fcfe with SMTP id s3-20020a170902ea0300b001a6961efcfemr17295589plg.30.1682340902366; Mon, 24 Apr 2023 05:55:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682340902; cv=none; d=google.com; s=arc-20160816; b=PxMbf+HqSbDDXEM9ObJjYAx8cLo/h1UFPP4CwHhoIBWsd9M7YvSKQh748dp0VregFZ TaK3wncZD/KWXLFZyuRwj/vfUTOQXmCkrS07U71PPuxCl0Jy/bt2FbwsuR1IZVsIlXI1 nK4wKmGe8zIPc4PlnmT8P+ozz5Vlvk/+DgZJ1iC8e1mh9qJMUH8a6vd75O8mNtC0P7xq 4ryI7neWqYOTZ0xcofrtPNxVKRP2tOKWznJTcAxheqbBwF/8Vyb2ffk99wLUEvWWVa3V xLiFKO5viUQ8WsiVxwhjyKg0sYOs7c5bQ7R/bRm1DKHJPjhAVXGWIkWvsm7jzRSz5uUs rfgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3cO9oYBVSRL3OLoYElVkRSt2h9c//mcTs9RB8weBV40=; b=Xy4flqIxrwKT1pwmgxJqbIlY61wYBtW2xFq2t0bEF119KdkYFP0xRKr2+eTjS9Gy/s NAJra2vZscu2B+iEG+fgrHdETVvZIb1Upe7PC4efRMZHA3s1cZeiWQo1T5WPdBGT7oBy eJVoCilJsaYDqyILIOke3fVz3P+bsyORSRMnyDCVVTZU4J9ISC+E5OUAn9wGsYqvhF5/ P6FS4weI2Jt8fp54FxaUXwIk+qFshMsEUaXjpGXJmxCTCqbBpxv6Q1jy45Kd0/qDelJq 0BgtpM1BiW3FGx6Y7m9tnAUHZXdHUhm79I45MWNPI/+XL2nxH+cflBZAV37e7TfRZ+z/ bVYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=B3E+bHqo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m1-20020a1709026bc100b001a24521e826si10613008plt.61.2023.04.24.05.54.49; Mon, 24 Apr 2023 05:55:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=B3E+bHqo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231847AbjDXMu1 (ORCPT + 99 others); Mon, 24 Apr 2023 08:50:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231818AbjDXMuY (ORCPT ); Mon, 24 Apr 2023 08:50:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13C184C0E; Mon, 24 Apr 2023 05:50:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6D25E61F2D; Mon, 24 Apr 2023 12:50:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B67E2C433EF; Mon, 24 Apr 2023 12:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682340602; bh=doty7Nzt+HL2eXizgefudpBTTJskbLd1/KbCneDfvBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B3E+bHqoklmEQDfyF6vGU4XrflewNvEr9ugq5EkTvqYq3TkA3rdNPFnPVzpLpayR2 aC3CRIGGm2dcI9JX6c4CwWlQswX5IK1JlTdAVWnmsaTZYIxgZ54/aZTpMP+2mMxVa+ OyJRsQPIiKlmPESbtEYJB1uihIgBkfWITm5Lv4kGrhgcoQn0SCjd1UpP7CEaVzqjh0 TosHtmvyg6tk02NV7ZOzk83U3D6Upz6tJ3Pq803oSo5TEsNuObxbsRd3i8e49Dygzp Im7YTrRwN01AC1vo2VvgrO5exFWwRwi563bvuN6YVqUqLbGkBcJATcKISR8B09jE5e qlxFb5cmRj8CQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pqve7-0003IX-6f; Mon, 24 Apr 2023 14:50:19 +0200 From: Johan Hovold To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/2] Bluetooth: fix debugfs registration Date: Mon, 24 Apr 2023 14:48:51 +0200 Message-Id: <20230424124852.12625-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230424124852.12625-1-johan+linaro@kernel.org> References: <20230424124852.12625-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764062063725402722?= X-GMAIL-MSGID: =?utf-8?q?1764062293710999322?= Since commit ec6cef9cd98d ("Bluetooth: Fix SMP channel registration for unconfigured controllers") the debugfs interface for unconfigured controllers will be created when the controller is configured. There is however currently nothing preventing a controller from being configured multiple time (e.g. setting the device address using btmgmt) which results in failed attempts to register the already registered debugfs entries: debugfs: File 'features' in directory 'hci0' already present! debugfs: File 'manufacturer' in directory 'hci0' already present! debugfs: File 'hci_version' in directory 'hci0' already present! ... debugfs: File 'quirk_simultaneous_discovery' in directory 'hci0' already present! Add a controller flag to avoid trying to register the debugfs interface more than once. Fixes: ec6cef9cd98d ("Bluetooth: Fix SMP channel registration for unconfigured controllers") Cc: stable@vger.kernel.org # 4.0 Signed-off-by: Johan Hovold --- include/net/bluetooth/hci.h | 1 + net/bluetooth/hci_sync.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 400f8a7d0c3f..b8bca65bcd79 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -335,6 +335,7 @@ enum { enum { HCI_SETUP, HCI_CONFIG, + HCI_DEBUGFS_CREATED, HCI_AUTO_OFF, HCI_RFKILLED, HCI_MGMT, diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 632be1267288..a8785126df75 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -4501,6 +4501,9 @@ static int hci_init_sync(struct hci_dev *hdev) !hci_dev_test_flag(hdev, HCI_CONFIG)) return 0; + if (hci_dev_test_and_set_flag(hdev, HCI_DEBUGFS_CREATED)) + return 0; + hci_debugfs_create_common(hdev); if (lmp_bredr_capable(hdev)) From patchwork Mon Apr 24 12:48:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 87017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2720467vqo; Mon, 24 Apr 2023 05:53:32 -0700 (PDT) X-Google-Smtp-Source: AKy350b7qbZhtwMTs9WrxGqCKVZPpfDWGjRk0FKh8m6oZa9jhln9C3uPoTymIZyfc17AkZKE2TRd X-Received: by 2002:a05:6a00:188d:b0:635:1770:beb7 with SMTP id x13-20020a056a00188d00b006351770beb7mr16794223pfh.14.1682340812559; Mon, 24 Apr 2023 05:53:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682340812; cv=none; d=google.com; s=arc-20160816; b=DRHzEsP4/6RDz9dC3rCgzEz6X9w/npY0gpDyHRoHQUY5VbaD0JQ6F0ttnF6C5TztcQ jhC5z0w/0v01vc9267JqP8yDXOU9ai9iN6X6K9Z9ioRkz5Cl/OlezkrioD7mupuYeyMj 3oBeX9RdUF51l/tJVWELsRtrZ296V34nFCD0XmcJQ12lfPrfoROhyQiHr9V+PEKE/6HA TDWujzaHgPOofMEFRNTfco74qGwhm8PXqHBsZelh2Km89m9OKbE+tFg2xtTOWN9gm+TB X7O/BLFssIO4sXGROZXYbQsyh/fF7QIZ1MFXWuNK5f0JogaAER6p5L3l/5HP2J9il8gG 9l+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Fzspn5LDVKmkJ/6cPd59oEXm8UF9Im2JNvOw9hzcOFI=; b=ZAvl77ru0d32swP8Rmn0j78WJjY3+4GCLH7b4barD+2hzFynRKnJH34UiEThdUkHjZ 1hkYOMKt5MoOvk/5OVFjBd4I+wEPpwZ4AunfZLgNRjkmnUpi4FwMvDFvqe/ostUE4Jo8 YJp8u4L71K05mbAUusNCsEkqkp2BQWzfNfhRBtNaWWYbQEhSoOdlGK7rXJnlTzTvhL/b 7KjR/gNeMZ3kg+/lhfmhWLjyhEfBC7Kc3iKh2ZHtSvgSlxtSEWw95EgQXZCCcW10jI5y o+9h4D1w7pKQH6usHg8pCEnF42WnS0buIN40v9rpNAXbMZJVU48mCSrfoRo5bpgyp2Pz EU9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QGTbaFPp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k71-20020a63844a000000b0051b6613dddesi10975310pgd.281.2023.04.24.05.53.19; Mon, 24 Apr 2023 05:53:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QGTbaFPp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231860AbjDXMua (ORCPT + 99 others); Mon, 24 Apr 2023 08:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231823AbjDXMuY (ORCPT ); Mon, 24 Apr 2023 08:50:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21BBA4C10; Mon, 24 Apr 2023 05:50:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 71FE161F32; Mon, 24 Apr 2023 12:50:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8882C4339B; Mon, 24 Apr 2023 12:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682340602; bh=Kp6sLYqmpkY6hExl+WRL9PGf/2mCUC4b+03Evy/ZlDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QGTbaFPpS88HlIx4V3SL3glUuDcDtTMpORjUTvqreo9LpPCMxst6lPABFFUCRBc+F gXHv5YzeJyUCd2bS8mFX6UMJ3d/kRxYGPpIOkXvzFL9tgXdSNyl9/K5HSqB+k51MgS hSJ+Lu+QZQysC+fX2BDwVv1VS/0xSHD7G8/ECgL3NU3pP2nUaoB1H9mHa6YK29BVbq z8kEzq2Ft85mnNR2GtanDzesV27goQHXkhBNl2XgT5drBK0hsh12951vfd9ePl4KEf zGbWgRJ6COPmrM6C7qoPeZw0ArUOMEt6pRLu8g7TxHQDcz4r7yyiutO/nNoHIDtU/i tm540grJRDTeg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pqve7-0003IZ-9n; Mon, 24 Apr 2023 14:50:19 +0200 From: Johan Hovold To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/2] Bluetooth: hci_qca: fix debugfs registration Date: Mon, 24 Apr 2023 14:48:52 +0200 Message-Id: <20230424124852.12625-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230424124852.12625-1-johan+linaro@kernel.org> References: <20230424124852.12625-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764062199758872838?= X-GMAIL-MSGID: =?utf-8?q?1764062199758872838?= Since commit 3e4be65eb82c ("Bluetooth: hci_qca: Add poweroff support during hci down for wcn3990"), the setup callback which registers the debugfs interface can be called multiple times. This specifically leads to the following error when powering on the controller: debugfs: Directory 'ibs' with parent 'hci0' already present! Add a driver flag to avoid trying to register the debugfs interface more than once. Fixes: 3e4be65eb82c ("Bluetooth: hci_qca: Add poweroff support during hci down for wcn3990") Cc: stable@vger.kernel.org # 4.20 Signed-off-by: Johan Hovold --- drivers/bluetooth/hci_qca.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 38ff962662ff..db020c04b3e8 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -78,7 +78,8 @@ enum qca_flags { QCA_HW_ERROR_EVENT, QCA_SSR_TRIGGERED, QCA_BT_OFF, - QCA_ROM_FW + QCA_ROM_FW, + QCA_DEBUGFS_CREATED, }; enum qca_capabilities { @@ -635,6 +636,9 @@ static void qca_debugfs_init(struct hci_dev *hdev) if (!hdev->debugfs) return; + if (test_and_set_bit(QCA_DEBUGFS_CREATED, &qca->flags)) + return; + ibs_dir = debugfs_create_dir("ibs", hdev->debugfs); /* read only */