matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Arista] Update drivers submodules (#4353)

Browse Source 
* Update arista drivers submodules

* Add device configs for 7060CX2-32S

* Update boot0 and union-mount for 7060CX2-32S

* Add 7170-32C and 7170-32CD support in boot0

* Sync after writting boot configs

* Add 7170-32C and 7170-32CD device configurations

Co-authored-by: Boyang Yu <byu@arista.com>

Co-authored-by: Boyang Yu <byu@arista.com>
This commit is contained in:
Samuel Angebault 2020-04-01 23:26:42 -07:00 committed by GitHub
parent 2e87a16941
commit 8819322210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 3752 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
device/arista/x86_64-arista_7060cx2_32s/Arista-7060CX2-32S-C32 Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32

1
device/arista/x86_64-arista_7060cx2_32s/default_sku Normal file
View File

@ -0,0 +1 @@
Arista-7060CX2-32S-C32 t1

1
device/arista/x86_64-arista_7060cx2_32s/fancontrol Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_7060_cx32s/fancontrol

1
device/arista/x86_64-arista_7060cx2_32s/platform_reboot Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_common/platform_reboot

1
device/arista/x86_64-arista_7060cx2_32s/plugins Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_common/plugins/

1
device/arista/x86_64-arista_7060cx2_32s/sensors.conf Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_7060_cx32s/sensors.conf

1734
device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json Normal file
View File

File diff suppressed because it is too large Load Diff

33
device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/port_config.ini Normal file
View File

@ -0,0 +1,33 @@
# name lanes alias speed index
Ethernet0 0,1,2,3 Ethernet1/1 100000 1
Ethernet4 4,5,6,7 Ethernet2/1 100000 2
Ethernet8 8,9,10,11 Ethernet3/1 100000 3
Ethernet12 12,13,14,15 Ethernet4/1 100000 4
Ethernet16 16,17,18,19 Ethernet5/1 100000 5
Ethernet20 20,21,22,23 Ethernet6/1 100000 6
Ethernet24 24,25,26,27 Ethernet7/1 100000 7
Ethernet28 28,29,30,31 Ethernet8/1 100000 8
Ethernet32 32,33,34,35 Ethernet9/1 100000 9
Ethernet36 36,37,38,39 Ethernet10/1 100000 10
Ethernet40 40,41,42,43 Ethernet11/1 100000 11
Ethernet44 44,45,46,47 Ethernet12/1 100000 12
Ethernet48 48,49,50,51 Ethernet13/1 100000 13
Ethernet52 52,53,54,55 Ethernet14/1 100000 14
Ethernet56 56,57,58,59 Ethernet15/1 100000 15
Ethernet60 60,61,62,63 Ethernet16/1 100000 16
Ethernet64 64,65,66,67 Ethernet17/1 100000 17
Ethernet68 68,69,70,71 Ethernet18/1 100000 18
Ethernet72 72,73,74,75 Ethernet19/1 100000 19
Ethernet76 76,77,78,79 Ethernet20/1 100000 20
Ethernet80 80,81,82,83 Ethernet21/1 100000 21
Ethernet84 84,85,86,87 Ethernet22/1 100000 22
Ethernet88 88,89,90,91 Ethernet23/1 100000 23
Ethernet92 92,93,94,95 Ethernet24/1 100000 24
Ethernet96 96,97,98,99 Ethernet25/1 100000 25
Ethernet100 100,101,102,103 Ethernet26/1 100000 26
Ethernet104 104,105,106,107 Ethernet27/1 100000 27
Ethernet108 108,109,110,111 Ethernet28/1 100000 28
Ethernet112 112,113,114,115 Ethernet29/1 100000 29
Ethernet116 116,117,118,119 Ethernet30/1 100000 30
Ethernet120 120,121,122,123 Ethernet31/1 100000 31
Ethernet124 124,125,126,127 Ethernet32/1 100000 32

33
device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf Normal file
View File

@ -0,0 +1,33 @@
{
"chip_list": [
{
"id": "asic-0",
"chip_family": "Tofino",
"instance": 0,
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
"pcie_domain": 0,
"pcie_bus": 7,
"pcie_fn": 0,
"pcie_dev": 0,
"pcie_int_mode": 1,
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
}
],
"instance": 0,
"p4_program_list": [
{
"id": "pgm-0",
"instance": 0,
"path": "switch",
"program-name": "switch",
"pd": "lib/tofinopd/switch/libpd.so",
"pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
"table-config": "share/tofinopd/switch/context.json",
"tofino-bin": "share/tofinopd/switch/tofino.bin",
"switchapi": "lib/libswitchapi.so",
"sai": "lib/libsai.so",
"switchapi_port_add": false,
"non_default_port_ppgs": 5
}
]
}

39
device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf Normal file
View File

@ -0,0 +1,39 @@
{
"instance": 0,
"chip_list": [
{
"id": "asic-0",
"chip_family": "Tofino",
"instance": 0,
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
"pcie_domain": 0,
"pcie_bus": 5,
"pcie_fn": 0,
"pcie_dev": 0,
"pcie_int_mode": 1,
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
}
],
"p4_devices": [
{
"device-id": 0,
"p4_programs": [
{
"p4_pipelines": [
{
"p4_pipeline_name": "pipe",
"config": "share/switch/pipe/tofino.bin",
"context": "share/switch/pipe/context.json"
}
],
"program-name": "switch",
"sai": "lib/libsai.so",
"bfrt-config": "share/switch/bf-rt.json",
"model_json_path" : "share/switch/aug_model.json",
"switchapi_port_add": false,
"non_default_port_ppgs": 5
}
]
}
]
}

1
device/arista/x86_64-arista_7170_32c/default_sku Normal file
View File

@ -0,0 +1 @@
Arista-7170-32CD-C32 t1

1
device/arista/x86_64-arista_7170_32c/platform_reboot Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_common/platform_reboot

1
device/arista/x86_64-arista_7170_32c/plugins Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_common/plugins

1
device/arista/x86_64-arista_7170_32c/sensors.conf Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_7170_64c/sensors.conf

1734
device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/board_lane_map.json Normal file
View File

File diff suppressed because it is too large Load Diff

33
device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/port_config.ini Normal file
View File

@ -0,0 +1,33 @@
# name lanes alias speed index
Ethernet0 0,1,2,3 Ethernet1/1 100000 1
Ethernet4 4,5,6,7 Ethernet2/1 100000 2
Ethernet8 8,9,10,11 Ethernet3/1 100000 3
Ethernet12 12,13,14,15 Ethernet4/1 100000 4
Ethernet16 16,17,18,19 Ethernet5/1 100000 5
Ethernet20 20,21,22,23 Ethernet6/1 100000 6
Ethernet24 24,25,26,27 Ethernet7/1 100000 7
Ethernet28 28,29,30,31 Ethernet8/1 100000 8
Ethernet32 32,33,34,35 Ethernet9/1 100000 9
Ethernet36 36,37,38,39 Ethernet10/1 100000 10
Ethernet40 40,41,42,43 Ethernet11/1 100000 11
Ethernet44 44,45,46,47 Ethernet12/1 100000 12
Ethernet48 48,49,50,51 Ethernet13/1 100000 13
Ethernet52 52,53,54,55 Ethernet14/1 100000 14
Ethernet56 56,57,58,59 Ethernet15/1 100000 15
Ethernet60 60,61,62,63 Ethernet16/1 100000 16
Ethernet64 64,65,66,67 Ethernet17/1 100000 17
Ethernet68 68,69,70,71 Ethernet18/1 100000 18
Ethernet72 72,73,74,75 Ethernet19/1 100000 19
Ethernet76 76,77,78,79 Ethernet20/1 100000 20
Ethernet80 80,81,82,83 Ethernet21/1 100000 21
Ethernet84 84,85,86,87 Ethernet22/1 100000 22
Ethernet88 88,89,90,91 Ethernet23/1 100000 23
Ethernet92 92,93,94,95 Ethernet24/1 100000 24
Ethernet96 96,97,98,99 Ethernet25/1 100000 25
Ethernet100 100,101,102,103 Ethernet26/1 100000 26
Ethernet104 104,105,106,107 Ethernet27/1 100000 27
Ethernet108 108,109,110,111 Ethernet28/1 100000 28
Ethernet112 112,113,114,115 Ethernet29/1 100000 29
Ethernet116 116,117,118,119 Ethernet30/1 100000 30
Ethernet120 120,121,122,123 Ethernet31/1 100000 31
Ethernet124 124,125,126,127 Ethernet32/1 100000 32

33
device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf Normal file
View File

@ -0,0 +1,33 @@
{
"chip_list": [
{
"id": "asic-0",
"chip_family": "Tofino",
"instance": 0,
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
"pcie_domain": 0,
"pcie_bus": 7,
"pcie_fn": 0,
"pcie_dev": 0,
"pcie_int_mode": 1,
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
}
],
"instance": 0,
"p4_program_list": [
{
"id": "pgm-0",
"instance": 0,
"path": "switch",
"program-name": "switch",
"pd": "lib/tofinopd/switch/libpd.so",
"pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
"table-config": "share/tofinopd/switch/context.json",
"tofino-bin": "share/tofinopd/switch/tofino.bin",
"switchapi": "lib/libswitchapi.so",
"sai": "lib/libsai.so",
"switchapi_port_add": false,
"non_default_port_ppgs": 5
}
]
}

39
device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf Normal file
View File

@ -0,0 +1,39 @@
{
"instance": 0,
"chip_list": [
{
"id": "asic-0",
"chip_family": "Tofino",
"instance": 0,
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
"pcie_domain": 0,
"pcie_bus": 5,
"pcie_fn": 0,
"pcie_dev": 0,
"pcie_int_mode": 1,
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
}
],
"p4_devices": [
{
"device-id": 0,
"p4_programs": [
{
"p4_pipelines": [
{
"p4_pipeline_name": "pipe",
"config": "share/switch/pipe/tofino.bin",
"context": "share/switch/pipe/context.json"
}
],
"program-name": "switch",
"sai": "lib/libsai.so",
"bfrt-config": "share/switch/bf-rt.json",
"model_json_path" : "share/switch/aug_model.json",
"switchapi_port_add": false,
"non_default_port_ppgs": 5
}
]
}
]
}

1
device/arista/x86_64-arista_7170_32cd/default_sku Normal file
View File

@ -0,0 +1 @@
Arista-7170-32CD-C32 t1

1
device/arista/x86_64-arista_7170_32cd/platform_reboot Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_common/platform_reboot

1
device/arista/x86_64-arista_7170_32cd/plugins Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_common/plugins

1
device/arista/x86_64-arista_7170_32cd/sensors.conf Symbolic link
View File

@ -0,0 +1 @@
../x86_64-arista_7170_64c/sensors.conf

83
files/Aboot/boot0.j2
View File

@ -216,9 +216,31 @@ EOF
chmod a+r "${target_path}/machine.conf"
}
in_array() {
local value="$1"
shift
for other in $@; do
if [ "$value" = "$other" ]; then
return 0
fi
done
return 1
}
read_system_eeprom() {
if [ -x /bin/readprefdl ]; then
readprefdl -f /tmp/.system-prefdl -d > $target_path/.system-prefdl
elif [ -f /etc/prefdl ]; then
cp /etc/prefdl $target_path/.system-prefdl
chmod a+r $target_path/.system-prefdl
fi
}
platform_specific() {
local platform="$(grep -Eo 'platform=[^ ]+' "$cmdline_base" | cut -f2 -d=)"
local sid="$(grep -Eo 'sid=[^ ]+' "$cmdline_base" | cut -f2 -d=)"
local platform="$(sed -nr 's/.*platform=([^ ]+).*/\1/p' "$cmdline_base")"
local sid="$(sed -nr 's/.*sid=([^ ]+).*/\1/p' "$cmdline_base" | sed 's/Ssd$//')"
# set varlog size to 100MB
local varlog_size=100
@ -227,31 +249,49 @@ platform_specific() {
local flash_size=$(($(df | grep -E "$flash_re" | tr -s ' ' | cut -f2 -d' ') / 1000))
if [ "$platform" = "raven" ]; then
# Assuming sid=Cloverdale
aboot_machine=arista_7050_qx32
flash_size=2000
docker_inram=on
echo "modprobe.blacklist=radeon,sp5100_tco acpi=off docker_inram=on" >>/tmp/append
fi
if [ "$platform" = "crow" ]; then
# Assuming sid=Clearlake
aboot_machine=arista_7050_qx32s
flash_size=3700
echo "modprobe.blacklist=radeon,sp5100_tco" >>/tmp/append
fi
if [ "$sid" = "Upperlake" ] || [ "$sid" = "UpperlakeES" ] ||
[ "$sid" = "UpperlakeSsd" ]; then
if [ "$sid" = "Upperlake" ] || [ "$sid" = "UpperlakeES" ]; then
aboot_machine=arista_7060_cx32s
flash_size=3700
echo "amd_iommu=off" >> /tmp/append
fi
if [ "$sid" = "Gardena" ] || [ "$sid" = "GardenaSsd" ]; then
if [ "$sid" = "UpperlakePlus" ]; then
aboot_machine=arista_7060cx2_32s
flash_size=3700
fi
if [ "$sid" = "Gardena" ] || [ "$sid" = "GardenaE" ]; then
aboot_machine=arista_7260cx3_64
flash_size=28000
fi
if [ "$sid" = "Alhambra" ] || [ "$sid" = "AlhambraSsd" ]; then
if [ "$sid" = "Alhambra" ]; then
aboot_machine=arista_7170_64c
flash_size=28000
echo "hugepages=128" >> /tmp/append
fi
if [ "$sid" = "Mineral" ]; then
aboot_machine=arista_7170_32c
flash_size=28000
echo "hugepages=128" >> /tmp/append
fi
if [ "$sid" = "MineralD" ]; then
aboot_machine=arista_7170_32cd
flash_size=28000
echo "hugepages=128" >> /tmp/append
fi
if [ "$sid" = "Lodoga" ]; then
aboot_machine=arista_7050cx3_32s
flash_size=3700
fi
if [ "$sid" = "BlackhawkO" ]; then
aboot_machine=arista_7060px4_32
flash_size=28000
@ -260,40 +300,30 @@ platform_specific() {
aboot_machine=arista_7060dx4_32
flash_size=28000
fi
if [ "$sid" = "Smartsville" ] || [ "$sid" = "SmartsvilleSsd" ]; then
if [ "$sid" = "Smartsville" ]; then
aboot_machine=arista_7280cr3_32p4
flash_size=7382
fi
if [ "$sid" = "SmartsvilleBK" ] || [ "$sid" = "SmartsvilleBKSsd" ]; then
if [ "$sid" = "SmartsvilleBK" ]; then
aboot_machine=arista_7280cr3k_32p4
flash_size=7382
fi
if [ "$sid" = "SmartsvilleDD" ] || [ "$sid" = "SmartsvilleDDSsd" ]; then
if [ "$sid" = "SmartsvilleDD" ]; then
aboot_machine=arista_7280cr3_32d4
flash_size=7382
fi
if [ "$sid" = "Lodoga" ] || [ "$sid" = "LodogaSsd" ]; then
aboot_machine=arista_7050cx3_32s
flash_size=3700
echo "amd_iommu=off" >> /tmp/append
fi
if [ "$platform" = "rook" ] || [ "$platform" = "magpie" ] ||
[ "$platform" = "woodpecker" ]; then
if in_array "$platform" "rook" "magpie" "woodpecker"; then
echo "tsc=reliable pcie_ports=native" >>/tmp/append
echo "rhash_entries=1 usb-storage.delay_use=0" >>/tmp/append
if [ -x /bin/readprefdl ]; then
readprefdl -f /tmp/.system-prefdl -d > /mnt/flash/.system-prefdl
elif [ -f /etc/prefdl ]; then
cp /etc/prefdl /mnt/flash/.system-prefdl
chmod a+r /mnt/flash/.system-prefdl
fi
echo "reassign_prefmem" >> /tmp/append
fi
if [ "$platform" = "rook" ] || [ "$platform" = "magpie" ]; then
if in_array "$platform" "rook"; then
echo "iommu=on intel_iommu=on" >>/tmp/append
read_system_eeprom
fi
if [ "$platform" = "woodpecker" ]; then
if in_array "$platform" "crow" "woodpecker" "magpie"; then
echo "amd_iommu=off modprobe.blacklist=snd_hda_intel,hdaudio" >> /tmp/append
read_system_eeprom
fi
if [ $flash_size -ge 28000 ]; then
@ -363,7 +393,8 @@ write_boot_configs() {
mkdir -p "$image_path"
cat /tmp/append > $cmdline_image
[ -e ${target_path}/machine.conf ] || write_machine_config
[ -s ${target_path}/machine.conf ] || write_machine_config
sync
}
run_kexec() {

1
files/initramfs-tools/union-mount.j2
View File

@ -21,6 +21,7 @@ set_tmpfs_log_partition_size()
[ X"$aboot_platform" = X"x86_64-arista_7050_qx32" ] && return
[ X"$aboot_platform" = X"x86_64-arista_7050_qx32s" ] && return
[ X"$aboot_platform" = X"x86_64-arista_7060_cx32s" ] && return
[ X"$aboot_platform" = X"x86_64-arista_7060cx2_32s" ] && return
# set varlogsize to existing var-log.ext4 size
if [ -f ${rootmnt}/host/disk-img/var-log.ext4 ]; then

2
platform/barefoot/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit e9cabadb42725d3c86eb93c3d766cfb5d58e6d29
Subproject commit 39860a109853b2f37367dfe68905e019b509d5bf

2
platform/broadcom/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit e9cabadb42725d3c86eb93c3d766cfb5d58e6d29
Subproject commit 39860a109853b2f37367dfe68905e019b509d5bf