Re: [PATCH v3 3/4] sunxi: binman: Support FIT generation for 32-bit SoCs
On Tue, 31 Oct 2023 00:17:40 -0500
Samuel Holland wrote:
Hi,
> Some 32-bit SoCs can use SCP firmware to implement additional PSCI
> functionality, such as system suspend. In order to load this firmware
> from SPL, we need to generate and use a FIT instead of a legacy image.
>
> Adjust the binman FIT definition so it does not rely on TF-A BL31, as
> this is not used on 32-bit SoCs. Instead, after loading the firmware,
> U-Boot proper is executed directly.
>
> Signed-off-by: Samuel Holland
So I merged this patch (along with the others), but with one change below:
> ---
>
> (no changes since v2)
>
> Changes in v2:
> - Rely on binman min-size instead of using explicit offsets
> - Use Kconfig for firmware addresses instead of an #ifdef staircase
>
> arch/arm/dts/sunxi-u-boot.dtsi | 23 ++-
> 1 file changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
> index 7a8764e463b..ed1cb91eeb5 100644
> --- a/arch/arm/dts/sunxi-u-boot.dtsi
> +++ b/arch/arm/dts/sunxi-u-boot.dtsi
> @@ -1,5 +1,11 @@
> #include
>
> +#ifdef CONFIG_ARM64
> +#define ARCH "arm64"
> +#else
> +#define ARCH "arm"
> +#endif
> +
> / {
> aliases {
> mmc0 =
> @@ -34,30 +40,32 @@
> filename = "spl/sunxi-spl.bin";
> };
>
> -#ifdef CONFIG_ARM64
> +#ifdef CONFIG_SPL_LOAD_FIT
> fit {
> - description = "Configuration to load ATF before U-Boot";
> + description = "Configuration to load U-Boot and
> firmware";
> #address-cells = <1>;
> fit,fdt-list = "of-list";
>
> images {
> uboot {
> - description = "U-Boot (64-bit)";
> + description = "U-Boot";
> type = "standalone";
> os = "u-boot";
> - arch = "arm64";
> + arch = ARCH;
> compression = "none";
> load = ;
> + entry = ;
This line for some odd reason broke the Debian arm64 Grub execution for
me: U-Boot would run fine, it would load grub.efi, but then I see U-Boot's
exception handler, with an ESR 0x2000 ("unknown reason"), and a reset.
It also confuses sunxi-fel's FIT loader, which expects exactly one image
with an "entry" property, and thus refuses to load such an image. This
is admittedly a limitation of sunxi-fel, but nevertheless would mean we
cannot FEL boot those images at the moment.
I will look into fixing this there, but together with the first problem, I
decided to make this line conditional, by bracketing it with a check for
CONFIG_SUNXI_BL31_BASE being 0.
This means we never get two "entry" properties:
- for arm64, BL31_BASE is never 0, so we skip it here, but get it below,
for the "atf" node.
- for arm, BL31_BASE is always 0, so we get it here, but skip the entire
"atf" node below.
Happy to revisit this problem with a proper fix, but to not hold this
series back any longer, because it's a nice series and cleans up some
mess, I merged it with this modification, plus the removal of the
unconditional enablement in the last patch.
Cheers,
Andre.
>
> u-boot-nodtb {
> };
> };
>
> +#if CONFIG_SUNXI_BL31_BASE
> atf {
> description = "ARM Trusted Firmware";
> type = "firmware";
> os = "arm-trusted-firmware";
> - arch = "arm64";
> + arch = ARCH;
> compression = "none";
> load = ;
> entry = ;
> @@ -67,6 +75,7 @@
> missing-msg = "atf-bl31-sunxi";
> };
> };
> +#endif
>
> #if CONFIG_SUNXI_SCP_BASE
> scp {
> @@ -95,7 +104,11 @@
>
> @config-SEQ {
> description = "NAME";
> +#if CONFIG_SUNXI_BL31_BASE
> firmware = "atf";
> +#else
> + firmware = "uboot";
> +#endif
> #if CONFIG_SUNXI_SCP_BASE
> loadables = "scp", "uboot";
> #else
Re: [PATCH v3 3/4] sunxi: binman: Support FIT generation for 32-bit SoCs
On Tue, 31 Oct 2023 00:17:40 -0500
Samuel Holland wrote:
Hi,
> Some 32-bit SoCs can use SCP firmware to implement additional PSCI
> functionality, such as system suspend. In order to load this firmware
> from SPL, we need to generate and use a FIT instead of a legacy image.
>
> Adjust the binman FIT definition so it does not rely on TF-A BL31, as
> this is not used on 32-bit SoCs. Instead, after loading the firmware,
> U-Boot proper is executed directly.
I like that it removes the artificial restriction to use a FIT image
only on arm64 builds, and indeed hinges that on the relevant
CONFIG_SPL_LOAD_FIT variable.
The changes look alright, even "uboot" being mentioned twice (once as
firmware, once as loadable): the SPL code can cope with that.
> Signed-off-by: Samuel Holland
Reviewed-by: Andre Przywara
Cheers,
Andre
> ---
>
> (no changes since v2)
>
> Changes in v2:
> - Rely on binman min-size instead of using explicit offsets
> - Use Kconfig for firmware addresses instead of an #ifdef staircase
>
> arch/arm/dts/sunxi-u-boot.dtsi | 23 ++-
> 1 file changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
> index 7a8764e463b..ed1cb91eeb5 100644
> --- a/arch/arm/dts/sunxi-u-boot.dtsi
> +++ b/arch/arm/dts/sunxi-u-boot.dtsi
> @@ -1,5 +1,11 @@
> #include
>
> +#ifdef CONFIG_ARM64
> +#define ARCH "arm64"
> +#else
> +#define ARCH "arm"
> +#endif
> +
> / {
> aliases {
> mmc0 =
> @@ -34,30 +40,32 @@
> filename = "spl/sunxi-spl.bin";
> };
>
> -#ifdef CONFIG_ARM64
> +#ifdef CONFIG_SPL_LOAD_FIT
> fit {
> - description = "Configuration to load ATF before U-Boot";
> + description = "Configuration to load U-Boot and
> firmware";
> #address-cells = <1>;
> fit,fdt-list = "of-list";
>
> images {
> uboot {
> - description = "U-Boot (64-bit)";
> + description = "U-Boot";
> type = "standalone";
> os = "u-boot";
> - arch = "arm64";
> + arch = ARCH;
> compression = "none";
> load = ;
> + entry = ;
>
> u-boot-nodtb {
> };
> };
>
> +#if CONFIG_SUNXI_BL31_BASE
> atf {
> description = "ARM Trusted Firmware";
> type = "firmware";
> os = "arm-trusted-firmware";
> - arch = "arm64";
> + arch = ARCH;
> compression = "none";
> load = ;
> entry = ;
> @@ -67,6 +75,7 @@
> missing-msg = "atf-bl31-sunxi";
> };
> };
> +#endif
>
> #if CONFIG_SUNXI_SCP_BASE
> scp {
> @@ -95,7 +104,11 @@
>
> @config-SEQ {
> description = "NAME";
> +#if CONFIG_SUNXI_BL31_BASE
> firmware = "atf";
> +#else
> + firmware = "uboot";
> +#endif
> #if CONFIG_SUNXI_SCP_BASE
> loadables = "scp", "uboot";
> #else
Re: [PATCH v3 3/4] sunxi: binman: Support FIT generation for 32-bit SoCs
On Tue, 31 Oct 2023 at 05:18, Samuel Holland wrote: > > Some 32-bit SoCs can use SCP firmware to implement additional PSCI > functionality, such as system suspend. In order to load this firmware > from SPL, we need to generate and use a FIT instead of a legacy image. > > Adjust the binman FIT definition so it does not rely on TF-A BL31, as > this is not used on 32-bit SoCs. Instead, after loading the firmware, > U-Boot proper is executed directly. > > Signed-off-by: Samuel Holland > --- > > (no changes since v2) > > Changes in v2: > - Rely on binman min-size instead of using explicit offsets > - Use Kconfig for firmware addresses instead of an #ifdef staircase > > arch/arm/dts/sunxi-u-boot.dtsi | 23 ++- > 1 file changed, 18 insertions(+), 5 deletions(-) Reviewed-by: Simon Glass
[PATCH v3 3/4] sunxi: binman: Support FIT generation for 32-bit SoCs
Some 32-bit SoCs can use SCP firmware to implement additional PSCI
functionality, such as system suspend. In order to load this firmware
from SPL, we need to generate and use a FIT instead of a legacy image.
Adjust the binman FIT definition so it does not rely on TF-A BL31, as
this is not used on 32-bit SoCs. Instead, after loading the firmware,
U-Boot proper is executed directly.
Signed-off-by: Samuel Holland
---
(no changes since v2)
Changes in v2:
- Rely on binman min-size instead of using explicit offsets
- Use Kconfig for firmware addresses instead of an #ifdef staircase
arch/arm/dts/sunxi-u-boot.dtsi | 23 ++-
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 7a8764e463b..ed1cb91eeb5 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -1,5 +1,11 @@
#include
+#ifdef CONFIG_ARM64
+#define ARCH "arm64"
+#else
+#define ARCH "arm"
+#endif
+
/ {
aliases {
mmc0 =
@@ -34,30 +40,32 @@
filename = "spl/sunxi-spl.bin";
};
-#ifdef CONFIG_ARM64
+#ifdef CONFIG_SPL_LOAD_FIT
fit {
- description = "Configuration to load ATF before U-Boot";
+ description = "Configuration to load U-Boot and
firmware";
#address-cells = <1>;
fit,fdt-list = "of-list";
images {
uboot {
- description = "U-Boot (64-bit)";
+ description = "U-Boot";
type = "standalone";
os = "u-boot";
- arch = "arm64";
+ arch = ARCH;
compression = "none";
load = ;
+ entry = ;
u-boot-nodtb {
};
};
+#if CONFIG_SUNXI_BL31_BASE
atf {
description = "ARM Trusted Firmware";
type = "firmware";
os = "arm-trusted-firmware";
- arch = "arm64";
+ arch = ARCH;
compression = "none";
load = ;
entry = ;
@@ -67,6 +75,7 @@
missing-msg = "atf-bl31-sunxi";
};
};
+#endif
#if CONFIG_SUNXI_SCP_BASE
scp {
@@ -95,7 +104,11 @@
@config-SEQ {
description = "NAME";
+#if CONFIG_SUNXI_BL31_BASE
firmware = "atf";
+#else
+ firmware = "uboot";
+#endif
#if CONFIG_SUNXI_SCP_BASE
loadables = "scp", "uboot";
#else
--
2.41.0
