* [PATCH 0/2] Bluetooth: hci_bcm4377 fixes
@ 2024-05-12 12:12 Sven Peter via B4 Relay
2024-05-12 12:12 ` [PATCH 1/2] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
2024-05-12 12:12 ` [PATCH 2/2] Bluetooth: hci_bcm4377: Fix msgid release Sven Peter via B4 Relay
0 siblings, 2 replies; 5+ 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, stable
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
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
Hector Martin (2):
Bluetooth: hci_bcm4377: Increase boot timeout
Bluetooth: hci_bcm4377: Fix msgid release
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>
_______________________________________________
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* [PATCH 1/2] Bluetooth: hci_bcm4377: Increase boot timeout
2024-05-12 12:12 [PATCH 0/2] Bluetooth: hci_bcm4377 fixes Sven Peter via B4 Relay
@ 2024-05-12 12:12 ` Sven Peter via B4 Relay
2024-05-12 12:54 ` Stefan Wahren
2024-05-12 12:12 ` [PATCH 2/2] Bluetooth: hci_bcm4377: Fix msgid release Sven Peter via B4 Relay
1 sibling, 1 reply; 5+ 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
_______________________________________________
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 1/2] Bluetooth: hci_bcm4377: Increase boot timeout
2024-05-12 12:12 ` [PATCH 1/2] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
@ 2024-05-12 12:54 ` Stefan Wahren
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Wahren @ 2024-05-12 12:54 UTC (permalink / raw)
To: sven, Hector Martin, Alyssa Rosenzweig, Marcel Holtmann,
Luiz Augusto von Dentz
Cc: asahi, linux-arm-kernel, linux-bluetooth, linux-kernel
Hi Sven,
Am 12.05.24 um 14:12 schrieb Sven Peter via B4 Relay:
> 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)
this change affect all timeouts not just the boot timeout, so i would
prefer to split this.
> +#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;
>
_______________________________________________
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
* [PATCH 2/2] Bluetooth: hci_bcm4377: Fix msgid release
2024-05-12 12:12 [PATCH 0/2] Bluetooth: hci_bcm4377 fixes Sven Peter via B4 Relay
2024-05-12 12:12 ` [PATCH 1/2] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
@ 2024-05-12 12:12 ` Sven Peter via B4 Relay
2024-05-14 1:15 ` Neal Gompa
1 sibling, 1 reply; 5+ 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, stable
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>
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 2/2] Bluetooth: hci_bcm4377: Fix msgid release
2024-05-12 12:12 ` [PATCH 2/2] Bluetooth: hci_bcm4377: Fix msgid release Sven Peter via B4 Relay
@ 2024-05-14 1:15 ` Neal Gompa
0 siblings, 0 replies; 5+ messages in thread
From: Neal Gompa @ 2024-05-14 1:15 UTC (permalink / raw)
To: sven
Cc: Hector Martin, Alyssa Rosenzweig, Marcel Holtmann,
Luiz Augusto von Dentz, asahi, linux-arm-kernel, linux-bluetooth,
linux-kernel, stable
On Sun, May 12, 2024 at 6:12 AM Sven Peter via B4 Relay
<devnull+sven.svenpeter.dev@kernel.org> wrote:
>
> 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>
> 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
Reviewed-by: Neal Gompa <neal@gompa.dev>
--
真実はいつも一つ！/ Always, there's only one truth!
_______________________________________________
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
end of thread, other threads:[~2024-05-14 1:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-12 12:12 [PATCH 0/2] Bluetooth: hci_bcm4377 fixes Sven Peter via B4 Relay
2024-05-12 12:12 ` [PATCH 1/2] Bluetooth: hci_bcm4377: Increase boot timeout Sven Peter via B4 Relay
2024-05-12 12:54 ` Stefan Wahren
2024-05-12 12:12 ` [PATCH 2/2] Bluetooth: hci_bcm4377: Fix msgid release Sven Peter via B4 Relay
2024-05-14 1:15 ` Neal Gompa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).