From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43A2960A381B for ; Sat, 7 Nov 2026 15:49:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ziJOqq3E; dkim=pass (2048-bit key) header.d=deq.rocks header.i=@deq.rocks header.a=rsa-sha256 header.s=securedbylima-20251205 header.b=Ezt/vcDR DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=eo/NywlEhroI6mMNdiDhHmXihtMSrWd5iTDNbsGOBzs=; b=ziJOqq3ESqNuqy EWvlds2giWmlPOqBi8f7kzAyfC7G1+JJJcOscM/tylTQ6OwSNnNCoMSuynI2HcELDhwmmOtfl1Y0K 5d+UIUIzfopKKuKjblBepS4Mn958WKw5zaj+35CdhD0YSAliE3TJ+BCcvHCvjDfPdQm7v1Z+JFiBO j2Qspg8J/NHr/aRnbiN/ulngmsowBVTsxxlP5/i8Dkczrq6kEXRXOSwVF7yumzHrm57KQw52AIXoc wDDsXlwVQMl9M6AX6lPfGc/o/XdlR59MfdDZ9t+veeRj2DLvyE7BPhh7w+dwQPJ57UInbFR4AJJaa o7PFh9mubTlRYK7nUQig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPif1-0000000ExIr-3Fgy; Sat, 07 Nov 2026 15:48:55 +0000 Received: from mx5.mail-out.lima-city.de ([91.216.248.207]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPieu-0000000ExFB-23P4 for linux-arm-kernel@lists.infradead.org; Sat, 07 Nov 2026 15:48:51 +0000 From: Andre Eikmeyer X-Lima-ML-UUID: c8b6b05e-e52f-4b47-b25b-9e465b8ba845 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=deq.rocks; s=securedbylima-20251205; t=1794066526; bh=1lAmkZ8NRJCX4r08vZCWyv+dbxFv1Yobgq898qKHccM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ezt/vcDR7MwuOzEiwcocCKJgtE3GT0XQ4+Pix9VfTFqdE9XqnNq9mfDPdZMxc+dDG hlFFrvsT7s6WgM5CPDVrsXzV8Np8tdmV1dR650DnDkhoZz6uR8qeVHnO+q2mR4tDtk UMhvtO8hsqcFt8J8h1QrqnmLxv39dMLsfMrye7beoI4wCN8RhQVufU4LgXKGza3crz vAp+ktS1K8LO7+q9ilRSYzN+dN7xlf8soALAajbVNBul7PmHFegdFljEsgXo9YO2s9 s5DHAVPC42eTTbAbvXO0GGVkxacPllWPHg1JyiCioI5qf2wWKFGA0hcDk2a0aiH79x 9/APIehc3B/Bg== To: Sven Peter , Marcel Holtmann , Luiz Augusto von Dentz Cc: Janne Grunau , Neal Gompa , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] Bluetooth: hci_bcm4377: probe again after a resume through firmware Date: Sat, 7 Nov 2026 16:48:39 +0100 Message-ID: <20261107154839.89941-3-dev@deq.rocks> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107154839.89941-1-dev@deq.rocks> References: <20261107154839.89941-1-dev@deq.rocks> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261107_074848_829640_666E088C X-CRM114-Status: GOOD ( 15.45 ) X-Spam-Score: -2.8 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 The BCM4377 is powered off during ACPI S3 and loses its firmware. On resume the driver only unquiesces it, so every command times out. When the platform firmware handled the resume, probe the controller again from a work item and skip the ring teardown messages to the lost firmware. Signed-off-by: Andre Eikmeyer --- drivers/bluetooth/hci_bcm4377.c | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/drivers/bluetooth/hci_bcm4377.c b/drivers/bluetooth/hci_bcm4377.c index da0a48c2be3..4e3630774c0 100644 --- a/drivers/bluetooth/hci_bcm4377.c +++ b/drivers/bluetooth/hci_bcm4377.c @@ -16,6 +16,9 @@ #include #include #include +#include +#include +#include #include @@ -566,6 +569,9 @@ struct bcm4377_data { struct pci_dev *pdev; struct hci_dev *hdev; + /* set when the controller lost its firmware during system sleep */ + bool fw_lost; + void __iomem *bar0; void __iomem *bar2; @@ -1017,6 +1023,11 @@ static int bcm4377_destroy_completion_ring(struct bcm4377_data *bcm4377, struct bcm4377_destroy_completion_ring_msg msg; int ret; + if (bcm4377->fw_lost) { + ring->enabled = false; + return 0; + } + memset(&msg, 0, sizeof(msg)); msg.msg_type = BCM4377_CONTROL_MSG_DESTROY_COMPLETION_RING; msg.ring_id = cpu_to_le16(ring->ring_id); @@ -1107,6 +1118,11 @@ static int bcm4377_destroy_transfer_ring(struct bcm4377_data *bcm4377, struct bcm4377_destroy_transfer_ring_msg msg; int ret; + if (bcm4377->fw_lost) { + ring->enabled = false; + return 0; + } + memset(&msg, 0, sizeof(msg)); msg.msg_type = BCM4377_CONTROL_MSG_DESTROY_XFER_RING; msg.ring_id = cpu_to_le16(ring->ring_id); @@ -2432,11 +2448,54 @@ static int bcm4377_suspend(struct device *dev) return 0; } +struct bcm4377_reprobe { + struct work_struct work; + struct pci_dev *pdev; +}; + +static void bcm4377_reprobe_work(struct work_struct *work) +{ + struct bcm4377_reprobe *reprobe = + container_of(work, struct bcm4377_reprobe, work); + int ret; + + /* + * Probing stays blocked until the system resume completes, the driver + * core then retries the deferred probe. + */ + ret = device_reprobe(&reprobe->pdev->dev); + if (ret && ret != -EPROBE_DEFER) + dev_err(&reprobe->pdev->dev, "re-probe after resume failed (%d)\n", + ret); + + pci_dev_put(reprobe->pdev); + kfree(reprobe); +} + static int bcm4377_resume(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); struct bcm4377_data *bcm4377 = pci_get_drvdata(pdev); + /* + * The controller is powered off when the platform firmware handles + * the system sleep, as with ACPI S3 on x86 Macs, and comes back + * without its firmware. Probe it again. + */ + if (pm_resume_via_firmware()) { + struct bcm4377_reprobe *reprobe; + + reprobe = kzalloc_obj(*reprobe); + if (!reprobe) + return -ENOMEM; + + bcm4377->fw_lost = true; + reprobe->pdev = pci_dev_get(pdev); + INIT_WORK(&reprobe->work, bcm4377_reprobe_work); + schedule_work(&reprobe->work); + return 0; + } + iowrite32(BCM4377_BAR0_SLEEP_CONTROL_UNQUIESCE, bcm4377->bar0 + BCM4377_BAR0_SLEEP_CONTROL);