Skip to content
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.

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

simple: Define SIMPLE_SKIPPED_INIT_CAPS better #76

Merged
merged 2 commits into from
Aug 12, 2023

Conversation

Furao
Copy link
Contributor

@Furao Furao commented Aug 10, 2023

Make sure this macro is defined based on all possible configurations.

Required based on this change: seL4/seL4#1088

@kent-mcleod
Copy link
Member

Thanks for putting this PR up @Furao ,

I think simple_default_nth_cap needs to also be updated to skip over the null caps correctly. It looks like it currently only handles the special x86 caps at the moment.

I think this also needs to account for seL4_CapSMMUSIDControl and seL4_CapSMMUCBControl caps which would be null if SMMUv2 isn't enabled.

Make sure this macro is defined based on all possible configurations.
Also update simple_default_nth_cap() to skip based on all features
correctly.

Signed-off-by: Robbie VanVossen <[email protected]>
Signed-off-by: Robbie VanVossen <[email protected]>
@Furao
Copy link
Contributor Author

Furao commented Aug 11, 2023

Thanks for putting this PR up @Furao ,

No Problem

I think simple_default_nth_cap needs to also be updated to skip over the null caps correctly. It looks like it currently only handles the special x86 caps at the moment.

I think this also needs to account for seL4_CapSMMUSIDControl and seL4_CapSMMUCBControl caps which would be null if SMMUv2 isn't enabled.

Ok, I updated that function. I looked at that a bit ago when Axel first brought this issue up on the SMC patches, but I was confused by this function. That explains why.

@kent-mcleod kent-mcleod merged commit 173c80c into seL4:master Aug 12, 2023
7 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants