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

Commit 32fd6398 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Marcel Holtmann
Browse files

Bluetooth: Enable auto sleep mode for btmrvl driver 



The auto sleep mode for btmrvl driver is not enabled by default.
This patch enables auto sleep mode when card is probed.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2ab25cdd

drivers/bluetooth/btmrvl_drv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,7 @@ void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb); 
int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);

int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);





int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);

int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);

int btmrvl_enable_ps(struct btmrvl_private *priv);

int btmrvl_prepare_command(struct btmrvl_private *priv);

int btmrvl_prepare_command(struct btmrvl_private *priv);





#ifdef CONFIG_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

drivers/bluetooth/btmrvl_main.c

+33 −22
Original line number Original line Diff line number Diff line
@@ -189,6 +189,38 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd) 
}

}

EXPORT_SYMBOL_GPL(btmrvl_send_module_cfg_cmd);

EXPORT_SYMBOL_GPL(btmrvl_send_module_cfg_cmd);





int btmrvl_enable_ps(struct btmrvl_private *priv)

{

	struct sk_buff *skb;

	struct btmrvl_cmd *cmd;



	skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);

	if (skb == NULL) {

		BT_ERR("No free skb");

		return -ENOMEM;

	}



	cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));

	cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF,

					BT_CMD_AUTO_SLEEP_MODE));

	cmd->length = 1;



	if (priv->btmrvl_dev.psmode)

		cmd->data[0] = BT_PS_ENABLE;

	else

		cmd->data[0] = BT_PS_DISABLE;



	bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;



	skb->dev = (void *) priv->btmrvl_dev.hcidev;

	skb_queue_head(&priv->adapter->tx_queue, skb);



	BT_DBG("Queue PSMODE Command:%d", cmd->data[0]);



	return 0;

}

EXPORT_SYMBOL_GPL(btmrvl_enable_ps);



static int btmrvl_enable_hs(struct btmrvl_private *priv)

static int btmrvl_enable_hs(struct btmrvl_private *priv)

{

{

	struct sk_buff *skb;

	struct sk_buff *skb;
@@ -258,28 +290,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv) 




	if (priv->btmrvl_dev.pscmd) {

	if (priv->btmrvl_dev.pscmd) {

		priv->btmrvl_dev.pscmd = 0;

		priv->btmrvl_dev.pscmd = 0;



		btmrvl_enable_ps(priv);

		skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);

		if (skb == NULL) {

			BT_ERR("No free skb");

			return -ENOMEM;

		}



		cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));

		cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_AUTO_SLEEP_MODE));

		cmd->length = 1;



		if (priv->btmrvl_dev.psmode)

			cmd->data[0] = BT_PS_ENABLE;

		else

			cmd->data[0] = BT_PS_DISABLE;



		bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;



		skb->dev = (void *) priv->btmrvl_dev.hcidev;

		skb_queue_head(&priv->adapter->tx_queue, skb);



		BT_DBG("Queue PSMODE Command:%d", cmd->data[0]);

	}

	}





	if (priv->btmrvl_dev.hscmd) {

	if (priv->btmrvl_dev.hscmd) {

drivers/bluetooth/btmrvl_sdio.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -930,6 +930,8 @@ static int btmrvl_sdio_probe(struct sdio_func *func, 
	priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;

	priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;





	btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);

	btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);

	priv->btmrvl_dev.psmode = 1;

	btmrvl_enable_ps(priv);





	return 0;

	return 0;