Add changes for TF-M v2.3 by valeriosetti · Pull Request #7 · zephyrproject-rtos/CMSIS_6

valeriosetti · 2026-04-27T08:59:39Z

Update to v2.4.0
Add TF-M's extra patch

Removes error: error: old-style function definition [-Werror=old-style-definition]

Bit shift in accordance with IRQn % 16 was incorrect, and masking was needed to extract only the IRQn bits. Both fixed.

) Need to be tested /reviewed, as I am not sure about the flag control logic.

Replaced references to https://github.com/Open-CMSIS-Pack/cmsis-toolbox/... with https://open-cmsis-pack.github.io/cmsis-toolbox/ Open-CMSIS-Pack/cmsis-toolbox#248

…ware#225) - remove references to deprecated HCI driver

…oftware#224)

…re#227)

…software#231)

Fix documentation of the Register HPPIR_INTID according to "ARM Generic Interrupt Controller Architecture version 2.0 Architecture Specification" Table 4-41 GICC_HPPIR bit assignments ![409053189-dfa13d3e-1650-489b-a8f2-b061ac9afe17](https://github.com/user-attachments/assets/919edcce-ce77-450b-8839-af6555f2249a)

…oftware#238)

Inline assembler constraints were incorrect Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>

Inline assembler constraints were incorrect. Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>

github-actions · 2026-04-27T09:10:35Z

Test Results

264 files - 108 264 suites - 108 0s ⏱️ - 8m 15s
56 tests + 7 54 ✅ + 41 2 💤 - 3 0 ❌ - 31
14 292 runs - 3 936 12 124 ✅ +784 2 168 💤 - 4 096 0 ❌ - 624

Results for commit 0149af2. ± Comparison against base commit 30a859f.

This pull request removes 49 and adds 56 tests. Note that renamed tests count towards both.

CMSIS-Core.src ‑ apsr.c
CMSIS-Core.src ‑ basepri.c
CMSIS-Core.src ‑ bkpt.c
CMSIS-Core.src ‑ clrex.c
CMSIS-Core.src ‑ clz.c
CMSIS-Core.src ‑ control.c
CMSIS-Core.src ‑ cp15.c
CMSIS-Core.src ‑ cpsr.c
CMSIS-Core.src ‑ dmb.c
CMSIS-Core.src ‑ dsb.c
…

TC_CML1Cache_CleanDCacheByAddrWhileDisabled
TC_CML1Cache_EnDisableDCache
TC_CML1Cache_EnDisableICache
TC_CoreFunc_APSR
TC_CoreFunc_BASEPRI
TC_CoreFunc_Control
TC_CoreFunc_EnDisIRQ
TC_CoreFunc_EncDecIRQPrio
TC_CoreFunc_FAULTMASK
TC_CoreFunc_FPSCR
…

This pull request removes 5 skipped tests and adds 2 skipped tests. Note that renamed tests count towards both.

CMSIS-Core.src ‑ lda.c
CMSIS-Core.src ‑ ldaex.c
CMSIS-Core.src ‑ stl.c
CMSIS-Core.src ‑ stlex.c
CMSIS-Core.src ‑ systick.c

TC_CoreInstr_WFE
TC_CoreInstr_WFI

♻️ This comment has been updated with latest results.

…-software#246) Use picolibc's _start function instead of providing our own. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit e902f86)

Added missing Coprocessor Power Control Register Definitions to the v8m-mainline cpus. Signed-off-by: Dávid Házi <david.hazi@arm.com>

Add "zephyr/module.yml" so that Zephyr's build system will use this as a module. Remaining integration is done the same way as for CMSIS_5. Signed-off-by: Valerio Setti <vsetti@baylibre.com>

Implements add_subdirectory_ifdef function needed to build with TF-M. Signed-off-by: Flavio Ceolin <flavio.ceolin@gmail.com>

wearyzen · 2026-04-30T14:14:14Z

Hi @valeriosetti, we don't have any Zephyr specific changes in this module. Could you please try upstreaming this changes instead?

valeriosetti · 2026-04-30T14:16:26Z

Hi @valeriosetti, we don't have any Zephyr specific changes in this module. Could you please try upstreaming this changes instead?

Sure, that's fine by me, but before trying to upstream anything I would like to have a green CI on the integrating PR. This is the reason why this is still drafted ;)

KeilChris and others added 22 commits December 4, 2024 17:39

Update ARM.CMSIS.pdsc

4b7fcfa

Fixes requested in ARM-software#208

fixed typo (ARM-software#212)

e48ce51

Fix workflows: Pin to Ubuntu 22.04

c0c86bc

Update armv8m_mpu.h - adding void

ad0be2a

Removes error: error: old-style function definition [-Werror=old-style-definition]

Guard include of RTE_Components.h with presence of _RTE_

6774423

Fixes ARM-software#205

Enable CoreValidation on CM52 with LLVM/Clang 19

1a1799c

Bug fix in GIC_GetConfiguration() (ARM-software#217)

8d9972d

Bit shift in accordance with IRQn % 16 was incorrect, and masking was needed to extract only the IRQn bits. Both fixed.

Possible bugs in MMU_MemorySection(), MMU_MemoryPage() (ARM-software#219

66058fe

) Need to be tested /reviewed, as I am not sure about the flag control logic.

Replaced doc references (ARM-software#220)

56299c6

Replaced references to https://github.com/Open-CMSIS-Pack/cmsis-toolbox/... with https://open-cmsis-pack.github.io/cmsis-toolbox/ Open-CMSIS-Pack/cmsis-toolbox#248

CMSIS-Driver: Minor update to USB Host Driver documentation (ARM-soft…

95fceda

…ware#225) - remove references to deprecated HCI driver

Update driver api descriptions in ARM.CMSIS.pdsc (ARM-software#223)

3bfa1c8

Remove CMSIS-Driver API header from custom component templates (ARM-s…

eb5eeaa

…oftware#224)

CMSIS-Driver: Added vStream Driver API 1.0.0 (ARM-software#226)

d854c95

CMSIS-Driver: Updated vStream Driver API to non-exclusive (ARM-softwa…

b7f79bb

…re#227)

Define linkage for the vStream and GPIO driver access structure (ARM-…

cc94f66

…software#231)

Update core_ca.h (ARM-software#216)

218b036

CMSIS-Driver: Minor update to vStream Driver API documentation (ARM-s…

efba702

…oftware#238)

Bump component version of CMSIS-Core to 6.1.1

6efa6c7

Bump CMSIS-Core documentation version and history

b2c51f0

IAR __get_SP_usr/__set_SP_usr fix (ARM-software#241)

0fa5d9f

Inline assembler constraints were incorrect Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>

IAR LDR{,B,H}T fix (ARM-software#242)

6f0a58d

Inline assembler constraints were incorrect. Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>

[zep fromtree] m-profile/gcc: Support picolibc startup mechanism (ARM…

a77f031

…-software#246) Use picolibc's _start function instead of providing our own. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit e902f86)

valeriosetti force-pushed the tfm-bump-2.3 branch 2 times, most recently from 0149af2 to 725ec47 Compare April 27, 2026 11:07

david-hazi-arm and others added 3 commits April 29, 2026 11:29

[zep noup][tf-m] Add missing CPPWR definitions (ARM-software#243)

2a044a4

Added missing Coprocessor Power Control Register Definitions to the v8m-mainline cpus. Signed-off-by: Dávid Házi <david.hazi@arm.com>

[zep noup] cmsis_6: Integrate with zephyr build system

508c9e6

Add "zephyr/module.yml" so that Zephyr's build system will use this as a module. Remaining integration is done the same way as for CMSIS_5. Signed-off-by: Valerio Setti <vsetti@baylibre.com>

[zep noup] cmake: zephyr: Implement used function

661f3a2

Implements add_subdirectory_ifdef function needed to build with TF-M. Signed-off-by: Flavio Ceolin <flavio.ceolin@gmail.com>

valeriosetti force-pushed the tfm-bump-2.3 branch from fd0d121 to 661f3a2 Compare April 29, 2026 09:30

github-actions Bot mentioned this pull request Apr 29, 2026

modules: tf-m: bump to v2.3 zephyrproject-rtos/zephyr#107373

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add changes for TF-M v2.3#7

Add changes for TF-M v2.3#7
valeriosetti wants to merge 26 commits intozephyrproject-rtos:mainfrom
valeriosetti:tfm-bump-2.3

valeriosetti commented Apr 27, 2026

Uh oh!

github-actions Bot commented Apr 27, 2026 •

edited

Loading

Uh oh!

wearyzen commented Apr 30, 2026

Uh oh!

valeriosetti commented Apr 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

Conversation

valeriosetti commented Apr 27, 2026

Uh oh!

github-actions Bot commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

wearyzen commented Apr 30, 2026

Uh oh!

valeriosetti commented Apr 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

github-actions Bot commented Apr 27, 2026 •

edited

Loading