Skip to content

capDL: updates for smmuv2 functionality #8

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

Closed
chrisguikema wants to merge 1 commit into from
Closed

capDL: updates for smmuv2 functionality #8

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
2 changes: 2 additions & 0 deletions capDL-tool/CapDL/State.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ validCapArch X86_64 (IOSpaceCap {}) = True
validCapArch X86_64 (IOPTCap {}) = True
validCapArch X86_64 (VCPUCap {}) = True
validCapArch ARM11 (ARMIOSpaceCap {}) = True
validCapArch AARCH64 (ARMIOSpaceCap {}) = True
validCapArch AARCH64 (PUDCap {}) = True
validCapArch AARCH64 (PGDCap {}) = True
validCapArch _ _ = False
Expand Down Expand Up @@ -460,6 +461,7 @@ validObjArch X86_64 (IOAPICIrq {}) = True
validObjArch X86_64 (MSIIrq {}) = True
validObjArch AARCH64 (PUD {}) = True
validObjArch AARCH64 (PGD {}) = True
validObjArch AARCH64 (ARMIODevice {}) = True
validObjArch _ _ = False

checkObjArch :: Arch -> KernelObject Word -> ObjID -> Logger Bool
Expand Down
4 changes: 4 additions & 0 deletions capdl-loader-app/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,8 +1808,12 @@ static void init_cnode_slot(CDL_Model *spec, init_cnode_mode mode, CDL_ObjID cno
#endif
#if defined(CONFIG_ARCH_ARM)
case CDL_ARMIOSpaceCap:
#ifdef CONFIG_ARM_SMMU_V2
src_index = first_arm_iospace;
#else
src_index = first_arm_iospace + target_cap_data;
target_cap_data = seL4_NilData;
#endif
break;
#endif
case CDL_IRQHandlerCap:
Expand Down