arm: snapdragon: Add snagboot support for Lemans-EVK
v6 cover arm: snapdragon: Add snagboot support for Lemans-EVK
This series adds support for running U-Boot in snagboot mode on Qualcomm Snapdragon platforms, targeting the Lemans-EVK board.
Snagboot is an open-source, scriptable flashing framework that provides an alternative to the proprietary Firehose protocol for device provisioning. Like the traditional EDL+Firehose flow, Snagboot uses the Qualcomm boot ROM EDL mode and Sahara protocol to download and execute bootloaders. However, instead of using the proprietary Firehose programmer, Snagboot loads U-Boot into DDR and uses the standard fastboot protocol for device flashing.
The framework consists of three modular components: snagrecover (downloads XBL/QCLib to initialize DDR and load U-Boot into RAM), snagflash (communicates with U-Boot over USB using fastboot to flash system images), and snagfactory (orchestrates parallel factory flashing tasks).
In the snagboot execution flow, ROM code in EDL mode loads snagrecover, which downloads XBL to internal memory. XBL executes and initializes DDR, then snagrecover downloads U-Boot into DDR and transfers control to it. At this point, XBL has left the MMU enabled with its own page tables and has not initialized PSCI firmware or populated the Command DB. U-Boot must handle this non-standard boot environment to enter fastboot mode for device flashing.
Support for Qualcomm Lemans-EVK SOC in Snagboot is now available in
https://github.com/qualcomm-linux/snagboot/tree/qcom-next
Soon these Snagboot changes will be upstreamed to https://github.com/bootlin/snagboot
When U-Boot executes in Snagboot flow, it has to deal with missing platform services such as TrustZone (TZ), Hypervisor and AOP (which populates CMD DB data).
This series depends on the following patch/series, which are already picked up in qcom-next
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/u-boot/[email protected]/
---
Changes in v6:
- Forget to send summary in v5 cover letter, no other changes in v6
- Link to v5: https://marc.info/?l=u-boot&m=178577208345353&w=2
Changes in v5:
- Make QCOM_BOOT0_SNAGBOOT_MODE as hidden config dependent on
QCOM_SNAGBOOT_MODE
- Disable C (Dcache) bit of SCTLR_EL3 register during MMU disable
- Remove now unused QCOM_COMMAND_DB_OPTIONAL Kconfig definition
- Disable unnecessar I2C configs (for Snagboot) in Qcom Snagboot
config fragment
- Add build steps for compiling U-Boot for Snagboot mode in
Qcom Snagboot doc
- Link to v4: https://lore.kernel.org/u-boot/[email protected]/
Changes in v4:
- Renamed QCOM_SNAGBOOT_SUPPORT to QCOM_SNAGBOOT_MODE
- Make SYSRESET_PSCI dependent on QCOM_SNAGBOOT_MODE
- Place Snagboot related configs in seperate config fragment
called configs/qcom-snagboot.config
- Include above config fragment in
configs/qcom_lemans_snagboot_defconfig
- Removed Lemans EVK override dtsi: arch/arm/dts/lemans-evk-u-boot.dtsi
- Removed QCOM_COMMAND_DB_OPTIONAL as now we use
CONFIG_QCOM_SNAGBOOT_MODE
- Added documentation on U-Boot for Snagboot
- Link to v3: https://lore.kernel.org/u-boot/[email protected]/
Changes in v3:
- Brought the MMU disable logic under CONFIG_QCOM_SNAGBOOT_SUPPORT
ifdef condition
- Moved the MMU disable codes to a new seperate file
- Used "if (IS_ENABLED(CONFIG_QCOM_COMMAND_DB_OPTIONAL))" instead
of #ifdef
- Removed enabling QCOM_COMMAND_DB_OPTIONAL, ENABLE_ARM_SOC_BOOT0_HOOK
and SKIP_RELOCATE as they are now automatically enabled by
QCOM_SNAGBOOT_SUPPORT selection
- Removed updating MAINTAINERS as the defconfig file is picked up by
the "N: qcom" line
- Link to v2: https://lore.kernel.org/u-boot/[email protected]/
Changes in v2:
- Changed SYSRESET_PSCI from 'select' to 'imply'
- Guard show_psci_version() and qcom_psci_fixup() with CONFIG_ARM_SMCCC
- Disables the MMU and invalidates TLBs at the earliest entry point
- Add qcom_lemans_snagboot_defconfig for Lemans-EVK
- Link to v1: https://lore.kernel.org/u-boot/[email protected]/
---
Balaji Selvanathan (8):
arm: snapdragon: Make SYSRESET_PSCI optional
arm: snapdragon: Guard PSCI functions with CONFIG_ARM_SMCCC
arm: snapdragon: Disable MMU early before U-Boot reset vector
arm: snapdragon: Add CONFIG_QCOM_SNAGBOOT_MODE option
soc: qcom: cmd-db: Allow boot without CMD DB data
arch: arm: dts: remove Lemans EVK override DTS
configs: add qcom_lemans_snagboot_defconfig for Lemans-EVK
doc: qualcomm: Add snagboot mode documentation
arch/arm/Kconfig | 2 +- arch/arm/dts/lemans-evk-u-boot.dtsi | 19 -- arch/arm/mach-snapdragon/Kconfig | 20 ++ arch/arm/mach-snapdragon/board.c | 6 + arch/arm/mach-snapdragon/include/mach/boot0.h | 2 + .../mach-snapdragon/include/mach/snagboot_boot0.h | 27 +++ configs/qcom-snagboot.config | 46 +++++ configs/qcom_lemans_snagboot_defconfig | 18 ++ doc/board/qualcomm/index.rst | 1 + doc/board/qualcomm/snagboot.rst | 224 +++++++++++++++++++++ drivers/soc/qcom/cmd-db.c | 15 +- 11 files changed, 358 insertions(+), 22 deletions(-)
---
base-commit: f79edc9ad08ec0c3e40323ff17cc7166ad2b9e71
change-id: 20260731-snagboot-4e9f66f0252d
Best regards,
Signature · 1 line
Balaji Selvanathan <[email protected]>
PATCH v6 1/8 arm: snapdragon: Make SYSRESET_PSCI optional
In snagboot mode, there is no PSCI firmware and U-Boot will crash if it attempts to make PSCI calls so disable it in this case.
---
Changes in v5:
- No changes
Changes in v4:
- Make SYSRESET_PSCI dependent on QCOM_SNAGBOOT_MODE
Changes in v3:
- No changes
Changes in v2:
- Newly introduced in v2
--- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -1149,7 +1149,7 @@ config ARCH_SNAPDRAGON select SAVE_PREV_BL_FDT_ADDR if !ENABLE_ARM_SOC_BOOT0_HOOK select LINUX_KERNEL_IMAGE_HEADER if !ENABLE_ARM_SOC_BOOT0_HOOK select SYSRESET - select SYSRESET_PSCI + select SYSRESET_PSCI if !QCOM_SNAGBOOT_MODE select ANDROID_BOOT_IMAGE_IGNORE_BLOB_ADDR select MMU_PGPROT imply OF_UPSTREAM
Signature · 1 line
2.34.1
PATCH v6 2/8 arm: snapdragon: Guard PSCI functions with CONFIG_ARM_SMCCC
In reply to Balaji Selvanathan via U-BootIn snagboot mode, U-Boot is loaded directly by XBL without PSCI firmware support. The functions show_psci_version() and qcom_psci_fixup() call arm_smccc_smc() which is unavailable when CONFIG_ARM_SMCCC is disabled, causing build failures.
Hence, added CONFIG_ARM_SMCCC guards to both functions.
---
Changes in v5:
- No changes
Changes in v4:
- No changes
Changes in v3:
- Added CONFIG_ARM_SMCCC guards
Changes in v2:
- Newly introduced in v2
--- arch/arm/mach-snapdragon/board.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/mach-snapdragon/board.c +6 -0
@@ -50,6 +50,9 @@ static void show_psci_version(void) {struct arm_smccc_res res; +if (!IS_ENABLED (CONFIG_ARM_SMCCC )) +return ; +arm_smccc_smc (ARM_PSCI_0_2_FN_PSCI_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ,0 , &res);/* Some older SoCs like MSM8916 don't always support PSCI */
@@ -73,6 +76,9 @@ static void qcom_psci_fixup(void *fdt)int offset, ret;struct arm_smccc_res res; +if (!IS_ENABLED (CONFIG_ARM_SMCCC )) +return ; +arm_smccc_smc (ARM_PSCI_0_2_FN_PSCI_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ,0 , &res);if ((int )res.a0 !=PSCI_RET_NOT_SUPPORTED )
Signature · 1 line
2.34.1
PATCH v6 3/8 arm: snapdragon: Disable MMU early before U-Boot reset vector
In reply to Balaji Selvanathan via U-BootWhen U-Boot is loaded by XBL in Snagboot mode, XBL leaves the MMU enabled with its own page tables. This causes stale TLB entries and incorrect memory mappings when U-Boot initializes its own MMU.
Disable the MMU and invalidate TLBs before branching to the reset vector. This ensures a clean MMU state for U-Boot initialization in Snagboot mode.
---
Changes iv v5:
- Clear C bit (Dcache enable) also during MMU disable
Changes iv v4:
- Remove handling for EL1 or EL2 entry as for Snagboot we would only enter U-Boot in EL3 from previous bootloader
Changes in v3:
- Brought the MMU disable logic under CONFIG_QCOM_SNAGBOOT_SUPPORT ifdef condition
- Moved the MMU disable codes to a new seperate file
Changes in v2:
- Newly introduced in v2
--- arch/arm/mach-snapdragon/include/mach/boot0.h | 2 ++ .../mach-snapdragon/include/mach/snagboot_boot0.h | 27 ++++++++++++++++++++++ 2 files changed, 29 insertions(+)
arch/arm/mach-snapdragon/include/mach/boot0.h +2 -0
@@ -4,6 +4,8 @@#else #if defined(CONFIG_BOOT0_MSM8916_PSCI_WORKAROUND )#include "msm8916_boot0.h" +#elif defined(CONFIG_QCOM_BOOT0_SNAGBOOT_MODE ) +#include "snagboot_boot0.h" #else b reset#endif
arch/arm/mach-snapdragon/include/mach/snagboot_boot0.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Early MMU Disable for Snagboot Mode +* +* Disable MMU at the earliest possible point for EL3 entry. +* Snagboot mode always enters U-Boot at EL3. +* +* After disabling MMU, invalidate TLB to clear any stale entries that might +* cause issues when MMU is re-enabled later. +*/ + +mrs x0, CurrentEL + cmp x0, #(3 << 2) /* Verify EL3 entry */ + b.ne reset /* Unexpected: not at EL3 */ + + /* Disable MMU at EL3 */ + mrs x0, sctlr_el3 + bic x0, x0, #1 /* Clear M bit (MMU enable) */ + bic x0, x0, #(1 << 2) /* Clear C bit (Dcache enable) */ + bic x0, x0, #(1 << 19) /* Clear WXN bit (Write XOR Execute) */ + msr sctlr_el3, x0 + isb + /* Invalidate entire TLB for all ELs */ + tlbi alle3 + dsb sy + isb + b reset
Signature · 1 line
2.34.1
PATCH v6 4/8 arm: snapdragon: Add CONFIG_QCOM_SNAGBOOT_MODE option
In reply to Balaji Selvanathan via U-BootAdd CONFIG_QCOM_SNAGBOOT_MODE to enable snagboot mode on Qualcomm platforms. This config automatically selects the required dependencies. Express the platform-specific requirements and configs that must be selected and disabled in snagboot mode.
Add QCOM_BOOT0_SNAGBOOT_MODE as a hidden boot0.h config, selected automatically by QCOM_SNAGBOOT_MODE. This boot0.h config is for disabling MMU at the start of U-Boot execution.
---
Changes in v5:
- Made QCOM_BOOT0_SNAGBOOT_MODE dependent on QCOM_SNAGBOOT_MODE so it is not exposed to users
- Add dependencies for QCOM_SNAGBOOT_MODE explicitly as "depends"
Changes in v4:
- Renamed QCOM_SNAGBOOT_SUPPORT to QCOM_SNAGBOOT_MODE
- Added QCOM_BOOT0_SNAGBOOT_MODE for boot0.h which gets selected by QCOM_SNAGBOOT_MODE
- Document the platform-specific requirements and configs that must be disabled in snagboot mode.
Changes in v3:
- Newly introduced in v3
--- arch/arm/mach-snapdragon/Kconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm/mach-snapdragon/Kconfig +20 -0
@@ -58,4 +58,24 @@ config BOOT0_MSM8916_PSCI_WORKAROUND uses the buggy PSCI implementation. endchoice +config QCOM_BOOT0_SNAGBOOT_MODE + bool + depends on QCOM_SNAGBOOT_MODE + +config QCOM_SNAGBOOT_MODE + bool "Build U-Boot for Snagboot mode loading" + select QCOM_BOOT0_SNAGBOOT_MODE + select ENABLE_ARM_SOC_BOOT0_HOOK + select SKIP_RELOCATE + select ENV_IS_NOWHERE + depends on !ENV_IS_IN_SCSI + depends on !PSCI_RESET + depends on !IOMMU + depends on !SAVE_PREV_BL_INITRAMFS_START_ADDR + depends on COUNTER_FREQUENCY != 0 + depends on TEXT_BASE != 0 + help + Build U-Boot to be loaded in Snagboot mode on Qualcomm platforms + for device/factory provisioning using fastboot. + endif
Signature · 1 line
2.34.1
PATCH v6 5/8 soc: qcom: cmd-db: Allow boot without CMD DB data
In reply to Balaji Selvanathan via U-BootIn snagboot mode, XBL loads U-Boot directly without populating CMD DB. The cmd-db driver fails to bind when CMD DB magic is invalid, blocking boot even when CMD DB is not strictly required.
Use QCOM_SNAGBOOT_MODE config to allow the driver to bind successfully when CMD DB data is absent. When QCOM_SNAGBOOT_MODE is enabled and CMD DB data is present, we log a warning.
---
Changes in v5:
- Remove QCOM_COMMAND_DB_OPTIONAL definition from Kconfig as its now not used
Changes in v4:
- Removed QCOM_COMMAND_DB_OPTIONAL as now we use CONFIG_QCOM_SNAGBOOT_MODE
- Drop these warnings if snagboot mode is enabled since that's the expected case
- Log a warning if snagboot is enabled and we do have a valid cmd-db, since that isn't an expected usecase
Changes in v3:
- Used "if (IS_ENABLED(CONFIG_QCOM_COMMAND_DB_OPTIONAL))" instead of #ifdef
Changes in v2:
- No changes
--- drivers/soc/qcom/cmd-db.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/soc/qcom/cmd-db.c +13 -2
@@ -252,8 +252,19 @@ static int cmd_db_bind(struct udevice *dev) cmd_db_header = base;if (!cmd_db_magic_matches (cmd_db_header)) { -log_err ("%s: Invalid Command DB Magic\n" , __func__); -return -EINVAL ; +if (IS_ENABLED (CONFIG_QCOM_SNAGBOOT_MODE )) { +/* Missing CMD DB is expected in snagboot mode */ + cmd_db_header =NULL ; +return 0 ; + }else { +log_err ("%s: Invalid Command DB Magic\n" , __func__); +return -EINVAL ; + } + } + +if (IS_ENABLED (CONFIG_QCOM_SNAGBOOT_MODE )) { +log_warning ("%s: CMD DB found in snagboot mode - this is unexpected\n" , + __func__); }return 0 ;
Signature · 1 line
2.34.1
PATCH v6 6/8 arch: arm: dts: remove Lemans EVK override DTS
In reply to Balaji Selvanathan via U-BootRemove Lemans EVK override dtsi: arch/arm/dts/lemans-evk-u-boot.dtsi provided the following SMEM modernize series is picked:
https://lore.kernel.org/u-boot/[email protected]/
Memory node is not required as we can read the memory info from SMEM.
---
Changes in v5:
- No changes
Changes in v4:
- Newly added in v4
--- arch/arm/dts/lemans-evk-u-boot.dtsi | 19 ------------------- 1 file changed, 19 deletions(-)
arch/arm/dts/lemans-evk-u-boot.dtsi deleted +0 -19
@@ -1,19 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2026, Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/ { - /* Will be removed when bootloader updates later */ - memory@80000000 { - device_type = "memory"; - reg = <0x0 0x80000000 0x0 0x3ee00000>, - <0x0 0xc0000000 0x0 0x0fd00000>, - <0xD 0x00000000 0x2 0x54100000>, - <0xA 0x80000000 0x1 0x80000000>, - <0x9 0x00000000 0x1 0x80000000>, - <0x1 0x00000000 0x3 0x00000000>, - <0x0 0xd0000000 0x0 0x01900000>, - <0x0 0xd3500000 0x0 0x2cb00000>; - }; -};
Signature · 1 line
2.34.1
PATCH v6 7/8 configs: add qcom_lemans_snagboot_defconfig for Lemans-EVK
In reply to Balaji Selvanathan via U-BootAdd defconfig for booting U-Boot in Snagboot mode on Lemans-EVK. In this mode, XBL loads U-Boot and directly jumps to it. U-Boot then enters fastboot over USB for device provisioning.
Create a reusable config fragment at configs/qcom-snagboot.config with common snagboot settings. Platform-specific defconfigs should include this fragment along with their own settings.
---
Changes in v5:
- Disable I2C configs as its not required in Snagboot mode
Changes in v4:
- Use CONFIG_ENV_IS_NOWHERE
- Place Snagboot related configs in seperate config fragment called configs/qcom-snagboot.config
- Include above config fragment in configs/qcom_lemans_snagboot_defconfig
Changes in v3:
- Removed enabling QCOM_COMMAND_DB_OPTIONAL, ENABLE_ARM_SOC_BOOT0_HOOK and SKIP_RELOCATE as they are now automatically enabled by QCOM_SNAGBOOT_SUPPORT selection
Changes in v2:
- Newly introduced in v2
--- configs/qcom-snagboot.config | 46 ++++++++++++++++++++++++++++++++++ configs/qcom_lemans_snagboot_defconfig | 18 +++++++++++++ 2 files changed, 64 insertions(+)
configs/qcom-snagboot.config new file +46 -0
@@ -0,0 +1,46 @@ +# Common configuration fragment for Qualcomm snagboot mode +# Include this in platform-specific snagboot defconfigs + +CONFIG_QCOM_SNAGBOOT_MODE=y + +# Disable configs that conflict with snagboot mode +# CONFIG_PSCI_RESET is not set +# CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR is not set +# CONFIG_IOMMU is not set +# CONFIG_REBOOT_MODE_ENV_UPDATE is not set + +# PSCI firmware is not available in snagboot mode, so nothing implements +# poweroff (neither SYSRESET_PSCI nor SYSRESET_CMD_POWEROFF are selected) +# CONFIG_CMD_POWEROFF is not set + +# I2C peripherals aren't accessible in snagboot mode (no Command DB / RPMh +# power-domain data from XBL), so probing them only produces noisy errors. +# CONFIG_DM_I2C is not set +# CONFIG_CMD_I2C is not set +# CONFIG_SYS_I2C_QUP is not set +# CONFIG_SYS_I2C_GENI is not set +# CONFIG_I2C_MUX is not set +# CONFIG_I2C_EEPROM is not set + +# Use default environment instead of loading from storage +# This ensures snagboot mode works even with corrupted environment +# CONFIG_ENV_IS_IN_SCSI is not set +# CONFIG_ENV_IS_IN_MMC is not set +# CONFIG_ENV_IS_IN_FLASH is not set +# CONFIG_ENV_IS_IN_NAND is not set +CONFIG_ENV_IS_NOWHERE=y + +# Disable default env file to use CONFIG_BOOTCOMMAND instead +# CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE is not set + +# Auto-enter fastboot mode for snagboot +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="fastboot -l $fastboot_addr_r usb 0" +CONFIG_BOOTDELAY=0 + +# Fastboot configuration for partition flashing +CONFIG_FASTBOOT_FLASH_BLOCK=y +CONFIG_FASTBOOT_FLASH_BLOCK_INTERFACE_NAME="scsi" +CONFIG_FASTBOOT_FLASH_BLOCK_DEVICE_ID=4 +CONFIG_FASTBOOT_GPT_NAME="gpt" +CONFIG_FASTBOOT_MBR_NAME="mbr"
configs/qcom_lemans_snagboot_defconfig new file +18 -0
@@ -0,0 +1,18 @@ +# Configuration for building U-Boot for snagboot/recovery mode +# on Lemans-EVK dev boards. +# +# For normal production boot, use qcom_lemans_defconfig instead. + +#include "qcom_defconfig" +#include "qcom-snagboot.config" + +# Platform-specific settings for Lemans-EVK + +# Address where U-Boot will be loaded +CONFIG_TEXT_BASE=0x1c100000 +CONFIG_REMAKE_ELF=y +CONFIG_FASTBOOT_BUF_ADDR=0xdb300000 +CONFIG_DEFAULT_DEVICE_TREE="qcom/lemans-evk" + +# Timer frequency for Lemans platform +CONFIG_COUNTER_FREQUENCY=19200000
Signature · 1 line
2.34.1
PATCH v6 8/8 doc: qualcomm: Add snagboot mode documentation
In reply to Balaji Selvanathan via U-BootAdd documentation for snagboot mode support on Qualcomm platforms. This covers build steps to compile U-Boot for Snagboot mode for Lemans-EVK along with the architecture, execution flow, and Snagboot enablement requirements.
---
Changes in v5:
- Added build steps for U-Boot in Snagboot mode
Changes in v4:
- Newly added in v4
--- doc/board/qualcomm/index.rst | 1 + doc/board/qualcomm/snagboot.rst | 224 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+)
doc/board/qualcomm/index.rst +1 -0
@@ -14,3 +14,4 @@ Qualcomm iq8 phones rdp + snagboot
doc/board/qualcomm/snagboot.rst new file +224 -0
224 lines not on this page · raw message
Signature · 1 line
2.34.1