Skip to content

Commit

Permalink
[Arista] Updating driver submodules (#5352)
Browse files Browse the repository at this point in the history
 - Merge chassis codebase upstream
 - Add support for Otterlake supervisor
 - Add support for NorthFace and Camp chassis
 - Add support for Eldridge, Dragonfly and Brooks fabrics
 - Add support for Clearwater2 and Clearwater2Ms linecards
 - Add new arista Cli to power on/off cards
 - Add new arista show Cli to inspect supervisor, chassis, fabrics and linecards
  • Loading branch information
Staphylo authored Sep 10, 2020
1 parent 339cfbf commit 0b4191f
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 4 deletions.
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7800_sup/platform_reboot
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7800_sup/plugins
4 changes: 4 additions & 0 deletions device/arista/x86_64-arista_7800_sup/pmon_daemon_control.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"skip_ledd": true,
"skip_xcvrd": true
}
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7800r3_48cq2_lc/plugins
Empty file.
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7800r3_48cqm2_lc/plugins
Empty file.
27 changes: 25 additions & 2 deletions files/Aboot/boot0.j2
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,11 @@ write_platform_specific_cmdline() {
# set varlog size to 100MB
local varlog_size=100

# sonic_mode is set to fixed by default.
sonic_mode="fixed"
supervisor_mode="supervisor"
linecard_mode="linecard"

# detect the size of the flash partition from name in Aboot/EOS/SONiC
local flash_size=$(($(df "$target_path" | tail -1 | tr -s ' ' | cut -f2 -d' ') / 1000))

Expand Down Expand Up @@ -502,14 +507,27 @@ write_platform_specific_cmdline() {
aboot_machine=arista_7280cr3k_32d4
flash_size=7382
fi
if in_array "$platform" "rook" "magpie" "woodpecker"; then
if [ "$sid" = "Clearwater2" ]; then
aboot_machine=arista_7800r3_48cq2_lc
sonic_mode="$linecard_mode"
fi
if [ "$sid" = "Clearwater2Ms" ]; then
aboot_machine=arista_7800r3_48cqm2_lc
sonic_mode="$linecard_mode"
fi
if [ "$sid" = "OtterLake" ]; then
aboot_machine=arista_7800_sup
flash_size=30000
sonic_mode=$supervisor_mode
fi
if in_array "$platform" "rook" "magpie" "woodpecker" "sprucefish"; then
cmdline_add tsc=reliable
cmdline_add pcie_ports=native
cmdline_add rhash_entries=1
cmdline_add usb-storage.delay_use=0
cmdline_add reassign_prefmem
fi
if in_array "$platform" "rook"; then
if in_array "$platform" "rook" "sprucefish"; then
cmdline_add iommu=on
cmdline_add intel_iommu=on
read_system_eeprom
Expand All @@ -523,6 +541,9 @@ write_platform_specific_cmdline() {
cmdline_add modprobe.blacklist=snd_hda_intel,hdaudio
read_system_eeprom
fi
if in_array "$platform" "lorikeet" "hedgehog"; then
read_system_eeprom
fi

if [ $flash_size -ge 28000 ]; then
varlog_size=4096
Expand All @@ -535,6 +556,8 @@ write_platform_specific_cmdline() {
fi

cmdline_add "varlog_size=$varlog_size"

cmdline_add "sonic.mode=$sonic_mode"
}

write_image_specific_cmdline() {
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-arista
Submodule sonic-platform-modules-arista updated 89 files
+15 −0 arista/cli/actions/chassis/__init__.py
+10 −0 arista/cli/actions/chassis/diag.py
+9 −0 arista/cli/actions/chassis/setup.py
+25 −0 arista/cli/actions/fabric/__init__.py
+20 −0 arista/cli/actions/fabric/clean.py
+10 −0 arista/cli/actions/fabric/diag.py
+16 −0 arista/cli/actions/fabric/power.py
+28 −0 arista/cli/actions/fabric/setup.py
+25 −0 arista/cli/actions/linecard/__init__.py
+39 −0 arista/cli/actions/linecard/clean.py
+10 −0 arista/cli/actions/linecard/diag.py
+30 −0 arista/cli/actions/linecard/power.py
+52 −0 arista/cli/actions/linecard/setup.py
+8 −0 arista/cli/actions/show/chassis/__init__.py
+33 −0 arista/cli/actions/show/chassis/summary.py
+8 −0 arista/cli/actions/show/fabric/__init__.py
+10 −0 arista/cli/actions/show/fabric/environment.py
+8 −0 arista/cli/actions/show/linecard/__init__.py
+10 −0 arista/cli/actions/show/linecard/environment.py
+10 −0 arista/cli/args/chassis/__init__.py
+11 −0 arista/cli/args/chassis/diag.py
+10 −0 arista/cli/args/chassis/setup.py
+11 −0 arista/cli/args/fabric/__init__.py
+12 −0 arista/cli/args/fabric/clean.py
+10 −0 arista/cli/args/fabric/diag.py
+8 −0 arista/cli/args/fabric/power.py
+12 −0 arista/cli/args/fabric/setup.py
+12 −0 arista/cli/args/linecard/__init__.py
+14 −0 arista/cli/args/linecard/clean.py
+11 −0 arista/cli/args/linecard/diag.py
+12 −0 arista/cli/args/linecard/power.py
+21 −0 arista/cli/args/linecard/setup.py
+8 −0 arista/cli/args/show/chassis/__init__.py
+8 −0 arista/cli/args/show/chassis/summary.py
+9 −0 arista/cli/args/show/fabric/__init__.py
+7 −0 arista/cli/args/show/fabric/environment.py
+9 −0 arista/cli/args/show/linecard/__init__.py
+7 −0 arista/cli/args/show/linecard/environment.py
+5 −0 arista/components/asic/ramon.py
+0 −0 arista/components/denali/__init__.py
+202 −0 arista/components/denali/card.py
+10 −0 arista/components/denali/chassis.py
+55 −0 arista/components/denali/fabric.py
+123 −0 arista/components/denali/linecard.py
+118 −0 arista/components/denali/supervisor.py
+6 −0 arista/components/fabric.py
+10 −0 arista/components/linecard.py
+6 −0 arista/components/max31790.py
+55 −0 arista/components/microsemi.py
+14 −0 arista/components/pca9541.py
+18 −0 arista/components/pci.py
+5 −0 arista/components/phy/b52.py
+74 −0 arista/components/plx.py
+6 −0 arista/components/power.py
+103 −0 arista/core/card.py
+2 −0 arista/core/config.py
+105 −0 arista/core/modular.py
+9 −0 arista/core/provision.py
+58 −0 arista/core/supervisor.py
+57 −0 arista/core/tests/fabrics.py
+72 −0 arista/core/tests/linecards.py
+71 −0 arista/drivers/microsemi.py
+65 −0 arista/drivers/pca9541.py
+123 −3 arista/drivers/pci.py
+362 −0 arista/drivers/plx.py
+0 −0 arista/platforms/chassis/__init__.py
+14 −0 arista/platforms/chassis/camp.py
+14 −0 arista/platforms/chassis/northface.py
+23 −0 arista/platforms/cpu/hedgehog.py
+42 −0 arista/platforms/cpu/sprucefish.py
+0 −0 arista/platforms/fabric/__init__.py
+34 −0 arista/platforms/fabric/brooks.py
+38 −0 arista/platforms/fabric/dragonfly.py
+141 −0 arista/platforms/fabric/eldridge.py
+0 −0 arista/platforms/linecard/__init__.py
+179 −0 arista/platforms/linecard/clearwater.py
+98 −0 arista/platforms/linecard/clearwater2.py
+0 −0 arista/platforms/supervisor/__init__.py
+81 −0 arista/platforms/supervisor/otterlake.py
+1 −1 debian/control
+1 −1 debian/rules
+3 −0 src/scd.c
+17 −0 systemd/platform-arista-chassis-network.service
+20 −0 systemd/platform-arista-fabric.service
+17 −0 systemd/platform-arista-linecard-network.service
+20 −0 systemd/platform-arista-linecard.service
+1 −0 udev/70-lc-network.rules
+62 −0 utils/arista-chassis-network
+137 −0 utils/lc-interface-config
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-arista
Submodule sonic-platform-modules-arista updated 89 files
+15 −0 arista/cli/actions/chassis/__init__.py
+10 −0 arista/cli/actions/chassis/diag.py
+9 −0 arista/cli/actions/chassis/setup.py
+25 −0 arista/cli/actions/fabric/__init__.py
+20 −0 arista/cli/actions/fabric/clean.py
+10 −0 arista/cli/actions/fabric/diag.py
+16 −0 arista/cli/actions/fabric/power.py
+28 −0 arista/cli/actions/fabric/setup.py
+25 −0 arista/cli/actions/linecard/__init__.py
+39 −0 arista/cli/actions/linecard/clean.py
+10 −0 arista/cli/actions/linecard/diag.py
+30 −0 arista/cli/actions/linecard/power.py
+52 −0 arista/cli/actions/linecard/setup.py
+8 −0 arista/cli/actions/show/chassis/__init__.py
+33 −0 arista/cli/actions/show/chassis/summary.py
+8 −0 arista/cli/actions/show/fabric/__init__.py
+10 −0 arista/cli/actions/show/fabric/environment.py
+8 −0 arista/cli/actions/show/linecard/__init__.py
+10 −0 arista/cli/actions/show/linecard/environment.py
+10 −0 arista/cli/args/chassis/__init__.py
+11 −0 arista/cli/args/chassis/diag.py
+10 −0 arista/cli/args/chassis/setup.py
+11 −0 arista/cli/args/fabric/__init__.py
+12 −0 arista/cli/args/fabric/clean.py
+10 −0 arista/cli/args/fabric/diag.py
+8 −0 arista/cli/args/fabric/power.py
+12 −0 arista/cli/args/fabric/setup.py
+12 −0 arista/cli/args/linecard/__init__.py
+14 −0 arista/cli/args/linecard/clean.py
+11 −0 arista/cli/args/linecard/diag.py
+12 −0 arista/cli/args/linecard/power.py
+21 −0 arista/cli/args/linecard/setup.py
+8 −0 arista/cli/args/show/chassis/__init__.py
+8 −0 arista/cli/args/show/chassis/summary.py
+9 −0 arista/cli/args/show/fabric/__init__.py
+7 −0 arista/cli/args/show/fabric/environment.py
+9 −0 arista/cli/args/show/linecard/__init__.py
+7 −0 arista/cli/args/show/linecard/environment.py
+5 −0 arista/components/asic/ramon.py
+0 −0 arista/components/denali/__init__.py
+202 −0 arista/components/denali/card.py
+10 −0 arista/components/denali/chassis.py
+55 −0 arista/components/denali/fabric.py
+123 −0 arista/components/denali/linecard.py
+118 −0 arista/components/denali/supervisor.py
+6 −0 arista/components/fabric.py
+10 −0 arista/components/linecard.py
+6 −0 arista/components/max31790.py
+55 −0 arista/components/microsemi.py
+14 −0 arista/components/pca9541.py
+18 −0 arista/components/pci.py
+5 −0 arista/components/phy/b52.py
+74 −0 arista/components/plx.py
+6 −0 arista/components/power.py
+103 −0 arista/core/card.py
+2 −0 arista/core/config.py
+105 −0 arista/core/modular.py
+9 −0 arista/core/provision.py
+58 −0 arista/core/supervisor.py
+57 −0 arista/core/tests/fabrics.py
+72 −0 arista/core/tests/linecards.py
+71 −0 arista/drivers/microsemi.py
+65 −0 arista/drivers/pca9541.py
+123 −3 arista/drivers/pci.py
+362 −0 arista/drivers/plx.py
+0 −0 arista/platforms/chassis/__init__.py
+14 −0 arista/platforms/chassis/camp.py
+14 −0 arista/platforms/chassis/northface.py
+23 −0 arista/platforms/cpu/hedgehog.py
+42 −0 arista/platforms/cpu/sprucefish.py
+0 −0 arista/platforms/fabric/__init__.py
+34 −0 arista/platforms/fabric/brooks.py
+38 −0 arista/platforms/fabric/dragonfly.py
+141 −0 arista/platforms/fabric/eldridge.py
+0 −0 arista/platforms/linecard/__init__.py
+179 −0 arista/platforms/linecard/clearwater.py
+98 −0 arista/platforms/linecard/clearwater2.py
+0 −0 arista/platforms/supervisor/__init__.py
+81 −0 arista/platforms/supervisor/otterlake.py
+1 −1 debian/control
+1 −1 debian/rules
+3 −0 src/scd.c
+17 −0 systemd/platform-arista-chassis-network.service
+20 −0 systemd/platform-arista-fabric.service
+17 −0 systemd/platform-arista-linecard-network.service
+20 −0 systemd/platform-arista-linecard.service
+1 −0 udev/70-lc-network.rules
+62 −0 utils/arista-chassis-network
+137 −0 utils/lc-interface-config

0 comments on commit 0b4191f

Please sign in to comment.