Skip to content

Commit

Permalink
Merge pull request #106 from pulp-platform/nwistoff/dualcore
Browse files Browse the repository at this point in the history
cheshire_cfg: Set number of cores to 2
  • Loading branch information
alex96295 authored Aug 4, 2023
2 parents 9de04a1 + 88f70b0 commit d4267b2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions Bender.lock
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ packages:
- common_cells
- obi
axi_riscv_atomics:
revision: 97dcb14ef057cbe5bd70dda2060b5bb9e7e04c6d
version: 0.7.0
revision: c3c3f2b65071841035c4e081c61c9b7be801d749
version: 0.8.1
source:
Git: https://github.com/pulp-platform/axi_riscv_atomics.git
dependencies:
Expand Down Expand Up @@ -134,7 +134,7 @@ packages:
- register_interface
- tech_cells_generic
cheshire:
revision: 7514252a9502737be3412078da371f3ce4207dbe
revision: d2a2a5b0b68383f227c12bd80f63a282a2c8ce4f
version: null
source:
Git: https://github.com/pulp-platform/cheshire.git
Expand Down Expand Up @@ -166,8 +166,8 @@ packages:
- common_cells
- register_interface
clint:
revision: e1357c1d0edddde458aec58363473605f51e539e
version: 0.1.0
revision: d5390a805c20f9226758a152ba1645f61da73349
version: 0.2.0
source:
Git: https://github.com/pulp-platform/clint.git
dependencies:
Expand Down Expand Up @@ -211,7 +211,7 @@ packages:
- fpnew
- tech_cells_generic
cva6:
revision: bf806ffa1385876ab70b28df488fafe7ea573a7f
revision: 3a628bf7585b3a3a0c3d205fbce8f998ac492fed
version: null
source:
Git: https://github.com/pulp-platform/cva6.git
Expand Down
2 changes: 1 addition & 1 deletion Bender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package:
dependencies:
register_interface: { git: https://github.com/pulp-platform/register_interface.git, version: 0.4.1 }
axi: { git: https://github.com/pulp-platform/axi.git, version: 0.39.0-beta.10 }
cheshire: { git: https://github.com/pulp-platform/cheshire.git, rev: 7514252a9502737be3412078da371f3ce4207dbe } # branch: aottaviano/carfield
cheshire: { git: https://github.com/pulp-platform/cheshire.git, rev: d2a2a5b0b68383f227c12bd80f63a282a2c8ce4f } # branch: nwistoff/carfield
hyperbus: { git: https://github.com/pulp-platform/hyperbus.git, rev: 2adb7271438cdb96c19fbaf3e2a6bf89ffeee568 } # branch: lv/phys_in_use
car_l2: { git: [email protected]:carfield/carfield_l2_mem.git, rev: d6ab486b2777bf78c38b49352b5977565a272a58 } # branch: main
safety_island: { git: [email protected]:carfield/safety-island.git, rev: b0501345b1741fa96b781ef5d845026fec036fd2 } # branch: param_banks
Expand Down
6 changes: 3 additions & 3 deletions carfield.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ VOPTARGS ?=

# Interrupt configuration in cheshire
# CLINT interruptible harts
CLINTCORES := 3
CLINTCORES := 4
# PLIC interruptible harts
PLICCORES := 6
PLICCORES := 8
# PLIC number of input interrupts
PLIC_NUM_INTRS := 89

Expand Down Expand Up @@ -90,7 +90,7 @@ endif
######################

CAR_NONFREE_REMOTE ?= [email protected]:carfield/carfield-nonfree.git
CAR_NONFREE_COMMIT ?= a51afe8cd67a47b83df79e1d0f53d5a8cf22371d
CAR_NONFREE_COMMIT ?= 717358edc2da9e31f4b24622086f6bc756344237

## Clone the non-free verification IP for the Carfield TB
car-nonfree-init:
Expand Down
2 changes: 1 addition & 1 deletion hw/carfield.sv
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ assign car_periph_intrs = {

// Mailbox unit

localparam int unsigned CheshireNumIntHarts = 1 + Cfg.DualCore;
localparam int unsigned CheshireNumIntHarts = Cfg.NumCores;
localparam int unsigned SafedNumIntHarts = 1;
localparam int unsigned SecdNumIntHarts = 1;

Expand Down
2 changes: 1 addition & 1 deletion hw/carfield_pkg.sv
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ localparam cheshire_cfg_t CarfieldCfgDefault = '{
// [0x7000_0000, 0x8000_0000) is CIE
Cva6ExtCieOnTop : 1,
// Harts
DualCore : 0, // Only one core, but rest of config allows for two
NumCores : 2,
CoreMaxTxns : 8,
CoreMaxTxnsPerId : 4,
// Interrupt parameters
Expand Down

0 comments on commit d4267b2

Please sign in to comment.