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

Commit f64988f1 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Ralf Baechle
Browse files

MIPS: OCTEON: watchdog: don't jump to bootloader without entry address 



If CONFIG_HOTPLUG_CPU is set, the driver thinks bootloader entry
address is configured and we should jump there. However, this is
not necessarily true if the kernel is booted on a system
with older/incompatible bootloader.

Add dynamic checks for the bootloader entry address.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-watchdog@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7201/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0953609f

drivers/watchdog/octeon-wdt-main.c

+34 −28
Original line number Diff line number Diff line
@@ -145,13 +145,16 @@ static void __init octeon_wdt_build_stage1(void) 


	uasm_i_mfc0(&p, K0, C0_STATUS);

#ifdef CONFIG_HOTPLUG_CPU

	uasm_il_bbit0(&p, &r, K0, ilog2(ST0_NMI), label_enter_bootloader);

	if (octeon_bootloader_entry_addr)

		uasm_il_bbit0(&p, &r, K0, ilog2(ST0_NMI),

			      label_enter_bootloader);

#endif

	/* Force 64-bit addressing enabled */

	uasm_i_ori(&p, K0, K0, ST0_UX | ST0_SX | ST0_KX);

	uasm_i_mtc0(&p, K0, C0_STATUS);



#ifdef CONFIG_HOTPLUG_CPU

	if (octeon_bootloader_entry_addr) {

		uasm_i_mfc0(&p, K0, C0_EBASE);

		/* Coreid number in K0 */

		uasm_i_andi(&p, K0, K0, 0xf);
@@ -174,6 +177,7 @@ static void __init octeon_wdt_build_stage1(void) 
		 */

		uasm_il_bbit0(&p, &r, K0, 1, label_enter_bootloader);

		uasm_i_nop(&p);

	}

#endif



	/* Clear Dcache so cvmseg works right. */
@@ -194,11 +198,13 @@ static void __init octeon_wdt_build_stage1(void) 
	uasm_i_dmfc0(&p, K0, C0_DESAVE);



#ifdef CONFIG_HOTPLUG_CPU

	if (octeon_bootloader_entry_addr) {

		uasm_build_label(&l, p, label_enter_bootloader);

		/* Jump to the bootloader and restore K0 */

		UASM_i_LA(&p, K0, (long)octeon_bootloader_entry_addr);

		uasm_i_jr(&p, K0);

		uasm_i_dmfc0(&p, K0, C0_DESAVE);

	}

#endif

	uasm_resolve_relocs(relocs, labels);