arm: socfpga: execute cold reboot by default (71686458) · Commits · 戴 / test

This changes system reboot for socfpga to issue a cold reboot by default instead of a warm reboot. Warm reboot can still be used by setting reboot_mode to REBOOT_WARM (e.g. via kernel command line 'reboot='), but this patch ensures cold reboot is issued for both REBOOT_COLD and REBOOT_HARD. Also, cold reboot is more fail safe than warm reboot has some issues at least fo CSEL=0 and BSEL=qspi, where the boot rom does not set the qspi clock to a valid range. Signed-off-by:

Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Signed-off-by:

Dinh Nguyen <dinguyen@kernel.org>

arch/arm/mach-socfpga/socfpga.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -73,10 +73,10 @@ static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)

		temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);

		if (mode == REBOOT_HARD)
		temp \|= RSTMGR_CTRL_SWCOLDRSTREQ;
		else
		if (mode == REBOOT_WARM)
		temp \|= RSTMGR_CTRL_SWWARMRSTREQ;
		else
		temp \|= RSTMGR_CTRL_SWCOLDRSTREQ;
		writel(temp, rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);
		}

		@@ -86,10 +86,10 @@ static void socfpga_arria10_restart(enum reboot_mode mode, const char *cmd)

		temp = readl(rst_manager_base_addr + SOCFPGA_A10_RSTMGR_CTRL);

		if (mode == REBOOT_HARD)
		temp \|= RSTMGR_CTRL_SWCOLDRSTREQ;
		else
		if (mode == REBOOT_WARM)
		temp \|= RSTMGR_CTRL_SWWARMRSTREQ;
		else
		temp \|= RSTMGR_CTRL_SWCOLDRSTREQ;
		writel(temp, rst_manager_base_addr + SOCFPGA_A10_RSTMGR_CTRL);
		}

Admin message