Skip to content

Commit 0625831

Browse files
authored
add support for rev b sidecars (#2007)
This change supports a new SMF property for the `dendrite` service. By changing `config/board_rev`, we change which board map `dpd` loads at startup.
1 parent 9a2a0f1 commit 0625831

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

package-manifest.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ only_for_targets.switch_variant = "stub"
138138
# 3. Use source.type = "manual" instead of "prebuilt"
139139
source.type = "prebuilt"
140140
source.repo = "dendrite"
141-
source.commit = "77e1268141aab830966b18526cffab8f458a28f9"
142-
source.sha256 = "76bab69b6a712e3da11de4aba044c90d86b6d374c8ece9ddda98ef2087541276"
141+
source.commit = "557f9e95a7ac213fe9bafdbbc566e85037085429"
142+
source.sha256 = "0b2291b797d7f3ae1d6b8af04088a0559faad74334b25da4e1f70602a85b828b"
143143
output.type = "zone"
144144
output.intermediate_only = true
145145

@@ -156,8 +156,8 @@ only_for_targets.switch_variant = "asic"
156156
# 3. Use source.type = "manual" instead of "prebuilt"
157157
source.type = "prebuilt"
158158
source.repo = "dendrite"
159-
source.commit = "77e1268141aab830966b18526cffab8f458a28f9"
160-
source.sha256 = "a402001c2e531af4d8b2416a546d5daacb50c69fb81009c6c5cb74aaad7066ac"
159+
source.commit = "557f9e95a7ac213fe9bafdbbc566e85037085429"
160+
source.sha256 = "830d082a96417c910c893bb66dd45a7a2a6b6db3316692b0df9abab509117b58"
161161
output.type = "zone"
162162
output.intermediate_only = true
163163

sled-agent/src/services.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -741,10 +741,13 @@ impl ServiceManager {
741741
&format!("[{}]:{}", address, DENDRITE_PORT,),
742742
)?;
743743
match *asic {
744-
DendriteAsic::TofinoAsic => smfh.setprop(
745-
"config/port_config",
746-
"/opt/oxide/dendrite/misc/sidecar_config.toml",
747-
)?,
744+
DendriteAsic::TofinoAsic => {
745+
smfh.setprop(
746+
"config/port_config",
747+
"/opt/oxide/dendrite/misc/sidecar_config.toml",
748+
)?;
749+
smfh.setprop("config/board_rev", "rev_a")?;
750+
}
748751
DendriteAsic::TofinoStub => smfh.setprop(
749752
"config/port_config",
750753
"/opt/oxide/dendrite/misc/model_config.toml",

0 commit comments

Comments
 (0)