Add grabber module #270

esavkin · 2023-10-12T17:35:24+08:00

esavkin commented

2023-10-12 17:35:24 +08:00

Waits for testing

esavkin added 1 commit 2023-10-12 17:35:24 +08:00

26a2bfacf5 Add grabber module

Signed-off-by: Egor Savkin <es@m-labs.hk>

mwojcik reviewed 2023-10-12 18:12:22 +08:00

src/gateware/kasli_soc.py Outdated

													
				@ -229,6 +230,7 @@ class GenericMaster(SoCCore):

				            pads=data_pads,

				            clk_freq=clk_freq)

				        self.csr_devices.append("gt_drtio")

				        self.config["CLOCK_FREQUENCY"] = int(description["rtio_frequency"])

mwojcik commented

2023-10-12 18:12:22 +08:00

clk_freq, actually can also introduce that to standalone

``clk_freq``, actually can also introduce that to standalone

mwojcik reviewed 2023-10-12 18:13:33 +08:00

src/runtime/src/main.rs Outdated

													
				@ -11,10 +11,13 @@ extern crate alloc;

				#[cfg(feature = "target_kasli_soc")]

				use core::cell::RefCell;

				use embedded_hal::blocking::delay::DelayMs;

mwojcik commented

2023-10-12 18:13:33 +08:00

Also should be behind has_grabber, otherwise will warn about unused import

mwojcik reviewed 2023-10-12 18:17:52 +08:00

src/runtime/src/main.rs Outdated

													
				@ -60,0 +64,4 @@

				async fn grabber_thread(mut timer: GlobalTimer) {

				    loop {

				        grabber::tick();

				        timer.delay_ms(200);

mwojcik commented

2023-10-12 18:17:52 +08:00

I believe this should be a countdown like in 812aea33b3/src/runtime/src/rtio_mgt.rs (L425), otherwise this task will never yield. Will need to double check. If timing is not an issue and grabber tick can be done anytime, it could be a yield like the io expander task above.

I believe this should be a countdown like in https://git.m-labs.hk/M-Labs/artiq-zynq/src/commit/812aea33b3cae41f70d35d5ca8a6eb4a507fdbed/src/runtime/src/rtio_mgt.rs#L425, otherwise this task will never yield. Will need to double check. If timing is not an issue and grabber tick can be done anytime, it could be a yield like the io expander task above.

mwojcik commented

2023-10-13 11:09:05 +08:00

Seems to work fine according to the customer, after replacing the delay with an async-friendly version.

Just replace timer.delay(200) with:

        let mut countdown = timer.countdown();
        delay(&mut countdown, Milliseconds(200)).await;

then remove DelayMs import, and add libasync::delay and libboard_zynq::time::Milliseconds. Remember to use cargo fmt too.

This will have to be integrated in release-7 too.

I'm thinking if to cut down on tasks, we could integrate the expander service together with the grabber tick. But that's beyond of the scope of getting grabber to work.

Seems to work fine according to the customer, after replacing the delay with an ``async``-friendly version. Just replace ``timer.delay(200)`` with: ``` let mut countdown = timer.countdown(); delay(&mut countdown, Milliseconds(200)).await; ``` then remove DelayMs import, and add ``libasync::delay`` and ``libboard_zynq::time::Milliseconds``. Remember to use cargo fmt too. This will have to be integrated in release-7 too. I'm thinking if to cut down on tasks, we could integrate the expander service together with the grabber tick. But that's beyond of the scope of getting grabber to work.

👍 1

esavkin force-pushed 264-fix-grabber from 26a2bfacf5 to 92b702da1b

2023-10-16 10:30:09 +08:00

Compare

esavkin changed title from ~~WIP: Add grabber module~~ to Add grabber module

2023-10-16 10:30:27 +08:00

esavkin force-pushed 264-fix-grabber from 92b702da1b to 7ffa897ae5

2023-10-16 10:31:08 +08:00

Compare

mwojcik reviewed 2023-10-16 13:36:31 +08:00

src/gateware/kasli_soc.py Outdated

													
				@ -139,6 +140,7 @@ class GenericStandalone(SoCCore):

				        ]

				        fix_serdes_timing_path(platform)

				        self.submodules.bootstrap = GTPBootstrapClock(self.platform, description["rtio_frequency"])