From nobody Thu Dec 18 09:27:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1745543799; cv=none; d=zohomail.com; s=zohoarc; b=YbnyyV/ypXDP8pBZEqpTTvEQRvgf5E0NaRrVNd540mH6iTxP24iDWSYiSt01LVeWgL4QhLnt/cghvdvCdpRhlkGst4GlOynzXSSU74U+iNgNwjUDzMYUKG5btFUaqtklbY5xAafeSrWMi3/4hYKx8hSKj75793XhfcuDKbsls70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745543799; h=Content-Type:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6nnZMdmJaptJBch6E/b0Ocg8qyLqpGUjNaffiyZiitU=; b=ebThY2LDuhLP9NUCVZTG343My0QBM3wxdQi0w2gMCr/xcLQgtE8A1pi15MEjMxXgng2MEePaJIl5MhA1h33+6DZtna3kcMgZeB/SSJbp4gLH9Fu5jG5DrCIsTwW7SUKhgjGd8j6YjSVhHlTDMNbH99oECAW8iaexHVxEYRFG+GE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1745543799673804.2842282369637; Thu, 24 Apr 2025 18:16:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.967087.1357039 (Exim 4.92) (envelope-from ) id 1u87fw-0005sq-1J; Fri, 25 Apr 2025 01:16:20 +0000 Received: by outflank-mailman (output) from mailman id 967087.1357039; Fri, 25 Apr 2025 01:16:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u87fv-0005sj-UH; Fri, 25 Apr 2025 01:16:19 +0000 Received: by outflank-mailman (input) for mailman id 967087; Fri, 25 Apr 2025 01:16:19 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u87fv-0005ro-6q for xen-devel@lists.xenproject.org; Fri, 25 Apr 2025 01:16:19 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e2e6b421-2172-11f0-9eb3-5ba50f476ded; Fri, 25 Apr 2025 03:16:17 +0200 (CEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 61B825C5B62; Fri, 25 Apr 2025 01:13:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 606EFC4CEE3; Fri, 25 Apr 2025 01:16:13 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e2e6b421-2172-11f0-9eb3-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745543775; bh=zeUVo3PJW7v34rEv6CBE9tM2pM+ky2r5ReJXipJMums=; h=Date:From:To:cc:Subject:From; b=CApcFpKeTBsGLm5W/ZU35bAOMjKq83DCtXENCzpgVH6gVbbA4TyKzAWYIppA9HvCV S5NFnvBIJPqF+OYCJs1NYk9dWsDN48jhe2/xndYRKD+rKZ569n8w/3XYNVbDm/Yq+e TspBYh8zX8600a8qkcW9kZLUds3rjzJYHhHvNZ8v/wY3HZbSZL5F0rIygMREGJrQ0G 3gMVPtEcYcv1ep9KwpM5z37HYUZls1yyzvUULmPS60TnvXpNSz51LSObzPlN23LLt7 B2YhIRYf2p2TANewBuj4SkcrOmU/exjof2H5CDvmrRHdRSzZZ6X4KtZbcCsOKf2VSc ZNU1nDvG4VwMg== Date: Thu, 24 Apr 2025 18:16:12 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@ubuntu-linux-20-04-desktop To: xen-devel@lists.xenproject.org cc: sstabellini@kernel.org, andrei.cherechesu@oss.nxp.com, Michal Orzel , jason.andryuk@amd.com Subject: [PATCH v5] uboot-script-gen: Dynamically compute addr and size when loading binaries Message-ID: User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1745543802090019000 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Andrei Cherechesu Normally, the Imagebuilder would precompute the sizes of the loaded binaries and addresses where they are loaded before generating the script, and the sizes and addresses that needed to be provided to Xen via /chosen would be hardcoded in the boot script. Added an option via "-s" parameter to avoid hardcoding any address in the boot script, and dynamically compute the loading addresses for binaries. The first loading address is based on the MEMORY_START parameter and after loading each binary, the loading address and the size of the binary are stored in variables with corresponding names. Then, the loading address for the next binary is computed and aligned to 0x200000. If the "-s" parameter is not used, the normal flow is executed, where the loading addresses and sizes for each binaries are precomputed and hardcoded inside the script, but the loading addresses and sizes for each binary are now also stored for eventual later use. Reserved memory regions are left TBD in the -s case. Link: https://lists.xenproject.org/archives/html/xen-devel/2022-09/msg01862= .html Signed-off-by: Andrei Cherechesu Signed-off-by: Stefano Stabellini --- This patch adds quite a bit of complexity which is the reason why I didn't originally commit it. Now that we are enabling ImageBuilder in Yocto, it turns out this patch is required because Yocto invokes ImageBuilder before all the binaries are ready and available. Andrei, sorry for taking so long to realize why it is essential, but we are getting there now. The changes I made to the original patch are purely to make it simpler to maintain. --- diff --git a/README.md b/README.md index f8039ec..28c9e6b 100644 --- a/README.md +++ b/README.md @@ -356,6 +356,8 @@ Where:\ can only be used in combination with the -k option. This adds the public key into the dtb. Then one can add this dtb back into the u-boot bin or elf.\ +-s addresses and sizes are calculated dynamically from U-Boot, hence + binaries don't need to be available at the time of invocation.\ =20 ### Signed FIT images =20 diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index 638154a..ee4af6c 100755 --- a/scripts/uboot-script-gen +++ b/scripts/uboot-script-gen @@ -1,8 +1,11 @@ #!/bin/bash =20 offset=3D$((2*1024*1024)) +PADDING_MASK=3D`printf "0x%X\n" $(($offset - 1))` +PADDING_MASK_INV=3D`printf "0x%X\n" $((~$PADDING_MASK))` filesize=3D0 prog_req=3D(mkimage file fdtput mktemp awk od) +CALC=3D"" =20 function cleanup_and_return_err() { @@ -100,17 +103,42 @@ function dt_set() fi } =20 +function dt_set_calc() +{ + local path=3D$1 + local var=3D$2 + local name_var=3D$3 +=20 + addr_var=3D"$name_var"_addr + size_var=3D"$name_var"_size + + # Split data_addr_var into high/low + echo "setexpr addr_hi \${"$addr_var"} / 0x100000000" >> $UBOOT_SOURCE + echo "setexpr addr_lo \${"$addr_var"} \& 0xFFFFFFFF" >> $UBOOT_SOURCE + =20 + # Split data_size_var into high/low + echo "setexpr size_hi \${"$size_var"} / 0x100000000" >> $UBOOT_SOURCE + echo "setexpr size_lo \${"$size_var"} \& 0xFFFFFFFF" >> $UBOOT_SOURCE + =20 + echo "fdt set $path $var <0x\${addr_hi} 0x\${addr_lo} 0x\${size_hi} 0x= \${size_lo}>" >> $UBOOT_SOURCE +} + function add_device_tree_kernel() { local path=3D$1 - local addr=3D$2 - local size=3D$3 - local bootargs=3D$4 + local name=3D$2 + local addr=3D$3 + local size=3D$4 + local bootargs=3D$5 local node_name=3D"module@${addr#0x}" =20 dt_mknode "$path" "$node_name" dt_set "$path/$node_name" "compatible" "str_a" "multiboot,kernel multi= boot,module" - dt_set "$path/$node_name" "reg" "hex" "$(split_addr_size $addr $size)" + if test "$CALC"; then + dt_set_calc "$path/$node_name" "reg" $name + else + dt_set "$path/$node_name" "reg" "hex" "$(split_addr_size $addr $s= ize)" + fi dt_set "$path/$node_name" "bootargs" "str" "$bootargs" } =20 @@ -118,26 +146,36 @@ function add_device_tree_kernel() function add_device_tree_ramdisk() { local path=3D$1 - local addr=3D$2 - local size=3D$3 + local name=3D$2 + local addr=3D$3 + local size=3D$4 local node_name=3D"module@${addr#0x}" =20 dt_mknode "$path" "$node_name" dt_set "$path/$node_name" "compatible" "str_a" "multiboot,ramdisk mult= iboot,module" - dt_set "$path/$node_name" "reg" "hex" "$(split_addr_size $addr $size)" + if test "$CALC"; then + dt_set_calc "$path/$node_name" "reg" $name + else + dt_set "$path/$node_name" "reg" "hex" "$(split_addr_size $addr $s= ize)" + fi } =20 =20 function add_device_tree_passthrough() { local path=3D$1 - local addr=3D$2 - local size=3D$3 + local name=3D$2 + local addr=3D$3 + local size=3D$4 local node_name=3D"module@${addr#0x}" =20 dt_mknode "$path" "$node_name" dt_set "$path/$node_name" "compatible" "str_a" "multiboot,device-tree = multiboot,module" - dt_set "$path/$node_name" "reg" "hex" "$(split_addr_size $addr $size)" + if test "$CALC"; then + dt_set_calc "$path/$node_name" "reg" $name + else + dt_set "$path/$node_name" "reg" "hex" "$(split_addr_size $addr $s= ize)" + fi } =20 function add_device_tree_mem() @@ -358,7 +396,11 @@ function xen_device_tree_editing() =20 dt_mknode "/chosen" "$node_name" dt_set "/chosen/$node_name" "compatible" "str_a" "xen,xsm-policy x= en,multiboot-module multiboot,module" - dt_set "/chosen/$node_name" "reg" "hex" "$(split_addr_size $xen_po= licy_addr $xen_policy_size)" + if test "$CALC"; then + dt_set_calc "/chosen/$node_name" "reg" "xen_policy" + else + dt_set "/chosen/$node_name" "reg" "hex" "$(split_addr_size $xe= n_policy_addr $xen_policy_size)" + fi fi =20 if test "$DOM0_KERNEL" @@ -367,7 +409,11 @@ function xen_device_tree_editing() =20 dt_mknode "/chosen" "$node_name" dt_set "/chosen/$node_name" "compatible" "str_a" "xen,linux-zimage= xen,multiboot-module multiboot,module" - dt_set "/chosen/$node_name" "reg" "hex" "$(split_addr_size $dom0_k= ernel_addr $dom0_kernel_size)" + if test "$CALC"; then + dt_set_calc "/chosen/$node_name" "reg" "dom0_linux" + else + dt_set "/chosen/$node_name" "reg" "hex" "$(split_addr_size $do= m0_kernel_addr $dom0_kernel_size)" + fi dt_set "/chosen" "xen,dom0-bootargs" "str" "$DOM0_CMD" fi =20 @@ -377,7 +423,11 @@ function xen_device_tree_editing() =20 dt_mknode "/chosen" "$node_name" dt_set "/chosen/$node_name" "compatible" "str_a" "xen,linux-initrd= xen,multiboot-module multiboot,module" - dt_set "/chosen/$node_name" "reg" "hex" "$(split_addr_size $ramdis= k_addr $ramdisk_size)" + if test "$CALC"; then + dt_set_calc "/chosen/$node_name" "reg" "dom0_ramdisk" + else + dt_set "/chosen/$node_name" "reg" "hex" "$(split_addr_size $ra= mdisk_addr $ramdisk_size)" + fi fi =20 i=3D0 @@ -464,14 +514,14 @@ function xen_device_tree_editing() =20 xen_dt_domu_add_vcpu_nodes "/chosen/domU$i" $i ${DOMU_VCPUS[$i]} =20 - add_device_tree_kernel "/chosen/domU$i" ${domU_kernel_addr[$i]} ${= domU_kernel_size[$i]} "${DOMU_CMD[$i]}" + add_device_tree_kernel "/chosen/domU$i" "domU${i}_kernel" ${domU_k= ernel_addr[$i]} ${domU_kernel_size[$i]} "${DOMU_CMD[$i]}" if test "${domU_ramdisk_addr[$i]}" then - add_device_tree_ramdisk "/chosen/domU$i" ${domU_ramdisk_addr[$= i]} ${domU_ramdisk_size[$i]} + add_device_tree_ramdisk "/chosen/domU$i" "domU${i}_ramdisk" ${= domU_ramdisk_addr[$i]} ${domU_ramdisk_size[$i]} fi if test "${domU_passthrough_dtb_addr[$i]}" then - add_device_tree_passthrough "/chosen/domU$i" ${domU_passthroug= h_dtb_addr[$i]} ${domU_passthrough_dtb_size[$i]} + add_device_tree_passthrough "/chosen/domU$i" "domU${i}_fdt" ${= domU_passthrough_dtb_addr[$i]} ${domU_passthrough_dtb_size[$i]} fi i=3D$(( $i + 1 )) done @@ -504,7 +554,11 @@ function device_tree_editing() =20 if test $UBOOT_SOURCE then - echo "fdt addr $device_tree_addr" >> $UBOOT_SOURCE + if test "$CALC"; then + echo "fdt addr \${host_fdt_addr}" >> $UBOOT_SOURCE + else + echo "fdt addr $device_tree_addr" >> $UBOOT_SOURCE + fi echo "fdt resize 1024" >> $UBOOT_SOURCE =20 if test $NUM_DT_OVERLAY && test $NUM_DT_OVERLAY -gt 0 @@ -512,7 +566,11 @@ function device_tree_editing() i=3D0 while test $i -lt $NUM_DT_OVERLAY do - echo "fdt apply ${dt_overlay_addr[$i]}" >> $UBOOT_SOURCE + if test "$CALC"; then + echo "fdt apply \${host_fdto${i}_addr}" >> $UBOOT_SOUR= CE + else + echo "fdt apply ${dt_overlay_addr[$i]}" >> $UBOOT_SOUR= CE + fi i=3D$(( $i + 1 )) done fi @@ -530,8 +588,12 @@ function fill_reserved_spaces_from_dtb() { if [ ! -f $DEVICE_TREE ] then - echo "File $DEVICE_TREE doesn't exist, exiting"; - cleanup_and_return_err + if test "$CALC"; then + return + else + echo "File $DEVICE_TREE doesn't exist, exiting"; + cleanup_and_return_err + fi fi =20 # Check if reserved-memory node exists @@ -613,7 +675,7 @@ function get_image_size() printf "%u" $effective_size } =20 -function add_size() +function add_size_from_file() { local filename=3D$1 local size=3D`stat -L --printf=3D"%s" $filename` @@ -645,6 +707,24 @@ function add_size() filesize=3D$size } =20 +function add_size_calculate() +{ + local fit_scr_name=3D$1 + + echo "setenv "$fit_scr_name"_addr \${memaddr}" >> $UBOOT_SOURCE + echo "setenv "$fit_scr_name"_size \${filesize}" >> $UBOOT_SOURCE + echo "setexpr memaddr \${memaddr} \+ \${filesize}" >> $UBOOT_SOURCE + echo "setexpr memaddr \${memaddr} \+ $PADDING_MASK" >> $UBOOT_SOURCE + echo "setexpr memaddr \${memaddr} \& $PADDING_MASK_INV" >> $UBOOT_SOUR= CE + + # TODO: missing ${RESERVED_MEM_SPACES[@]} check + + # The following are updated to avoid collisions in node names, but + # they are not actively used. + memaddr=3D$((memaddr + offset)) + filesize=3D$offset +} + function load_file() { local filename=3D$1 @@ -657,10 +737,16 @@ function load_file() if test "$FIT" then echo "imxtract \$fit_addr $fit_scr_name $memaddr" >> $UBOOT_SOURCE + add_size_from_file $filename else - echo "$LOAD_CMD $memaddr ${prepend_path:+$prepend_path/}$relative_= path" >> $UBOOT_SOURCE + if test "$CALC"; then + echo "$LOAD_CMD \${memaddr} ${prepend_path:+$prepend_path/}$re= lative_path" >> $UBOOT_SOURCE + add_size_calculate $fit_scr_name + else + echo "$LOAD_CMD $memaddr ${prepend_path:+$prepend_path/}$relat= ive_path" >> $UBOOT_SOURCE + add_size_from_file $filename + fi fi - add_size $filename } =20 function check_file_type() @@ -670,8 +756,13 @@ function check_file_type() =20 if [ ! -f $filename ] then - echo "File $filename doesn't exist, exiting"; - cleanup_and_return_err + if test "$CALC" + then + return + else + echo "File $filename doesn't exist, exiting"; + cleanup_and_return_err + fi fi =20 # if file doesn't know what it is, it outputs data, so include that @@ -705,8 +796,13 @@ function check_compressed_file_type() =20 if [ ! -f $filename ] then - echo "File $filename doesn't exist, exiting"; - cleanup_and_return_err + if test "$CALC" + then + return + else + echo "File $filename doesn't exist, exiting"; + cleanup_and_return_err + fi fi =20 file_type=3D$( file -L $filename ) @@ -872,6 +968,12 @@ function linux_config() generate_uboot_images() { local arch=3D$(file -L $XEN | grep -E 'ARM64|Aarch64') + =20 + if test "$CALC" + then + echo "bootm is not compatible with -s" + cleanup_and_return_err + fi =20 if test "$arch" then @@ -997,7 +1099,11 @@ bitstream_load_and_config() if test "$UBOOT_SOURCE" then # we assume the FPGA device is 0 here - echo "fpga load 0 $bitstream_addr $bitstream_size" >> "$UBOOT_= SOURCE" + if test "$CALC"; then + echo "fpga load 0 \${fpga_bitstream_addr} \${fpga_bitstrea= m_size}" >> "$UBOOT_SOURCE" + else + echo "fpga load 0 $bitstream_addr $bitstream_size" >> "$UB= OOT_SOURCE" + fi fi fi } @@ -1271,7 +1377,7 @@ function print_help { script=3D`basename "$0"` echo "usage:" - echo " $script -c CONFIG_FILE -d DIRECTORY [-t LOAD_CMD] [-o FILE] [-k= KEY_DIR/HINT [-u U-BOOT_DTB]] [-e] [-f] [-p PREPEND_PATH]" + echo " $script -c CONFIG_FILE -d DIRECTORY [-t LOAD_CMD] [-o FILE] [-k= KEY_DIR/HINT [-u U-BOOT_DTB]] [-e] [-f] [-p PREPEND_PATH] [-s]" echo " $script -h" echo "where:" echo " CONFIG_FILE - configuration file" @@ -1288,6 +1394,7 @@ function print_help echo " U-BOOT_DTB - u-boot control dtb so that the public key gets add= ed to it" echo " -f - enable generating a FIT image" echo " PREPEND_PATH - path to be appended before file names to match d= eploy location within rootfs" + echo " -s - enable dynamic loading of binaries by storing their addres= ses and sizes u-boot env variables" echo " -h - prints out the help message and exits " echo "Defaults:" echo " CONFIG_FILE=3D$cfg_file, UBOOT_TYPE=3D\"LOAD_CMD\" env var, DIR= ECTORY=3D$uboot_dir" @@ -1295,7 +1402,7 @@ function print_help echo " $script -c ../config -d ./build42 -t \"scsi load 1:1\"" } =20 -while getopts ":c:t:d:ho:k:u:fp:" opt; do +while getopts ":c:t:d:ho:k:u:fp:s" opt; do case ${opt} in t ) case $OPTARG in @@ -1340,6 +1447,9 @@ while getopts ":c:t:d:ho:k:u:fp:" opt; do p ) prepend_path=3D"$OPTARG" ;; + s ) + CALC=3Dy + ;; h ) print_help exit 0 @@ -1533,6 +1643,7 @@ uboot_addr=3D$memaddr # 2MB are enough for a uboot script memaddr=3D$(( $memaddr + $offset )) memaddr=3D`printf "0x%X\n" $memaddr` +echo "setenv memaddr $memaddr" >> $UBOOT_SOURCE =20 fill_reserved_spaces_from_dtb =20 @@ -1583,7 +1694,11 @@ fi =20 if [ "$BOOT_CMD" !=3D "none" ] then - echo "$BOOT_CMD $kernel_addr $([ "$BOOT_CMD" =3D "bootefi" ] || echo '= -') $device_tree_addr" >> $UBOOT_SOURCE + if test "$CALC"; then + echo "$BOOT_CMD \${host_kernel_addr} $([ "$BOOT_CMD" =3D "bootefi"= ] || echo '-') \${host_fdt_addr}" >> $UBOOT_SOURCE + else + echo "$BOOT_CMD $kernel_addr $([ "$BOOT_CMD" =3D "bootefi" ] || ec= ho '-') $device_tree_addr" >> $UBOOT_SOURCE + fi else # skip boot command but store load addresses to be used later echo "setenv host_kernel_addr $kernel_addr" >> $UBOOT_SOURCE