kk105
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
649 Commits 3 Branches 0 Tags 1.8 MiB
Commit Graph

419 Commits

Author SHA1 Message Date
stevefan1999 84becfe2c0 report async errors upon kernel termination 
Port of 4a6bea479a

Co-authored-by: Steve Fan <sf@m-labs.hk>
Reviewed-on: M-Labs/artiq-zynq#156
Co-authored-by: stevefan1999 <sf@m-labs.hk>
Co-committed-by: stevefan1999 <sf@m-labs.hk>
 2021-12-06 17:38:55 +08:00
mwojcik 31fb2b388a Support for DRTIO 100MHz (#155) 
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-12-03 17:19:42 +08:00
mwojcik e045837b67 zc706: not actually ultrascale 2021-11-29 12:48:45 +08:00
mwojcik ada3f2e704 drtio: reading still needs work buffer after all 2021-11-29 12:46:08 +08:00
mwojcik 8be5048cd3 upgrade to new clock configuration system (#152) 
As mentioned in https://github.com/m-labs/artiq/issues/1735 - this is the Zynq version.

Reviewed-on: M-Labs/artiq-zynq#152
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-11-29 11:17:59 +08:00
mwojcik e8db2a4b49 drtio: crc from mainline, removed byte swap 2021-11-24 12:12:40 +08:00
mwojcik 0b27349ec4 dummy_spi -> pmod_spi 2021-10-14 16:37:13 +08:00
mwojcik 21eb1cab1a zc706: added dummy spi in place of sdio 2021-10-14 15:43:51 +08:00
mwojcik 3096daaaee zc706: removed nist_clock sdcard, put pmod instead 2021-10-14 15:01:38 +08:00
mwojcik 4fbfccf575 zc706: fix nist_qc2 extension, ams101 iostandard 2021-10-14 12:39:09 +08:00
mwojcik 5c40115945 make ZC706 RTIO channels consistent with KC705 
Reviewed-on: M-Labs/artiq-zynq#147
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-13 17:20:25 +08:00
Sebastien Bourdeauducq a5e3580d18 Revert "runtime: expose rint from libm" 
This reverts commit 3582af564d.
 2021-10-11 08:13:26 +08:00
Sebastien Bourdeauducq 3582af564d runtime: expose rint from libm 2021-10-10 20:40:29 +08:00
mwojcik 219c075931 added explicit runtime/satman targets for makefile 
Reviewed-on: M-Labs/artiq-zynq#144
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-08 21:06:23 +08:00
mwojcik d04a7decfe removed simple variants from zc706 2021-10-08 11:07:12 +02:00
mwojcik 0efa83e956 update build scripts for DRTIO 
Reviewed-on: M-Labs/artiq-zynq#135
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-08 16:25:13 +08:00
Sebastien Bourdeauducq 4fa824f42b kasli-soc: remove irrelevant comment 2021-10-08 16:13:17 +08:00
mwojcik ab0c205dd2 gateware: add DRTIO 
Reviewed-on: M-Labs/artiq-zynq#140
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-08 16:12:30 +08:00
mwojcik 8d2bb09149 add satman firmware (#136) 
Reviewed-on: M-Labs/artiq-zynq#136
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-08 16:04:50 +08:00
mwojcik aaec0abdf6 fix build/warnings before drtio is fully merged 2021-10-06 16:17:19 +08:00
mwojcik e241957419 add libbuild_zynq 
Reviewed-on: M-Labs/artiq-zynq#141
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-06 16:16:49 +08:00
mwojcik 50262b3f0c runtime: link_thread -> link_task 2021-10-06 07:59:55 +02:00
mwojcik 827c6c1306 runtime: switch to libio/libboard_artiq, add DRTIO mastering support 
Reviewed-on: M-Labs/artiq-zynq#137
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-06 13:05:45 +08:00
mwojcik e6863263b4 add libboard_artiq (to be shared between runtime and satman) 
Reviewed-on: M-Labs/artiq-zynq#139
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-06 13:02:28 +08:00
mwojcik d7f45d473e add libio (to be shared between runtime and satman) 
Reviewed-on: M-Labs/artiq-zynq#138
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-10-06 13:01:52 +08:00
pca006132 35250b3f56 libdyld: fixed symbol relocation 
Note that in libdyld/src/lib.rs #117-118, image pointer is already added
to the symbol offset, so we do not need to add the pointer again
 2021-09-25 11:30:45 +08:00
Sebastien Bourdeauducq 2ed2ffe417 update dependencies 2021-08-09 15:16:54 +08:00
Sebastien Bourdeauducq 18e05c91e1 zc706: si5324 is not needed for standalone target 2021-08-04 09:14:19 +08:00
mwojcik e3d3cb2311 si5324: bring on par with mainline ARTIQ (#132) 
si5324 driver in runtime should be now equal in function to the one in artiq.

kasli-soc has no way of doing a hard reset on the peripheral, but zc706 does.

Reviewed-on: M-Labs/artiq-zynq#132
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-08-04 09:12:38 +08:00
Sebastien Bourdeauducq f543501012 si5324: remove debug print 2021-08-02 14:14:59 +08:00
Sebastien Bourdeauducq 111ac0c716 runtime: clock Si5324 from its crystal 2021-07-30 17:07:58 +08:00
Sebastien Bourdeauducq 8128dc0b56 Revert "kasli-soc: work around I2C breakage (#130)" 
This reverts commit f1fd55dee5.
 2021-07-30 16:55:06 +08:00
Sebastien Bourdeauducq dcb6129b0e update dependencies 2021-07-05 13:56:40 +08:00
Sebastien Bourdeauducq f25e261bdd update dependencies 2021-06-25 17:12:47 +08:00
Sebastien Bourdeauducq 2ba4d8935d fix compilation with nixpkgs 21.05 
The environment variable is optional to keep compatibility with other build environments.

Closes #131
 2021-06-25 15:57:39 +08:00
Sebastien Bourdeauducq 8c8a5d53b9 update dependencies 2021-06-19 22:51:25 +08:00
Sebastien Bourdeauducq 852123b42a kasli-soc: add RTIO LEDs 2021-05-30 20:40:53 +08:00
Sebastien Bourdeauducq f1fd55dee5 kasli-soc: work around I2C breakage (#130) 2021-05-29 17:13:41 +08:00
Sebastien Bourdeauducq 21d98711c1 use new smoltcp error code 2021-05-29 17:13:22 +08:00
Sebastien Bourdeauducq 0ae2138034 kasli-soc: preliminary si5324 support 2021-05-29 16:15:27 +08:00
Sebastien Bourdeauducq 1b474d2dd4 update dependencies 2021-05-29 14:20:23 +08:00
Sebastien Bourdeauducq 506c741238 support absence of gateware RTIO clock selection mux 2021-02-15 21:41:30 +08:00
Sebastien Bourdeauducq 8815f76114 kasli_soc: fix has_grabber 2021-02-15 21:41:02 +08:00
Sebastien Bourdeauducq ef18fa4c6d kasli_soc: add RTIO log channel 2021-02-15 19:56:59 +08:00
Sebastien Bourdeauducq faf9714e10 add demo build for Kasli-SoC 2021-02-15 19:52:13 +08:00
Sebastien Bourdeauducq 8d4e42be32 remove redpitaya and coraz7 support 2021-02-15 19:30:13 +08:00
Astro fcb38fae6c runtime: disable TCP delayed ack 2021-02-08 03:24:18 +01:00
Astro bfd8343876 update zynq-rs and dependencies (smoltcp 0.7.0) 2021-02-08 03:24:18 +01:00
Sebastien Bourdeauducq 4039431533 kasli_soc: fix eem iostandards 2021-02-07 22:34:29 +08:00
Sebastien Bourdeauducq 3f9bd06468 add Kasli-SoC generic gateware builder (WIP) 2021-02-07 14:44:32 +08:00
pca006132 bb65074254 updated zynq-rs and IRQ handling 2021-01-28 12:56:54 +08:00
pca006132 c2a6fb72f7 updated zynq-rs dependency 2021-01-26 12:38:09 +08:00
pca006132 faa335461d runtime: modified protocols to use device endian 2021-01-22 13:36:38 +08:00
pca006132 be01fbd943 runtime/irq: use assembly for naked IRQ handler 
and solves the bug introduced due to stack unwinding...
 2021-01-18 17:08:04 +08:00
pca006132 9e8b554c6d runtime/kernel/core1: use correct ABI 2021-01-18 16:43:30 +08:00
pca006132 b4ff6dda24 runtime: use naked function for IRQ 
non-naked IRQ would somehow trigger interrupts after several kernel
restarts, investigating
 2021-01-18 10:38:50 +08:00
pca006132 35204d4716 fixed new compiler warnings 2021-01-15 17:55:58 +08:00
pca006132 93493397ae updated zynq-rs dependency 2021-01-15 17:55:47 +08:00
Astro e5207b86db update rust dependencies 2020-12-24 01:17:24 +01:00
Astro 28fe61b061 runtime: add feature target_kasli_soc 2020-12-23 20:11:43 +01:00
Astro ce55e2ed23 update rust dependencies 2020-12-23 17:02:19 +01:00
Astro cb9dae1951 update rust dependencies 2020-11-20 17:54:09 +01:00
Sebastien Bourdeauducq 07b425a67a fix other compilation warnings 2020-11-16 14:57:20 +08:00
Sebastien Bourdeauducq 57ae8619f8 remove unnecessary no_mangle 
no_mangle does nothing on extern items as per https://github.com/rust-lang/rust/issues/78989#issuecomment-726163973

Closes #115
 2020-11-16 14:51:30 +08:00
Astro 32048ead20 gateware/coraz7: remove unused VARIANTS 2020-11-14 02:24:29 +01:00
Astro 113c8eb0b8 add coraz7 + redpitaya targets 2020-11-13 20:17:18 +01:00
Astro 9259cffeb2 i2c: add stubs for targets without i2c 2020-11-12 15:26:06 +01:00
David Nadlinger 7c336f7770 kernel/api: Add additional binary libm functions 
Also factored out (f64, f64) -> f64 libm wrappers into
a macro, similar to the unary ones.
 2020-11-11 01:24:44 +01:00
Sebastien Bourdeauducq 291a782db0 fix compiler warning 
Feature is now stable.
 2020-11-06 12:22:34 +08:00
Sebastien Bourdeauducq 479e6afd12 update Rust dependencies 2020-11-06 12:20:48 +08:00
pca006132 7dbffadf08 mgmt: implemented config write 2020-11-04 21:16:47 +08:00
Sebastien Bourdeauducq b7155c9ded Makefile: cleanup 2020-10-14 13:06:15 +08:00
Sebastien Bourdeauducq 5c62d6a141 update dependencies, disable custom compiler_builtins (#113) 2020-10-13 21:51:40 +08:00
Sebastien Bourdeauducq eab839aed0 follow changes in zynq-rs 2020-10-13 19:12:55 +08:00
pca006132 a374d8a02f runtime/kernel/dma: reduced replay overhead 
We can just flush the cache once when we get the handle, instead of
everytime before replay.
 2020-09-09 21:25:03 +08:00
pca006132 03d9827a5a acpki: working 2020-09-09 21:24:49 +08:00
Sebastien Bourdeauducq 86b9045417 use liconfig, libcoreio, szl from zynq-rs 2020-09-09 18:44:12 +08:00
Sebastien Bourdeauducq 7e26a87aed fix previous commit 2020-09-09 18:12:39 +08:00
Sebastien Bourdeauducq a277e89b3a Makefile: fix runtime.bin target 2020-09-09 17:01:14 +08:00
pca006132 1e742cc390 updated zynq-rs dependency 2020-09-07 16:18:50 +08:00
Sebastien Bourdeauducq 2fe73505c8 improve i2c error reporting 2020-09-06 00:38:28 +08:00
Sebastien Bourdeauducq 36d8ffec3b expose i2c to kernels 2020-09-06 00:11:19 +08:00
Sebastien Bourdeauducq 91ed035bef makefile: fix szl rebuild (#108) 2020-09-06 00:10:44 +08:00
pca006132 d5a91a7697 updated zynq-rs for more CPU options 2020-09-04 16:43:07 +08:00
pca006132 5da76f2abb enabled cpu program flow prediction 2020-09-04 13:25:17 +08:00
pca006132 5e4bf8bbf7 runtime/comms: Faster RPC alloc 
We do busy polling for some time before doing await, for small
allocations we could avoid the context switching and reduce the latency.
 2020-09-03 16:58:44 +08:00
pca006132 cdc8ad8aee runtime/kernel/control: fixed memory leak 2020-09-03 16:51:51 +08:00
pca006132 805f1d4eff runtime: increased heap size 2020-09-02 10:15:52 +08:00
pca006132 ae07c05db4 runtime: optimize for speed and fix deadlock 
The previous method of taking the channel could cause deadlock, we now
use semaphore to signal if the channel is available instead of busy
polling the mutex.
 2020-09-02 10:15:52 +08:00
Sebastien Bourdeauducq b0706f470d runtime: set default log level to Info 2020-09-01 17:11:21 +08:00
pca006132 ccf8ae5b5d szl: implemented #96 
SZL no longer do self-extraction for runtime binary, it would boot from
SD/ethernet depending on the boot mode settings.
This allows a larger runtime binary, so we can optimize for speed in the
runtime firmware for better performance, and allow more features to be
added later.
 2020-09-01 15:57:20 +08:00
pca006132 050b2457a4 runtime/main: removed bitstream loading code 2020-09-01 15:43:54 +08:00
pca006132 eb78e4e2da libconfig: refactored load_pl into bootgen 
Now allows loading firmware.
 2020-09-01 14:48:19 +08:00
pca006132 afecc83ecf libconfig/net_settings: made ipv6 optional feature 
This is to prepare for szl, which cannot use ipv6 due to memory
limitation.
 2020-09-01 14:48:19 +08:00
pca006132 04437e876c libconfig/load_pl: added alignment for devc buffer 
According to the TRM, the buffer should be 64B aligned.
Without the alignment would cause failure for the DMA transaction.
It seems that the allocator would give some alignment, but to be more
correct we should specify that with the alloc interface.
 2020-09-01 14:48:19 +08:00
pca006132 42f94487cf split config code into libconfig 2020-09-01 14:48:09 +08:00
pca006132 d474cf58a5 runtime/rpc: optimizations for list and arrays 
Requires https://github.com/m-labs/artiq/pull/1510
This is the commit producing the result in the table.
 2020-08-26 13:47:41 +08:00
pca006132 71427f8ec8 runtime/proto_async: simplify functions 
And the compiler can use its intrinsic for byte rev.
 2020-08-26 13:46:51 +08:00
Sebastien Bourdeauducq 538c012bc4 use new repos location for compiler-builtins-zynq 2020-08-25 16:24:30 +08:00
pca006132 ba162b3997 Fix pure build 2020-08-25 14:51:39 +08:00
pca006132 321a8e1522 runtime/kernel/core1: reset rtio after interrupted 2020-08-25 14:51:39 +08:00
pca006132 0fb278f7cb runtime/kernel/core1: allows getting backtrace when kernel is not loaded 2020-08-25 14:51:39 +08:00
pca006132 fa187fb37a runtime/kernel: use mutable static for shared channel 
Mutex would prevent restart if we failed while waiting for RPC.
 2020-08-25 14:51:39 +08:00
pca006132 e592efb2b8 enabled L2 cache and optimized ethernet 2020-08-25 14:51:39 +08:00
Astro 760f46a115 update dependencies 2020-08-17 19:17:42 +02:00
David Nadlinger 6ccd0cb389 runtime/kernel: Expose libm::atanh 2020-08-09 20:06:09 +01:00
David Nadlinger 63250240d2 runtime/kernel: Expose __powidf2 2020-08-09 19:17:38 +01:00
David Nadlinger 9f898dd2b8 runtime/rpc: Support new TArray layout (ndarrays) 
This is a port of the respective commit in the main ARTIQ
repository.
 2020-08-09 19:17:38 +01:00
pca006132 7342736124 szl: reduced binary size. 
* Compiled unlzma with -Oz and enable LTO.
* Changed one unwrap to manual handling to remove fmt code.
* Implemented custom panic handler with minimal code.
 2020-08-07 13:25:16 +08:00
Sebastien Bourdeauducq 3a8a025d5f update dependencies, zc706 -> zynq-rs 2020-08-06 20:33:23 +08:00
Sebastien Bourdeauducq 2f6310f8bd cleanup 2020-08-06 20:26:48 +08:00
Sebastien Bourdeauducq 8dabc8e6fd runtime: remove access to obsolete i_overflow_reset CSR 2020-08-06 20:23:36 +08:00
Sebastien Bourdeauducq 1eeee43d64 acpki: implement input interface 2020-08-06 18:15:34 +08:00
pca006132 0354699ae3 runtime/kernel/dma: fixed missing end of buffer marker. 
The DMA transfer would halt before.
 2020-08-06 14:00:20 +08:00
Sebastien Bourdeauducq 7873565917 runtime: expose libm tan 2020-08-06 11:45:41 +08:00
pca006132 05e1614313 runtime/kernel: fixed duration bug. 
Fixes #89.
 2020-08-06 11:12:24 +08:00
Sebastien Bourdeauducq 323191b9fc runtime: expose more libm functions 2020-08-06 10:32:20 +08:00
Sebastien Bourdeauducq 2f7cc6fc38 tune compiler optimizations 2020-08-06 10:32:20 +08:00
pca006132 5becf0af0a runtime/kernel: fixed memory corruption for cache and DMA. 2020-08-06 10:29:31 +08:00
pca006132 e7752a3d6d runtime/kernel: fixes core0 memory leak. 
Fixes #85
 2020-08-06 09:39:49 +08:00
Sebastien Bourdeauducq 984bb08d27 Makefile: optimize 2020-08-05 19:14:18 +08:00
Sebastien Bourdeauducq de2d7ecf48 typo 2020-08-05 18:52:08 +08:00
pca006132 c85e85aa6d runtime/logger: use blocking wait. 
Fixes #84 using the first solution.

If the performance is considered too slow,
we can do the second option later.
 2020-08-05 18:51:27 +08:00
pca006132 4b6c5d5679 runtime/kernel: store DMA and cache buffer on core0. 
Closes #77.
 2020-08-05 15:33:40 +08:00
Sebastien Bourdeauducq 72427dbebb runtime: cleanup core_log 2020-08-05 00:40:54 +08:00
Sebastien Bourdeauducq 6d654de3d5 runtime: implement core_log 2020-08-04 23:27:51 +08:00
Sebastien Bourdeauducq 3092bfc21a runtime: expose __aeabi_idivmod to kernel 2020-08-04 22:45:28 +08:00
Sebastien Bourdeauducq b915176b29 runtime: implement acpki RTIO output 2020-08-04 17:32:43 +08:00
Sebastien Bourdeauducq 537f4968eb acpki: add legacy i_status/o_status registers 2020-08-04 17:31:35 +08:00
Sebastien Bourdeauducq 62988a580e acpki: update for combined RTIO channel/address 2020-08-04 17:28:15 +08:00
pca006132 fc21fcc920 runtime/comms: removed sync_channel hack. 
Fixes #80
 2020-08-04 14:40:02 +08:00
pca006132 6a4d871917 runtime/irq: use spinlock functions instead of asm. 
Closes #81
 2020-08-04 14:40:02 +08:00
Sebastien Bourdeauducq 8337c9173e runtime: share rtio_log format function 2020-08-04 13:27:18 +08:00
Sebastien Bourdeauducq 1e20259c36 fix acpki selection 2020-08-04 13:26:45 +08:00
Sebastien Bourdeauducq f8d4036451 add ACP kernel initiator 
Based on work by Chris Ballance
https://github.com/m-labs/artiq/issues/1167#issuecomment-427188287
M-Labs/artiq-zynq#55

Work-in-progress, only gateware part and build system, untested.
 2020-08-04 13:15:26 +08:00
Sebastien Bourdeauducq c9bac028bf dma: call rtio module to get time cursor position 
More portable across RTIO implementations.
 2020-08-04 13:14:00 +08:00
pca006132 56e7cc822c runtime/comms: limited concurrent connections to 1 only. 2020-08-04 10:31:03 +08:00
pca006132 d58a3ef12c runtime/comms: restart core1 before kernel load. 2020-08-04 10:17:19 +08:00
pca006132 fa00ab211d Updated zc706 dependency and fixed compiler errors. 2020-08-04 10:15:57 +08:00
Sebastien Bourdeauducq 7caee2bf88 improve DMA logging 2020-07-30 22:25:49 +08:00
Sebastien Bourdeauducq 2e7090a359 remove unused import 2020-07-30 22:07:44 +08:00
Astro b388b529ad dyld: remove KERNEL_EXIDX_START/END globals, move dl_unwind_find_exidx() into runtime::kernel::core1 
Gitea issue #16
 2020-07-27 19:56:06 +02:00
Astro 641204425e dyld: obtain EXIDX offsets from section headers 
Gitea issue #16
 2020-07-27 01:58:42 +02:00
Sebastien Bourdeauducq 7f983a453d implement core device cache 2020-07-25 17:04:40 +08:00
Sebastien Bourdeauducq 630dcc274e fix compilation warning with new rustc 2020-07-25 12:15:50 +08:00
Sebastien Bourdeauducq e64f59723c dma: use const initializer for manager 2020-07-25 12:12:56 +08:00
Sebastien Bourdeauducq 26874030fc retry RTIO PLL lock 2020-07-25 11:15:33 +08:00
pca006132 0ce45b145e kernel: proper type for static shared variables. 
* Changed the KERNEL_CHANNEL_* to Mutex<T> with proper type, remove the
  need for unsafe.
* Exposed a const pointer to KernelImage, with UnsafeCell holding
  the library field for unbind with interior mutability.
 2020-07-24 12:24:01 +08:00
pca006132 0310421085 RTIO DMA: Compiled but not working. 
* Cache flush should be done before playback instead when getting the
  handler.
* `csr::rtio_dma::enable_read()` would loop forever, probably bug in the
  gateware.
 2020-07-23 17:04:15 +08:00
pca006132 64dad88a32 Kernel exception: fixed top level finally. (#70) 
Fixes #70.
 2020-07-23 14:09:15 +08:00