Make MUSCA B1 and MUSCA A1 TF-M ready #12735

Patater · 2020-03-31T16:50:04Z

Summary of changes

Refactor MUSCA platform support in a way that makes the NS binaries compatible with how TF-M expects: same layout in flash and RAM. Doing this doesn't break ordinary Mbed OS usage.

Impact of changes

No breaking changes. MUSCA targets will be ready for TF-M.

Migration actions required

None

Documentation

None

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

Reviewers

@Devran01 @jainvikas8

ciarmcom · 2020-03-31T17:00:36Z

@Patater, thank you for your changes.
@ashok-rao @Devran01 @jainvikas8 @ARMmbed/mbed-os-core @ARMmbed/mbed-os-tools @ARMmbed/mbed-os-maintainers please review.

0xc0170 · 2020-04-05T18:01:59Z

CI started

mbed-ci · 2020-04-05T18:51:21Z

Test run: FAILED

Summary: 2 of 3 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-ARM
jenkins-ci/mbed-os-ci_build-GCC_ARM

Pull request has been modified.

Patater · 2020-04-06T14:28:01Z

Updated to add image_macros_preprocessed.c for Musca B1, to update baud rate naming consistently, and to add copyright headers for all image_macros_preprocessed.c files.

jainvikas8

Please update the copyright year of the files as needed.

jainvikas8 · 2020-04-07T11:17:27Z

targets/TARGET_ARM_SSG/TARGET_MUSCA_A1/TARGET_MUSCA_A1_NS/device/TOOLCHAIN_GCC_ARM/musca_ns.ld


    /* To copy multiple ROM to RAM sections,
     * define etext2/data2_start/data2_end and
     * define __STARTUP_COPY_MULTIPLE in startup_cmsdk_musca_ns.S */
    .copy.table :
    {
-        . = ALIGN(8);
+        . = ALIGN(4);


It would be good to know why the alignment has been changed to 4-bytes in a comment.

mbed-ci · 2020-04-07T11:55:00Z

Test run: FAILED

Summary: 2 of 3 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-ARM-lts
jenkins-ci/mbed-os-ci_build-GCC_ARM-lts

0xc0170 · 2020-04-07T12:55:18Z

Please ignore lts jobs here , not valid for this PR. We will restart testing and fix lts status here later once 5.15 jobs are in

0xc0170 · 2020-04-09T19:06:55Z

CI started

mbed-ci · 2020-04-09T20:30:34Z

Test run: FAILED

Summary: 2 of 3 test jobs failed
Build number : 2
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-GCC_ARM
jenkins-ci/mbed-os-ci_build-ARM

0xc0170 · 2020-04-16T15:18:05Z

CI restarted

mbed-ci · 2020-04-16T15:53:46Z

Test run: FAILED

Summary: 2 of 3 test jobs failed
Build number : 3
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-ARM
jenkins-ci/mbed-os-ci_build-GCC_ARM

Patater · 2020-04-24T16:01:27Z

Wrap inclusion of region_defs.h to TARGET_TFM targets, as the header isn't available otherwise.

0xc0170 · 2020-04-27T07:43:56Z

CI started

mbed-ci · 2020-04-27T08:22:26Z

Test run: FAILED

Summary: 2 of 3 test jobs failed
Build number : 5
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-ARM
jenkins-ci/mbed-os-ci_build-GCC_ARM

0xc0170 · 2020-04-27T08:31:45Z

CI failure is due to outstanding PR to Mbed OS that is in CI now, will fix the issue and I'll start the tests

0xc0170 · 2020-04-27T15:48:20Z

CI started

mbed-ci · 2020-04-27T17:54:03Z

Test run: FAILED

Summary: 1 of 6 test jobs failed
Build number : 6
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_greentea-test

0xc0170 · 2020-04-28T11:10:47Z

Test psa failed, please review

mergify · 2020-04-30T08:45:22Z

This PR cannot be merged due to conflicts. Please rebase to resolve them.

Avoid surprising users. Use the Mbed OS default baud rate. Applications that want to see TF-M debug prints can both enable and set their baud rate at the application level. Mbed OS should not turn on TF-M debug prints nor surprise the user with a non-default baud rate. Signed-off-by: Jaeden Amero <jaeden.amero@arm.com>

We are moving to flash_layout.h and region_defs.h being more closely aligned with TF-M's version. As such, some of the Mbed PSA implementation needs to additionally include region_defs.h.

Make the MUSCA_A1 target TF-M compatible by doing the following: - Add flash, region definitions, and preprocessed image macros from TF-M (at version 6e7be077eabe "Core: Add lifecycle API") - Update the MUSCA_A1 linker script to create a flash image compatible with TF-M. - Update the tfm/bin_utils/assemble.py signing script to work with preprocessed image macros rather than flat C pre-processor defines Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com> Signed-off-by: Jaeden Amero <jaeden.amero@arm.com>

Make the MUSCA_B1 target TF-M compatible by doing the following: - Add flash, region definitions, and preprocessed image macros from TF-M (at version 6e7be077eabe "Core: Add lifecycle API") - Update the MUSCA_B1 linker script to create a flash image compatible with TF-M. - Update the tfm/bin_utils/assemble.py signing script to work with preprocessed image macros rather than flat C pre-processor defines Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com> Signed-off-by: Jaeden Amero <jaeden.amero@arm.com>

Patater · 2020-04-30T10:38:00Z

Rebased on latest master to resolve conflicts. Conflicts were with MUSCA target tools and device_cfg.h because building for S targets was removed.

adbridge · 2020-05-01T09:48:25Z

CI restarted

mbed-ci · 2020-05-01T10:32:14Z

Test run: SUCCESS

Summary: 6 of 6 test jobs passed
Build number : 7
Build artifacts

adbridge

AFAICT looks ok to me

ciarmcom requested review from ashok-rao, urutva, jainvikas8 and a team March 31, 2020 17:00

ciarmcom added the needs: review label Mar 31, 2020

0xc0170 previously approved these changes Apr 3, 2020

View reviewed changes

mergify bot added needs: CI and removed needs: review labels Apr 3, 2020

mergify bot added needs: work and removed needs: CI labels Apr 5, 2020

Patater force-pushed the musca-tfm branch from 73cc5e2 to 496d703 Compare April 6, 2020 14:23

jainvikas8 suggested changes Apr 7, 2020

View reviewed changes

0xc0170 added needs: CI and removed needs: work labels Apr 16, 2020

mergify bot added needs: work and removed needs: CI labels Apr 16, 2020

Patater force-pushed the musca-tfm branch from 496d703 to d8e48a4 Compare April 20, 2020 15:05

0xc0170 added needs: CI and removed needs: work labels Apr 24, 2020

Patater force-pushed the musca-tfm branch from 69dc3fd to f8385e5 Compare April 24, 2020 16:00

0xc0170 added the mergify skip label Apr 27, 2020

0xc0170 added needs: work and removed mergify skip needs: CI labels Apr 28, 2020

Patater and others added 4 commits April 30, 2020 11:32

psa: Include region_defs.h where needed

803d295

We are moving to flash_layout.h and region_defs.h being more closely aligned with TF-M's version. As such, some of the Mbed PSA implementation needs to additionally include region_defs.h.

Patater force-pushed the musca-tfm branch from f8385e5 to 6f6a92c Compare April 30, 2020 10:36

urutva approved these changes May 1, 2020

View reviewed changes

adbridge approved these changes May 1, 2020

View reviewed changes

0xc0170 added ready for merge release-version: 6.0.0-beta-1 and removed needs: work labels May 4, 2020

0xc0170 merged commit dbf05ce into ARMmbed:master May 4, 2020

mergify bot removed the ready for merge label May 4, 2020

Make MUSCA B1 and MUSCA A1 TF-M ready #12735

Make MUSCA B1 and MUSCA A1 TF-M ready #12735

Uh oh!

Conversation

Patater commented Mar 31, 2020

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type

Test results

Reviewers

Uh oh!

ciarmcom commented Mar 31, 2020

Uh oh!

0xc0170 commented Apr 5, 2020

Uh oh!

mbed-ci commented Apr 5, 2020

Uh oh!

Patater commented Apr 6, 2020

Uh oh!

jainvikas8 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mbed-ci commented Apr 7, 2020

Uh oh!

0xc0170 commented Apr 7, 2020

Uh oh!

0xc0170 commented Apr 9, 2020

Uh oh!

mbed-ci commented Apr 9, 2020

Uh oh!

0xc0170 commented Apr 16, 2020

Uh oh!

mbed-ci commented Apr 16, 2020

Uh oh!

Patater commented Apr 24, 2020

Uh oh!

0xc0170 commented Apr 27, 2020

Uh oh!

mbed-ci commented Apr 27, 2020

Uh oh!

0xc0170 commented Apr 27, 2020

Uh oh!

0xc0170 commented Apr 27, 2020

Uh oh!

mbed-ci commented Apr 27, 2020

Uh oh!

0xc0170 commented Apr 28, 2020

Uh oh!

mergify bot commented Apr 30, 2020

Uh oh!

Patater commented Apr 30, 2020

Uh oh!

adbridge commented May 1, 2020

Uh oh!

mbed-ci commented May 1, 2020

Uh oh!

adbridge left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!