Skip to content

Decouple front-io functionality from sidecar-seq #2161

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Decouple front-io functionality from sidecar-seq #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 61 additions & 35 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/medusa/base.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ memory-size = 33_554_432 # 256 Mib / 32 MiB
slot-count = 16 # 2 MiB slots

[[auxflash.blobs]]
file = "drv/sidecar-front-io/sidecar_qsfp_x32_controller_rev_b_c.bit"
file = "drv/front-io-api/sidecar_qsfp_x32_controller_rev_b_c.bit"
compress = true
tag = "QSFP"

Expand Down
3 changes: 0 additions & 3 deletions app/medusa/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ fn main() -> ! {

const CYCLES_PER_MS: u32 = 400_000;

#[cfg(feature = "traptrace")]
kern::profiling::configure_events_table(tracing::table());

unsafe { kern::startup::start_kernel(CYCLES_PER_MS) }
}

Expand Down
1 change: 0 additions & 1 deletion app/minibar/app.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ notifications = ["timer"]

[tasks.power]
name = "task-power"
features = ["sidecar"]
priority = 6
max-sizes = {flash = 32768, ram = 8192 }
stacksize = 3800
Expand Down
47 changes: 30 additions & 17 deletions app/sidecar/base.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ task-slots = ["sys"]
[tasks.net]
name = "task-net"
stacksize = 10000
priority = 5
priority = 6
features = ["mgmt", "h753", "sidecar", "vlan", "vpd-mac", "use-spi-core", "spi3"]
max-sizes = {flash = 131072, ram = 131072, sram1_mac = 16384}
sections = {eth_bulk = "sram1_mac"}
Expand All @@ -103,7 +103,7 @@ task-slots = ["sys", "packrat", { seq = "sequencer" }, "jefe"]

[tasks.control_plane_agent]
name = "task-control-plane-agent"
priority = 7
priority = 8
# This is a big number -- do we need to tune this?
stacksize = 12000
start = true
Expand All @@ -121,9 +121,9 @@ task-slots = [
"sequencer",
"sprot",
"sys",
"transceivers",
"update_server",
"validate",
"front_io",
"vpd",
]
features = ["sidecar", "vlan", "auxflash", "vpd"]
Expand All @@ -146,7 +146,7 @@ interrupts = {"spi4.irq" = "spi-irq"}

[tasks.udpecho]
name = "task-udpecho"
priority = 6
priority = 7
max-sizes = {flash = 16384, ram = 8192}
stacksize = 4096
start = true
Expand All @@ -156,7 +156,7 @@ notifications = ["socket"]

[tasks.udpbroadcast]
name = "task-udpbroadcast"
priority = 6
priority = 7
max-sizes = {flash = 16384, ram = 8192}
stacksize = 4096
start = true
Expand All @@ -171,7 +171,7 @@ max-sizes = {flash = 262144, ram = 16384}
features = ["mgmt", "sidecar", "vlan", "use-spi-core", "h753", "spi2"]
stacksize = 4096
start = true
task-slots = ["ecp5_front_io", "sys", { seq = "sequencer" }]
task-slots = ["front_io", "sys", { seq = "sequencer" }]
uses = ["spi2"]
notifications = ["spi-irq", "wake-timer"]
interrupts = {"spi2.irq" = "spi-irq"}
Expand Down Expand Up @@ -240,20 +240,33 @@ interrupts = {"spi1.irq" = "spi-irq"}
[tasks.transceivers]
name = "drv-transceivers-server"
features = ["vlan", "thermal-control"]
priority = 6
priority = 7
max-sizes = {flash = 65536, ram = 16384}
stacksize = 4096
start = true
task-slots = [
"i2c_driver",
"net",
"sensor",
"sys",
"thermal",
{front_io = "ecp5_front_io"},
"front_io",
{seq = "sequencer"}]
notifications = ["socket", "timer"]

[tasks.front_io]
name = "drv-front-io-server"
priority = 4
max-sizes = {flash = 65536, ram = 16384}
stacksize = 4096
start = true
task-slots = [
"sys",
"auxflash",
"i2c_driver",
{mainboard = "ecp5_mainboard"},
{front_io = "ecp5_front_io"}]
notifications = ["timer"]

[tasks.packrat]
name = "task-packrat"
priority = 3
Expand All @@ -264,22 +277,22 @@ task-slots = []

[tasks.sequencer]
name = "drv-sidecar-seq-server"
priority = 4
priority = 5
stacksize = 4096
start = true
task-slots = [
"sys",
"i2c_driver",
"auxflash",
"packrat",
{mainboard = "ecp5_mainboard"},
{front_io = "ecp5_front_io"}]
"front_io",
{mainboard = "ecp5_mainboard"}]
notifications = ["timer"]

[tasks.thermal]
name = "task-thermal"
features = ["sidecar"]
priority = 5
priority = 6
max-sizes = {flash = 32768, ram = 16384 }
stacksize = 8096
start = true
Expand Down Expand Up @@ -307,7 +320,7 @@ task-slots = ["i2c_driver"]
[tasks.ignition]
name = "drv-ignition-server"
features = ["sequencer"]
priority = 5
priority = 6
max-sizes = {flash = 16384, ram = 8192}
stacksize = 2048
start = true
Expand All @@ -324,7 +337,7 @@ stacksize = 800

[tasks.dump_agent]
name = "task-dump-agent"
priority = 6
priority = 7
max-sizes = {flash = 32768, ram = 16384 }
start = true
task-slots = ["sprot", "jefe", "net"]
Expand All @@ -335,7 +348,7 @@ features = ["net", "vlan"]

[tasks.idle]
name = "task-idle"
priority = 8
priority = 10
max-sizes = {flash = 128, ram = 256}
stacksize = 256
start = true
Expand Down Expand Up @@ -1168,7 +1181,7 @@ memory-size = 33_554_432 # 256 Mib / 32 MiB
slot-count = 16 # 2 MiB slots

[[auxflash.blobs]]
file = "drv/sidecar-front-io/sidecar_qsfp_x32_controller_rev_b_c.bit"
file = "drv/front-io-api/sidecar_qsfp_x32_controller_rev_b_c.bit"
compress = true
tag = "QSFP"

Expand Down
2 changes: 1 addition & 1 deletion app/sidecar/dev.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ request_reset = ["udprpc"]

[tasks.udprpc]
name = "task-udprpc"
priority = 6
priority = 7
max-sizes = {flash = 32768, ram = 8192}
stacksize = 4096
start = true
Expand Down
Loading