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

Commit 582c1b53 authored by Anna Neal's avatar Anna Neal Committed by John W. Linville
Browse files

libertas: Fine grained configuration of wake-on-lan. 



Based on a patch from Shailendra Govardhan <shailen@marvell.com>.
This patch allows implementation of more specific wake-on-lan rules than those
of ethtool.

Please note that only firmware 5.110.22.p20 and above supports this feature.

This patch only implements the driver/firmware interface, not the
userspace/driver interface.

Signed-off-by: default avatarAnna Neal <anna@cozybit.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 50da3ead

drivers/net/wireless/libertas/cmd.c

+15 −3
Original line number Diff line number Diff line
@@ -159,7 +159,8 @@ int lbs_update_hw_spec(struct lbs_private *priv) 
	return ret;

}



int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria)

int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,

		struct wol_config *p_wol_config)

{

	struct cmd_ds_host_sleep cmd_config;

	int ret;
@@ -169,10 +170,21 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria) 
	cmd_config.gpio = priv->wol_gpio;

	cmd_config.gap = priv->wol_gap;



	if (p_wol_config != NULL)

		memcpy((uint8_t *)&cmd_config.wol_conf, (uint8_t *)p_wol_config,

				sizeof(struct wol_config));

	else

		cmd_config.wol_conf.action = CMD_ACT_ACTION_NONE;



	ret = lbs_cmd_with_response(priv, CMD_802_11_HOST_SLEEP_CFG, &cmd_config);

	if (!ret) {

		if (criteria) {

			lbs_deb_cmd("Set WOL criteria to %x\n", criteria);

			priv->wol_criteria = criteria;

		} else

			memcpy((uint8_t *) p_wol_config,

					(uint8_t *)&cmd_config.wol_conf,

					sizeof(struct wol_config));

	} else {

		lbs_pr_info("HOST_SLEEP_CFG failed %d\n", ret);

	}

drivers/net/wireless/libertas/cmd.h

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ int lbs_mesh_config_send(struct lbs_private *priv, 
			 uint16_t action, uint16_t type);

int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan);



int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria);

int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,

		struct wol_config *p_wol_config);

int lbs_suspend(struct lbs_private *priv);

void lbs_resume(struct lbs_private *priv);

drivers/net/wireless/libertas/defs.h

+12 −0
Original line number Diff line number Diff line
@@ -149,6 +149,18 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in 
#define EHS_WAKE_ON_MAC_EVENT		0x0004

#define EHS_WAKE_ON_MULTICAST_DATA	0x0008

#define EHS_REMOVE_WAKEUP		0xFFFFFFFF

/* Wake rules for Host_Sleep_CFG command */

#define WOL_RULE_NET_TYPE_INFRA_OR_IBSS	0x00

#define WOL_RULE_NET_TYPE_MESH		0x10

#define WOL_RULE_ADDR_TYPE_BCAST	0x01

#define WOL_RULE_ADDR_TYPE_MCAST	0x08

#define WOL_RULE_ADDR_TYPE_UCAST	0x02

#define WOL_RULE_OP_AND			0x01

#define WOL_RULE_OP_OR			0x02

#define WOL_RULE_OP_INVALID		0xFF

#define WOL_RESULT_VALID_CMD		0

#define WOL_RESULT_NOSPC_ERR		1

#define WOL_RESULT_EEXIST_ERR		2



/** Misc constants */

/* This section defines 802.11 specific contants */

drivers/net/wireless/libertas/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int lbs_ethtool_set_wol(struct net_device *dev, 
	if (wol->wolopts & WAKE_BCAST) criteria |= EHS_WAKE_ON_BROADCAST_DATA;

	if (wol->wolopts & WAKE_PHY)   criteria |= EHS_WAKE_ON_MAC_EVENT;



	return lbs_host_sleep_cfg(priv, criteria);

	return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL);

}



struct ethtool_ops lbs_ethtool_ops = {

drivers/net/wireless/libertas/host.h

+8 −0
Original line number Diff line number Diff line
@@ -220,6 +220,14 @@ enum cmd_fwt_access_opts { 
	CMD_ACT_FWT_ACCESS_TIME,

};



/* Define action or option for CMD_802_11_HOST_SLEEP_CFG */

enum cmd_wol_cfg_opts {

	CMD_ACT_ACTION_NONE = 0,

	CMD_ACT_SET_WOL_RULE,

	CMD_ACT_GET_WOL_RULE,

	CMD_ACT_RESET_WOL_RULE,

};



/* Define action or option for CMD_MESH_ACCESS */

enum cmd_mesh_access_opts {

	CMD_ACT_MESH_GET_TTL = 1,