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

Commit fb724ed5 authored by Emil Goode's avatar Emil Goode Committed by Kalle Valo
Browse files

wlcore: Fix regression in wlcore_set_partition() 



The commit 3719c17e ("wlcore/wl18xx: fw logger over sdio") introduced a
regression causing the wlcore to time out and go into recovery. Reverting the
changes regarding write of the last partition size brings the module back to
it's functional state.

Fixes: 3719c17e ("wlcore/wl18xx: fw logger over sdio")
Reported-by: default avatarRoss Green <rgkernel@gmail.com>
Signed-off-by: default avatarEmil Goode <emil.fsw@goode.io>
[kvalo@codeaurora.org: improved commit log]
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d76d65fd

drivers/net/wireless/ti/wlcore/io.c

+4 −4
Original line number Diff line number Diff line
@@ -175,14 +175,14 @@ int wlcore_set_partition(struct wl1271 *wl, 
	if (ret < 0)

		goto out;



	/* We don't need the size of the last partition, as it is

	 * automatically calculated based on the total memory size and

	 * the sizes of the previous partitions.

	 */

	ret = wlcore_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);

	if (ret < 0)

		goto out;



	ret = wlcore_raw_write32(wl, HW_PART3_SIZE_ADDR, p->mem3.size);

	if (ret < 0)

		goto out;



out:

	return ret;

}

drivers/net/wireless/ti/wlcore/io.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#define HW_PART1_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 12)

#define HW_PART2_SIZE_ADDR              (HW_PARTITION_REGISTERS_ADDR + 16)

#define HW_PART2_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 20)

#define HW_PART3_SIZE_ADDR              (HW_PARTITION_REGISTERS_ADDR + 24)

#define HW_PART3_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 28)

#define HW_PART3_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 24)



#define HW_ACCESS_REGISTER_SIZE         4



#define HW_ACCESS_PRAM_MAX_RANGE	0x3c000