Add ARM_MUSCA_S1 as a new target platform #13196

gbrtth · 2020-06-26T14:35:59Z

Summary of changes

ARM_MUSCA_S1 is the PSA_V8_M target running mbed-os.
TF-M secure bootloader (McuBoot) for MUSCA_S1 is submitted as a
pre-built binary.
A post-build hook concatenates The secure and non-secure binaries,
signs it and then concatenates the bootloader with the signed binary.

Impact of changes

Migration actions required

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

ARM_MUSCA_S1-GCC_ARM_greentea.txt

Reviewers

ciarmcom · 2020-06-26T15:00:30Z

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

targets/targets.json

gbrtth · 2020-07-03T12:13:47Z

Hi,
I have added "device_name": "Musca-S1" in targets.json as this was the device name in the CMSIS pack (<device Dname="Musca-S1">).
However some of the checks fail with the error:
AssertionError: Target ARM_MUSCA_S1 contains invalid device_name Musca-S1

Is it possible that the checks do not see this pack?

MarceloSalazar · 2020-07-10T13:30:13Z

@ARMmbed/mbed-os-maintainers please review

0xc0170 · 2020-07-10T16:14:22Z

targets/targets.json

+            "GNUARM"
+        ],
+        "tfm_delivery_dir": "TARGET_ARM_SSG/TARGET_MUSCA_S1",
+        "device_name": "Musca-S1",


Can we get this PR without device_name? Just asking as I dont see it used , or ?

If we need, we shall also update index.json file. This is why it fails, cached object can't find the target. See https://os.mbed.com/docs/mbed-os/v6.0/program-setup/adding-and-configuring-targets.html

I added device_name on @MarceloSalazar 's request. If it is not necessary for the moment, I can remove it and add it later.

Please remove it for now so we can get the PR in while we investigate and fix.

It is removed now.

Patater · 2020-07-16T08:50:24Z

@gbrtth Could I please request also a PR to https://github.com/ARMmbed/mbed-os-tf-m-regression-tests to add the S1? This should make testing (once we integrate those tests with Mbed CI) and updating TF-M within Mbed OS much easier. Thanks.

mergify · 2020-07-17T09:55:54Z

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

adbridge · 2020-07-17T15:22:51Z

@gbrtth This is just a new target so comes in as a patch. Also looks like you need a rebase .

mergify · 2020-07-23T15:01:15Z

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

0xc0170 · 2020-07-27T15:16:54Z

@gbrtth Please comment once rebased, to notify reviewers about the update. The rebase is needed again.

@MarceloSalazar this was already reviewed and approved by you (asking if this is now ready for CI and integration) ?

0xc0170

Change in bbd9dad should be sent via separate pull request. As this is changing the boot up sequence, please send via a new pull request and describe the changes. It should not be part of "adding new target".

This pull request will depend on it.

MarceloSalazar · 2020-07-27T16:24:12Z

@MarceloSalazar this was already reviewed and approved by you (asking if this is now ready for CI and integration) ?

Approval subject to tests results. Note we need to see Greentea tests results for both AC6 and GCC ARM.
I understand there is (was?) at least an issue related to TRNG.

@gbrtth can you please upload new test logs once you see all tests passing? Thanks!

gbrtth · 2020-07-28T13:08:09Z

@gbrtth can you please upload new test logs once you see all tests passing? Thanks!

There are a few active pull requests to TF-M that needs to be merged to have passing test logs. I can update the PR with the logs, once it is done.

Pull request has been modified.

0xc0170 · 2020-08-12T20:29:42Z

There are a few active pull requests to TF-M that needs to be merged to have passing test logs. I can update the PR with the logs, once it is done.

Let us know once it is done and this pull request is ready to proceed

mergify · 2020-08-21T12:50:06Z

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

0xc0170 · 2020-09-09T14:49:22Z

Changes to tools/targets are required? They cause Travis to fail due to changing tools (online compiler won't be updated).

cc @Patater

I'll run CI meanwhile

gbrtth · 2020-09-09T15:00:20Z

Changes to tools/targets are required? They cause Travis to fail due to changing tools (online compiler won't be updated).

cc @Patater

I'll run CI meanwhile

If I understand correctly tools/targets/ is the directory, where the keys for Musca-B1 are kept to sign the images. I followed the example and put the S1 keys there.

mbed-ci · 2020-09-09T15:43:55Z

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_build-ARM	✔️
jenkins-ci/mbed-os-ci_build-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_dynamic-memory-usage	✔️
jenkins-ci/mbed-os-ci_greentea-test	✔️
jenkins-ci/mbed-os-ci_cloud-client-pytest	✔️

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/TOOLCHAIN_ARMC6/musca_ns.sct

gbrtth · 2020-09-09T16:54:33Z

Test logs:
musca_s1_gcc_09_09.txt

0xc0170 · 2020-09-10T08:42:52Z

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/PinNames.h

@@ -0,0 +1,117 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 Arm Limited
+ *


Can you add SPDX identifiers to new files?

Don't we have CI to catch SPDX missing? What happened with CI?

Yes, it runs

Found files with missing license details, please review and fix File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/i2c_api.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/lp_ticker.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/mbed_serial_platform.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/pinmap.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/serial_api.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/cmsis.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/device_definition.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/device_definition.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/platform_base_address.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/platform_description.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/platform_irq.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/platform_pins.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/platform_regs.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/system_core_init.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/system_core_init.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/cache_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/cache_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/gpio_cmsdk_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/gpio_cmsdk_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/i2c_ip6510_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/i2c_ip6510_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/musca_s1_scc_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/musca_s1_scc_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/qspi_ip6514e_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/qspi_ip6514e_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/timer_cmsdk_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/timer_cmsdk_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/timer_gp_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/timer_gp_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/uart_pl011_drv.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/drivers/uart_pl011_drv.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/Libraries/mt25ql_flash_lib.c reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/Libraries/mt25ql_flash_lib.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/partition/flash_layout.h reason: Missing SPDX license identifier File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/partition/image_macros_preprocessed_ns.c reason: Missing license header File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/partition/image_macros_preprocessed_s.c reason: Missing license header File: /targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/partition/region_defs.h reason: Missing SPDX license identifier

Offenders

I'll improve Travis reports (new files without a proper license will report error to Travis), I'll create a new PR later today

I have added the SPDX license identifiers to all the files on the list.

0xc0170 · 2020-09-10T08:47:11Z

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/serial_api.c

@@ -0,0 +1,215 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2017-2019 Arm Limited


I can't comment above, s_veneers.o is needed? I cant find it used anywhere.

It is needed. It contains the definitions of the tfm veneer functions, which are used to call the tfm services from the non-secure code.

0xc0170 · 2020-09-10T08:47:56Z

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/objects.h

@@ -0,0 +1,76 @@
+/* mbed Microcontroller Library


also mcu_boot.bin (in the target folder), is part of this ?

It is also needed, mcuboot.bin is used in tools\targets\ARM_MUSCA_S1.py

0xc0170 · 2020-09-10T08:48:16Z

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/mbed_serial_platform.c

@@ -0,0 +1,137 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2017-2019 Arm Limited
+ *


SPDX here , in all hal implementation files

0xc0170 · 2020-09-10T08:50:11Z

@gbrtth Only small changes requested. If they are fixed, we can restart CI as soon as possible to have this ready by later today.

Change-Id: Iebdd4bc402446caba6b7bd894eddb0a85ed884d8 Signed-off-by: Mark Horvath <mark.horvath@arm.com> Signed-off-by: Gabor Toth <gabor.toth@arm.com>

Change-Id: Ib0d207d4ca22ae239f6b40b95618b66eb329a29c Signed-off-by: Mark Horvath <mark.horvath@arm.com>

Pull request has been modified.

0xc0170 · 2020-09-10T13:48:29Z

CI started

mbed-ci · 2020-09-10T14:04:42Z

Jenkins CI Test : ✔️ SUCCESS

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

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-ARM	✔️
jenkins-ci/mbed-os-ci_build-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_greentea-test	✔️
jenkins-ci/mbed-os-ci_dynamic-memory-usage	✔️
jenkins-ci/mbed-os-ci_cloud-client-pytest	✔️

0xc0170 · 2020-09-10T14:25:41Z

Travis will start soon

ciarmcom requested review from ashok-rao and a team June 26, 2020 15:00

ciarmcom added the needs: review label Jun 26, 2020

0xc0170 added the scope: new-target label Jun 29, 2020

MarceloSalazar reviewed Jun 30, 2020

View reviewed changes

targets/targets.json Show resolved Hide resolved

MarceloSalazar reviewed Jun 30, 2020

View reviewed changes

targets/targets.json Show resolved Hide resolved

0xc0170 added needs: work and removed needs: review labels Jul 1, 2020

gbrtth force-pushed the musca_s1_support_mbed6 branch from 7f5b85e to 4b61bb6 Compare July 2, 2020 13:12

0xc0170 reviewed Jul 10, 2020

View reviewed changes

adbridge added the release-type: patch Indentifies a PR as containing just a patch label Jul 17, 2020

gbrtth force-pushed the musca_s1_support_mbed6 branch from 4b61bb6 to bbd9dad Compare July 20, 2020 13:27

0xc0170 previously requested changes Jul 27, 2020

View reviewed changes

gbrtth force-pushed the musca_s1_support_mbed6 branch from bbd9dad to 361b400 Compare August 7, 2020 17:53

gbrtth force-pushed the musca_s1_support_mbed6 branch from 3574a10 to 21f09a1 Compare September 9, 2020 14:29

Patater previously approved these changes Sep 9, 2020

View reviewed changes

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/TOOLCHAIN_ARMC6/musca_ns.sct Outdated Show resolved Hide resolved

0xc0170 previously requested changes Sep 10, 2020

View reviewed changes

gbrtth and others added 2 commits September 10, 2020 14:53

Add platform support to Musca S1

bdf2306

Change-Id: Iebdd4bc402446caba6b7bd894eddb0a85ed884d8 Signed-off-by: Mark Horvath <mark.horvath@arm.com> Signed-off-by: Gabor Toth <gabor.toth@arm.com>

Workaround to fix clang build

37f2669

Change-Id: Ib0d207d4ca22ae239f6b40b95618b66eb329a29c Signed-off-by: Mark Horvath <mark.horvath@arm.com>

gbrtth force-pushed the musca_s1_support_mbed6 branch from 21f09a1 to 37f2669 Compare September 10, 2020 13:06

0xc0170 added needs: CI priority: high and removed needs: work labels Sep 10, 2020

Patater approved these changes Sep 10, 2020

View reviewed changes

mergify bot added needs: work and removed needs: CI labels Sep 10, 2020

0xc0170 added ready for merge and removed needs: work labels Sep 10, 2020

0xc0170 merged commit 6bfd89e into ARMmbed:master Sep 10, 2020

mergify bot removed the ready for merge label Sep 10, 2020

mbedmain added release-version: 6.3.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Sep 14, 2020

		@@ -0,0 +1,215 @@
		/* mbed Microcontroller Library
		* Copyright (c) 2017-2019 Arm Limited

Add ARM_MUSCA_S1 as a new target platform #13196

Add ARM_MUSCA_S1 as a new target platform #13196

Uh oh!

Conversation

gbrtth commented Jun 26, 2020 • edited by adbridge Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type

Test results

Reviewers

Uh oh!

ciarmcom commented Jun 26, 2020

Uh oh!

Uh oh!

Uh oh!

gbrtth commented Jul 3, 2020

Uh oh!

MarceloSalazar commented Jul 10, 2020

Uh oh!

0xc0170 Jul 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gbrtth Jul 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Patater commented Jul 16, 2020

Uh oh!

mergify bot commented Jul 17, 2020

Uh oh!

adbridge commented Jul 17, 2020

Uh oh!

mergify bot commented Jul 23, 2020

Uh oh!

0xc0170 commented Jul 27, 2020

Uh oh!

0xc0170 left a comment

Choose a reason for hiding this comment

Uh oh!

MarceloSalazar commented Jul 27, 2020

Uh oh!

gbrtth commented Jul 28, 2020

Uh oh!

0xc0170 commented Aug 12, 2020

Uh oh!

mergify bot commented Aug 21, 2020

Uh oh!

0xc0170 commented Sep 9, 2020

Uh oh!

gbrtth commented Sep 9, 2020

Uh oh!

mbed-ci commented Sep 9, 2020

Jenkins CI Test : ✔️ SUCCESS

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

Uh oh!

Uh oh!

gbrtth commented Sep 9, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xc0170 Sep 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gbrtth commented Jun 26, 2020 •

edited by adbridge

Loading

0xc0170 Jul 10, 2020 •

edited

Loading

gbrtth Jul 15, 2020 •

edited

Loading

0xc0170 Sep 10, 2020 •

edited

Loading