Skip to content

Commit

Permalink
Persistent shared dirs
Browse files Browse the repository at this point in the history
  • Loading branch information
jmichalski-ant committed Feb 1, 2024
1 parent fb10cdc commit b3b7ac8
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 1 deletion.
18 changes: 18 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,24 @@ jobs:
git+https://github.com/antmicro/tuttest.git@c44309e0365c54759fb36864fb77bf8b347bd647
repos: https://github.com/antmicro/pyrav4l2.git pyrav4l2

riscv64-shared-dirs-test:
runs-on: ubuntu-latest
needs: send-to-releases
if: ${{ !failure() && !github.event.act }}
steps:
- uses: actions/checkout@v3

- name: test
uses: ./
with:
shared-dirs: tests
renode-run: |
echo "riscv64-shared-dirs-test"
- name: read
run:
ls ./shared
cat test.txt

arm32-test:
runs-on: ubuntu-latest
needs: send-to-releases
Expand Down
3 changes: 3 additions & 0 deletions action/device/hifive_unleashed/init.resc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ machine LoadPlatformDescription @action/device/hifive_unleashed/platform.repl
machine LoadPlatformDescriptionFromString 'virtio: Storage.VirtIOBlockDevice @ sysbus 0x100d0000 { IRQ -> plic@50 }'
virtio LoadImage @images/rootfs.img

machine LoadPlatformDescriptionFromString 'virtio2: Storage.VirtIOBlockDevice @ sysbus 0x100e0000 { IRQ -> plic@51 }'
virtio2 LoadImage @images/persistent.img true

showAnalyzer uart0
e51 LogFunctionNames true

Expand Down
4 changes: 4 additions & 0 deletions action/images.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,5 +200,9 @@ def burn_rootfs_image(
run(["mkfs.ext4", "-d", "images/rootfs", "images/rootfs.img"],
check=True,
stdout=DEVNULL)
run(["truncate", "images/persistent.img", "-s", "128MB"], check=True)
run(["mkfs.ext4", "images/persistent.img"],
check=True,
stdout=DEVNULL)
except CalledProcessError as e:
sys.exit(e.returncode)
4 changes: 4 additions & 0 deletions action/run-in-renode.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from dependencies import add_repos, add_packages
from images import prepare_shared_directories, prepare_kernel_and_initramfs, burn_rootfs_image
from dispatcher import CommandDispatcher
from subprocess import run

from datetime import datetime

Expand Down Expand Up @@ -146,3 +147,6 @@ def test_task(test_task_str: str):
dispatcher.add_task(test_task(args.get("renode-run", "")))

dispatcher.evaluate()

run(["mkdir", "shared"], check=True)
run(["sudo", "mount", "images/persistent.img", "shared"], check=True)
14 changes: 14 additions & 0 deletions action/tasks/save_shared_dirs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: save_shared_dirs
shell: target
requires: [action_test]
echo: true
timeout: 5
fail-fast: false
check-exit-code: false
commands:
- echo "TEST"
- mkdir -p host_dir
- mount /dev/vdb host_dir
- ls host_dir
- echo "file from Renode" > host_dir/test.txt
- umount host_dir
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ diff --git a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts b/arch/riscv/bo
index dddabfbbc7a9..15e528335102 100644
--- a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
+++ b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
@@ -29,6 +29,12 @@ memory@80000000 {
@@ -29,6 +29,18 @@ memory@80000000 {
};

soc {
Expand All @@ -24,6 +24,12 @@ index dddabfbbc7a9..15e528335102 100644
+ reg = <0x00 0x100d0000 0x00 0x150>;
+ interrupt-parent = <&plic0>;
+ interrupts = <50>;
+ };
+ virtio@100e0000 {
+ compatible = "virtio,mmio";
+ reg = <0x00 0x100e0000 0x00 0x150>;
+ interrupt-parent = <&plic0>;
+ interrupts = <51>;
+ };
};

Expand Down

0 comments on commit b3b7ac8

Please sign in to comment.