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

Commit d546530e authored by Sara Sharon's avatar Sara Sharon Committed by Kalle Valo
Browse files

iwlwifi: alloc memory dynamically also for DVM 



For old firmwares the memory wasn't allocated, resulting in panic.
Make it dynamically allocated as well. Allow any order of functions
call.

Fixes: eef187a7 ("iwlwifi: enlarge number of ucode sections")
Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Tested-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 33e962c8

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+26 −0
Original line number Diff line number Diff line
@@ -291,11 +291,33 @@ static struct fw_sec *get_sec(struct iwl_firmware_pieces *pieces, 
	return &pieces->img[type].sec[sec];

}



static void alloc_sec_data(struct iwl_firmware_pieces *pieces,

			   enum iwl_ucode_type type,

			   int sec)

{

	struct fw_img_parsing *img = &pieces->img[type];

	struct fw_sec *sec_memory;

	int size = sec + 1;

	size_t alloc_size = sizeof(*img->sec) * size;



	if (img->sec && img->sec_counter >= size)

		return;



	sec_memory = krealloc(img->sec, alloc_size, GFP_KERNEL);

	if (!sec_memory)

		return;



	img->sec = sec_memory;

	img->sec_counter = size;

}



static void set_sec_data(struct iwl_firmware_pieces *pieces,

			 enum iwl_ucode_type type,

			 int sec,

			 const void *data)

{

	alloc_sec_data(pieces, type, sec);



	pieces->img[type].sec[sec].data = data;

}
@@ -304,6 +326,8 @@ static void set_sec_size(struct iwl_firmware_pieces *pieces, 
			 int sec,

			 size_t size)

{

	alloc_sec_data(pieces, type, sec);



	pieces->img[type].sec[sec].size = size;

}
@@ -319,6 +343,8 @@ static void set_sec_offset(struct iwl_firmware_pieces *pieces, 
			   int sec,

			   u32 offset)

{

	alloc_sec_data(pieces, type, sec);



	pieces->img[type].sec[sec].offset = offset;

}