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.

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

Jump to bottom

M2354: Fix TF-M 1.4 #15078

Merged
merged 1 commit into from
Sep 17, 2021
Merged

M2354: Fix TF-M 1.4 #15078

merged 1 commit into from
Sep 17, 2021

Conversation

ccli8
Copy link
Contributor

@ccli8 ccli8 commented Sep 17, 2021 •
edited
Loading

Summary of changes

This PR, following #15050, tries to fix NSC call broken on M2354 with TF-M 1.4 upgrade. It has the following modifications:

  1. In TF-M, fix NSPE interrupt-disabled NSC call broken. Check https://developer.trustedfirmware.org/T966.
  2. In TF-M, enable mcuboot log forcibly. This is to help check firmware update process.
  3. Update readme and script

Pull request type 

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results 

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

@ccli8
M2354: Fix TF-M 1.4
bbc5ad9 
1.  In TF-M, fix NSPE interrupt-disabled NSC call broken. Check:
    https://developer.trustedfirmware.org/T966
2.  In TF-M, enable mcuboot log enabled forcibly. This is to help check firmware update process.
3.  Update readme and script
@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Sep 17, 2021
@ciarmcom ciarmcom requested a review from a team September 17, 2021 06:30
@ciarmcom
Copy link
Member

@ccli8, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@ccli8
Copy link
Contributor Author

ccli8 commented Sep 17, 2021

@LDong-Arm Same as #14441, this PR changes frozen tools/targets to update post-build script for M2354 for Mbed CLI 1.

Then this PR can land in 6.15? Otherwise, M2354 will break.

LDong-Arm
LDong-Arm approved these changes Sep 17, 2021
View reviewed changes
Copy link
Contributor

@LDong-Arm LDong-Arm left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@ccli8 Thanks for the PR. How is "NSPE interrupt-disabled NSC call broken" reproduced?

Anyway, given that the TF-M code in https://github.com/OpenNuvoton/trusted-firmware-m/tree/nuvoton_mbed_m2354_tfm-1.4 has new commits added, updating binaries in mbed-os is fine.

LDong-Arm
LDong-Arm reviewed Sep 17, 2021
View reviewed changes
Copy link
Contributor

@LDong-Arm LDong-Arm left a comment

Choose a reason for hiding this comment

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

@ccli8 (As a follow-up) If a more verbose boot log is helpful with firmware update, could you please raise a PR to mbed-os-tf-m-regression-tests to pass additional cmake options during TF-M build, at least when the target is NU_M2354?

@Patater
Copy link
Contributor

Patater commented Sep 17, 2021

CI started

@ccli8
Copy link
Contributor Author

ccli8 commented Sep 17, 2021

How is "NSPE interrupt-disabled NSC call broken" reproduced?

On Mbed, call __disable_irq() first and then call any PSA API. As I know, Musca boards needn't this path, but M2354 does.

@LDong-Arm

If a more verbose boot log is helpful with firmware update, could you please raise a PR to mbed-os-tf-m-regression-tests to pass additional cmake options during TF-M build, at least when the target is NU_M2354?

nuvoton_mbed_m2354_tfm-1.4 has enabled it
https://github.com/OpenNuvoton/trusted-firmware-m/blob/1b83c833390a784d1612622273953463bf5c555e/platform/ext/target/nuvoton/m2354/config.cmake#L43

@mbed-ci
Copy link

mbed-ci commented Sep 17, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@LDong-Arm LDong-Arm added this to In progress (8) in Mbed Core via automation Sep 17, 2021
@Patater Patater merged commit 4cfbea4 into ARMmbed:master Sep 17, 2021
Mbed Core automation moved this from In progress (8) to Done Sep 17, 2021
@mbedmain mbedmain added release-version: 6.15.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Sep 17, 2021
@Patater Patater moved this from Done to Reported in Mbed Core Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LDong-Arm LDong-Arm LDong-Arm approved these changes

@Patater Patater Patater approved these changes

@rwalton-arm rwalton-arm rwalton-arm approved these changes

Assignees
No one assigned
Labels
component: tools devices: nuvoton needs: review release-version: 6.15.0
Projects
No open projects
Mbed Core
  
Reported
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@ccli8 @ciarmcom @Patater @mbed-ci @rwalton-arm @LDong-Arm @mbedmain