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

Commit 1b628151 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: Fix bug in tg3_load_firmware_cpu 



Add tg3_nvram_lock() and tg3_nvram_unlock() calls around tg3_halt_cpu().
It is possible that the bootcode may be loading code from nvram during
this call and stopping the cpu without getting the lock may cause
uncompleted nvram data to be left in the nvram data register. Subsequent
calls to read/write nvram data will fail.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4bc3927

drivers/net/tg3.c

+5 −0
Original line number Diff line number Diff line
@@ -4370,7 +4370,12 @@ static int tg3_load_firmware_cpu(struct tg3 *tp, u32 cpu_base, u32 cpu_scratch_b 
	 */

	tp->tg3_flags |= TG3_FLAG_PCIX_TARGET_HWBUG;



	/* It is possible that bootcode is still loading at this point.

	 * Get the nvram lock first before halting the cpu.

	 */

	tg3_nvram_lock(tp);

	err = tg3_halt_cpu(tp, cpu_base);

	tg3_nvram_unlock(tp);

	if (err)

		goto out;