From 201f1533e7cb3abce0f12df73b67257896d4352e Mon Sep 17 00:00:00 2001 From: Sven Peter Date: Mon, 11 Jul 2022 20:47:19 +0200 Subject: [PATCH] fixup! Bluetooth: hci_bcm43xx: Add new driver for BCM43XX PCI boards Signed-off-by: Sven Peter --- drivers/bluetooth/hci_bcm43xx.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/hci_bcm43xx.c b/drivers/bluetooth/hci_bcm43xx.c index c9309deaab78..108841cea592 100644 --- a/drivers/bluetooth/hci_bcm43xx.c +++ b/drivers/bluetooth/hci_bcm43xx.c @@ -308,7 +308,7 @@ struct bcm43xx_ring_state { struct bcm43xx_transfer_ring { enum bcm43xx_transfer_ring_id ring_id; enum bcm43xx_doorbell doorbell; - u16 payload_size; + size_t payload_size; size_t mapped_payload_size; u8 completion_ring; u16 n_entries; @@ -693,8 +693,14 @@ static int bcm43xx_enqueue(struct bcm43xx_data *bcm43xx, int ret, msgid; DECLARE_COMPLETION_ONSTACK(event); - if (len > ring->payload_size && len > ring->mapped_payload_size) + if (len > ring->payload_size && len > ring->mapped_payload_size) { + dev_warn( + &bcm43xx->pdev->dev, + "payload len %zu is too large for ring %d (max is %zu or %zu)\n", + len, ring->ring_id, ring->payload_size, + ring->mapped_payload_size); return -EINVAL; + } if (wait && !ring->allow_wait) return -EINVAL; if (ring->virtual) @@ -711,12 +717,17 @@ static int bcm43xx_enqueue(struct bcm43xx_data *bcm43xx, new_head = (head + 1) % ring->n_entries; if (new_head == tail) { + dev_warn(&bcm43xx->pdev->dev, + "can't send message because ring %d is full\n", + ring->ring_id); ret = -EINVAL; goto out; } msgid = bitmap_find_free_region(ring->msgids, ring->n_entries, 0); if (msgid < 0) { + dev_warn(&bcm43xx->pdev->dev, + "can't find message id for ring %d\n", ring->ring_id); ret = -EINVAL; goto out; } -- 2.25.1