PSA: TFM import from master branch #10286

orenc17 · 2019-04-01T15:11:09Z

Description

Import TF-M sources from master branch at hash 0101fd3766913ff9786b95568cbc69cf58c1946b
Refactor PSA code generators scripts

Pull request type

[ ] Fix
[X] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@ARMmbed/mbed-os-psa

Release Notes

ciarmcom · 2019-04-01T17:00:40Z

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

bridadan · 2019-04-01T18:46:26Z

components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/bl2/include/boot_record.h

@@ -11,6 +11,8 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <limits.h>
+#include "../ext/mcuboot/bootutil/include/bootutil/image.h"
+#include "../ext/mcuboot/include/flash_map/flash_map.h"


This include path doesn't seem right.

for now we are not building secure bootloader in tree as it is provided as binary.
Can we tweak importer to skip bl2 folder.

@alzix could you clarify what you mean? Should this include path stay as-is?

You were right about include path is being wrong. The only reason why it does not fail compilation is that this header file is never included. This raises a question why is it here? I suggest tweaking importer configuration file to exclude this header file.

bridadan · 2019-04-01T18:57:14Z

tools/test/spm/test_generate_partition_code.py

 from tools.psa.mbed_spm_tfm_common import *
-from tools.psa.generate_mbed_spm_partition_code import *
+from tools.psa.generate_partition_code import *
+from .test_data import *


In general, we should stay away from import * to avoid bringing everything into the namespace. I realize in this case you're trying to do just that. For consistency with (most) of the tools, could you do one of the following:

Import the module and call the functions on the module (this is usually my preferred choice).

If you're worries about line length, you can always do something like import tools.psa.generate_partition_code as gpc. This allows you to then call those functions with gpc.my_func().

Import each of the functions by name

alzix · 2019-04-04T15:16:46Z

components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/bl2/include/boot_record.h

@@ -11,6 +11,8 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <limits.h>
+#include "../ext/mcuboot/bootutil/include/bootutil/image.h"
+#include "../ext/mcuboot/include/flash_map/flash_map.h"


for now we are not building secure bootloader in tree as it is provided as binary.
Can we tweak importer to skip bl2 folder.

orenc17 · 2019-04-08T17:11:20Z

@bridadan @alzix
components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/bl2/include/boot_record.h was not in use i've removed it in the first patch...updated commit SHA's as well

bridadan

Thanks for addressing my comments!

My previous comment about the import * statements can be addressed in a later pull request. I didn't realize that many of those statements were already present in a release.

cmonr · 2019-04-09T18:49:34Z

CI started while reviews are finished.

cmonr · 2019-04-09T18:52:42Z

~~CI restarted since results are now stale~~

Wrong PR.

cmonr · 2019-04-09T19:09:00Z

Also started PSA/job/PSA-SPM-tests Jenkins test.

mbed-ci · 2019-04-09T22:42:58Z

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 1
Build artifacts

mbed-ci · 2019-04-10T00:44:33Z

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 2
Build artifacts

cmonr · 2019-04-10T02:58:55Z

@orenc17 Can you check the results of the PSA/job/PSA-SPM-tests job in Jenkins and let us know what the results are here? Currently not on VPN.

0xc0170 · 2019-04-10T08:58:22Z

@orenc17 Can you check the results of the PSA/job/PSA-SPM-tests job in Jenkins and let us know what the results are here? Currently not on VPN.

Waiting for the confirmation.

- Remove un-needed files - Disable printf and uart - Modify include paths - Guard macros from mbed_lib with ifndef (cherry picked from commit 1f30b52) (cherry picked from commit 71cd34d)

- Link to bug tracking: https://developer.trustedfirmware.org/T239 (cherry picked from commit 5f2e4b3)

- Link to bug tracking: https://developer.trustedfirmware.org/T230 (cherry picked from commit 0c23e86)

- Link to bug tracking: https://developer.trustedfirmware.org/T240 (cherry picked from commit fc78640)

) - Link to bug tracking: https://developer.trustedfirmware.org/T241 (cherry picked from commit da01e34)

#236) - Link to bug tracking: https://developer.trustedfirmware.org/T236 (cherry picked from commit 008bf1b)

- Add Secure/non-secure code and secure heap to memory check - Link to bug tracking: https://developer.trustedfirmware.org/T224

0xc0170 · 2019-04-10T11:26:06Z

CI restarted

mbed-ci · 2019-04-10T12:29:40Z

Test run: FAILED

Summary: 6 of 7 test jobs failed
Build number : 3
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-IAR
jenkins-ci/mbed-os-ci_build-GCC_ARM
jenkins-ci/mbed-os-ci_mbed2-build-GCC_ARM
jenkins-ci/mbed-os-ci_build-ARM
jenkins-ci/mbed-os-ci_mbed2-build-ARM
jenkins-ci/mbed-os-ci_mbed2-build-IAR

alekla01 · 2019-04-10T12:33:02Z

Restarted jenkins-ci

mbed-ci · 2019-04-10T22:06:06Z

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 5
Build artifacts

ciarmcom requested review from a team April 1, 2019 17:00

ciarmcom added the needs: review label Apr 1, 2019

bridadan suggested changes Apr 1, 2019

View reviewed changes

cmonr added needs: work and removed needs: review labels Apr 1, 2019

alzix approved these changes Apr 4, 2019

View reviewed changes

bridadan approved these changes Apr 8, 2019

View reviewed changes

cmonr added needs: review and removed needs: work labels Apr 9, 2019

cmonr added ready for merge and removed needs: review labels Apr 10, 2019

0xc0170 added release-version: 5.13.0-rc1 needs: review and removed ready for merge labels Apr 10, 2019

0xc0170 mentioned this pull request Apr 10, 2019

Refactor PSA code generators #10364

Merged

Oren Cohen and others added 5 commits April 10, 2019 14:20

Remove outdated patch

4e720fd

[trusted-firmware-m]: Updated to 0101fd37

4e6ed2b

TF-M patch: General modifications

185d286

- Remove un-needed files - Disable printf and uart - Modify include paths - Guard macros from mbed_lib with ifndef (cherry picked from commit 1f30b52) (cherry picked from commit 71cd34d)

TF-M patch: Fix tfm_ns_lock_init issue (TF-M issue #239)

e89c1a6

- Link to bug tracking: https://developer.trustedfirmware.org/T239 (cherry picked from commit 5f2e4b3)

TF-M patch: Fix service handles not cleared issue (TF-M issue #230)

3fbc73e

- Link to bug tracking: https://developer.trustedfirmware.org/T230 (cherry picked from commit 0c23e86)

Michael Schwarcz added 4 commits April 10, 2019 14:20

TF-M patch: Fix fixed-size partitions stack size (TF-M issue #240)

f0e4583

- Link to bug tracking: https://developer.trustedfirmware.org/T240 (cherry picked from commit fc78640)

TF-M patch: Fix tfm_psa_call_venner wrong argument type (TF-M issue #241

ad8ddd8

) - Link to bug tracking: https://developer.trustedfirmware.org/T241 (cherry picked from commit da01e34)

TF-M patch: Fix wrong check in tfm_spm_check_client_version (TF-M issue

3badc12

#236) - Link to bug tracking: https://developer.trustedfirmware.org/T236 (cherry picked from commit 008bf1b)

TF-M patch: Fix tfm_memory_check issue (TF-M issue #224)

5a9dff2

- Add Secure/non-secure code and secure heap to memory check - Link to bug tracking: https://developer.trustedfirmware.org/T224

0xc0170 added needs: CI release-version: 5.12.2 and removed needs: review release-version: 5.13.0-rc1 labels Apr 10, 2019

0xc0170 approved these changes Apr 10, 2019

View reviewed changes

Update commit sha's

904656e

orenc17 changed the title ~~PSA: TFM import and code generation refactor~~ PSA: TFM import from master branch Apr 10, 2019

0xc0170 added ready for merge and removed needs: CI labels Apr 11, 2019

0xc0170 merged commit 5846cf4 into ARMmbed:master Apr 11, 2019

0xc0170 removed the ready for merge label Apr 11, 2019

orenc17 mentioned this pull request Apr 18, 2019

TFM: Fix compile error with casting #10439

Closed

adbridge added Manually Patch and removed release-version: 5.12.2 labels Apr 24, 2019

adbridge added release-version: 5.12.3 and removed Manually Patch labels May 17, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PSA: TFM import from master branch #10286

PSA: TFM import from master branch #10286

orenc17 commented Apr 1, 2019

ciarmcom commented Apr 1, 2019

bridadan Apr 1, 2019

alzix Apr 4, 2019

bridadan Apr 5, 2019

alzix Apr 5, 2019

bridadan Apr 1, 2019

alzix Apr 4, 2019

orenc17 commented Apr 8, 2019

bridadan left a comment

cmonr commented Apr 9, 2019

cmonr commented Apr 9, 2019 •

edited

Loading

cmonr commented Apr 9, 2019

mbed-ci commented Apr 9, 2019

mbed-ci commented Apr 10, 2019

cmonr commented Apr 10, 2019

0xc0170 commented Apr 10, 2019

0xc0170 commented Apr 10, 2019

mbed-ci commented Apr 10, 2019

alekla01 commented Apr 10, 2019

mbed-ci commented Apr 10, 2019

PSA: TFM import from master branch #10286

PSA: TFM import from master branch #10286

Conversation

orenc17 commented Apr 1, 2019

Description

Pull request type

Reviewers

Release Notes

ciarmcom commented Apr 1, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

orenc17 commented Apr 8, 2019

bridadan left a comment

Choose a reason for hiding this comment

cmonr commented Apr 9, 2019

cmonr commented Apr 9, 2019 • edited Loading

cmonr commented Apr 9, 2019

mbed-ci commented Apr 9, 2019

mbed-ci commented Apr 10, 2019

cmonr commented Apr 10, 2019

0xc0170 commented Apr 10, 2019

0xc0170 commented Apr 10, 2019

mbed-ci commented Apr 10, 2019

alekla01 commented Apr 10, 2019

mbed-ci commented Apr 10, 2019

cmonr commented Apr 9, 2019 •

edited

Loading