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

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

mwifiex: dynamically increase preallocated firmware dump memory size 



This patch increase firmware dump memory 4K each time, until
meet the demand.

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 50632092

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

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ 
#define BLOCK_NUMBER_OFFSET		15

#define SDIO_HEADER_OFFSET		28



#define MWIFIEX_SIZE_4K 0x4000



enum mwifiex_bss_type {

	MWIFIEX_BSS_TYPE_STA = 0,

	MWIFIEX_BSS_TYPE_UAP = 1,

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

+16 −5
Original line number Diff line number Diff line
@@ -2402,7 +2402,8 @@ 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, dump_num, idx, i, read_reg, doneflag = 0;

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

	u8 idx, i, read_reg, doneflag = 0;

	enum rdwr_status stat;

	u32 memory_size;

	int ret;
@@ -2485,11 +2486,21 @@ static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter) 
				mwifiex_read_reg_byte(adapter, reg, dbg_ptr);

				if (dbg_ptr < end_ptr) {

					dbg_ptr++;

				} else {

					continue;

				}

				mwifiex_dbg(adapter, ERROR,

						    "Allocated buf not enough\n");

					    "pre-allocated buf not enough\n");

				tmp_ptr =

					vzalloc(memory_size + MWIFIEX_SIZE_4K);

				if (!tmp_ptr)

					return;

				}

				memcpy(tmp_ptr, entry->mem_ptr, memory_size);

				vfree(entry->mem_ptr);

				entry->mem_ptr = tmp_ptr;

				tmp_ptr = NULL;

				dbg_ptr = entry->mem_ptr + memory_size;

				memory_size += MWIFIEX_SIZE_4K;

				end_ptr = entry->mem_ptr + memory_size;

			}



			if (stat != RDWR_STATUS_DONE)