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

Cherry-pick to earlgrey_1.0.0: [manuf] Finalize {Creator,Owner}SwCfg at end of perso flow #24917

Merged
merged 2 commits into from
Oct 29, 2024

Conversation

github-actions[bot]
Copy link

This is an automatic cherry-pick of #24783 to branch earlgrey_1.0.0.

This calculates the measurement of the OTP partitions in
`ft_personalize` and pass them to `dice_uds_tbs_cert_build()`.
This change is necessary because the CreatorSwCfg and OwnerSwCfg might
not be fully provisioned to the OTP when building the UDS certification.
By calculating the final measurements in `ft_personalize`, we can get
the values of unprovisioned field from the OTP image to ensure the
correct values are used in the certificate generation process.

Signed-off-by: Anthony Chen <[email protected]>
(cherry picked from commit dbd0a4a)
This modifies the perso flow to complete the provisioning of the
CreatorSwCfg and OwnerSwCfg OTP partitions at the end of the process.
This ensures that the perso firmware can be reentrant in case of
unexpected resets during personalization.

Previously, these partitions were provisioned earlier in the flow.
However, since we are going to bind the perso firmware with
`CREATOR_SW_CFG_MANUF_STATE`, we need to ensure that this field is
provisioned as late as possible.

Since CreatorSwCfg and OwnerSwCfg partitions are now not fully
provisioned in the OTP during the UDS certificate generation process,
overwrite the fields that are not provisioned until the end of
personalization process with the values from the OTP image. At the end
of perso flow, compare the OTP measurement used during certificate
generation with the digest stored in the OTP. Ensure that the UDS
certificate was generated using the correct OTP values.

Signed-off-by: Anthony Chen <[email protected]>
(cherry picked from commit 1404534)
@github-actions github-actions bot requested a review from a team as a code owner October 28, 2024 21:00
@github-actions github-actions bot requested review from jadephilipoom and removed request for a team October 28, 2024 21:00
@timothytrippel timothytrippel requested review from moidx and timothytrippel and removed request for jadephilipoom October 28, 2024 21:01
@timothytrippel timothytrippel merged commit 36b1c6f into earlgrey_1.0.0 Oct 29, 2024
25 checks passed
@timothytrippel timothytrippel deleted the backport-24783-to-earlgrey_1.0.0 branch October 29, 2024 03:30
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.

2 participants