Refactor disk.c for generic use. Wired up uSD read for MBR/GPT

Author: dgarske

.github/workflows/test-build-riscv.yml

@@ -81,12 +81,21 @@ jobs:
         run: sudo apt-get update -o Acquire::Retries=3
 
       - name: Download and install RISC-V toolchains
+        if: ${{ inputs.arch == 'riscv' }}
         run: |
+          # Download SiFive prebuilt toolchain with newlib
+          wget -q https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.12/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
+          tar xzf riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
+          echo "$GITHUB_WORKSPACE/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin" >> $GITHUB_PATH
+
           # Download latest prebuilt RISC-V toolchains
           #wget -q https://github.com/RISCV-Tools/riscv-gnu-toolchain/releases/latest/download/riscv32-elf-ubuntu-24.04-gcc.tar.xz
           #tar -xf riscv32-elf-ubuntu-24.04-gcc.tar.xz
           #echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
 
+      - name: Download and install RISC-V toolchains
+        if: ${{ inputs.arch == 'riscv64' }}
+        run: |
           wget -q https://github.com/RISCV-Tools/riscv-gnu-toolchain/releases/latest/download/riscv64-elf-ubuntu-24.04-gcc.tar.xz
           tar -xf riscv64-elf-ubuntu-24.04-gcc.tar.xz
           echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
@@ -106,7 +115,7 @@ jobs:
       - name: Build wolfboot (riscv32)
         if: ${{ inputs.arch == 'riscv' }}
         run: |
-          # using riscv64 for now since riscv64-unknown-elf- is missing "zicsr" extension
+          # using riscv64 for now since riscv32-unknown-elf- is missing "zicsr" extension
           make CROSS_COMPILE=riscv64-unknown-elf- FREEDOM_E_SDK=$GITHUB_WORKSPACE/freedom-e-sdk ${{inputs.make-args}}
 
       - name: Build wolfboot (riscv64))

Makefile

@@ -528,7 +528,7 @@ line-count-nrf52:
 	cloc --force-lang-def cloc_lang_def.txt src/boot_arm.c src/image.c src/libwolfboot.c src/loader.c src/update_flash.c hal/nrf52.c
 
 line-count-x86:
-	cloc --force-lang-def cloc_lang_def.txt src/boot_x86_fsp.c src/boot_x86_fsp_payload.c src/boot_x86_fsp_start.S src/image.c src/keystore.c src/libwolfboot.c src/loader.c src/string.c src/update_disk.c src/gpt.c src/x86/ahci.c src/x86/ata.c src/x86/common.c src/x86/disk.c src/x86/hob.c src/pci.c src/x86/tgl_fsp.c hal/x86_fsp_tgl.c hal/x86_uart.c
+	cloc --force-lang-def cloc_lang_def.txt src/boot_x86_fsp.c src/boot_x86_fsp_payload.c src/boot_x86_fsp_start.S src/image.c src/keystore.c src/libwolfboot.c src/loader.c src/string.c src/update_disk.c src/gpt.c src/x86/ahci.c src/x86/ata.c src/x86/common.c src/disk.c src/x86/hob.c src/pci.c src/x86/tgl_fsp.c hal/x86_fsp_tgl.c hal/x86_uart.c
 
 stack-usage: wolfboot.bin
 	$(Q)echo $(STACK_USAGE) > .stack_usage

arch.mk

@@ -563,9 +563,10 @@ endif
 ifeq ($(ARCH),RISCV64)
   CROSS_COMPILE?=riscv64-unknown-elf-
   CFLAGS+=-DMMU -DWOLFBOOT_DUALBOOT
-  CFLAGS+=-DWOLFBOOT_UPDATE_DISK
+  CFLAGS+=-DWOLFBOOT_UPDATE_DISK -DMAX_DISKS=1
   UPDATE_OBJS:=src/update_disk.o
   OBJS += src/gpt.o
+  OBJS += src/disk.o
   ARCH_FLAGS=-march=rv64imafd -mabi=lp64d -mcmodel=medany
   CFLAGS+=-fno-builtin-printf -DUSE_M_TIME -g -nostartfiles -DARCH_RISCV64
   CFLAGS+=$(ARCH_FLAGS)
@@ -1117,7 +1118,7 @@ ifeq ("${FSP}", "1")
     OBJS += src/x86/ahci.o
     OBJS += src/x86/ata.o
     OBJS += src/gpt.o
-    OBJS += src/x86/disk.o
+    OBJS += src/disk.o
     OBJS += src/x86/mptable.o
     OBJS += src/stage2_params.o
     OBJS += src/x86/exceptions.o

docs/Targets.md

@@ -799,7 +799,10 @@ All build settings come from .config file. For this platform use `TARGET=mpfs250
 See example configuration at `config/examples/polarfire_mpfs250.config`.
 
 ```sh
+# Setup .config (build settings)
 cp config/examples/polarfire_mpfs250.config .config
+
+# build boot loader
 make wolfboot.elf
 ```
 
@@ -822,13 +825,48 @@ hss-payload-generator -vvv -c ./hal/mpfs.yaml wolfboot.bin
 
 Any customizations to the Device Tree can be made in mpfs.dts and it can be recompiled using: `dtc -I dts -O dtb mpfs.dts -o mpfs.dtb`
 
-
 Example one-shot command:
 
 ```sh
 cp ./config/examples/polarfire_mpfs250.config .config && make clean && make wolfboot.elf && size wolfboot.elf && hss-payload-generator -vvv -c ./hal/mpfs.yaml wolfboot.bin && file wolfboot.bin && ls -la wolfboot.bin
 ```
 
+#### Build PolarFire test-application, sign it and apply to uSD
+
+```sh
+# make test-app
+make test-app/image.elf
+
+# assemble GPT image
+dd if=/dev/zero of=app.bin bs=1M count=64
+/sbin/fdisk app.bin <<EOF
+g
+n
+1
+
++16M
+n
+
+
++16M
+x
+n
+1
+OFP_A
+n
+2
+OFP_B
+r
+w
+EOF
+
+cp test-app/image.elf image.bin
+tools/keytools/sign $SIGN $HASH image.bin wolfboot_signing_private_key.der 1
+tools/keytools/sign $SIGN $HASH image.bin wolfboot_signing_private_key.der 2
+dd if=image_v1_signed.bin of=app.bin bs=512 seek=2048 conv=notrunc
+dd if=image_v2_signed.bin of=app.bin bs=512 seek=34816 conv=notrunc
+```
+
 ### Flashing PolarFire SoC
 
 
@@ -879,10 +917,9 @@ set architecture riscv:rv64
 ### PolarFire Example Boot Output
 
 ```
-wolfBoot Version: 2.7.0 (Dec 17 2025 11:59:22)
-disk_open: drv = 0
+wolfBoot Version: 2.7.0 (Dec 17 2025 17:03:55)
 mmc_set_timeout: timeout_val 500000 (12)
-mmc_set_clock: clock_khz: 400, freq_khz: 400
+mmc_set_clock: requested khz: 400, actual khz: 400
 mmc_send_cmd: cmd_index: 0, cmd_arg: 00000000, resp_type: 0
 mmc_send_cmd: cmd_index: 8, cmd_arg: 00000100, resp_type: 9
 mmc_init: xpc:0, si8r:1, max_ma (3.3v:128 1.8v:128)
@@ -908,17 +945,79 @@ mmc_send_cmd: cmd_index: 6, cmd_arg: 00000002, resp_type: 1
 mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
 mmc_send_cmd: cmd_index: 16, cmd_arg: 00000008, resp_type: 1
 mmc_send_cmd: cmd_index: 55, cmd_arg: AAAA0000, resp_type: 1
-mmc_block_read: cmd_index: 51, block_addr: 00000000, dst 0x801FFCE0, sz: 8
+mmc_read: cmd_index: 51, block_addr: 00000000, dst 0x801FFCD0, sz: 8
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 6, block_addr: 00000001, dst 0x801FFC38, sz: 64
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 6, block_addr: 80000001, dst 0x801FFC38, sz: 64
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+mmc_set_clock: requested khz: 50000, actual khz: 50000
+Reading MBR...
+disk_read: drv:0, start:0, count:512, dst:0x801FF918
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00000000, dst 0x801FF918, sz: 512
 mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+Found GPT PTE at sector 1
+Found valid boot signature in MBR
+disk_read: drv:0, start:512, count:512, dst:0x801FF918
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00000001, dst 0x801FF918, sz: 512
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+Valid GPT partition table
+Current LBA: 0x1
+Backup LBA: 0x3B723FF
+Max number of partitions: 128
+Software limited: only allowing up to 16 partitions per disk.
+Disk size: 1850178048
+disk_read: drv:0, start:1024, count:128, dst:0x801FF818
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00000002, dst 0x801FF588, sz: 512
 mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
-mmc_block_read: cmd_index: 6, block_addr: 00000001, dst 0x801FFC48, sz: 64
+mmc_read: status: 0
+disk0.p0 (0_3FFFE00h@ 0_400000)
+disk_read: drv:0, start:1152, count:128, dst:0x801FF818
 mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00000002, dst 0x801FF588, sz: 512
 mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
-mmc_block_read: cmd_index: 6, block_addr: 80000001, dst 0x801FFC48, sz: 64
+mmc_read: status: 0
+disk0.p1 (0_3FFFE00h@ 0_400000)
+disk_read: drv:0, start:1280, count:128, dst:0x801FF818
 mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
-mmc_set_clock: clock_khz: 50000, freq_khz: 50000
+mmc_read: cmd_index: 17, block_addr: 00000002, dst 0x801FF588, sz: 512
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+disk0.p2 (0_3FFFE00h@ 0_400000)
+disk_read: drv:0, start:1408, count:128, dst:0x801FF818
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00000002, dst 0x801FF588, sz: 512
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+disk0.p3 (0_3FFFE00h@ 0_400000)
+disk_read: drv:0, start:1536, count:128, dst:0x801FF818
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00000003, dst 0x801FF588, sz: 512
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
+Total partitions on disk0: 4
 Checking primary OS image in 0,1...
+disk_read: drv:0, start:4194304, count:512, dst:0x801FFDA0
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00002000, dst 0x801FFDA0, sz: 512
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
 Checking secondary OS image in 0,2...
+disk_read: drv:0, start:4194304, count:512, dst:0x801FFDA0
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: cmd_index: 17, block_addr: 00002000, dst 0x801FFDA0, sz: 512
+mmc_send_cmd: cmd_index: 13, cmd_arg: AAAA0000, resp_type: 1
+mmc_read: status: 0
 No valid OS image found in either partition 1 or 2
 wolfBoot: PANIC!
 ```