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

Make RT depend on caliptra-cfi and update DPE version #1332

Merged
merged 2 commits into from
Feb 14, 2024

Conversation

sree-revoori1
Copy link
Contributor

@sree-revoori1 sree-revoori1 commented Feb 12, 2024

Previously, we forked caliptra-sw's cfi crate into a new repo, caliptra-cfi, to be able to add CFI in DPE. In this PR, we make RT use caliptra-cfi instead of caliptra-sw's cfi so that we can update DPE to the latest version containing CFI instrumentation. To do this correctly without modifying the ROM binary, we make drivers depend on caliptra-cfi only if the runtime flag is enabled.

The plan is to make caliptra-cfi a submodule and replace the cfi crate with caliptra-cfi everywhere. We will do this for ROM 1.01.

The RT binary size delta is + 7800 due to adding CFI to DPE.

@sree-revoori1 sree-revoori1 force-pushed the dpe_cfi branch 3 times, most recently from 40eeb40 to 157a34d Compare February 12, 2024 19:11
@sree-revoori1 sree-revoori1 requested a review from korran February 12, 2024 22:27
Copy link
Collaborator

@jhand2 jhand2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but will need a submodule update when chipsalliance/caliptra-dpe#310 is merged. I assume the current submodule import isn't a commit in main.

@sree-revoori1 sree-revoori1 force-pushed the dpe_cfi branch 2 times, most recently from 55bdd50 to e7c7ff3 Compare February 13, 2024 03:42
mhatrevi
mhatrevi previously approved these changes Feb 13, 2024
@jhand2 jhand2 enabled auto-merge (rebase) February 14, 2024 01:52
@jhand2 jhand2 merged commit 11edcf3 into chipsalliance:main Feb 14, 2024
10 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.

4 participants