rj/itcm by jordens · Pull Request #322 · quartiq/stabilizer

jordens · 2021-03-31T10:35:01Z

close Run process() task from ITCM #315
would profit from cortex-m-rtic 0.6 elevating the attributes to the actual ISR thus removing the veneer

needs newer fixed cortex-m-rt 0.6.13+unreleased relevant? https://reviews.llvm.org/D81986

323: link.x.in: put most __[se] symbols back into sections r=adamgreig a=jordens This puts most start/end address symbols back into the sections. Only `__ebss` and `__edata` are kept outside their sections so that potential user code with external libraries can inject stuff using `INSERT AFTER .bss/.data` and profit from the .bss/.data zeroing/loading mechanism. This also leads to the `__sbss` and `__veneer_base` symbols having the right section type (bss is B not D in nm). Also the trust zone start and end address are aligned to 32 bytes as per the requirements. That section does cost up to 28 byte of padding at the end of FLASH due to that alignment even if empty. But since flash is typically a multiple of 32 bytes and since the padding is at the end, there is no downside. The .rodata start is kept free for the linker to allocate it after .text. This enables users to inject sections between .text and .rodata and removes the chance to get overlapping address errors. With this the linker will by default place .rodata after .text as before. This commit also adds and exposes a few more stable address start/end symbols (__[se]uninit, __stext, __srodata) that are usefull for debugging and hooking into. See #287 (comment) for discussion of the issues and description of this compromise solution. Tested: * [x] [stm32h7 ITCM](quartiq/stabilizer#322) * [x] [sgstubs](#323 (comment)) * [x] `INSERT AFTER` for bss/data still works (#323 (comment)) Topics: * [x] `sgstubs` moved to be the last section in FLASH to minimize the impact of the 32 byte alignment. (Padding flash to 32 byte is considered benign.) * [ ] `INSERT AFTER` with binutils ld doesn't work. But that's independent of these changes. This is the `sgstubs`-in `memory.x` use case. Currently the `sgstubs` section is kept in `link.x`. Co-authored-by: Robert Jördens <rj@quartiq.de>

jordens · 2021-04-29T15:27:49Z

bors try

bors · 2021-04-29T15:27:52Z

try

Merge conflict.

* master: (70 commits) Updating JSON syntax Updating trigger Adding bors timeout dual-iir: add some mqtt parameter docs changelog: spelling update lock let bors handle hitl prepare v0.5.0 release Updating code after review Adding comment, reverting change Adding sleep to HITL run Updating ping deadline Reverting unintended change Updating dependency revision Renaming interface to avoid confusion dual-iir: use InputPin re-export, rename digital_input Updating dependency dual-iir: add enable_hold, force_hold fix bench hardware: add digital input support ...

jordens · 2021-04-29T15:29:44Z

bors try

bors · 2021-04-29T15:31:25Z

try

Build failed:

style

jordens · 2021-04-29T15:35:29Z

bors try

bors · 2021-04-29T15:37:00Z

try

Build failed:

compile (stable)

jordens · 2021-04-29T15:45:05Z

bors try

bors · 2021-04-29T15:58:20Z

try

Build failed:

HITL Run Status

* origin/master: (34 commits) Simplifying unit conversions Cleaning up conversion + comments Addressing review feedback Update src/hardware/dac.rs Renaming AdcSample -> AdcCode Updating float conversion Adding adc/dac code conversion utilities Simplifying settings lock Updating after review Updating delay Fixing merge Formatting Updating dependencies Fixing clippy Finalizing merge Merging lockin app functions Fixing system timer Fixing build, formatting Adding documentation Renaming files ...

jordens · 2021-05-10T15:04:06Z

bors try

bors · 2021-05-10T15:09:35Z

try

Build succeeded:

* rj/log: refine panic handler and add some logging info hitl: kill probe-run cleanly set target-cpu=cortex-m7, MSRV 1.52.0, use probe-run README: document lockin, cleanup instructions, use probe-run CHANGELOG: update README: streamline docs a bit, add probe-run update hitl script remove rtt feature use rtt logging dsp/lowpass,lockin: const generics

* origin/master: deps: fix rtt-logger->rtt-target, cleanup, bump cortex-m build(deps): bump embedded-hal from 0.2.4 to 0.2.5 Bump rtt-target from 0.2.2 to 0.3.1 Bump serde from 1.0.125 to 1.0.126 remove unused dependencies remove unused dependencies

src/startup.S

src/hardware/configuration.rs

jordens · 2021-05-28T14:04:07Z

bors merge

322: rj/itcm r=jordens a=jordens * close #315 * would profit from cortex-m-rtic 0.6 elevating the attributes to the actual ISR thus removing the veneer Co-authored-by: Robert Jördens <rj@quartiq.de>

jordens · 2021-05-28T14:32:43Z

bors cancel

jordens · 2021-05-28T14:34:14Z

bors merge

bors · 2021-05-28T14:39:37Z

Build succeeded:

323: link.x.in: put most __[se] symbols back into sections r=adamgreig a=jordens This puts most start/end address symbols back into the sections. Only `__ebss` and `__edata` are kept outside their sections so that potential user code with external libraries can inject stuff using `INSERT AFTER .bss/.data` and profit from the .bss/.data zeroing/loading mechanism. This also leads to the `__sbss` and `__veneer_base` symbols having the right section type (bss is B not D in nm). Also the trust zone start and end address are aligned to 32 bytes as per the requirements. That section does cost up to 28 byte of padding at the end of FLASH due to that alignment even if empty. But since flash is typically a multiple of 32 bytes and since the padding is at the end, there is no downside. The .rodata start is kept free for the linker to allocate it after .text. This enables users to inject sections between .text and .rodata and removes the chance to get overlapping address errors. With this the linker will by default place .rodata after .text as before. This commit also adds and exposes a few more stable address start/end symbols (__[se]uninit, __stext, __srodata) that are usefull for debugging and hooking into. See rust-embedded/cortex-m-rt#287 (comment) for discussion of the issues and description of this compromise solution. Tested: * [x] [stm32h7 ITCM](quartiq/stabilizer#322) * [x] [sgstubs](rust-embedded/cortex-m-rt#323 (comment)) * [x] `INSERT AFTER` for bss/data still works (rust-embedded/cortex-m-rt#323 (comment)) Topics: * [x] `sgstubs` moved to be the last section in FLASH to minimize the impact of the 32 byte alignment. (Padding flash to 32 byte is considered benign.) * [ ] `INSERT AFTER` with binutils ld doesn't work. But that's independent of these changes. This is the `sgstubs`-in `memory.x` use case. Currently the `sgstubs` section is kept in `link.x`. Co-authored-by: Robert Jördens <rj@quartiq.de>

jordens added 2 commits March 29, 2021 17:34

load process into itcm

14bae09

needs newer fixed cortex-m-rt 0.6.13+unreleased relevant? https://reviews.llvm.org/D81986

enable itcm/dtcm explicitly

fc73744

jordens had a problem deploying to hitl April 7, 2021 15:52 Failure

jordens mentioned this pull request Apr 14, 2021

link.x.in: put most __[se] symbols back into sections rust-embedded/cortex-m-rt#323

Merged

6 tasks

jordens force-pushed the rj/itcm branch from 8f94304 to 46adbd9 Compare April 29, 2021 14:44

jordens added 3 commits April 29, 2021 16:45

memory.x: remove comment about old cortex-m-rt

cd3cfa6

bump cortex-m-rt to 0.6.13+git

9e66054

dependencies: align with master

23bdd81

jordens force-pushed the rj/itcm branch from 46adbd9 to 23bdd81 Compare April 29, 2021 14:45

bors bot added a commit that referenced this pull request Apr 29, 2021

Try #322:

ac94442

fmt

780b344

bors bot added a commit that referenced this pull request Apr 29, 2021

Try #322:

7c83bed

gha: install gcc

b8b3bc0

bors bot added a commit that referenced this pull request Apr 29, 2021

Try #322:

03fffff

jordens added 2 commits May 10, 2021 12:09

Merge branch 'master' into rj/itcm

bd491cf

bors bot added a commit that referenced this pull request May 10, 2021

Try #322:

1b84e93

jordens added 2 commits May 13, 2021 15:22

remove duplicate linker option

ff5f3af

ryan-summers reviewed May 14, 2021

View reviewed changes

src/startup.S Outdated Show resolved Hide resolved

jordens added 3 commits May 14, 2021 17:23

itcm: implement in rust and execute during setup()

4d5f1ab

deps: add rationales for git dependencies

75a38df

Merge branch 'master' into rj/itcm

441c81d

jordens marked this pull request as ready for review May 27, 2021 16:22

jordens requested a review from ryan-summers May 27, 2021 16:22

ryan-summers suggested changes May 27, 2021

View reviewed changes

src/hardware/configuration.rs Outdated Show resolved Hide resolved

src/hardware/configuration.rs Outdated Show resolved Hide resolved

src/hardware/configuration.rs Show resolved Hide resolved

jordens requested a review from ryan-summers May 28, 2021 07:28

itcm: add some comments, make it safe

c5d3837

bors bot added a commit that referenced this pull request May 28, 2021

Merge #322

344b84d

322: rj/itcm r=jordens a=jordens * close #315 * would profit from cortex-m-rtic 0.6 elevating the attributes to the actual ISR thus removing the veneer Co-authored-by: Robert Jördens <rj@quartiq.de>

setup: cleanup

79d30b4

bors bot merged commit 9587088 into master May 28, 2021

bors bot deleted the rj/itcm branch May 28, 2021 14:39

jordens mentioned this pull request Jun 28, 2024

ITCM init #910

Open

Conversation

jordens commented Mar 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jordens commented Apr 29, 2021

Uh oh!

bors bot commented Apr 29, 2021

try

Uh oh!

jordens commented Apr 29, 2021

Uh oh!

bors bot commented Apr 29, 2021

try

Uh oh!

jordens commented Apr 29, 2021

Uh oh!

bors bot commented Apr 29, 2021

try

Uh oh!

jordens commented Apr 29, 2021

Uh oh!

bors bot commented Apr 29, 2021

try

Uh oh!

jordens commented May 10, 2021

Uh oh!

bors bot commented May 10, 2021

try

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jordens commented May 28, 2021

Uh oh!

jordens commented May 28, 2021

Uh oh!

jordens commented May 28, 2021

Uh oh!

bors bot commented May 28, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jordens commented Mar 31, 2021 •

edited

Loading