From 0b4191fe2ab88223e689ef341592d5b79e72fb0b Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Thu, 10 Sep 2020 01:34:38 -0700 Subject: [PATCH] [Arista] Updating driver submodules (#5352) - 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 --- .../x86_64-arista_7800_sup/platform_reboot | 1 + device/arista/x86_64-arista_7800_sup/plugins | 1 + .../pmon_daemon_control.json | 4 +++ .../platform_reboot | 1 + .../x86_64-arista_7800r3_48cq2_lc/plugins | 1 + .../sensors.conf | 0 .../platform_reboot | 1 + .../x86_64-arista_7800r3_48cqm2_lc/plugins | 1 + .../sensors.conf | 0 files/Aboot/boot0.j2 | 27 +++++++++++++++++-- .../barefoot/sonic-platform-modules-arista | 2 +- .../broadcom/sonic-platform-modules-arista | 2 +- 12 files changed, 37 insertions(+), 4 deletions(-) create mode 120000 device/arista/x86_64-arista_7800_sup/platform_reboot create mode 120000 device/arista/x86_64-arista_7800_sup/plugins create mode 100644 device/arista/x86_64-arista_7800_sup/pmon_daemon_control.json create mode 120000 device/arista/x86_64-arista_7800r3_48cq2_lc/platform_reboot create mode 120000 device/arista/x86_64-arista_7800r3_48cq2_lc/plugins create mode 100644 device/arista/x86_64-arista_7800r3_48cq2_lc/sensors.conf create mode 120000 device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_reboot create mode 120000 device/arista/x86_64-arista_7800r3_48cqm2_lc/plugins create mode 100644 device/arista/x86_64-arista_7800r3_48cqm2_lc/sensors.conf diff --git a/device/arista/x86_64-arista_7800_sup/platform_reboot b/device/arista/x86_64-arista_7800_sup/platform_reboot new file mode 120000 index 000000000000..7f94a49e38b0 --- /dev/null +++ b/device/arista/x86_64-arista_7800_sup/platform_reboot @@ -0,0 +1 @@ +../x86_64-arista_common/platform_reboot \ No newline at end of file diff --git a/device/arista/x86_64-arista_7800_sup/plugins b/device/arista/x86_64-arista_7800_sup/plugins new file mode 120000 index 000000000000..789a45fcace9 --- /dev/null +++ b/device/arista/x86_64-arista_7800_sup/plugins @@ -0,0 +1 @@ +../x86_64-arista_common/plugins \ No newline at end of file diff --git a/device/arista/x86_64-arista_7800_sup/pmon_daemon_control.json b/device/arista/x86_64-arista_7800_sup/pmon_daemon_control.json new file mode 100644 index 000000000000..fbec8f525160 --- /dev/null +++ b/device/arista/x86_64-arista_7800_sup/pmon_daemon_control.json @@ -0,0 +1,4 @@ +{ + "skip_ledd": true, + "skip_xcvrd": true +} diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_reboot b/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_reboot new file mode 120000 index 000000000000..7f94a49e38b0 --- /dev/null +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_reboot @@ -0,0 +1 @@ +../x86_64-arista_common/platform_reboot \ No newline at end of file diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/plugins b/device/arista/x86_64-arista_7800r3_48cq2_lc/plugins new file mode 120000 index 000000000000..5fbbf98a6284 --- /dev/null +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/plugins @@ -0,0 +1 @@ +../x86_64-arista_common/plugins/ \ No newline at end of file diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/sensors.conf b/device/arista/x86_64-arista_7800r3_48cq2_lc/sensors.conf new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_reboot b/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_reboot new file mode 120000 index 000000000000..7f94a49e38b0 --- /dev/null +++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_reboot @@ -0,0 +1 @@ +../x86_64-arista_common/platform_reboot \ No newline at end of file diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/plugins b/device/arista/x86_64-arista_7800r3_48cqm2_lc/plugins new file mode 120000 index 000000000000..5fbbf98a6284 --- /dev/null +++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/plugins @@ -0,0 +1 @@ +../x86_64-arista_common/plugins/ \ No newline at end of file diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/sensors.conf b/device/arista/x86_64-arista_7800r3_48cqm2_lc/sensors.conf new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index 34291c2b1e8f..eccdfd251bf5 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -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)) @@ -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 @@ -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 @@ -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() { diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista index 6de446114d0e..10f08eea2732 160000 --- a/platform/barefoot/sonic-platform-modules-arista +++ b/platform/barefoot/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 6de446114d0e2bfaa100bab42897f6f1192e2723 +Subproject commit 10f08eea27329e7090fcedf1857f3ab385a27a27 diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index 6de446114d0e..10f08eea2732 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 6de446114d0e2bfaa100bab42897f6f1192e2723 +Subproject commit 10f08eea27329e7090fcedf1857f3ab385a27a27