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

manifest: update TF-M with latest upstream #35510

Merged
merged 5 commits into from
May 26, 2021
Merged

manifest: update TF-M with latest upstream #35510

merged 5 commits into from
May 26, 2021

Conversation

ioannisg
Copy link
Member

@ioannisg ioannisg commented May 20, 2021 •
edited
Loading

The TF-M update brings in the latest PSA crypto headers,
after TF-M switched formally to MBedTLS 2.26.0. It also
brings in some important fixes for cache enabling in nRF
platforms.

Signed-off-by: Ioannis Glaropoulos Ioannis.Glaropoulos@nordicsemi.no

Fixes #33423.
Fixes #33667.
Fixes #34962

Supersedes #35455

@ioannisg ioannisg requested a review from erwango May 20, 2021 15:23
@github-actions github-actions bot added manifest west manifest-trusted-firmware-m DNM This PR should not be merged (Do Not Merge) labels May 20, 2021
@github-actions
Copy link

github-actions bot commented May 20, 2021 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@51cdecd zephyrproject-rtos/trusted-firmware-m@e18b7a9 (master) zephyrproject-rtos/trusted-firmware-m@51cdecd6..e18b7a9b

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@ioannisg ioannisg added the block: HW Test Testing on hardware required before merging label May 20, 2021
@ioannisg ioannisg added this to the v2.6.0 milestone May 20, 2021
@anangl anangl mentioned this pull request May 20, 2021
Closed
@ioannisg ioannisg force-pushed the tfm_upmerge_to_v1.3.0.99_for_v2.6 branch from a1ff651 to a6c5ceb Compare May 21, 2021 15:17
@anangl anangl mentioned this pull request May 24, 2021
Merged
@ioannisg ioannisg force-pushed the tfm_upmerge_to_v1.3.0.99_for_v2.6 branch from a6c5ceb to f3bdf94 Compare May 25, 2021 15:39
@github-actions github-actions bot added the area: Samples Samples label May 25, 2021
@ioannisg ioannisg force-pushed the tfm_upmerge_to_v1.3.0.99_for_v2.6 branch from f3bdf94 to a7c1268 Compare May 25, 2021 17:02
microbuilder
microbuilder approved these changes May 25, 2021
View reviewed changes
Copy link
Member

@microbuilder microbuilder left a comment

Choose a reason for hiding this comment

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

Tested on:

  • lpcxpresso5s69_ns
  • mps2_an521_nonsecure

@microbuilder microbuilder mentioned this pull request May 25, 2021
Closed
@microbuilder
Copy link
Member

Also tested for issue #34962 ... fixes problem:

./scripts/twister -p mps2_an521_nonsecure -N --inline-logs \
  -s samples/tfm_integration/tfm_psa_test/sample.tfm.psa_internal_trusted_storage_test
INFO    - Zephyr version: zephyr-v2.5.0-4118-ga7c1268ee622
INFO    - JOBS: 8
INFO    - Using 'gnuarmemb' toolchain.
INFO    - Building initial testcase list...
INFO    - 1 test scenarios (1 configurations) selected, 0 configurations discarded due to filters.
INFO    - Adding tasks to the queue...
INFO    - Added initial list of jobs to queue
INFO    - Total complete:    1/   1  100%  skipped:    0, failed:    0
INFO    - 1 of 1 test configurations passed (100.00%), 0 failed, 0 skipped with 0 warnings in 45.03 seconds
INFO    - In total 1 test cases were executed, 0 skipped on 1 out of total 372 platforms (0.27%)
INFO    - 1 test configurations executed on platforms, 0 test configurations were only built.
INFO    - Saving reports...
INFO    - Writing xunit report /Users/kevin/Linaro/zephyr/zephyr/twister-out/twister.xml...
INFO    - Writing xunit report /Users/kevin/Linaro/zephyr/zephyr/twister-out/twister_report.xml...
INFO    - Run completed

@ioannisg ioannisg force-pushed the tfm_upmerge_to_v1.3.0.99_for_v2.6 branch 3 times, most recently from 38b1a41 to 42f1127 Compare May 25, 2021 21:56
@ioannisg
Copy link
Member Author

Tested on all platforms that support TF-M

  • mps2
  • nrf
  • laird
  • stm
  • nxp

@ioannisg
Copy link
Member Author

ioannisg commented May 26, 2021 •
edited
Loading

@MaureenHelm @galak looks to me that the CI failure is relevant to the fact that the LPC build in TF-M is pulling HAL from external tries. What should we do about this? I confirm that the failing test builds fine locally.

@MaureenHelm
Copy link
Member

@MaureenHelm @galak looks to me that the CI failure is relevant to the fact that the LPC build in TF-M is pulling HAL from external tries. What should we do about this? I confirm that the failing test builds fine locally.

Do you mean this?

In file included from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/platform_base_address.h:26,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/platform_regs.h:27,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/cmsis.h:14,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/include/tfm_hal_device_header.h:14,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/interface/src/psa/psa_client.c:12:
/workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Native_Driver/LPC55S69_cm33_core0.h:195:1: error: unterminated comment
  195 | /*!
      | ^
/workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Native_Driver/LPC55S69_cm33_core0.h:46: error: unterminated #ifndef
   46 | #ifndef _LPC55S69_CM33_CORE0_H_
      |

@ioannisg
Copy link
Member Author

ioannisg commented May 26, 2021 •
edited
Loading

@MaureenHelm @galak looks to me that the CI failure is relevant to the fact that the LPC build in TF-M is pulling HAL from external tries. What should we do about this? I confirm that the failing test builds fine locally.

Do you mean this?

In file included from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/platform_base_address.h:26,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/platform_regs.h:27,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/cmsis.h:14,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/include/tfm_hal_device_header.h:14,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/interface/src/psa/psa_client.c:12:
/workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Native_Driver/LPC55S69_cm33_core0.h:195:1: error: unterminated comment
  195 | /*!
      | ^
/workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Native_Driver/LPC55S69_cm33_core0.h:46: error: unterminated #ifndef
   46 | #ifndef _LPC55S69_CM33_CORE0_H_
      |

No, not this one. @MaureenHelm where did you get this log?

@MaureenHelm
Copy link
Member

@MaureenHelm @galak looks to me that the CI failure is relevant to the fact that the LPC build in TF-M is pulling HAL from external tries. What should we do about this? I confirm that the failing test builds fine locally.

Do you mean this?

In file included from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/platform_base_address.h:26,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/platform_regs.h:27,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Device/Include/cmsis.h:14,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/platform/include/tfm_hal_device_header.h:14,
                 from /workdir/modules/tee/tfm/trusted-firmware-m/interface/src/psa/psa_client.c:12:
/workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Native_Driver/LPC55S69_cm33_core0.h:195:1: error: unterminated comment
  195 | /*!
      | ^
/workdir/modules/tee/tfm/trusted-firmware-m/platform/ext/target/nxp/lpcxpresso55s69/Native_Driver/LPC55S69_cm33_core0.h:46: error: unterminated #ifndef
   46 | #ifndef _LPC55S69_CM33_CORE0_H_
      |

No, not this one. @MaureenHelm where did you get this log?

https://buildkite.com/zephyr/zephyr/builds/31235#a79acfd7-ae18-4309-9dd8-5cd98d3d35ef, line 1639

@ioannisg ioannisg removed the block: HW Test Testing on hardware required before merging label May 26, 2021
@ioannisg
Copy link
Member Author

I removed the HW test block label, since i actually tested this.

@ioannisg ioannisg force-pushed the tfm_upmerge_to_v1.3.0.99_for_v2.6 branch from 42f1127 to 2ed5963 Compare May 26, 2021 19:15
ioannisg and others added 5 commits May 26, 2021 23:33
@ioannisg
manifest: update TF-M with latest upstream
de3a01d 
The TF-M update brings in the latest PSA crypto headers,
after TF-M switched formally to MBedTLS 2.26.0. It also
brings in some important fixes for cache enabling in nRF
platforms.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
@microbuilder @ioannisg
samples: tfm_integration: tfm_ipc: Remove regression dependency
b5d8713 
Removes the dependency on the external test service from the
CONFIG_TFM_REGRESSION_S test suite, instead
demonstrating how to make direct IPC calls to the CRYPTO
service that is available as a part of standard TF-M builds.

Signed-off-by: Kevin Townsend <kevin.townsend@linaro.org>
@ioannisg
boards: lpcxpresso55s69: fix TFM offset for builds without MCUboot
9838ac9 
The flash layout definition has changed in upstream TF-M for the
LCPXPRESSO55S69 platform, for builds without bootloader. Fix the
layout in the boards' configuration, as well.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
@ioannisg
samples: tfm_ipc: update DT overlay for nucleo_l552ze_q_ns
7865c4b 
Update overlay file for nucleo_l552ze_q_ns board,
since now the sample does not enable REGRESSION,
and thus regular TF-M flash layout for the board
is used.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
@ioannisg
samples: tfm_integration: DT overlay doc fixes for stm32l562e_dk_ns
d8e29c1 
Minor documentation fixes for the DT overlay files for
stm32l562e_dk_ns board.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
@ioannisg ioannisg force-pushed the tfm_upmerge_to_v1.3.0.99_for_v2.6 branch from 2ed5963 to d8e29c1 Compare May 26, 2021 21:34
@github-actions github-actions bot removed the DNM This PR should not be merged (Do Not Merge) label May 26, 2021
@galak galak merged commit 00e2bb0 into zephyrproject-rtos:main May 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anangl anangl anangl approved these changes

@mmahadevan108 mmahadevan108 mmahadevan108 approved these changes

@MaureenHelm MaureenHelm MaureenHelm approved these changes

@microbuilder microbuilder microbuilder approved these changes

@erwango erwango Awaiting requested review from erwango

@oyvindronningstad oyvindronningstad Awaiting requested review from oyvindronningstad

@galak galak Awaiting requested review from galak

@dleach02 dleach02 Awaiting requested review from dleach02

Assignees

@MaureenHelm MaureenHelm

Labels
area: Boards area: Modules area: Samples Samples manifest manifest-trusted-firmware-m platform: NXP NXP
Projects
None yet
Milestone
v2.6.0
6 participants
@ioannisg @microbuilder @MaureenHelm @mmahadevan108 @anangl @galak