public inbox for linux-bluetooth@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/3] Bluetooth: hci_bcm4377 fixes
@ 2024-05-15 18:15 Sven Peter via B4 Relay
  2024-05-15 18:15 ` [PATCH v2 1/3] Bluetooth: hci_bcm4377: Use correct unit for timeouts Sven Peter via B4 Relay
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Sven Peter via B4 Relay @ 2024-05-15 18:15 UTC (permalink / raw)
  To: Hector Martin, Alyssa Rosenzweig, Marcel Holtmann,
	Luiz Augusto von Dentz
  Cc: asahi, linux-arm-kernel, linux-bluetooth, linux-kernel,
	Sven Peter, stable, Neal Gompa

Hi,

There are just two minor fixes from Hector that we've been carrying downstream
for a while now. One increases the timeout while waiting for the firmware to
boot which is optional for the controller already supported upstream but
required for a newer 4388 board for which we'll also submit support soon.
It also fixes the units for the timeouts which is why I've already included it
here. The other one fixes a call to bitmap_release_region where we only wanted
to release a single bit but are actually releasing much more.

Best,

Sven

To: Hector Martin <marcan@marcan.st>
To: Alyssa Rosenzweig <alyssa@rosenzweig.io>
To: Marcel Holtmann <marcel@holtmann.org>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: asahi@lists.linux.dev
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Sven Peter <sven@svenpeter.dev>

Changes in v2:
- split the timeout commit into two
- collect Neal's tag
- Link to v1: https://lore.kernel.org/r/20240512-btfix-msgid-v1-0-ab1bd938a7f4@svenpeter.dev

---
Hector Martin (2):
      Bluetooth: hci_bcm4377: Increase boot timeout
      Bluetooth: hci_bcm4377: Fix msgid release

Sven Peter (1):
      Bluetooth: hci_bcm4377: Use correct unit for timeouts

 drivers/bluetooth/hci_bcm4377.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
base-commit: cf87f46fd34d6c19283d9625a7822f20d90b64a4
change-id: 20240512-btfix-msgid-d76029a7d917

Best regards,
-- 
Sven Peter <sven@svenpeter.dev>



^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/2] Bluetooth: hci_bcm4377: Increase boot timeout
@ 2024-05-12 12:12 Sven Peter via B4 Relay
  2024-05-12 12:40 ` Bluetooth: hci_bcm4377 fixes bluez.test.bot
  0 siblings, 1 reply; 7+ messages in thread
From: Sven Peter via B4 Relay @ 2024-05-12 12:12 UTC (permalink / raw)
  To: Hector Martin, Alyssa Rosenzweig, Marcel Holtmann,
	Luiz Augusto von Dentz
  Cc: asahi, linux-arm-kernel, linux-bluetooth, linux-kernel,
	Sven Peter

From: Hector Martin <marcan@marcan.st>

BCM4388 takes over 2 seconds to boot, so increase the timeout (and also
fix the units while we're here).

Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
 drivers/bluetooth/hci_bcm4377.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/hci_bcm4377.c b/drivers/bluetooth/hci_bcm4377.c
index 9a7243d5db71..5b818a0e33d6 100644
--- a/drivers/bluetooth/hci_bcm4377.c
+++ b/drivers/bluetooth/hci_bcm4377.c
@@ -32,7 +32,8 @@ enum bcm4377_chip {
 #define BCM4378_DEVICE_ID 0x5f69
 #define BCM4387_DEVICE_ID 0x5f71
 
-#define BCM4377_TIMEOUT 1000
+#define BCM4377_TIMEOUT msecs_to_jiffies(1000)
+#define BCM4377_BOOT_TIMEOUT msecs_to_jiffies(5000)
 
 /*
  * These devices only support DMA transactions inside a 32bit window
@@ -1857,7 +1858,7 @@ static int bcm4377_boot(struct bcm4377_data *bcm4377)
 	dev_dbg(&bcm4377->pdev->dev, "waiting for firmware to boot\n");
 
 	ret = wait_for_completion_interruptible_timeout(&bcm4377->event,
-							BCM4377_TIMEOUT);
+							BCM4377_BOOT_TIMEOUT);
 	if (ret == 0) {
 		ret = -ETIMEDOUT;
 		goto out_dma_free;

-- 
2.34.1



^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-15 20:00 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-15 18:15 [PATCH v2 0/3] Bluetooth: hci_bcm4377 fixes Sven Peter via B4 Relay
2024-05-15 18:15 ` [PATCH v2 1/3] Bluetooth: hci_bcm4377: Use correct unit for timeouts Sven Peter via B4 Relay
2024-05-15 18:59   ` Bluetooth: hci_bcm4377 fixes bluez.test.bot
2024-05-15 18:15 ` [PATCH v2 2/3] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
2024-05-15 18:15 ` [PATCH v2 3/3] Bluetooth: hci_bcm4377: Fix msgid release Sven Peter via B4 Relay
2024-05-15 20:00 ` [PATCH v2 0/3] Bluetooth: hci_bcm4377 fixes patchwork-bot+bluetooth
  -- strict thread matches above, loose matches on Subject: below --
2024-05-12 12:12 [PATCH 1/2] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
2024-05-12 12:40 ` Bluetooth: hci_bcm4377 fixes bluez.test.bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox