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

Commit 95dac04f authored by Ido Yariv's avatar Ido Yariv Committed by Luciano Coelho
Browse files

wl12xx: Support routing FW logs to the host 



A recently added feature to the firmware enables the driver to retrieve
firmware logs via the host bus (SDIO or SPI).

There are two modes of operation:
1. On-demand: The FW collects its log in an internal ring buffer. This
   buffer can later be read, for example, upon recovery.
2. Continuous: The FW pushes the FW logs as special packets in the RX
   path.

Reading the internal ring buffer does not involve the FW. Thus, as long
as the HW is not in ELP, it should be possible to read the logs, even if
the FW crashes.

A sysfs binary file named "fwlog" was added to support this feature,
letting a monitor process read the FW messages. The log is transferred
from the FW only when available, so the reading process might block.

Signed-off-by: default avatarIdo Yariv <ido@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent baacb9ae

drivers/net/wireless/wl12xx/acx.c

+1 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,7 @@ int wl1271_acx_sta_mem_cfg(struct wl1271 *wl) 
	mem_conf->tx_free_req = mem->min_req_tx_blocks;

	mem_conf->rx_free_req = mem->min_req_rx_blocks;

	mem_conf->tx_min = mem->tx_min;

	mem_conf->fwlog_blocks = wl->conf.fwlog.mem_blocks;



	ret = wl1271_cmd_configure(wl, ACX_MEM_CFG, mem_conf,

				   sizeof(*mem_conf));

drivers/net/wireless/wl12xx/acx.h

+2 −0
Original line number Diff line number Diff line
@@ -828,6 +828,8 @@ struct wl1271_acx_sta_config_memory { 
	u8 tx_free_req;

	u8 rx_free_req;

	u8 tx_min;

	u8 fwlog_blocks;

	u8 padding[3];

} __packed;



struct wl1271_acx_mem_map {

drivers/net/wireless/wl12xx/boot.c

+9 −0
Original line number Diff line number Diff line
@@ -117,6 +117,15 @@ static unsigned int wl12xx_get_fw_ver_quirks(struct wl1271 *wl) 
	      (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_1_SPARE_AP_MIN))))

		quirks |= WL12XX_QUIRK_USE_2_SPARE_BLOCKS;



	/* Only new station firmwares support routing fw logs to the host */

	if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&

	    (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))

		quirks |= WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED;



	/* This feature is not yet supported for AP mode */

	if (fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP)

		quirks |= WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED;



	return quirks;

}

drivers/net/wireless/wl12xx/cmd.c

+84 −0
Original line number Diff line number Diff line
@@ -1234,3 +1234,87 @@ int wl1271_cmd_remove_sta(struct wl1271 *wl, u8 hlid) 
out:

	return ret;

}



int wl12xx_cmd_config_fwlog(struct wl1271 *wl)

{

	struct wl12xx_cmd_config_fwlog *cmd;

	int ret = 0;



	wl1271_debug(DEBUG_CMD, "cmd config firmware logger");



	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);

	if (!cmd) {

		ret = -ENOMEM;

		goto out;

	}



	cmd->logger_mode = wl->conf.fwlog.mode;

	cmd->log_severity = wl->conf.fwlog.severity;

	cmd->timestamp = wl->conf.fwlog.timestamp;

	cmd->output = wl->conf.fwlog.output;

	cmd->threshold = wl->conf.fwlog.threshold;



	ret = wl1271_cmd_send(wl, CMD_CONFIG_FWLOGGER, cmd, sizeof(*cmd), 0);

	if (ret < 0) {

		wl1271_error("failed to send config firmware logger command");

		goto out_free;

	}



out_free:

	kfree(cmd);



out:

	return ret;

}



int wl12xx_cmd_start_fwlog(struct wl1271 *wl)

{

	struct wl12xx_cmd_start_fwlog *cmd;

	int ret = 0;



	wl1271_debug(DEBUG_CMD, "cmd start firmware logger");



	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);

	if (!cmd) {

		ret = -ENOMEM;

		goto out;

	}



	ret = wl1271_cmd_send(wl, CMD_START_FWLOGGER, cmd, sizeof(*cmd), 0);

	if (ret < 0) {

		wl1271_error("failed to send start firmware logger command");

		goto out_free;

	}



out_free:

	kfree(cmd);



out:

	return ret;

}



int wl12xx_cmd_stop_fwlog(struct wl1271 *wl)

{

	struct wl12xx_cmd_stop_fwlog *cmd;

	int ret = 0;



	wl1271_debug(DEBUG_CMD, "cmd stop firmware logger");



	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);

	if (!cmd) {

		ret = -ENOMEM;

		goto out;

	}



	ret = wl1271_cmd_send(wl, CMD_STOP_FWLOGGER, cmd, sizeof(*cmd), 0);

	if (ret < 0) {

		wl1271_error("failed to send stop firmware logger command");

		goto out_free;

	}



out_free:

	kfree(cmd);



out:

	return ret;

}

drivers/net/wireless/wl12xx/cmd.h

+62 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ int wl1271_cmd_start_bss(struct wl1271 *wl); 
int wl1271_cmd_stop_bss(struct wl1271 *wl);

int wl1271_cmd_add_sta(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid);

int wl1271_cmd_remove_sta(struct wl1271 *wl, u8 hlid);

int wl12xx_cmd_config_fwlog(struct wl1271 *wl);

int wl12xx_cmd_start_fwlog(struct wl1271 *wl);

int wl12xx_cmd_stop_fwlog(struct wl1271 *wl);



enum wl1271_commands {

	CMD_INTERROGATE     = 1,    /*use this to read information elements*/
@@ -107,6 +110,9 @@ enum wl1271_commands { 
	CMD_START_PERIODIC_SCAN      = 50,

	CMD_STOP_PERIODIC_SCAN       = 51,

	CMD_SET_STA_STATE            = 52,

	CMD_CONFIG_FWLOGGER          = 53,

	CMD_START_FWLOGGER           = 54,

	CMD_STOP_FWLOGGER            = 55,



	/* AP mode commands */

	CMD_BSS_START                = 60,
@@ -575,4 +581,60 @@ struct wl1271_cmd_remove_sta { 
	u8 padding1;

} __packed;



/*

 * Continuous mode - packets are transferred to the host periodically

 * via the data path.

 * On demand - Log messages are stored in a cyclic buffer in the

 * firmware, and only transferred to the host when explicitly requested

 */

enum wl12xx_fwlogger_log_mode {

	WL12XX_FWLOG_CONTINUOUS,

	WL12XX_FWLOG_ON_DEMAND

};



/* Include/exclude timestamps from the log messages */

enum wl12xx_fwlogger_timestamp {

	WL12XX_FWLOG_TIMESTAMP_DISABLED,

	WL12XX_FWLOG_TIMESTAMP_ENABLED

};



/*

 * Logs can be routed to the debug pinouts (where available), to the host bus

 * (SDIO/SPI), or dropped

 */

enum wl12xx_fwlogger_output {

	WL12XX_FWLOG_OUTPUT_NONE,

	WL12XX_FWLOG_OUTPUT_DBG_PINS,

	WL12XX_FWLOG_OUTPUT_HOST,

};



struct wl12xx_cmd_config_fwlog {

	struct wl1271_cmd_header header;



	/* See enum wl12xx_fwlogger_log_mode */

	u8 logger_mode;



	/* Minimum log level threshold */

	u8 log_severity;



	/* Include/exclude timestamps from the log messages */

	u8 timestamp;



	/* See enum wl1271_fwlogger_output */

	u8 output;



	/* Regulates the frequency of log messages */

	u8 threshold;



	u8 padding[3];

} __packed;



struct wl12xx_cmd_start_fwlog {

	struct wl1271_cmd_header header;

} __packed;



struct wl12xx_cmd_stop_fwlog {

	struct wl1271_cmd_header header;

} __packed;



#endif /* __WL1271_CMD_H__ */