ot_darjeeling: update IRQ and Alert map

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

@@ -1,4 +1,4 @@
-# Baremetal Tests for Earlgrey
+# Baremetal Tests for Earlgrey & Darjeeling
 
 baremetal-eg-tests:
   tags:
@@ -13,6 +13,7 @@ baremetal-eg-tests:
   variables:
     BASEDIR: bmtests/eg
     CI_EXEC: 1
+    DISABLE_FLAKY: 1
   script:
     - python3 -m virtualenv .venv
     - . .venv/bin/activate
@@ -21,11 +22,42 @@ baremetal-eg-tests:
     - 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.hjson
+    - scripts/opentitan/pyot.py -vv -c ${BASEDIR}/data/ot-earlgrey/qemu/pyot.hjson
          -w ot-earlgrey.csv -R -T 3
   artifacts:
     public: false
     expire_in: 1 year
     name: "bm-ot-earlgrey"
     paths:
       - ot-earlgrey.csv
+
+baremetal-dj-tests:
+  tags:
+    - qemu_ot
+  stage: test
+  needs:
+    - "build-clang"
+    - project: rv/sandbox/rot/baremetal_test
+      job: build-dj
+      ref: $BAREMETAL_REF
+      artifacts: true
+  variables:
+    BASEDIR: bmtests/dj
+    CI_EXEC: 1
+    DISABLE_FLAKY: 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-dj-bmtest.tar.zst | tar xf - -C ${BASEDIR}
+    - find ${BASEDIR}
+    - scripts/opentitan/pyot.py -vv -c ${BASEDIR}/data/ot-darjeeling/qemu/pyot.hjson
+         -w ot-darjeeling.csv -R -T 3
+  artifacts:
+    public: false
+    expire_in: 1 year
+    name: "bm-ot-darjeeling"
+    paths:
+      - ot-darjeeling.csv

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

@@ -12,5 +12,5 @@ smoke-tests-ot:
         -object ot-rom_img,id=rom,file=build/exit_eg.bin -d in_asm,int
         -nographic -global ot-ibex_wrapper.lc-ignore=on
     - timeout -s KILL 4 build/qemu-system-riscv32 -M ot-darjeeling,no_epmp_cfg=true
-        -object ot-rom_img,id=rom,file=build/exit_dj.bin -d in_asm,int
+        -object ot-rom_img,id=rom0,file=build/exit_dj.bin -d in_asm,int
          -nographic -global ot-ibex_wrapper.lc-ignore=on

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

@@ -1,5 +1,5 @@
 variables:
-  BAREMETAL_REF: "b0-250724-1"
+  BAREMETAL_REF: "a0-251104-1"
   QEMU_BUILD_OPTS: "--disable-install-blobs"
 
 include:

README.md

@@ -8,10 +8,11 @@ QEMU is capable of emulating a complete machine in software without any need for
 virtualization support. By using dynamic translation, it achieves very good performance.
 
 This branch contains a fork of QEMU 9.2.0 dedicated to support lowRISC Ibex platforms:
-  * [OpenTitan](https://opentitan.org) [EarlGrey](docs/opentitan/earlgrey.md) with FPGA "Bergen Board"
-    CW310 memory map.
-  * [lowRISC](https://github.com/lowRISC/ibex-demo-system) [IbexDemo](ibexdemo.md) with Digilent Arty7
-    board memory map.
+  * [OpenTitan](https://opentitan.org) [EarlGrey](docs/opentitan/earlgrey.md), based on
+    [1.0.0](https://github.com/lowRISC/opentitan/tree/earlgrey_1.0.0).
+  * [OpenTitan](https://opentitan.org) [Darjeeling](docs/opentitan/darjeeling.md), based on
+    [development version](https://github.com/lowRISC/opentitan/tree/master).
+  * [lowRISC](https://github.com/lowRISC/ibex-demo-system) [IbexDemo](ibexdemo.md).
 
 See [installation instructions](docs/opentitan/index.md)
 

hw/riscv/Kconfig

@@ -54,6 +54,7 @@ config OT_DARJEELING
     select OT_RSTMGR
     select OT_ROM_CTRL
     select OT_SOCDBG_CTRL
+    select OT_SOC_PROXY
     select OT_SPI_DEVICE
     select OT_SPI_HOST
     select OT_SRAM_CTRL