modules: CMSIS_6: fix path and use it for TF-M and Cortex-M #89370

wearyzen · 2025-05-01T15:07:18Z

What is the change?

Switch to using CMSIS_6 module for TF-M and Cortex-M while continue to use CMSIS for Cortex-A/R.

Why do we need this change?

Pls refer to the commit messages for more details.

Signed-off-by: Sudan Landge [email protected]

github-actions · 2025-05-01T15:08:44Z

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
cmsis_6	zephyrproject-rtos/CMSIS_6@`783317a`	zephyrproject-rtos/CMSIS_6@`6dd5043` (`main`)	zephyrproject-rtos/[email protected]
trusted-firmware-m	zephyrproject-rtos/trusted-firmware-m@`e2288c1`	zephyrproject-rtos/trusted-firmware-m@`6473899` (`main`)	zephyrproject-rtos/[email protected]

Additional metadata changed:

Name	URL	Submodules	West cmds	`module.yml`
cmsis_6				✏

⛔ DNM label due to: 1 project with metadata changes

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

RobinKastberg · 2025-05-01T16:16:32Z

Ah. Good idea just enabling it for M only.

wearyzen · 2025-05-02T19:49:05Z

The twister failures are observed on main branch as well so they are not related to this PR.

tomi-font · 2025-05-05T13:45:24Z

Thanks for this. Could you also put up a PR in the TF-M fork that removes the copy of the CMSIS 6 files (just reverting the commit)?

aescolar

Doesn't this change warrant a line in the release notes?
(CC @kartben @danieldegrasse @dkalowsk)
(I'm ok with that coming as a follow up PR)

modules/cmsis_6/CMakeLists.txt

fabiobaltieri · 2025-05-14T15:45:54Z

Doesn't this change warrant a line in the release notes?

Hey, this breaks any downstream project that has hal module filtering enabled does not have cmsis listed and is using ARM.

Going to break the example app too:
https://github.com/zephyrproject-rtos/example-application/actions/runs/15025085627/job/42223734547?pr=84

 /home/runner/work/example-application/example-application/zephyr/include/zephyr/arch/arm/asm_inline_gcc.h:24:10: fatal error: cmsis_core.h: No such file or directory
   24 | #include <cmsis_core.h>
      |          ^~~~~~~~~~~~~~

it really needs this to be mentioned in the release notes, something about the requirement of using the cmsis_6 module instead of cmsis if Cortex-M is used.

Opened zephyrproject-rtos/example-application#84 for the example application.

fabiobaltieri · 2025-05-14T15:55:32Z

Or is it meant to need both cmsis and cmsis_6? bumped into an stm32 project that fails with

In file included from /home/fabiobaltieri/zephyrproject/zephyr/arch/arm/core/cortex_m/timing.c:17:
/home/fabiobaltieri/zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h: In function 'dwt_access':
/home/fabiobaltieri/zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h:37:29: error: 'ITM_LSR_Present_Msk' undeclared (first use in this function); did you mean 'ITM_LSR_PRESENT_Msk'?
   37 | #define DWT_LSR_Present_Msk ITM_LSR_Present_Msk
      |                             ^~~~~~~~~~~~~~~~~~~

if it only has cmsis_6

wearyzen · 2025-05-14T19:21:22Z

Or is it meant to need both cmsis and cmsis_6? bumped into an stm32 project that fails with

In file included from /home/fabiobaltieri/zephyrproject/zephyr/arch/arm/core/cortex_m/timing.c:17:
/home/fabiobaltieri/zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h: In function 'dwt_access':
/home/fabiobaltieri/zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h:37:29: error: 'ITM_LSR_Present_Msk' undeclared (first use in this function); did you mean 'ITM_LSR_PRESENT_Msk'?
   37 | #define DWT_LSR_Present_Msk ITM_LSR_Present_Msk
      |                             ^~~~~~~~~~~~~~~~~~~

if it only has cmsis_6

@fabiobaltieri, the combination is expected atm because some of the hal's like stm32 might be using the older cmsis and we'll have to wait for them to upgrade. This wasn't possible before because there was no CMSIS_6 module for them to update to but now they should be able to do so.
Also, I wasn't aware about the example-application repo so missed it before but please do let me know if there is anything else that breaks in ci because of this.

BTW, could you please share the command you tried for the above error? This looks like something that can be easily fixed with the right path.

wearyzen · 2025-05-14T19:42:16Z

Or is it meant to need both cmsis and cmsis_6? bumped into an stm32 project that fails with
In file included from /home/fabiobaltieri/zephyrproject/zephyr/arch/arm/core/cortex_m/timing.c:17:
/home/fabiobaltieri/zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h: In function 'dwt_access':
/home/fabiobaltieri/zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h:37:29: error: 'ITM_LSR_Present_Msk' undeclared (first use in this function); did you mean 'ITM_LSR_PRESENT_Msk'?
   37 | #define DWT_LSR_Present_Msk ITM_LSR_Present_Msk
      |                             ^~~~~~~~~~~~~~~~~~~
if it only has cmsis_6
@fabiobaltieri, the combination is expected atm because some of the hal's like stm32 might be using the older cmsis and we'll have to wait for them to upgrade. This wasn't possible before because there was no CMSIS_6 module for them to update to but now they should be able to do so. Also, I wasn't aware about the example-application repo so missed it before but please do let me know if there is anything else that breaks in ci because of this.

BTW, could you please share the command you tried for the above error? This looks like something that can be easily fixed with the right path.

Tried to build a few stm32 projects (including nucleo_f429zi/stm32f429xx which includes the file dwt.h) but couldn't see the issue reported, let me know if you find the board used to reproduce this error.

Thanks!

fabiobaltieri · 2025-05-14T20:13:44Z

Also, I wasn't aware about the example-application repo so missed it before but please do let me know if there is anything else that breaks in ci because of this.

All good, don't worry about it.

BTW, could you please share the command you tried for the above error? This looks like something that can be easily fixed with the right path.

Ah it was from one of my test projects, had a CI run with minimal modules, let's see you can do:

$ rm -rf ../modules/hal/cmsis
$ west build -p -b nucleo_h745zi_q/stm32h745xx/m7 samples/basic/blinky -DCONFIG_CORTEX_M_DWT=y -DCONFIG_TIMING_FUNCTIONS=y
...
zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h:37:29: error: 'ITM_LSR_Present_Msk' undeclared (first use in this function); did you mean 'ITM_LSR_PRESENT_Msk'?

I think it's enabled from these in the specific project

CONFIG_THREAD_RUNTIME_STATS=y
CONFIG_THREAD_RUNTIME_STATS_USE_TIMING_FUNCTIONS=y

wearyzen · 2025-05-14T21:15:31Z

Also, I wasn't aware about the example-application repo so missed it before but please do let me know if there is anything else that breaks in ci because of this.

All good, don't worry about it.

BTW, could you please share the command you tried for the above error? This looks like something that can be easily fixed with the right path.

Ah it was from one of my test projects, had a CI run with minimal modules, let's see you can do:
$ rm -rf ../modules/hal/cmsis
$ west build -p -b nucleo_h745zi_q/stm32h745xx/m7 samples/basic/blinky -DCONFIG_CORTEX_M_DWT=y -DCONFIG_TIMING_FUNCTIONS=y
...
zephyrproject/zephyr/arch/arm/include/cortex_m/dwt.h:37:29: error: 'ITM_LSR_Present_Msk' undeclared (first use in this function); did you mean 'ITM_LSR_PRESENT_Msk'?
I think it's enabled from these in the specific project
CONFIG_THREAD_RUNTIME_STATS=y
CONFIG_THREAD_RUNTIME_STATS_USE_TIMING_FUNCTIONS=y

Thanks, I found the issue and will be posting a fix soon with the release notes update.

As noted in PR zephyrproject-rtos#89370, the content of these files falls below the trivial threshold. Therefore, it is not necessary to retain the original copyright, which was carried over when the files were copied from the `cmsis` module. Signed-off-by: Sudan Landge <[email protected]>

Zephyr has migrated to CMSIS v6. While the plan was to transition all ARM architectures, issues with Cortex-A and Cortex-R prevented full adoption. As a result, only Cortex-M was updated to v6 in zephyrproject-rtos/zephyr#89370. Since the SC-OBC module A1 uses a Cortex-M3, we need to adopt CMSIS v6. That PR was merged after Zephyr v4.1.0, so older versions may still require the legacy CMSIS module. To maintain compatibility, we are keeping the old module alongside v6.

Zephyr has migrated to CMSIS v6. While the plan was to transition all ARM architectures, issues with Cortex-A and Cortex-R prevented full adoption. As a result, only Cortex-M was updated to v6 in zephyrproject-rtos/zephyr#89370. Since the SC-OBC module A1 uses a Cortex-M3, we need to adopt CMSIS v6. That PR was merged after Zephyr v4.1.0, so older versions may still require the legacy CMSIS module. To maintain compatibility, we are keeping the old module alongside v6. Signed-off-by: Yasushi SHOJI <[email protected]>

As noted in PR zephyrproject-rtos#89370, the content of these files falls below the trivial threshold. Therefore, it is not necessary to retain the original copyright, which was carried over when the files were copied from the `cmsis` module. Signed-off-by: Sudan Landge <[email protected]>

As noted in PR #89370, the content of these files falls below the trivial threshold. Therefore, it is not necessary to retain the original copyright, which was carried over when the files were copied from the `cmsis` module. Signed-off-by: Sudan Landge <[email protected]>

Zephyr has migrated to CMSIS v6. While the plan was to transition all ARM architectures, issues with Cortex-A and Cortex-R prevented full adoption. As a result, only Cortex-M was updated to v6 in zephyrproject-rtos/zephyr#89370. Since the SC-OBC module A1 uses a Cortex-M3, we need to adopt CMSIS v6. That PR was merged after Zephyr v4.1.0, so older versions may still require the legacy CMSIS module. To maintain compatibility, we are keeping the old module alongside v6. Signed-off-by: Yasushi SHOJI <[email protected]>

mikk-leini-krakul · 2025-05-29T07:41:12Z

This merge created a sudden error for us, so I add a helpful hint for others who have "cmsis" in west.yml import modules whitelist and get such compilation error:

zephyr/include/zephyr/arch/arm/asm_inline_gcc.h:24:10: fatal error: cmsis_core.h: No such file or directory
   #include <cmsis_core.h>

The solution is to whitelist "cmsis_6".

Zephyr has migrated to CMSIS v6. While the plan was to transition all ARM architectures, issues with Cortex-A and Cortex-R prevented full adoption. As a result, only Cortex-M was updated to v6 in zephyrproject-rtos/zephyr#89370. Since the SC-OBC module A1 uses a Cortex-M3, we need to adopt CMSIS v6. That PR was merged after Zephyr v4.1.0, so older versions may still require the legacy CMSIS module. To maintain compatibility, we are keeping the old module alongside v6. Signed-off-by: Yasushi SHOJI <[email protected]>

github-actions bot added area: CMSIS-Core area: TF-M ARM Trusted Firmware-M (TF-M) labels May 1, 2025

github-actions bot requested review from d3zd3z, ithinuel, microbuilder, povergoing, stephanosio, tomi-font, valeriosetti and Vge0rge May 1, 2025 15:08

github-actions bot assigned stephanosio May 1, 2025

github-actions bot added manifest manifest-cmsis_6 DNM (manifest) This PR should not be merged (controlled by action-manifest) labels May 1, 2025

wearyzen mentioned this pull request May 1, 2025

cmsis_6: Integrate with zephyr build system zephyrproject-rtos/CMSIS_6#1

Closed

wearyzen force-pushed the cmsis_6_update branch from 9094caf to c3ce5bd Compare May 1, 2025 15:24

github-actions bot added the manifest-hal_nordic label May 2, 2025

wearyzen force-pushed the cmsis_6_update branch from 5c0f44f to ad0a478 Compare May 2, 2025 01:28

github-actions bot added the platform: nRF BSIM Nordic Semiconductors, nRF BabbleSim label May 2, 2025

github-actions bot requested a review from aescolar May 2, 2025 01:29

wearyzen force-pushed the cmsis_6_update branch 5 times, most recently from 7f6707d to 320db7b Compare May 2, 2025 17:03

wearyzen force-pushed the cmsis_6_update branch from 320db7b to fdd5b08 Compare May 6, 2025 09:54

tomi-font assigned wearyzen and unassigned stephanosio May 14, 2025

tomi-font requested a review from aescolar May 14, 2025 06:45

aescolar reviewed May 14, 2025

View reviewed changes

modules/cmsis_6/CMakeLists.txt Show resolved Hide resolved

kartben merged commit f726cb5 into zephyrproject-rtos:main May 14, 2025
29 of 30 checks passed

fabiobaltieri mentioned this pull request May 14, 2025

example-application does not build after 4.1.0 #89951

Closed

wearyzen mentioned this pull request May 16, 2025

CMSIS 6 update #90063

Merged

yashi mentioned this pull request May 18, 2025

west.yml: Fix CMSIS module to use v6 for Cortex-M spacecubics/libcsp-zephyr#3

Merged

rexut mentioned this pull request May 18, 2025

[BUG] CMSIS_6 module required by the ARM port for Cortex-M tiacsys/bridle#320

Closed

mikk-leini-krakul mentioned this pull request May 29, 2025

STM32N6 USB PCD_Init Failed #90567

Closed

beriberikix mentioned this pull request Jun 7, 2025

build failing due to missing cmsis_core.h embeddedcontainers/zephyr#12

Closed

andre-stefanov mentioned this pull request Jul 22, 2025

Update west.yml to correct cmsis module name in allowlist OpenAstroTech/OpenAstroFirmware#7

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

modules: CMSIS_6: fix path and use it for TF-M and Cortex-M #89370

modules: CMSIS_6: fix path and use it for TF-M and Cortex-M #89370

Uh oh!

wearyzen commented May 1, 2025

Uh oh!

github-actions bot commented May 1, 2025 •

edited

Loading

Uh oh!

RobinKastberg commented May 1, 2025

Uh oh!

wearyzen commented May 2, 2025

Uh oh!

tomi-font commented May 5, 2025

Uh oh!

aescolar left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

fabiobaltieri commented May 14, 2025

Uh oh!

fabiobaltieri commented May 14, 2025

Uh oh!

wearyzen commented May 14, 2025 •

edited

Loading

Uh oh!

wearyzen commented May 14, 2025 •

edited

Loading

Uh oh!

fabiobaltieri commented May 14, 2025 •

edited

Loading

Uh oh!

wearyzen commented May 14, 2025

Uh oh!

mikk-leini-krakul commented May 29, 2025

Uh oh!

Uh oh!

modules: CMSIS_6: fix path and use it for TF-M and Cortex-M #89370

modules: CMSIS_6: fix path and use it for TF-M and Cortex-M #89370

Uh oh!

Conversation

wearyzen commented May 1, 2025

What is the change?

Why do we need this change?

Uh oh!

github-actions bot commented May 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RobinKastberg commented May 1, 2025

Uh oh!

wearyzen commented May 2, 2025

Uh oh!

tomi-font commented May 5, 2025

Uh oh!

aescolar left a comment • 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!

Uh oh!

Uh oh!

fabiobaltieri commented May 14, 2025

Uh oh!

fabiobaltieri commented May 14, 2025

Uh oh!

wearyzen commented May 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wearyzen commented May 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fabiobaltieri commented May 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wearyzen commented May 14, 2025

Uh oh!

mikk-leini-krakul commented May 29, 2025

Uh oh!

Uh oh!

github-actions bot commented May 1, 2025 •

edited

Loading

aescolar left a comment •

edited

Loading

wearyzen commented May 14, 2025 •

edited

Loading

wearyzen commented May 14, 2025 •

edited

Loading

fabiobaltieri commented May 14, 2025 •

edited

Loading