Skip to content

fvp-aemva: bump shrinkwrap to 2026.3.0 and target Armv9.7 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roxell merged 1 commit into from
Jun 10, 2026
Merged

fvp-aemva: bump shrinkwrap to 2026.3.0 and target Armv9.7 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions docs/devices.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,21 @@ fvp-morello-grub |
fvp-morello-oe |
fvp-morello-ubuntu |

!!! tip "Arm architecture version on fvp-aemva"
By default `fvp-aemva` runs the FVP model at Armv9.7, exposing
SVE2 v3, SME2 v3, LSFE and the FP16 matrix instructions. Armv9.6
made `HCR_EL2.E2H` read-as-one, so nVHE is no longer
architecturally possible. Stable kernels that always run the
nVHE-flavoured SVE EL2 init (between the refactor in v5.15 and
the v6.5 hVHE rework) hang when writing `ZCR_EL2`. In practice
that affects **linux-5.15.y** and **linux-6.1.y**. Older kernels
(linux-5.10.y) kept a VHE guard around the nVHE setup and still
boot at Armv9.7; newer kernels (linux-6.6.y and later) inherit
the v6.5 hVHE rework and also boot unchanged. Pass
`--parameters FVP_ARM_ARCH_VERSION=9.5` to clamp the model to
Armv9.5 for the affected branches. The same knob can be used to
target older architecture versions when newer ones cause issues.

# NFS devices

Device |
Expand Down
189 changes: 189 additions & 0 deletions test/unit/refs/definitions/fvp-aemva-arch-v95.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
device_type: "fvp"

job_name: "tuxlava@fvp-aemva"
priority: low
visibility: "public"


timeouts:
job:
minutes: 25
action:
minutes: 10
connection:
minutes: 10

actions:
- deploy:
to: fvp
timeout:
minutes: 15
uniquify: False
images:
startup:
url: "/DATA/startup.nsh"
uefi:
url: "https://storage.tuxboot.com/buildroot/fvp-aemva/FVP_AARCH64_EFI.fd"
bl1:
url: "/DATA/tf-bl1.bin"
dtb:
url: "https://storage.tuxboot.com/buildroot/fvp-aemva/fvp-base-revc.dtb"
kernel:
url: "https://storage.tuxboot.com/buildroot/fvp-aemva/Image"
rootfs:
url: "https://example.com/rootfs.ext4.zst"
compression: zstd
format: ext4
fip:
url: "/DATA/fip.bin"
- boot:
method: fvp
docker:
name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
local: false
container_name: "tuxlava-ci"
image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
version_string: "Fast Models [^\\n]+"
timeout:
minutes: 10
console_string: "terminal_0: Listening for serial connection on port (?P<PORT>\\d+)"
feedbacks:
- "(?P<NAME>terminal_1): Listening for serial connection on port (?P<PORT>\\d+)"
- "(?P<NAME>terminal_2): Listening for serial connection on port (?P<PORT>\\d+)"
- "(?P<NAME>terminal_3): Listening for serial connection on port (?P<PORT>\\d+)"
arguments:
- "--stat"
- "-C bp.dram_size=4"
- "-C bp.flashloader0.fname='{FIP}'"
- "-C bp.flashloader1.fname='{UEFI}'"
- "-C bp.hostbridge.userNetPorts=8022=22"
- "-C bp.hostbridge.userNetworking=1"
- "-C bp.refcounter.non_arch_start_at_default=1"
- "-C bp.secure_memory=1"
- "-C bp.secureflashloader.fname='{BL1}'"
- "-C bp.smsc_91c111.enabled=1"
- "-C bp.terminal_0.mode=telnet"
- "-C bp.terminal_0.start_telnet=0"
- "-C bp.terminal_1.mode=raw"
- "-C bp.terminal_1.start_telnet=0"
- "-C bp.terminal_2.mode=raw"
- "-C bp.terminal_2.start_telnet=0"
- "-C bp.terminal_3.mode=raw"
- "-C bp.terminal_3.start_telnet=0"
- "-C bp.ve_sysregs.exit_on_shutdown=1"
- "-C bp.virtio_rng.enabled=1"
- "-C bp.virtioblockdevice.image_path='{ROOTFS}'"
- "-C bp.virtiop9device.root_path="
- "-C bp.vis.disable_visualisation=1"
- "-C cache_state_modelled=0"
- "-C cluster0.NUM_CORES=4"
- "-C cluster0.PA_SIZE=48"
- "-C cluster0.check_memory_attributes=0"
- "-C cluster0.clear_reg_top_eret=2"
- "-C cluster0.cpu0.semihosting-cwd={ARTIFACT_DIR}"
- "-C cluster0.ecv_support_level=2"
- "-C cluster0.enhanced_pac2_level=3"
- "-C cluster0.gicv3.cpuintf-mmap-access-level=2"
- "-C cluster0.gicv3.without-DS-support=1"
- "-C cluster0.gicv4.mask-virtual-interrupt=1"
- "-C cluster0.has_16k_granule=1"
- "-C cluster0.has_amu=1"
- "-C cluster0.has_arm_v8-1=1"
- "-C cluster0.has_arm_v8-2=1"
- "-C cluster0.has_arm_v8-3=1"
- "-C cluster0.has_arm_v8-4=1"
- "-C cluster0.has_arm_v8-5=1"
- "-C cluster0.has_arm_v8-6=1"
- "-C cluster0.has_arm_v8-7=1"
- "-C cluster0.has_arm_v8-8=1"
- "-C cluster0.has_arm_v8-9=1"
- "-C cluster0.has_arm_v9-0=1"
- "-C cluster0.has_arm_v9-1=1"
- "-C cluster0.has_arm_v9-2=1"
- "-C cluster0.has_arm_v9-3=1"
- "-C cluster0.has_arm_v9-4=1"
- "-C cluster0.has_arm_v9-5=1"
- "-C cluster0.has_branch_target_exception=1"
- "-C cluster0.has_brbe=1"
- "-C cluster0.has_brbe_v1p1=1"
- "-C cluster0.has_const_pac=1"
- "-C cluster0.has_gcs=1"
- "-C cluster0.has_hpmn0=1"
- "-C cluster0.has_large_system_ext=1"
- "-C cluster0.has_large_va=1"
- "-C cluster0.has_lsfe=1"
- "-C cluster0.has_permission_indirection_s1=1"
- "-C cluster0.has_permission_indirection_s2=1"
- "-C cluster0.has_permission_overlay_s1=1"
- "-C cluster0.has_permission_overlay_s2=1"
- "-C cluster0.has_rndr=1"
- "-C cluster0.has_sve=1"
- "-C cluster0.max_32bit_el=0"
- "-C cluster0.pmb_idr_external_abort=1"
- "-C cluster0.stage12_tlb_size=1024"
- "-C cluster0.sve.has_sme2=1"
- "-C cluster0.sve.has_sme=1"
- "-C cluster0.sve.has_sve2=1"
- "-C cluster1.NUM_CORES=4"
- "-C cluster1.PA_SIZE=48"
- "-C cluster1.check_memory_attributes=0"
- "-C cluster1.clear_reg_top_eret=2"
- "-C cluster1.ecv_support_level=2"
- "-C cluster1.enhanced_pac2_level=3"
- "-C cluster1.gicv3.cpuintf-mmap-access-level=2"
- "-C cluster1.gicv3.without-DS-support=1"
- "-C cluster1.gicv4.mask-virtual-interrupt=1"
- "-C cluster1.has_16k_granule=1"
- "-C cluster1.has_amu=1"
- "-C cluster1.has_arm_v8-1=1"
- "-C cluster1.has_arm_v8-2=1"
- "-C cluster1.has_arm_v8-3=1"
- "-C cluster1.has_arm_v8-4=1"
- "-C cluster1.has_arm_v8-5=1"
- "-C cluster1.has_arm_v8-6=1"
- "-C cluster1.has_arm_v8-7=1"
- "-C cluster1.has_arm_v8-8=1"
- "-C cluster1.has_arm_v8-9=1"
- "-C cluster1.has_arm_v9-0=1"
- "-C cluster1.has_arm_v9-1=1"
- "-C cluster1.has_arm_v9-2=1"
- "-C cluster1.has_arm_v9-3=1"
- "-C cluster1.has_arm_v9-4=1"
- "-C cluster1.has_arm_v9-5=1"
- "-C cluster1.has_branch_target_exception=1"
- "-C cluster1.has_brbe=1"
- "-C cluster1.has_brbe_v1p1=1"
- "-C cluster1.has_const_pac=1"
- "-C cluster1.has_gcs=1"
- "-C cluster1.has_hpmn0=1"
- "-C cluster1.has_large_system_ext=1"
- "-C cluster1.has_large_va=1"
- "-C cluster1.has_lsfe=1"
- "-C cluster1.has_permission_indirection_s1=1"
- "-C cluster1.has_permission_indirection_s2=1"
- "-C cluster1.has_permission_overlay_s1=1"
- "-C cluster1.has_permission_overlay_s2=1"
- "-C cluster1.has_rndr=1"
- "-C cluster1.has_sve=1"
- "-C cluster1.max_32bit_el=0"
- "-C cluster1.pmb_idr_external_abort=1"
- "-C cluster1.stage12_tlb_size=1024"
- "-C cluster1.sve.has_sme2=1"
- "-C cluster1.sve.has_sme=1"
- "-C cluster1.sve.has_sve2=1"
- "-C gic_distributor.has_nmi=1"
- "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
- "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
- "-C pci.pci_smmuv3.mmu.SMMU_IDR1=216481056"
- "-C pci.pci_smmuv3.mmu.SMMU_IDR3=5908"
- "-C pci.pci_smmuv3.mmu.SMMU_IDR5=4294902901"
- "-C pci.pci_smmuv3.mmu.SMMU_S_IDR1=2684354562"
- "-C pci.pci_smmuv3.mmu.SMMU_S_IDR2=0"
- "-C pci.pci_smmuv3.mmu.SMMU_S_IDR3=0"
- "-C pctl.startup=0.0.0.0"
auto_login:
login_prompt: 'login:'
username: root
prompts:
- 'root@(.*):[/~]#'
- '/ #'
22 changes: 20 additions & 2 deletions test/unit/refs/definitions/fvp-aemva-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ actions:
- boot:
method: fvp
docker:
name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
local: false
container_name: "tuxlava-ci"
image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
version_string: "Fast Models [^\\n]+"
timeout:
minutes: 10
Expand Down Expand Up @@ -103,14 +103,20 @@ actions:
- "-C cluster0.has_arm_v9-3=1"
- "-C cluster0.has_arm_v9-4=1"
- "-C cluster0.has_arm_v9-5=1"
- "-C cluster0.has_arm_v9-7=1"
- "-C cluster0.has_arm_v9-6=1"
- "-C cluster0.has_branch_target_exception=1"
- "-C cluster0.has_brbe=1"
- "-C cluster0.has_brbe_v1p1=1"
- "-C cluster0.has_const_pac=1"
- "-C cluster0.has_f16f32dot=1"
- "-C cluster0.has_f16f32mm=1"
- "-C cluster0.has_f16mm=1"
- "-C cluster0.has_gcs=1"
- "-C cluster0.has_hpmn0=1"
- "-C cluster0.has_large_system_ext=1"
- "-C cluster0.has_large_va=1"
- "-C cluster0.has_lsfe=1"
- "-C cluster0.has_permission_indirection_s1=1"
- "-C cluster0.has_permission_indirection_s2=1"
- "-C cluster0.has_permission_overlay_s1=1"
Expand All @@ -120,9 +126,12 @@ actions:
- "-C cluster0.max_32bit_el=0"
- "-C cluster0.pmb_idr_external_abort=1"
- "-C cluster0.stage12_tlb_size=1024"
- "-C cluster0.sve.has_b16mm=1"
- "-C cluster0.sve.has_sme2=1"
- "-C cluster0.sve.has_sme=1"
- "-C cluster0.sve.has_sve2=1"
- "-C cluster0.sve.sme2_version=3"
- "-C cluster0.sve.sve2_version=3"
- "-C cluster1.NUM_CORES=4"
- "-C cluster1.PA_SIZE=48"
- "-C cluster1.check_memory_attributes=0"
Expand All @@ -149,14 +158,20 @@ actions:
- "-C cluster1.has_arm_v9-3=1"
- "-C cluster1.has_arm_v9-4=1"
- "-C cluster1.has_arm_v9-5=1"
- "-C cluster1.has_arm_v9-7=1"
- "-C cluster1.has_arm_v9-6=1"
- "-C cluster1.has_branch_target_exception=1"
- "-C cluster1.has_brbe=1"
- "-C cluster1.has_brbe_v1p1=1"
- "-C cluster1.has_const_pac=1"
- "-C cluster1.has_f16f32dot=1"
- "-C cluster1.has_f16f32mm=1"
- "-C cluster1.has_f16mm=1"
- "-C cluster1.has_gcs=1"
- "-C cluster1.has_hpmn0=1"
- "-C cluster1.has_large_system_ext=1"
- "-C cluster1.has_large_va=1"
- "-C cluster1.has_lsfe=1"
- "-C cluster1.has_permission_indirection_s1=1"
- "-C cluster1.has_permission_indirection_s2=1"
- "-C cluster1.has_permission_overlay_s1=1"
Expand All @@ -166,9 +181,12 @@ actions:
- "-C cluster1.max_32bit_el=0"
- "-C cluster1.pmb_idr_external_abort=1"
- "-C cluster1.stage12_tlb_size=1024"
- "-C cluster1.sve.has_b16mm=1"
- "-C cluster1.sve.has_sme2=1"
- "-C cluster1.sve.has_sme=1"
- "-C cluster1.sve.has_sve2=1"
- "-C cluster1.sve.sme2_version=3"
- "-C cluster1.sve.sve2_version=3"
- "-C gic_distributor.has_nmi=1"
- "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
- "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
Expand Down
22 changes: 20 additions & 2 deletions test/unit/refs/definitions/fvp-aemva-enable-cca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ actions:
- boot:
method: fvp
docker:
name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
local: false
container_name: "tuxlava-ci"
image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
version_string: "Fast Models [^\\n]+"
timeout:
minutes: 10
Expand Down Expand Up @@ -105,14 +105,20 @@ actions:
- "-C cluster0.has_arm_v9-3=1"
- "-C cluster0.has_arm_v9-4=1"
- "-C cluster0.has_arm_v9-5=1"
- "-C cluster0.has_arm_v9-7=1"
- "-C cluster0.has_arm_v9-6=1"
- "-C cluster0.has_branch_target_exception=1"
- "-C cluster0.has_brbe=1"
- "-C cluster0.has_brbe_v1p1=1"
- "-C cluster0.has_const_pac=1"
- "-C cluster0.has_f16f32dot=1"
- "-C cluster0.has_f16f32mm=1"
- "-C cluster0.has_f16mm=1"
- "-C cluster0.has_gcs=1"
- "-C cluster0.has_hpmn0=1"
- "-C cluster0.has_large_system_ext=1"
- "-C cluster0.has_large_va=1"
- "-C cluster0.has_lsfe=1"
- "-C cluster0.has_permission_indirection_s1=1"
- "-C cluster0.has_permission_indirection_s2=1"
- "-C cluster0.has_permission_overlay_s1=1"
Expand All @@ -128,9 +134,12 @@ actions:
- "-C cluster0.output_attributes=ExtendedID[62:55]=MPAM_PMG,ExtendedID[54:39]=MPAM_PARTID,ExtendedID[38:37]=MPAM_SP"
- "-C cluster0.brbe_disable_recording=1"
- "-C cluster0.stage12_tlb_size=1024"
- "-C cluster0.sve.has_b16mm=1"
- "-C cluster0.sve.has_sme2=1"
- "-C cluster0.sve.has_sme=1"
- "-C cluster0.sve.has_sve2=1"
- "-C cluster0.sve.sme2_version=3"
- "-C cluster0.sve.sve2_version=3"
- "-C cluster1.NUM_CORES=4"
- "-C cluster1.PA_SIZE=48"
- "-C cluster1.check_memory_attributes=0"
Expand All @@ -157,14 +166,20 @@ actions:
- "-C cluster1.has_arm_v9-3=1"
- "-C cluster1.has_arm_v9-4=1"
- "-C cluster1.has_arm_v9-5=1"
- "-C cluster1.has_arm_v9-7=1"
- "-C cluster1.has_arm_v9-6=1"
- "-C cluster1.has_branch_target_exception=1"
- "-C cluster1.has_brbe=1"
- "-C cluster1.has_brbe_v1p1=1"
- "-C cluster1.has_const_pac=1"
- "-C cluster1.has_f16f32dot=1"
- "-C cluster1.has_f16f32mm=1"
- "-C cluster1.has_f16mm=1"
- "-C cluster1.has_gcs=1"
- "-C cluster1.has_hpmn0=1"
- "-C cluster1.has_large_system_ext=1"
- "-C cluster1.has_large_va=1"
- "-C cluster1.has_lsfe=1"
- "-C cluster1.has_permission_indirection_s1=1"
- "-C cluster1.has_permission_indirection_s2=1"
- "-C cluster1.has_permission_overlay_s1=1"
Expand All @@ -180,9 +195,12 @@ actions:
- "-C cluster1.output_attributes=ExtendedID[62:55]=MPAM_PMG,ExtendedID[54:39]=MPAM_PARTID,ExtendedID[38:37]=MPAM_SP"
- "-C cluster1.brbe_disable_recording=1"
- "-C cluster1.stage12_tlb_size=1024"
- "-C cluster1.sve.has_b16mm=1"
- "-C cluster1.sve.has_sme2=1"
- "-C cluster1.sve.has_sme=1"
- "-C cluster1.sve.has_sve2=1"
- "-C cluster1.sve.sme2_version=3"
- "-C cluster1.sve.sve2_version=3"
- "-C gic_distributor.has_nmi=1"
- "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
- "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
Expand Down
Loading
Loading