* [PATCH v2 1/3] Bluetooth: hci_bcm4377: Use correct unit for timeouts
2024-05-15 18:15 [PATCH v2 0/3] Bluetooth: hci_bcm4377 fixes Sven Peter via B4 Relay
@ 2024-05-15 18:15 ` Sven Peter via B4 Relay
2024-05-15 18:15 ` [PATCH v2 2/3] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ 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
From: Sven Peter <sven@svenpeter.dev>
BCM4377_TIMEOUT is always used to wait for completitions and their API
expects a timeout in jiffies instead of msecs.
Fixes: 8a06127602de ("Bluetooth: hci_bcm4377: Add new driver for BCM4377 PCIe boards")
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/bluetooth/hci_bcm4377.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bluetooth/hci_bcm4377.c b/drivers/bluetooth/hci_bcm4377.c
index 9a7243d5db71..caf9b64c8111 100644
--- a/drivers/bluetooth/hci_bcm4377.c
+++ b/drivers/bluetooth/hci_bcm4377.c
@@ -32,7 +32,7 @@ enum bcm4377_chip {
#define BCM4378_DEVICE_ID 0x5f69
#define BCM4387_DEVICE_ID 0x5f71
-#define BCM4377_TIMEOUT 1000
+#define BCM4377_TIMEOUT msecs_to_jiffies(1000)
/*
* These devices only support DMA transactions inside a 32bit window
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/3] Bluetooth: hci_bcm4377: Increase boot timeout
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:15 ` 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
3 siblings, 0 replies; 5+ 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
From: Hector Martin <marcan@marcan.st>
BCM4388 takes over 2 seconds to boot, so increase the timeout.
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/hci_bcm4377.c b/drivers/bluetooth/hci_bcm4377.c
index caf9b64c8111..5b818a0e33d6 100644
--- a/drivers/bluetooth/hci_bcm4377.c
+++ b/drivers/bluetooth/hci_bcm4377.c
@@ -33,6 +33,7 @@ enum bcm4377_chip {
#define BCM4387_DEVICE_ID 0x5f71
#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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 3/3] Bluetooth: hci_bcm4377: Fix msgid release
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:15 ` [PATCH v2 2/3] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
@ 2024-05-15 18:15 ` Sven Peter via B4 Relay
2024-05-15 20:00 ` [PATCH v2 0/3] Bluetooth: hci_bcm4377 fixes patchwork-bot+bluetooth
3 siblings, 0 replies; 5+ 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
From: Hector Martin <marcan@marcan.st>
We are releasing a single msgid, so the order argument to
bitmap_release_region must be zero.
Fixes: 8a06127602de ("Bluetooth: hci_bcm4377: Add new driver for BCM4377 PCIe boards")
Cc: stable@vger.kernel.org
Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/bluetooth/hci_bcm4377.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bluetooth/hci_bcm4377.c b/drivers/bluetooth/hci_bcm4377.c
index 5b818a0e33d6..92d734f02e00 100644
--- a/drivers/bluetooth/hci_bcm4377.c
+++ b/drivers/bluetooth/hci_bcm4377.c
@@ -717,7 +717,7 @@ static void bcm4377_handle_ack(struct bcm4377_data *bcm4377,
ring->events[msgid] = NULL;
}
- bitmap_release_region(ring->msgids, msgid, ring->n_entries);
+ bitmap_release_region(ring->msgids, msgid, 0);
unlock:
spin_unlock_irqrestore(&ring->lock, flags);
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 0/3] Bluetooth: hci_bcm4377 fixes
2024-05-15 18:15 [PATCH v2 0/3] Bluetooth: hci_bcm4377 fixes Sven Peter via B4 Relay
` (2 preceding siblings ...)
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 ` patchwork-bot+bluetooth
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+bluetooth @ 2024-05-15 20:00 UTC (permalink / raw)
To: Sven Peter via B4 Relay
Cc: marcan, alyssa, marcel, luiz.dentz, asahi, linux-arm-kernel,
linux-bluetooth, linux-kernel, sven, stable, neal
Hello:
This series was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:
On Wed, 15 May 2024 18:15:01 +0000 you wrote:
> 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.
>
> [...]
Here is the summary with links:
- [v2,1/3] Bluetooth: hci_bcm4377: Use correct unit for timeouts
https://git.kernel.org/bluetooth/bluetooth-next/c/9ee7beea5921
- [v2,2/3] Bluetooth: hci_bcm4377: Increase boot timeout
https://git.kernel.org/bluetooth/bluetooth-next/c/710a05bcfd4a
- [v2,3/3] Bluetooth: hci_bcm4377: Fix msgid release
https://git.kernel.org/bluetooth/bluetooth-next/c/bb0e96ccc834
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread