CMSIS: update to CMSIS 5.7.0 #12949

0xc0170 · 2020-05-11T09:46:46Z

Summary of changes

Fixes #12568

There are couple of fixes here:

importer be compatible with python 3
importer sha for RTOS after move (sha updated , after I manually resolved the conflicts)

Impact of changes

Migration actions required

Documentation

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

As they were applied on the different code base (moved files), we remove them and reapply locally manually and add new sha.

mbed OS used older RTX4 version and with osThreadDef accepting only 3 parameters, to preserve compatibility we hardcode the 'instances' parameter to 1. (cherry picked from commit 428acae) (cherry picked from commit 4360b7b)

(cherry picked from commit 6a6e3ac)

tz_context.c should be compiled only for secure world, definition of API's in tz_context.h should be part of secure binary/bootloader when building mbed-os as non-secure (Cherry picked from d0a43b8) (cherry picked from commit fb35475)

- TF-M v8m secure-side implements their own TZ context APIs so need to avoid building the Mbed implementation. (cherry picked from commit d3f7abd)

In case of ARM compiler, idle and timer thread stack though assigned to `.bss.os` section since not zero initialized are part of `data` section. In this commit, we are moving stacks of idle and timer thread to bss section and thereby saving ROM space.

CMSIS repo does not support pre-processor defines, hence multiple assembly files are added for secure/non-secure and floating point tools. Mbed OS tools support assembly file pre-processing, but the build system does not support multiple assembly files for each target, hence updating the assembly files. 1. Patch RTX so irq_cm4f.S files work with no FPU targets 2. Patch RTX so irq_armv8mml.S files to work with and without FPU 2. Patch RTX so irq_armv8mml.S and irq_armv8mbl.S files to work with secure and non-secure builds

cherry pick otherwise fails because the sources were moved under rtos/source. I manually resolved these patches. For the future, lets use these newer sha that should work.

0xc0170 · 2020-05-11T10:06:47Z

This needs testing that a script will actually find new SHAs there.

Note: You must resolve any conflicts that arise during this cherry-pick process. Make sure that the "(cherry picked from commit ...)" statement is present in the commit message. Re-execute the python script to apply rest of the SHA commits.

I however used git patch/am to apply patches (after updating the paths in each). I don't have this "cherry picked from commit ..." in the commit messages. I can see our script uses it so might resolution might not be correct way then for the future.

I'll test the script to update to another sha to see if it passes.

mbed OS used older RTX4 version and with osThreadDef accepting only 3 parameters, to preserve compatibility we hardcode the 'instances' parameter to 1. (cherry picked from commit 428acae) (cherry picked from commit 4360b7b)

(cherry picked from commit 6a6e3ac)

tz_context.c should be compiled only for secure world, definition of API's in tz_context.h should be part of secure binary/bootloader when building mbed-os as non-secure (Cherry picked from d0a43b8) (cherry picked from commit fb35475)

- TF-M v8m secure-side implements their own TZ context APIs so need to avoid building the Mbed implementation. (cherry picked from commit d3f7abd)

(cherry picked from commit 08ab8cc)

(cherry picked from commit dd21ea0)

In case of ARM compiler, idle and timer thread stack though assigned to `.bss.os` section since not zero initialized are part of `data` section. In this commit, we are moving stacks of idle and timer thread to bss section and thereby saving ROM space. (cherry picked from commit 9549fff)

CMSIS repo does not support pre-processor defines, hence multiple assembly files are added for secure/non-secure and floating point tools. Mbed OS tools support assembly file pre-processing, but the build system does not support multiple assembly files for each target, hence updating the assembly files. 1. Patch RTX so irq_cm4f.S files work with no FPU targets 2. Patch RTX so irq_armv8mml.S files to work with and without FPU 2. Patch RTX so irq_armv8mml.S and irq_armv8mbl.S files to work with secure and non-secure builds (cherry picked from commit 96e0689)

0xc0170 · 2020-05-11T10:29:31Z

I was able to update to the latest release (my branch was older), here it is the review: https://github.com/0xc0170/mbed-os/pull/new/feature_CMSIS_5_a65b7c9a3

I can push these here and would be updated to the latest CMSIS 5 we have (I would leave both updates as one is to fix conflicts with renames and the latest one is using the updated shas). Let me know what you think

0xc0170 · 2020-05-11T10:40:59Z

Updated. I updated to the newer version here: the latest CMSIS 5 release. It might be confusing there are two updates but one is served as a basement after our source/ restructure and t he other one is on top of that. I could possibly just resolve to the latest but would need need to go through the conflict manual resolution for multiple files once again. Having this sequence here, we just update twice. Let me know what you think.

I updated the readme as well to be more clear what it does.

0xc0170 · 2020-05-12T15:05:24Z

CI restarted

mbed-ci · 2020-05-12T15:38:57Z

Test run: FAILED

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

Failed test jobs:

jenkins-ci/mbed-os-ci_build-GCC_ARM

0xc0170 · 2020-05-13T06:06:32Z

will review failures again 😞

This reverts commit 606ccbc.

define __PROGRAM_START so we use own startup as AD had it defined, this fixes the conflicts with CMSIS_5 update (they introduced low level init).

Don't use CMSIS low level startup

We need a linker script as it was. As files update in the future, should be compatible with newer CMSIS core.

0xc0170 · 2020-05-13T12:27:03Z

CI restarted

mbed-ci · 2020-05-13T13:09:13Z

Test run: FAILED

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

Failed test jobs:

jenkins-ci/mbed-os-ci_build-GCC_ARM

0xc0170 · 2020-05-13T13:22:22Z

ci restarted

mbed-ci · 2020-05-13T14:48:34Z

Test run: SUCCESS

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

evedon

LGTM

0xc0170 and others added 13 commits May 11, 2020 09:47

importer: fix byte like objects

6d17a23

importer: fix rtos paths

7b066eb

importer: remove rtos changed files

74a640f

As they were applied on the different code base (moved files), we remove them and reapply locally manually and add new sha.

[CMSIS_5]: Updated to b5f0603d6

48747cd

CMSIS/RTX: Reintroduce arm_math.h

9f1e666

(cherry picked from commit 6a6e3ac)

CMSIS/RTX: Patch to conditionally compile

fcaecd5

tz_context.c should be compiled only for secure world, definition of API's in tz_context.h should be part of secure binary/bootloader when building mbed-os as non-secure (Cherry picked from d0a43b8) (cherry picked from commit fb35475)

CMSIS/CORTEX-M: Don't build mbed_tz_context.c in TF-M targets

80f2475

- TF-M v8m secure-side implements their own TZ context APIs so need to avoid building the Mbed implementation. (cherry picked from commit d3f7abd)

CMSIS/RTX: Allow overwriting mutex ops for ARMC

08ab8cc

CMSIS/RTX: Fix using FALSE/TRUE with preprocesor

dd21ea0

cmsis importer: add sha for rtx changes after file moved

9977458

cherry pick otherwise fails because the sources were moved under rtos/source. I manually resolved these patches. For the future, lets use these newer sha that should work.

0xc0170 mentioned this pull request May 11, 2020

Missing definition of __SXTB16_RORn in cmsis_gcc.h #12568

Closed

0xc0170 changed the title ~~cmsis 5 update to b5f0603d6~~ CMSIS: update to b5f0603d6 (cmsis + rtx) May 11, 2020

0xc0170 and others added 9 commits May 11, 2020 11:17

[CMSIS_5]: Updated to a65b7c9a3

fb4f9e5

CMSIS/RTX: Reintroduce arm_math.h

b631333

(cherry picked from commit 6a6e3ac)

CMSIS/RTX: Patch to conditionally compile

856989d

tz_context.c should be compiled only for secure world, definition of API's in tz_context.h should be part of secure binary/bootloader when building mbed-os as non-secure (Cherry picked from d0a43b8) (cherry picked from commit fb35475)

CMSIS/CORTEX-M: Don't build mbed_tz_context.c in TF-M targets

58af676

- TF-M v8m secure-side implements their own TZ context APIs so need to avoid building the Mbed implementation. (cherry picked from commit d3f7abd)

CMSIS/RTX: Allow overwriting mutex ops for ARMC

94d9406

(cherry picked from commit 08ab8cc)

CMSIS/RTX: Fix using FALSE/TRUE with preprocesor

f7dc7e9

(cherry picked from commit dd21ea0)

0xc0170 added 2 commits May 11, 2020 11:37

importer: update readme

8859cb0

importer: add a note about cherry pick continue for conflicts

78b7a05

0xc0170 changed the title ~~CMSIS: update to b5f0603d6 (cmsis + rtx)~~ CMSIS: update to a65b7c9a3 (cmsis + rtx) May 11, 2020

MIMXRT1050: undefine vector table symbol from CMSIS (not used)

d04b403

0xc0170 force-pushed the feature_CMSIS_5_b5f0603d6 branch from 61812ff to d04b403 Compare May 12, 2020 15:04

0xc0170 added 5 commits May 13, 2020 10:43

Revert "Use cmsis gcc types instead of own"

2c8be47

This reverts commit 606ccbc.

Analog devices: overwrite cmsis startup

067630a

define __PROGRAM_START so we use own startup as AD had it defined, this fixes the conflicts with CMSIS_5 update (they introduced low level init).

M251: fix startup after cmsis update

981fcdf

Don't use CMSIS low level startup

M2351: fix startup after cmsis update

e2fb52a

Don't use CMSIS low level startup

TARGET_MIMXRT1050: fix vector table redef from cmsis

8b777a5

We need a linker script as it was. As files update in the future, should be compatible with newer CMSIS core.

0xc0170 added needs: CI and removed needs: work labels May 13, 2020

mergify bot added needs: work and removed needs: CI labels May 13, 2020

ad4050lz: fix gcc copy table and zero table missing

ac3df20

0xc0170 added needs: CI and removed needs: work labels May 13, 2020

0xc0170 added needs: review ready for merge and removed needs: CI needs: review labels May 13, 2020

evedon approved these changes May 14, 2020

View reviewed changes

0xc0170 merged commit e371db4 into ARMmbed:master May 14, 2020

0xc0170 deleted the feature_CMSIS_5_b5f0603d6 branch May 14, 2020 11:21

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

0xc0170 mentioned this pull request Jun 4, 2020

mbed-os-example-mesh-minimal build fails with KW41Z and GCC_ARM #13062

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

CMSIS: update to CMSIS 5.7.0 #12949

CMSIS: update to CMSIS 5.7.0 #12949

Uh oh!

0xc0170 commented May 11, 2020

Uh oh!

0xc0170 commented May 11, 2020

Uh oh!

0xc0170 commented May 11, 2020

Uh oh!

0xc0170 commented May 11, 2020 •

edited

Loading

Uh oh!

0xc0170 commented May 12, 2020

Uh oh!

mbed-ci commented May 12, 2020

Uh oh!

0xc0170 commented May 13, 2020

Uh oh!

0xc0170 commented May 13, 2020

Uh oh!

mbed-ci commented May 13, 2020

Uh oh!

0xc0170 commented May 13, 2020

Uh oh!

mbed-ci commented May 13, 2020

Uh oh!

evedon left a comment

Uh oh!

Uh oh!

CMSIS: update to CMSIS 5.7.0 #12949

CMSIS: update to CMSIS 5.7.0 #12949

Uh oh!

Conversation

0xc0170 commented May 11, 2020

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type

Test results

Reviewers

Uh oh!

0xc0170 commented May 11, 2020

Uh oh!

0xc0170 commented May 11, 2020

Uh oh!

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

Uh oh!

Uh oh!

0xc0170 commented May 12, 2020

Uh oh!

mbed-ci commented May 12, 2020

Test run: FAILED

Uh oh!

0xc0170 commented May 13, 2020

Uh oh!

0xc0170 commented May 13, 2020

Uh oh!

mbed-ci commented May 13, 2020

Test run: FAILED

Uh oh!

0xc0170 commented May 13, 2020

Uh oh!

mbed-ci commented May 13, 2020

Test run: SUCCESS

Uh oh!

evedon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

0xc0170 commented May 11, 2020 •

edited

Loading