Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/buildomat/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
TOFINO_STAGES=20

# These describe which version of the SDE to download and where to find it
SDE_COMMIT=2a6b33211c9675996dcb99fe939045506667ae94
SDE_PKG_SHA256=d32739c368d1666b98dd74e25e22f83c209982e2c6670de6db5d6fdf49b5e275
SDE_DEB_SHA256=3ecbf7c677bb722b351d5af74cee44fab70c1bb5eadc6ab2558ba714a8c3978b
SDE_COMMIT=6107bba19c2ae4da870ef6f8dfcff61ca457eb88
SDE_PKG_SHA256=ca4ecfd8cfca4d53caa8e91747db6c2754aa71dd89788239c2a6faa4321204b6
SDE_DEB_SHA256=c34158295489cb4ea91d94a840aa384bb364298b4c1eb49124bced0438893d6e

[ `uname -s` == "SunOS" ] && SERIES=illumos
[ `uname -s` == "SunOS" ] || SERIES=linux
Expand Down
2 changes: 1 addition & 1 deletion .helix/languages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ name = "rust"
# default to tofino_sde, can change this to any other feature such as softnpu
# as needed during development but in source control this should probably
# remain as tofino_sde
features = [ "tofino_asic" ]
features = [ "interrupts", "tofino_asic" ]
138 changes: 130 additions & 8 deletions Cargo.lock

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

13 changes: 9 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ members = [
"dpd-types",
"dpd-types/versions",
"dropshot-apis",
"intr",
"packet",
"pcap",
"swadm",
"tfportd",
"uplinkd",
"xtask",
"xtask", "intr",
]

resolver = "2"
Expand All @@ -38,11 +39,12 @@ dpd-client = { path = "dpd-client" }
dpd-types = { path = "dpd-types" }
dpd-types-versions = { path = "dpd-types/versions" }
common = { path = "common" }
intr = { path = "intr" }
packet = { path = "packet" }
pcap = { path = "pcap" }

# oxide dependencies from github
scuffle = { git = "https://github.com/oxidecomputer/scuffle", version = "0.1.0", features = ["smf-by-instance"] }
bitset = { git = "https://github.com/oxidecomputer/bitset", branch = "main"}
internal-dns-resolver = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
internal-dns-types = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
ispf = { git = "https://github.com/oxidecomputer/ispf" }
Expand All @@ -56,14 +58,17 @@ oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch =
oximeter-instruments = { git = "https://github.com/oxidecomputer/omicron", branch = "main", default-features = false, features = ["kstat"] }
oxnet = { version = "0.1.4", default-features = false, features = ["schemars", "serde"] }
propolis = { git = "https://github.com/oxidecomputer/propolis" }
regs = { git = "https://github.com/oxidecomputer/tofino", branch = "atype" }
rust_rpi = { git = "https://github.com/oxidecomputer/rsf", branch = "associated_types" }
scuffle = { git = "https://github.com/oxidecomputer/scuffle", version = "0.1.0", features = ["smf-by-instance"] }
smf = { git = "https://github.com/illumos/smf-rs" }
softnpu-lib = { git = "https://github.com/oxidecomputer/softnpu" , package = "softnpu" , branch = "main"}
tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "atype" }
transceiver-controller = { git = "https://github.com/oxidecomputer/transceiver-control", branch = "main" }

# public dependencies from crates.io
anyhow = "1.0"
bytes = "1.6"
bytes = "1.11"
camino = { version = "1.1", features = ["serde1"] }
cfg-if = "1"
chrono = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion asic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ tofino_stub = []
softnpu = ["softnpu-lib", "dep:propolis"]
chaos = []
multicast = ["aal/multicast", "common/multicast"]
interrupts = []

[lib]
# The genpd.rs code generated by bindgen causes the doctest to fail
Expand All @@ -24,6 +23,7 @@ doctest = false
aal.workspace = true
common.workspace = true
dpd-types.workspace = true
intr.workspace = true

propolis = { workspace = true, optional = true , features = ["falcon"] }
tofino = { workspace = true, optional = true }
Expand Down
1 change: 0 additions & 1 deletion asic/src/chaos/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ macro_rules! unfurl {
$handle.config.$name.unfurled(&$handle.log, stringify!($name))?
};
}
pub(crate) use unfurl;

/// A convenience macro for unfurling multicast chaos. The $name should be a
/// regular `Chaos` member of [`AsicMulticastConfigConfig`]. The `handle` is
Expand Down
3 changes: 2 additions & 1 deletion asic/src/tofino_asic/c/bf_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,11 @@ bfw_init_ctx(const char *devpath, const char *p4_dir,
}
ctx->conf_file = conffile;
ctx->init_mode = BF_DEV_INIT_COLD;
ctx->running_in_background = 1;;
ctx->running_in_background = 1;

if (devpath != NULL) {
ctx->kernel_pkt = 1;
ctx->skip_interrupt_thread = true;
} else {
perror("failed to find a tofino device");
}
Expand Down
4 changes: 0 additions & 4 deletions asic/src/tofino_asic/imported_bf_functions
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@ bf_snapshot_entry_params_get
bf_snapshot_handle_get

# Interrupt management
lld_enable_all_ints
lld_dump_new_ints
lld_int_poll
bf_err_interrupt_handling_mode_set
pipe_mgr_is_device_locked
pipe_mgr_tcam_scrub_timer_set
pipe_mgr_tcam_scrub_timer_get
Loading