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

Commit 11e70824 authored by Xinming Hu's avatar Xinming Hu Committed by Kalle Valo
Browse files

mwifiex: firmware dump support for w8997 chipset 



Current firmware dump solution support w8897 chipset, this
patch extend the exist framework with support for w8997
chipset.

Trigger firmware dump using,
cat /sys/kernel/debug/mwifiex/mlan0/device_dump,
data can be obtain by
cat /sys/class/devcoredump/devcd*/data > data.txt after that.

Signed-off-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 03f0f7cd

drivers/net/wireless/marvell/mwifiex/decl.h

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ struct mwifiex_11h_intf_state { 
} __packed;



#define MWIFIEX_FW_DUMP_IDX		0xff

#define MWIFIEX_FW_DUMP_MAX_MEMSIZE     0x160000

#define MWIFIEX_DRV_INFO_IDX		20

#define FW_DUMP_MAX_NAME_LEN		8

#define FW_DUMP_HOST_READY      0xEE

drivers/net/wireless/marvell/mwifiex/pcie.c

+20 −10
Original line number Diff line number Diff line
@@ -2402,7 +2402,7 @@ static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter) 
	struct pcie_service_card *card = adapter->card;

	const struct mwifiex_pcie_card_reg *creg = card->pcie.reg;

	unsigned int reg, reg_start, reg_end;

	u8 *dbg_ptr, *end_ptr, *tmp_ptr, dump_num;

	u8 *dbg_ptr, *end_ptr, *tmp_ptr, fw_dump_num, dump_num;

	u8 idx, i, read_reg, doneflag = 0;

	enum rdwr_status stat;

	u32 memory_size;
@@ -2430,23 +2430,33 @@ static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter) 
		return;



	reg = creg->fw_dump_start;

	mwifiex_read_reg_byte(adapter, reg, &dump_num);

	mwifiex_read_reg_byte(adapter, reg, &fw_dump_num);



	/* W8997 chipset firmware dump will be restore in single region*/

	if (fw_dump_num == 0)

		dump_num = 1;

	else

		dump_num = fw_dump_num;



	/* Read the length of every memory which will dump */

	for (idx = 0; idx < dump_num; idx++) {

		struct memory_type_mapping *entry =

				&adapter->mem_type_mapping_tbl[idx];

		memory_size = 0;

		if (fw_dump_num != 0) {

			stat = mwifiex_pcie_rdwr_firmware(adapter, doneflag);

			if (stat == RDWR_STATUS_FAILURE)

				return;



		memory_size = 0;

			reg = creg->fw_dump_start;

			for (i = 0; i < 4; i++) {

				mwifiex_read_reg_byte(adapter, reg, &read_reg);

				memory_size |= (read_reg << (i * 8));

			reg++;

			}

		} else {

			memory_size = MWIFIEX_FW_DUMP_MAX_MEMSIZE;

		}



		if (memory_size == 0) {

			mwifiex_dbg(adapter, MSG, "Firmware dump Finished!\n");

drivers/net/wireless/marvell/mwifiex/pcie.h

+12 −1
Original line number Diff line number Diff line
@@ -239,6 +239,11 @@ static const struct mwifiex_pcie_card_reg mwifiex_reg_8997 = { 
	.ring_tx_start_ptr = MWIFIEX_BD_FLAG_TX_START_PTR,

	.pfu_enabled = 1,

	.sleep_cookie = 0,

	.fw_dump_ctrl = 0xcf4,

	.fw_dump_start = 0xcf8,

	.fw_dump_end = 0xcff,

	.fw_dump_host_ready = 0xcc,

	.fw_dump_read_done = 0xdd,

	.msix_support = 1,

};
@@ -253,6 +258,10 @@ static struct memory_type_mapping mem_type_mapping_tbl_w8897[] = { 
	{"MAC", NULL, 0, 0xF7},

};



static struct memory_type_mapping mem_type_mapping_tbl_w8997[] = {

	{"DUMP", NULL, 0, 0xDD},

};



struct mwifiex_pcie_device {

	const char *firmware;

	const struct mwifiex_pcie_card_reg *reg;
@@ -289,7 +298,9 @@ static const struct mwifiex_pcie_device mwifiex_pcie8997 = { 
	.reg            = &mwifiex_reg_8997,

	.blksz_fw_dl = MWIFIEX_PCIE_BLOCK_SIZE_FW_DNLD,

	.tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,

	.can_dump_fw = false,

	.can_dump_fw = true,

	.mem_type_mapping_tbl = mem_type_mapping_tbl_w8997,

	.num_mem_types = ARRAY_SIZE(mem_type_mapping_tbl_w8997),

	.can_ext_scan = true,

};