Skip to content

Commit 184ea40

Browse files
moore-brosholtmann
authored andcommitted
Bluetooth: btmtksdio: use register CRPLR to read packet length
That is a preliminary patch to introduce mt7921s support. Use the register CRPLR to read packet length to make all the devices share the common logic. Co-developed-by: Mark-yw Chen <[email protected]> Signed-off-by: Mark-yw Chen <[email protected]> Signed-off-by: Sean Wang <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
1 parent 5b23ac1 commit 184ea40

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/bluetooth/btmtksdio.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ MODULE_DEVICE_TABLE(sdio, btmtksdio_table);
8383

8484
#define MTK_REG_CRDR 0x1c
8585

86+
#define MTK_REG_CRPLR 0x24
87+
8688
#define MTK_SDIO_BLOCK_SIZE 256
8789

8890
#define BTMTKSDIO_TX_WAIT_VND_EVT 1
@@ -404,9 +406,8 @@ static void btmtksdio_txrx_work(struct work_struct *work)
404406
struct btmtksdio_dev *bdev = container_of(work, struct btmtksdio_dev,
405407
txrx_work);
406408
unsigned long txrx_timeout;
409+
u32 int_status, rx_size;
407410
struct sk_buff *skb;
408-
u32 int_status;
409-
u16 rx_size;
410411
int err;
411412

412413
pm_runtime_get_sync(bdev->dev);
@@ -450,11 +451,11 @@ static void btmtksdio_txrx_work(struct work_struct *work)
450451
bt_dev_warn(bdev->hdev, "Tx fifo overflow");
451452

452453
if (int_status & RX_DONE_INT) {
453-
rx_size = (int_status & RX_PKT_LEN) >> 16;
454+
rx_size = sdio_readl(bdev->func, MTK_REG_CRPLR, NULL);
455+
rx_size = (rx_size & RX_PKT_LEN) >> 16;
454456
if (btmtksdio_rx_packet(bdev, rx_size) < 0)
455457
bdev->hdev->stat.err_rx++;
456458
}
457-
458459
} while (int_status || time_is_before_jiffies(txrx_timeout));
459460

460461
/* Enable interrupt */

0 commit comments

Comments
 (0)