raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

firmware: raspberrypi: Add support for tryonce reboot flag

Browse Source 
Define a new mailbox (SET_REBOOT_FLAGS) which may be used to
pass optional flags to the Raspberry Pi firmware that changes
the behaviour of the bootloader and firmware during a reboot.

Currently this just defines the 'tryboot' flag which causes
the firmware to load tryboot.txt instead config.txt. This
alternate configuration file can be used to specify the
path of an alternate firmware and kernels allowing a fallback
mechanism to be implemented for OS upgrades.
This commit is contained in:
Tim Gover
2020-10-20 11:55:37 +01:00
committed by Dom Cobley
parent 241f9cf48e
commit 5391f4cc0f
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/firmware/raspberrypi.c
View File

@@ -189,6 +189,7 @@ static int rpi_firmware_notify_reboot(struct notifier_block *nb,
{
struct rpi_firmware *fw;
struct platform_device *pdev = g_pdev;
u32 reboot_flags = 0;
if (!pdev)
return 0;
@@ -197,8 +198,28 @@ static int rpi_firmware_notify_reboot(struct notifier_block *nb,
if (!fw)
return 0;
(void)rpi_firmware_property(fw, RPI_FIRMWARE_NOTIFY_REBOOT,
0, 0);
// The partition id is the first parameter followed by zero or
// more flags separated by spaces indicating the reason for the reboot.
//
// 'tryboot': Sets a one-shot flag which is cleared upon reboot and
// causes the tryboot.txt to be loaded instead of config.txt
// by the bootloader and the start.elf firmware.
//
// This is intended to allow automatic fallback to a known
// good image if an OS/FW upgrade fails.
//
// N.B. The firmware mechanism for storing reboot flags may vary
// on different Raspberry Pi models.
if (data && strstr(data, " tryboot"))
reboot_flags |= 0x1;
// The mailbox might have been called earlier, directly via vcmailbox
// so only overwrite if reboot flags are passed to the reboot command.
if (reboot_flags)
(void)rpi_firmware_property(fw, RPI_FIRMWARE_SET_REBOOT_FLAGS,
&reboot_flags, sizeof(reboot_flags));
(void)rpi_firmware_property(fw, RPI_FIRMWARE_NOTIFY_REBOOT, NULL, 0);
return 0;
}