Update pyot to support execution from flash and VMEM file format

.gitlab-ci.d/opentitan/build.yml

@@ -0,0 +1,76 @@
+#------------------------------------------------------------------------------
+# QEMU OpenTitan CI
+#------------------------------------------------------------------------------
+
+build-clang:
+  tags:
+    - qemu_ot
+  stage: build
+  # build QEMU for OT platforms, ensure subprojects are cleaned up first
+  # store generated header files and ninja command file as artifacts, which are
+  # required to run the clang-tidy stage
+  # libvhost-user.c generates sign-compare warnings with clang, so disable
+  # warning-as-error
+  # the alternative would be to build here with GCC, then rebuild everything
+  # with clang in clang-tidy stage, as meson generates different, incompatible
+  # warning list between GCC and clang...
+  script:
+    - rm -rf build
+    - git clean -dffx subprojects
+    - mkdir build
+    - cd build
+    - ../configure --cc=clang-19 --disable-werror $QEMU_BUILD_OPTS
+        --target-list=riscv32-softmmu,riscv64-softmmu,x86_64-linux-user
+    - ninja
+    - ninja qemu-img
+    - strip qemu-system-riscv32 qemu-img
+    - QEMU_DIR="$(cd .. && pwd -P)"; cat compile_commands.json |
+        sed -E 's,'"$QEMU_DIR"',@QEMU_DIR@,g' > compile_commands.json.tpl
+    - ../scripts/opentitan/swexit.py -t ibexdemo -b 0x0 -o exit_id.bin
+    - ../scripts/opentitan/swexit.py -t earlgrey -b 0x80 -o exit_eg.bin
+  artifacts:
+    public: false
+    expire_in: 1 hour
+    name: "qemu-ot"
+    paths:
+      - subprojects/libtomcrypt/src/headers/*.h
+      - build/*.h
+      - build/qapi/*.h
+      - build/trace/*.h
+      - build/compile_commands.json.tpl
+      - build/qemu-system-riscv32
+      - build/qemu-img
+      - build/exit_*.bin
+
+build-gcc:
+  tags:
+    - qemu_ot
+  stage: build
+  # build QEMU for OT platforms, ensure subprojects are cleaned up first
+  # build with GCC may need different warnings
+  script:
+    - rm -rf build-gcc
+    - mkdir build-gcc
+    - cd build-gcc
+    - ../configure --cc=gcc $QEMU_BUILD_OPTS --target-list=riscv32-softmmu,riscv64-softmmu
+    - ninja
+
+format:
+  tags:
+    - qemu_ot
+  stage: build
+  script:
+    - scripts/opentitan/ot-format.sh --ci -i
+    - git status -s
+    - test -z "$(git status -s)" || git diff
+    - test -z "$(git status -s)"
+
+tidy:
+  tags:
+    - qemu_ot
+  stage: build
+  needs: ["build-clang"]
+  script:
+    - QEMU_DIR="$(pwd -P)"; cat build/compile_commands.json.tpl |
+        sed -E 's,@QEMU_DIR@,'"$QEMU_DIR"',g' > build/compile_commands.json
+    - scripts/opentitan/ot-tidy.sh --ci -p build

.gitlab-ci.d/opentitan/ot-bmtests.yml

@@ -0,0 +1,31 @@
+# Baremetal Tests for Earlgrey
+
+baremetal-eg-tests:
+  tags:
+    - qemu_ot
+  stage: test
+  needs:
+    - "build-clang"
+    - project: rv/sandbox/rot/baremetal_test
+      job: build-eg
+      ref: $BAREMETAL_REF
+      artifacts: true
+  variables:
+    BASEDIR: bmtests/eg
+    CI_EXEC: 1
+  script:
+    - python3 -m virtualenv .venv
+    - . .venv/bin/activate
+    - pip3 install -r scripts/opentitan/requirements.txt
+    - rm -rf ${BASEDIR}
+    - mkdir -p ${BASEDIR}
+    - zstd -d --stdout ot-eg-bmtest.tar.zst | tar xf - -C ${BASEDIR}
+    - find ${BASEDIR}
+    - scripts/opentitan/pyot.py -vv -c ${BASEDIR}/data/qemu/ot-earlgrey/pyot-eflash.hjson
+         -w ot-earlgrey.csv -R -T 3
+  artifacts:
+    public: false
+    expire_in: 1 year
+    name: "bm-ot-earlgrey"
+    paths:
+      - ot-earlgrey.csv

.gitlab-ci.d/opentitan/ot-smoke.yml

@@ -0,0 +1,12 @@
+smoke-tests-ot:
+  tags:
+    - qemu_ot
+  stage: test
+  needs: ["build-clang"]
+  script:
+    - build/qemu-system-riscv32 -M help | grep ibexdemo
+    - build/qemu-system-riscv32 -M help | grep ot-earlgrey
+    - timeout -s KILL 4 build/qemu-system-riscv32 -M ibexdemo -nographic
+        -device loader,addr=0x100080,file=build/exit_id.bin -d in_asm,int
+    - timeout -s KILL 4 build/qemu-system-riscv32 -M ot-earlgrey,no_epmp_cfg=true -nographic
+        -object ot-rom_img,id=rom,file=build/exit_eg.bin -d in_asm,int

.gitlab-ci.d/opentitan/pylint-ot.yml

@@ -0,0 +1,12 @@
+pylint-ot:
+  tags:
+    - qemu_ot
+  stage: build
+  script:
+    # disable duplicate code as all front end are tested at once (false positive)
+    # disable fixme ("# TODO" comments)
+    - python3 -m virtualenv .venv
+    - . .venv/bin/activate
+    - pip3 install -r scripts/opentitan/requirements.txt
+    - pylint --rcfile scripts/opentitan/.pylintrc -d 'duplicate-code' -d 'fixme'
+        scripts/opentitan/*.py python/qemu/jtagtools python/qemu/ot

.gitlab-ci.d/opentitan/qemu-ot.yml

@@ -0,0 +1,9 @@
+variables:
+  BAREMETAL_REF: "b0-250310-1"
+  QEMU_BUILD_OPTS: "--disable-install-blobs"
+
+include:
+  - local: '/.gitlab-ci.d/opentitan/build.yml'
+  - local: '/.gitlab-ci.d/opentitan/pylint-ot.yml'
+  - local: '/.gitlab-ci.d/opentitan/ot-smoke.yml'
+  - local: '/.gitlab-ci.d/opentitan/ot-bmtests.yml'

hw/opentitan/ot_csrng.c

@@ -1341,7 +1341,8 @@ static int ot_csrng_handle_command(OtCSRNGState *s, unsigned slot)
     default:
         qemu_log_mask(LOG_GUEST_ERROR, "Unknown command: %u\n", acmd);
         // JW: check this shouldn't be CMD_STAGE_INVALID_CMD_SEQ_ALERT.
-        s->regs[R_RECOV_ALERT_STS] |= R_RECOV_ALERT_STS_CMD_STAGE_INVALID_ACMD_ALERT_MASK;
+        s->regs[R_RECOV_ALERT_STS] |=
+            R_RECOV_ALERT_STS_CMD_STAGE_INVALID_ACMD_ALERT_MASK;
         CHANGE_STATE(s, CSRNG_ERROR);
         ot_csrng_update_alerts(s);
         return -1;

hw/opentitan/ot_flash.c

@@ -1402,10 +1402,10 @@ static void ot_flash_op_erase_bank(OtFlashState *s, unsigned address)
     }
 
     /*
-        * For bank erase only, if the data partition is selected, just the
-        * data partition is erased. If the info partition is selected, BOTH
-        * the data and info partitions are erased.
-        */
+     * For bank erase only, if the data partition is selected, just the
+     * data partition is erased. If the info partition is selected, BOTH
+     * the data and info partitions are erased.
+     */
     unsigned bank_address = address - (address % bank_size);
     bank_address /= sizeof(uint32_t); /* convert to word address */
     unsigned data_address, info_address = 0u;
@@ -1819,7 +1819,8 @@ static void ot_flash_regs_write(void *opaque, hwaddr addr, uint64_t val64,
                 s->op.info_part = part_sel;
                 s->op.info_sel = info_sel;
                 s->op.erase_sel = (bool)erase_sel;
-                /* Erase operations neither go through FIFOs nor use/require a word count */
+                /* Erase operations neither go through FIFOs nor use/require a
+                 * word count */
                 s->op.count = 0u;
                 xtrace_ot_flash_info("Erase at", s->op.address);
                 break;

python/qemu/ot/eflash/__init__.py

@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Rivos, Inc.
+# SPDX-License-Identifier: Apache2
+
+"""Embedded Flash tools."""