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

Commit f539f2ef authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: convert sleep/wake config direct commands 



Confirm sleep event: they come very regularly, eventually several times per
second. Therefore we want to send the config command as fast as possible.
The old code pre-set the command in priv->lbs_ps_confirm_sleep. However, the
byte sequence to be sent to the hardware is the same for all interfaces. So
this patch make this an extern structure, initialized at module load time.

Config wake event: normal conversion to a direct command. However, I don't know
how to trigger a "HOST AWAKE" event from the firmware, so this part is
untested.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7460f5a6

drivers/net/wireless/libertas/cmd.c

+10 −22
Original line number Original line Diff line number Diff line
@@ -1802,38 +1802,27 @@ void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str) 
	lbs_deb_leave(LBS_DEB_WEXT);

	lbs_deb_leave(LBS_DEB_WEXT);

}

}





static int sendconfirmsleep(struct lbs_private *priv, u8 *cmdptr, u16 size)

static void lbs_send_confirmsleep(struct lbs_private *priv)

{

{

	unsigned long flags;

	unsigned long flags;

	int ret = 0;

	int ret;





	lbs_deb_enter(LBS_DEB_HOST);

	lbs_deb_enter(LBS_DEB_HOST);

	lbs_deb_hex(LBS_DEB_HOST, "sleep confirm command", cmdptr, size);

	lbs_deb_hex(LBS_DEB_HOST, "sleep confirm", (u8 *) &confirm_sleep,



		sizeof(confirm_sleep));

	ret = priv->hw_host_to_card(priv, MVMS_CMD, cmdptr, size);





	spin_lock_irqsave(&priv->driver_lock, flags);

	ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) &confirm_sleep,

	if (priv->intcounter || priv->currenttxskb)

		sizeof(confirm_sleep));

		lbs_deb_host("SEND_SLEEPC_CMD: intcounter %d, currenttxskb %p\n",

		       priv->intcounter, priv->currenttxskb);

	spin_unlock_irqrestore(&priv->driver_lock, flags);





	if (ret) {

	if (ret) {

		lbs_pr_alert(

		lbs_pr_alert("confirm_sleep failed\n");

		       "SEND_SLEEPC_CMD: Host to Card failed for Confirm Sleep\n");

	} else {

	} else {

		spin_lock_irqsave(&priv->driver_lock, flags);

		spin_lock_irqsave(&priv->driver_lock, flags);

		if (!priv->intcounter) {

		if (!priv->intcounter)

			priv->psstate = PS_STATE_SLEEP;

			priv->psstate = PS_STATE_SLEEP;

		} else {

			lbs_deb_host("SEND_SLEEPC_CMD: after sent, intcounter %d\n",

			       priv->intcounter);

		}

		spin_unlock_irqrestore(&priv->driver_lock, flags);

		spin_unlock_irqrestore(&priv->driver_lock, flags);

	}

	}



	lbs_deb_leave(LBS_DEB_HOST);

	lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);

	return ret;

}

}





void lbs_ps_sleep(struct lbs_private *priv, int wait_option)

void lbs_ps_sleep(struct lbs_private *priv, int wait_option)
@@ -1906,8 +1895,7 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv) 




	if (allowed) {

	if (allowed) {

		lbs_deb_host("sending lbs_ps_confirm_sleep\n");

		lbs_deb_host("sending lbs_ps_confirm_sleep\n");

		sendconfirmsleep(priv, (u8 *) & priv->lbs_ps_confirm_sleep,

		lbs_send_confirmsleep(priv);

				 sizeof(struct PS_CMD_ConfirmSleep));

	} else {

	} else {

		lbs_deb_host("sleep confirm has been delayed\n");

		lbs_deb_host("sleep confirm has been delayed\n");

	}

	}

drivers/net/wireless/libertas/cmdresp.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -548,21 +548,20 @@ int lbs_process_rx_command(struct lbs_private *priv) 




static int lbs_send_confirmwake(struct lbs_private *priv)

static int lbs_send_confirmwake(struct lbs_private *priv)

{

{

	struct cmd_header *cmd = &priv->lbs_ps_confirm_wake;

	struct cmd_header cmd;

	int ret = 0;

	int ret = 0;





	lbs_deb_enter(LBS_DEB_HOST);

	lbs_deb_enter(LBS_DEB_HOST);





	cmd->command = cpu_to_le16(CMD_802_11_WAKEUP_CONFIRM);

	cmd.command = cpu_to_le16(CMD_802_11_WAKEUP_CONFIRM);

	cmd->size = cpu_to_le16(sizeof(*cmd));

	cmd.size = cpu_to_le16(sizeof(cmd));

	cmd->seqnum = cpu_to_le16(++priv->seqnum);

	cmd.seqnum = cpu_to_le16(++priv->seqnum);

	cmd->result = 0;

	cmd.result = 0;





	lbs_deb_host("SEND_WAKEC_CMD: before download\n");

	lbs_deb_hex(LBS_DEB_HOST, "wake confirm", (u8 *) &cmd,

		sizeof(cmd));





	lbs_deb_hex(LBS_DEB_HOST, "wake confirm command", (void *)cmd, sizeof(*cmd));

	ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) &cmd, sizeof(cmd));



	ret = priv->hw_host_to_card(priv, MVMS_CMD, (void *)cmd, sizeof(*cmd));

	if (ret)

	if (ret)

		lbs_pr_alert("SEND_WAKEC_CMD: Host to Card failed for Confirm Wake\n");

		lbs_pr_alert("SEND_WAKEC_CMD: Host to Card failed for Confirm Wake\n");

drivers/net/wireless/libertas/dev.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -267,9 +267,6 @@ struct lbs_private { 
	char ps_supported;

	char ps_supported;

	u8 needtowakeup;

	u8 needtowakeup;





	struct PS_CMD_ConfirmSleep lbs_ps_confirm_sleep;

	struct cmd_header lbs_ps_confirm_wake;



	struct assoc_request * pending_assoc_req;

	struct assoc_request * pending_assoc_req;

	struct assoc_request * in_progress_assoc_req;

	struct assoc_request * in_progress_assoc_req;
@@ -326,6 +323,8 @@ struct lbs_private { 
	u8 fw_ready;

	u8 fw_ready;

};

};





extern struct cmd_confirm_sleep confirm_sleep;



/** Association request

/** Association request

 *

 *

 * Encapsulates all the options that describe a specific assocation request

 * Encapsulates all the options that describe a specific assocation request

drivers/net/wireless/libertas/hostcmd.h

+3 −6
Original line number Original line Diff line number Diff line
@@ -480,14 +480,11 @@ struct cmd_ds_802_11_ps_mode { 
	__le16 locallisteninterval;

	__le16 locallisteninterval;

};

};





struct PS_CMD_ConfirmSleep {

struct cmd_confirm_sleep {

	__le16 command;

	struct cmd_header hdr;

	__le16 size;

	__le16 seqnum;

	__le16 result;





	__le16 action;

	__le16 action;

	__le16 reserved1;

	__le16 nullpktinterval;

	__le16 multipledtim;

	__le16 multipledtim;

	__le16 reserved;

	__le16 reserved;

	__le16 locallisteninterval;

	__le16 locallisteninterval;

drivers/net/wireless/libertas/main.c

+9 −8
Original line number Original line Diff line number Diff line
@@ -37,6 +37,11 @@ EXPORT_SYMBOL_GPL(lbs_debug); 
module_param_named(libertas_debug, lbs_debug, int, 0644);

module_param_named(libertas_debug, lbs_debug, int, 0644);









/* This global structure is used to send the confirm_sleep command as

 * fast as possible down to the firmware. */

struct cmd_confirm_sleep confirm_sleep;





#define LBS_TX_PWR_DEFAULT		20	/*100mW */

#define LBS_TX_PWR_DEFAULT		20	/*100mW */

#define LBS_TX_PWR_US_DEFAULT		20	/*100mW */

#define LBS_TX_PWR_US_DEFAULT		20	/*100mW */

#define LBS_TX_PWR_JP_DEFAULT		16	/*50mW */

#define LBS_TX_PWR_JP_DEFAULT		16	/*50mW */
@@ -1013,14 +1018,6 @@ static int lbs_init_adapter(struct lbs_private *priv) 
			      &priv->network_free_list);

			      &priv->network_free_list);

	}

	}





	priv->lbs_ps_confirm_sleep.seqnum = cpu_to_le16(++priv->seqnum);

	priv->lbs_ps_confirm_sleep.command =

	    cpu_to_le16(CMD_802_11_PS_MODE);

	priv->lbs_ps_confirm_sleep.size =

	    cpu_to_le16(sizeof(struct PS_CMD_ConfirmSleep));

	priv->lbs_ps_confirm_sleep.action =

	    cpu_to_le16(CMD_SUBCMD_SLEEP_CONFIRMED);



	memset(priv->current_addr, 0xff, ETH_ALEN);

	memset(priv->current_addr, 0xff, ETH_ALEN);





	priv->connect_status = LBS_DISCONNECTED;

	priv->connect_status = LBS_DISCONNECTED;
@@ -1462,6 +1459,10 @@ EXPORT_SYMBOL_GPL(lbs_interrupt); 
static int __init lbs_init_module(void)

static int __init lbs_init_module(void)

{

{

	lbs_deb_enter(LBS_DEB_MAIN);

	lbs_deb_enter(LBS_DEB_MAIN);

	memset(&confirm_sleep, 0, sizeof(confirm_sleep));

	confirm_sleep.hdr.command = cpu_to_le16(CMD_802_11_PS_MODE);

	confirm_sleep.hdr.size = cpu_to_le16(sizeof(confirm_sleep));

	confirm_sleep.action = cpu_to_le16(CMD_SUBCMD_SLEEP_CONFIRMED);

	lbs_debugfs_init();

	lbs_debugfs_init();

	lbs_deb_leave(LBS_DEB_MAIN);

	lbs_deb_leave(LBS_DEB_MAIN);

	return 0;

	return 0;