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

Fix system clock driver selection for cortex m #24348

Merged
merged 1 commit into from
Apr 15, 2020

Conversation

b0661
Copy link
Collaborator

@b0661 b0661 commented Apr 14, 2020

The selection of the Cortex M systick driver to be used as a system clock driver
is controlled by CONFIG_CORTEX_M_SYSTICK.

To replace it by another driver CONFIG_CORTEX_M_SYSTICK must be set to 'n'.
Unfortunately this also controls the interrupt vector for the systick interrupt.
It is now routed to z_arm_exc_spurious.

Remove the dependecy on CONFIG_CORTEX_M_SYSTICK and route to z_clock_isr as it
was before #24012.

Fixes #24347

Signed-off-by: Bobby Noelte b0661n0e17e@gmail.com

Copy link
Member

@ioannisg ioannisg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, see if you can add a comment to make it more future-proof.

@ioannisg ioannisg requested a review from stephanosio April 14, 2020 16:28
@ioannisg ioannisg added Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc. area: ARM ARM (32-bit) Architecture labels Apr 14, 2020
@zephyrbot
Copy link
Collaborator

zephyrbot commented Apr 14, 2020

All checks are passing now.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

@b0661 b0661 force-pushed the pr_systick_reinstall branch from bc645b2 to 1eea145 Compare April 14, 2020 17:09
Copy link
Member

@ioannisg ioannisg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)
Would you mind removing the extra sentence about the ASSERT of the _week z_clock_ISR? I feel this is not really of some use here (and it would be more future-proof, as we might decide later to remove that assert)

The selection of the Cortex M systick driver to be used as a system
clock driver is controlled by CONFIG_CORTEX_M_SYSTICK.

To replace it by another driver CONFIG_CORTEX_M_SYSTICK must be set
to 'n'. Unfortunately this also controls the interrupt vector for
the systick interrupt. It is now routed to z_arm_exc_spurious.

Remove the dependecy on CONFIG_CORTEX_M_SYSTICK and route to
z_clock_isr as it was before zephyrproject-rtos#24012.

Fixes zephyrproject-rtos#24347

Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
@b0661 b0661 force-pushed the pr_systick_reinstall branch from 1eea145 to a44efc6 Compare April 14, 2020 18:13
@b0661
Copy link
Collaborator Author

b0661 commented Apr 14, 2020

Would you mind removing the extra sentence about the ASSERT of the _week z_clock_ISR?

Done

@ioannisg ioannisg merged commit 68cd1b7 into zephyrproject-rtos:master Apr 15, 2020
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 Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Application Cortex M Systick driver broken by merge of #24012
4 participants