Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b4b8740 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Marcel Holtmann
Browse files

Bluetooth: btmrvl: add surprise_removed flag 



This flag will be set in unload path to make sure that we skip
sending further commands, ignore interrupts and stop main thread
when unload starts.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 9b89fdfe

drivers/bluetooth/btmrvl_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct btmrvl_private { 
#ifdef CONFIG_DEBUG_FS

	void *debugfs_data;

#endif

	bool surprise_removed;

};



#define MRVL_VENDOR_PKT			0xFE

drivers/bluetooth/btmrvl_main.c

+7 −2
Original line number Diff line number Diff line
@@ -178,6 +178,11 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode, 
	struct sk_buff *skb;

	struct hci_command_hdr *hdr;



	if (priv->surprise_removed) {

		BT_ERR("Card is removed");

		return -EFAULT;

	}



	skb = bt_skb_alloc(HCI_COMMAND_HDR_SIZE + len, GFP_ATOMIC);

	if (skb == NULL) {

		BT_ERR("No free skb");
@@ -600,7 +605,7 @@ static int btmrvl_service_main_thread(void *data) 
		add_wait_queue(&thread->wait_q, &wait);



		set_current_state(TASK_INTERRUPTIBLE);

		if (kthread_should_stop()) {

		if (kthread_should_stop() || priv->surprise_removed) {

			BT_DBG("main_thread: break from main thread");

			break;

		}
@@ -619,7 +624,7 @@ static int btmrvl_service_main_thread(void *data) 


		BT_DBG("main_thread woke up");



		if (kthread_should_stop()) {

		if (kthread_should_stop() || priv->surprise_removed) {

			BT_DBG("main_thread: break from main thread");

			break;

		}

drivers/bluetooth/btmrvl_sdio.c

+4 −0
Original line number Diff line number Diff line
@@ -798,6 +798,9 @@ static void btmrvl_sdio_interrupt(struct sdio_func *func) 


	priv = card->priv;



	if (priv->surprise_removed)

		return;



	if (card->reg->int_read_to_clear)

		ret = btmrvl_sdio_read_to_clear(card, &ireg);

	else
@@ -1466,6 +1469,7 @@ static void btmrvl_sdio_remove(struct sdio_func *func) 
				btmrvl_sdio_disable_host_int(card);

			}

			BT_DBG("unregester dev");

			card->priv->surprise_removed = true;

			btmrvl_sdio_unregister_dev(card);

			btmrvl_remove_card(card->priv);

		}