Skip to content

cpu/cortexm_common: use linker variable to initialize SCB->VTOR#6638

Merged
vincent-d merged 3 commits intoRIOT-OS:masterfrom
OTAkeys:pr/cortexm_isr_vector
Mar 21, 2017
Merged

cpu/cortexm_common: use linker variable to initialize SCB->VTOR#6638
vincent-d merged 3 commits intoRIOT-OS:masterfrom
OTAkeys:pr/cortexm_isr_vector

Conversation

@vincent-d
Copy link
Copy Markdown
Member

@vincent-d vincent-d commented Feb 22, 2017

Use the actual vector base address from the linker to initialize the vector base address register.

It's easier to overwrite from an application with a custom linker file.

@kaspar030 kaspar030 added Platform: ARM Platform: This PR/issue effects ARM-based platforms CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Feb 22, 2017
@jnohlgard
Copy link
Copy Markdown
Member

jnohlgard commented Feb 22, 2017

Looks good. What boards have you tested it on?

@jnohlgard jnohlgard added this to the Release 2017.04 milestone Feb 22, 2017
@vincent-d
Copy link
Copy Markdown
Member Author

vincent-d commented Feb 22, 2017

Tested with our hardware (stm32f2 based), I'll give a try with a nucleo-f401.

@vincent-d
Copy link
Copy Markdown
Member Author

vincent-d commented Feb 22, 2017

Works fine on nucleo-f207 and nucleo-f401, I don't have any others cortex-m(3/4) to test

@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Feb 28, 2017

Tested on fox, nucleo-f334 with success.

@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Feb 28, 2017

@gebart the kinetis boards work with this PR?

@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Feb 28, 2017

@astralien3000 Can you test with the opencm board? Maybe with this PR you can avoid to specify explicitly where the VTOR is?

@kYc0o kYc0o mentioned this pull request Feb 28, 2017
Closed
@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Feb 28, 2017

@kaspar030 does this breaks the softdevice (anyways IIRC it's already broken)? In my opinion it shouldn't...

@astralien3000
Copy link
Copy Markdown
Member

astralien3000 commented Mar 2, 2017

Good PR !
I tested it on opencm9-04, it worked just fine, even if I remove my hack about the VTOR register.

@jnohlgard
Copy link
Copy Markdown
Member

jnohlgard commented Mar 11, 2017

This does not work on Kinetis. The program crashes on first ISR call after the SCB->VTOR assignment. Looking at the map file I can see that the _isr_vectors variable is not placed at 0x00000000 as it should. Might have something to do with the special ldscript for Kinetis.

@jnohlgard jnohlgard mentioned this pull request Mar 11, 2017
Closed
@jnohlgard
Copy link
Copy Markdown
Member

jnohlgard commented Mar 11, 2017

Fix for Kinetis is at OTAkeys#5
Feel free to squash it into your other changes

@vincent-d
Copy link
Copy Markdown
Member Author

vincent-d commented Mar 13, 2017

OTAkeys#5 cherry picked

@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Mar 15, 2017

Can you squash? I think this is ready.

@kYc0o kYc0o self-assigned this Mar 15, 2017
@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Mar 15, 2017 •
edited
Loading

I was looking on the boards that could be affected by this PR and I only see the spark-core.
Can you remove this and this for spark-core? Then I can ACK.

Besides, the softdevice will bee indeed broken, however I couldn't find any usage of its linker script. @kaspar030 any hints?

@vincent-d vincent-d force-pushed the pr/cortexm_isr_vector branch from ae41528 to 46ad232 Compare March 17, 2017 16:33
@vincent-d
Copy link
Copy Markdown
Member Author

vincent-d commented Mar 17, 2017

Squashed

@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Mar 17, 2017

Oops... I think we forgot opencm904 here and here. Do you mind? 😄

@vincent-d vincent-d force-pushed the pr/cortexm_isr_vector branch from 46ad232 to 27057d4 Compare March 17, 2017 17:09
@vincent-d
Copy link
Copy Markdown
Member Author

vincent-d commented Mar 17, 2017

@kYc0o No problem, done!

kYc0o
kYc0o approved these changes Mar 19, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@kYc0o kYc0o left a comment

Choose a reason for hiding this comment

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

ACK

@kYc0o kYc0o mentioned this pull request Mar 21, 2017
Closed
@vincent-d
Copy link
Copy Markdown
Member Author

vincent-d commented Mar 21, 2017

All green, go

@vincent-d vincent-d merged commit bb0c2d0 into RIOT-OS:master Mar 21, 2017
@vincent-d vincent-d deleted the pr/cortexm_isr_vector branch March 21, 2017 14:46
@kYc0o kYc0o mentioned this pull request Mar 24, 2017
Merged
@dylad dylad mentioned this pull request Nov 17, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kYc0o kYc0o kYc0o approved these changes

Assignees

@kYc0o kYc0o

Labels

CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms

Projects

None yet

Milestone

Release 2017.04

Development

Successfully merging this pull request may close these issues.

5 participants

@vincent-d @jnohlgard @kYc0o @astralien3000 @kaspar030