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

Thales IPs integration. #33

Open
wants to merge 63 commits into
base: astral
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
819db40
Fix Spatz enabler in carfield.mk.
Apr 11, 2024
19f60be
Add workaround to compile Streamer's IPs.
Apr 14, 2024
ff1f4ee
Add Streamer as a dependency.
Apr 14, 2024
bfe8416
First transparent streamer integration.
Apr 15, 2024
7a9dc02
Expand APB memory map.
Apr 17, 2024
57e1fbb
Functional streamer integration (APB and RegBus access).
Apr 17, 2024
cc8bcb7
Added proper streamer test. Wrong values read from register file.
Apr 18, 2024
47f98d5
Fix lint.
Apr 18, 2024
2d9eb67
Bump streamer removing Master ID constraint on register interface.
Apr 22, 2024
08c3879
Adapt Streamer test to readback all regs after writihg them.
Apr 22, 2024
8cfb728
Extend sim-clean rule removing *lib and *Lib generated by Streamer.
Apr 22, 2024
1c82b8f
Add correct return value in PTME read back.
Apr 22, 2024
5fe6a6a
Add read from TC buffer and write to HPC LLC.
Apr 22, 2024
27ad525
WIP: Add PTME emulator.
Apr 23, 2024
c0266eb
Bump streamer commit and test.
May 9, 2024
9563e4a
Adjust L2 and Mailboxe sizes in config.
May 15, 2024
350ad80
Adjust bender URLs.
May 15, 2024
58c5cb0
Bump dependencies.
May 15, 2024
c5f91c8
PTME_EMULATOR is upper-case.
May 16, 2024
c48a052
bump streamer commit
andrea-caslini May 27, 2024
f28ff60
New hash for streamer repository
andrea-caslini May 30, 2024
467ea22
tc interface added at tb top level and updated hash in bender.yml
andrea-caslini May 31, 2024
06984d3
updated hash in bender.yml
andrea-caslini May 31, 2024
481df55
updated bender hash
andrea-caslini May 31, 2024
7d02131
first issue of tb with tc
andrea-caslini May 31, 2024
e7703c0
updated streamer hash bender
andrea-caslini May 31, 2024
aea788d
update bender.lock
andrea-caslini May 31, 2024
98f5e46
updated bender
mattiacosmi Jun 17, 2024
2c5f624
updated bender and tasi top level ports
mattiacosmi Jun 19, 2024
75f6627
Add streamer-dedicated clock divider.
Jun 20, 2024
ed94a22
Allow streamer test termination.
Jun 20, 2024
dfcb9a3
added test cases for TASI module
mattiacosmi Jun 21, 2024
80dd7a1
[Draft]: SpW integration.
Jun 20, 2024
bf6740c
Fix typo in streamer test.
Jun 21, 2024
1d94e95
Successful SpW integration.
Jun 21, 2024
b0d0b3c
Connect streamer general interrupt to memory-mapped register.
Jun 21, 2024
4e47ba0
Fix error in streamer general interrupt connections.
Jun 21, 2024
9fc5b5b
updated bender and interrupt mask register in tasi_interrupt_test
mattiacosmi Jun 21, 2024
8b600e3
added tests; added spw tb compact; added hpc/llc tb detection; bender…
mattiacosmi Jul 3, 2024
7f37bf3
bender updated
mattiacosmi Jul 8, 2024
bc82b7b
Add APB demux on TMTC IP bus.
Jul 8, 2024
7a2f729
Use SSH to fetch SpW IP.
Jul 8, 2024
61dc0ef
Optimize APB connections to Streamer and SpW.
Jul 8, 2024
09c60f9
Fix SpW ABP demux selector connection.
Jul 8, 2024
5baffd3
Bump Streamer and SpaceWire.
Jul 8, 2024
cf38bf2
Bump SpaceWire to latest release.
Jul 8, 2024
d97a8c0
Bump SpaceWire and Streamer.
Jul 9, 2024
bdd0832
Exclude tasi files from lint.
Jul 9, 2024
fe26478
Fetch Thales IPs using SSH.
Jul 9, 2024
33f96ea
Set SPATZD to 0.
Jul 10, 2024
bac98df
Fix number of APB slaves.
Jul 10, 2024
584ed57
Move eth_clk scope.
Jul 10, 2024
ab43047
Introduce ethernet config.
Jul 10, 2024
d118499
Bump streamer.
Jul 10, 2024
2c0989a
Bump common cells.
Jul 10, 2024
f1c03fd
Commit updated config.
Jul 11, 2024
b7cefe7
Bump Streamer and Spacewire for DC synthesis sypport.
Jul 21, 2024
822f9f4
Bump tech commit.
Jul 21, 2024
a2be21e
Update streamer.
Jul 21, 2024
d793dc7
Bump tech commit.
Jul 25, 2024
e150aa4
Bump streamer.
Jul 25, 2024
1d6f7a7
Enlarge L2 and LLC sizes.
Jul 27, 2024
62a78b0
Reduce LLC size.
Aug 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
# Exclude generated headers (no license checker support for optional lines)
exclude_paths: |
sw/include/regs/*.h
sw/include/tasi.h
sw/tests/bare-metal/hostd/tasi_*
.dir-locals.el
utils/*
scripts/*
Expand Down
3 changes: 1 addition & 2 deletions Bender.local
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ overrides:
cv32e40p: { git: "https://github.com/pulp-platform/cv32e40p.git" , rev: e863f576699815b38cc9d80dbdede8ed5efd5991 }
axi_rt: { git: "https://github.com/pulp-platform/axi_rt.git" , version: =0.0.0-alpha.8 }
register_interface: { git: "https://github.com/pulp-platform/register_interface.git" , version: 0.4.4 }
common_cells: { git: "https://github.com/pulp-platform/common_cells.git" , version: 1.37.0 } # branch: master

common_cells: { git: "https://github.com/pulp-platform/common_cells.git" , version: 1.37.0 }
16 changes: 14 additions & 2 deletions Bender.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ packages:
- apb
- register_interface
axi:
revision: 9402c8a9ce0a7b5253c3c29e788612d771e8b5d6
version: 0.39.3
revision: 587355b77b8ce94dcd600efbd5d5bd118ff913a7
version: 0.39.4
source:
Git: https://github.com/pulp-platform/axi.git
dependencies:
Expand Down Expand Up @@ -544,6 +544,12 @@ packages:
- hwpe-ctrl
- hwpe-stream
- ibex
spacewire:
revision: 4e8ad9fc08c25e6d8db60d6abdcc1310a4c0b289
version: null
source:
Git: [email protected]:musa/spacewire.git
dependencies: []
spatz:
revision: 98de97f24fe42675c9b4a8cc08354a03af57400a
version: null
Expand All @@ -558,6 +564,12 @@ packages:
- register_interface
- riscv-dbg
- tech_cells_generic
streamer:
revision: f5594d3cf7325ed941a88a796a47484e1f8ebacd
version: null
source:
Git: [email protected]:musa/streamer.git
dependencies: []
tagger:
revision: b288376b65b6bbd5feea196bb3c220f783d96e29
version: null
Expand Down
9 changes: 9 additions & 0 deletions Bender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ dependencies:
common_cells: { git: https://github.com/pulp-platform/common_cells.git, version: 1.37.0 } # branch: master
pulp-ethernet: { git: https://github.com/pulp-platform/pulp-ethernet.git, rev: 1f8f1776ec494773f8e6c48e16685eb35d5f445e } # branch: handshake
riscv-dbg: { git: https://github.com/pulp-platform/riscv-dbg.git, version: =0.8.0 }
streamer: { git: [email protected]:musa/streamer.git, rev: f5594d3cf7325ed941a88a796a47484e1f8ebacd } # branch: yt/synth-1
spacewire: { git: [email protected]:musa/spacewire.git, rev: 4e8ad9fc08c25e6d8db60d6abdcc1310a4c0b289 } # branch: yt/synth

workspace:
package_links:
Expand All @@ -44,6 +46,10 @@ sources:
files:
- hw/configs/carfield_l2dual_secure_pulp_periph_can.sv

- target: carfield_l2dual_secure_pulp_periph_can_ethernet_streamer_spw
files:
- hw/configs/carfield_l2dual_secure_pulp_periph_can_ethernet_streamer_spw.sv

- target: carfield_l2dual_safe_secure_pulp_spatz_periph_can
files:
- hw/configs/carfield_l2dual_safe_secure_pulp_spatz_periph_can.sv
Expand Down Expand Up @@ -115,6 +121,7 @@ sources:
files:
- tech/sourcecode/tc_clk.sv
- tech/sourcecode/tc_sram.sv
- tech/sourcecode/ptme_ram.sv
- tech/sourcecode/configurable_delay.sv
- target/synth/src/carfield_synth_wrap.sv

Expand All @@ -132,8 +139,10 @@ sources:
- tech/sourcecode/macros/sram_dp_hse_rvt_mvt_16384x8m16b8w1.v
- tech/sourcecode/macros/sram_sp_hse_rvt_mvt_2560x76m4b4w0.v
- tech/sourcecode/macros/sram_sp_hse_rvt_mvt_4096x76m4b4w0.v
- tech/sourcecode/macros/sram_sp_hse_rvt_mvt_16384x39m8b8w0.v
- tech/sourcecode/tc_clk.sv
- tech/sourcecode/tc_sram.sv
- tech/sourcecode/ptme_ram.sv

- target: all(xilinx, fpga, xilinx_vanilla)
files:
Expand Down
2 changes: 1 addition & 1 deletion bender-common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Author: Matteo Perotti <[email protected]>

# Runtime-selectable Carfield configuration
CARFIELD_CONFIG ?= carfield_l2dual_secure_pulp_periph_can
CARFIELD_CONFIG ?= carfield_l2dual_secure_pulp_periph_can_ethernet_streamer_spw

# bender targets
common_targs += -t cva6
Expand Down
12 changes: 9 additions & 3 deletions carfield.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
CAR_ROOT ?= $(shell $(BENDER) path carfield)
CAR_HW_DIR := $(CAR_ROOT)/hw
CAR_SW_DIR := $(CAR_ROOT)/sw
CAR_TGT_DIR := $(CAR_ROOT)/target/
CAR_TGT_DIR := $(CAR_ROOT)/target
CAR_XIL_DIR := $(CAR_TGT_DIR)/xilinx
CAR_SIM_DIR := $(CAR_TGT_DIR)/sim
SECD_ROOT ?= $(shell $(BENDER) path opentitan)
Expand Down Expand Up @@ -100,6 +100,12 @@ SPATZD_MAKEDIR := $(SPATZD_ROOT)/hw/system/spatz_cluster
SPATZD_BINARY ?=
SPATZD_BOOTMODE ?= 0 # default jtag bootmode

# Streamer, implementing telecommand and telemetry protocols
STREAMER_ROOT ?= $(shell $(BENDER) path streamer)

# SpaceWire IP
SPACEWIRE_ROOT ?= $(shell $(BENDER) path spacewire)

###########################
# System HW configuration #
###########################
Expand Down Expand Up @@ -167,7 +173,7 @@ SAFED_SW_BUILD := safed-sw-build
SAFED_SW_INIT := safed-sw-init
endif

ifeq ($(shell echo $(SAFED_PRESENT)), 1)
ifeq ($(shell echo $(SPATZD_PRESENT)), 1)
SPATZD_HW_INIT := spatzd-hw-init
endif

Expand Down Expand Up @@ -387,7 +393,7 @@ car-check-litmus-tests: $(LITMUS_WORK_DIR)/litmus.log
##############
tech-repo := [email protected]:Astral/gf12.git
# no commit by default, change during development
tech-commit := fdb28aed61aa113a897c6840674ec9033eb1f2ed # branch: zx/ecc_llc_256x39
tech-commit := a8c12632a9c395aed8e014d36dd88e760d8e5ddf # branch: thales

tech-clone:
git clone $(tech-repo) tech
Expand Down
Loading
Loading