Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arch: arm: cortex_m: Move default configs to a file and add consistency checks #64978

Conversation

ithinuel
Copy link
Collaborator

@ithinuel ithinuel commented Nov 8, 2023

This PR separates the default configuration setting from main cmsis_core.h path and add checks ensuring that Kconfig defines do match CMSIS' configuration.

@ithinuel
Copy link
Collaborator Author

I get the same error on main locally, so I'm not sure this issue is related to the changes in this PR.

@ithinuel ithinuel force-pushed the modules/cmsis/check_config_consistency branch from fbeb38a to 42fc662 Compare November 23, 2023 19:32
arch/arm/core/cortex_m/Kconfig Outdated Show resolved Hide resolved
modules/cmsis/cmsis_core_m_defaults.h Show resolved Hide resolved
This adds kconfig entries for Performance Monitoring Unit (PMU).

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
Kconfig parameters, header’s default & silicon vendor’s SDK configuration
for CMSIS Core, must be consistent. Depending on the inclusion order of
the headers, this is currently not always the case.

This change introduces consistency checks & enusers defaults match their
Kconfig settings.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
This change adds checks to validate consistency between Zephyr’s Kconfig
settings and cmsis configuration defined in SiP’s sdk provided headers.

This change also introduces a config to enable cmsis’ own checks which
emits warnings if a parameter relies on auto-populated default values.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
This changes remove extraneous includes causing issues with cycles in
includes subsequently having code requiring definitions from CMSIS
while it’s configuration hasn’t completed yet.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
@ithinuel ithinuel force-pushed the modules/cmsis/check_config_consistency branch from 42fc662 to 3b9e7ba Compare November 27, 2023 11:05
Caches are optional on cortex-m7, having CPU_HAS_*CACHE in CPU_CORTEX_M7
definition renders them mandatory.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
Some SoC have missing feature selections in their Kconfig.
Some others are missing includes of CMSIS-Core headers.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
@ithinuel ithinuel force-pushed the modules/cmsis/check_config_consistency branch from 3b9e7ba to 250ba9b Compare November 27, 2023 11:09
@microbuilder microbuilder requested review from povergoing and SgrrZhf and removed request for dleach02, yonsch, ifyall, npal-cy, MulinChao and ChiHuaL December 5, 2023 04:36
@fabiobaltieri fabiobaltieri merged commit af3a191 into zephyrproject-rtos:main Dec 5, 2023
25 checks passed
manuargue added a commit to nxp-zephyr/zephyr that referenced this pull request Dec 5, 2023
Include CMSIS headers, missing to be added in zephyrproject-rtos#64978. And align
CPU_HAS_xCACHE symbols with the CMSIS feature definitions in the
device headers so that both have the same value.

Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
manuargue added a commit to nxp-zephyr/zephyr that referenced this pull request Dec 5, 2023
Following changes in zephyrproject-rtos#64978, align CPU_HAS_xCACHE symbols with
the CMSIS feature definitions in the device headers so that
both have the same value.

Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
manuargue added a commit to nxp-zephyr/zephyr that referenced this pull request Dec 5, 2023
Following changes in zephyrproject-rtos#64978, align CPU_HAS_xCACHE symbols with
the CMSIS feature definitions in the device headers so that
both have the same value.

Fixes zephyrproject-rtos#66147

Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
manuargue added a commit to nxp-zephyr/zephyr that referenced this pull request Dec 5, 2023
Following changes in zephyrproject-rtos#64978, align CPU_HAS_xCACHE symbols with
the CMSIS feature definitions in the device headers so that
both have the same value.

Fixes zephyrproject-rtos#66147

Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
henrikbrixandersen pushed a commit that referenced this pull request Dec 5, 2023
Following changes in #64978, align CPU_HAS_xCACHE symbols with
the CMSIS feature definitions in the device headers so that
both have the same value.

Fixes #66147

Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
panxxhub pushed a commit to panxxhub/zephyr that referenced this pull request Dec 7, 2023
Following changes in zephyrproject-rtos#64978, align CPU_HAS_xCACHE symbols with
the CMSIS feature definitions in the device headers so that
both have the same value.

Fixes zephyrproject-rtos#66147

Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
@ithinuel ithinuel deleted the modules/cmsis/check_config_consistency branch January 31, 2024 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: ARM ARM (32-bit) Architecture area: CMSIS-Core Enhancement Changes/Updates/Additions to existing features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants