Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable arista drivers for sonic-linux-kernel 4.9 #21

Merged
merged 5 commits into from
Mar 27, 2018
Merged

Enable arista drivers for sonic-linux-kernel 4.9 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07a6dca
Enable arista drivers
Staphylo Mar 6, 2018
915ff11
Add vfat ascii charset in initramfs
Staphylo Mar 14, 2018
193f319
Update boot0.j2 for 4.9 kernel
Staphylo Mar 14, 2018
4687ef2
Fix i2c offsets in sensors.conf
Staphylo Mar 14, 2018
cd01285
Bump sonic-platform-modules-arista submodule
Staphylo Mar 20, 2018
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
20 changes: 10 additions & 10 deletions device/arista/x86_64-arista_7050_qx32/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
# ------------------------------------------------
#

bus "i2c-2" "SCD SMBus master 0 bus 0"
bus "i2c-3" "SCD SMBus master 0 bus 1"
bus "i2c-5" "SCD SMBus master 0 bus 3"
bus "i2c-6" "SCD SMBus master 0 bus 4"
bus "i2c-7" "SCD SMBus master 0 bus 5"
bus "i2c-5" "SCD 0000:04:00.0 SMBus master 0 bus 0"
bus "i2c-6" "SCD 0000:04:00.0 SMBus master 0 bus 1"
bus "i2c-8" "SCD 0000:04:00.0 SMBus master 0 bus 3"
bus "i2c-9" "SCD 0000:04:00.0 SMBus master 0 bus 4"
bus "i2c-10" "SCD 0000:04:00.0 SMBus master 0 bus 5"

chip "k10temp-pci-00c3"
label temp1 "Cpu temp sensor"

chip "lm73-i2c-3-48"
chip "lm73-i2c-6-48"
label temp1 "Back panel temp sensor"
set temp1_max 65
#set temp1_max_alarm 75 # read-only

chip "max6658-i2c-2-4c"
chip "max6658-i2c-5-4c"
label temp1 "Board temp sensor"
set temp1_max 65
set temp1_crit 75
Expand All @@ -26,7 +26,7 @@ chip "max6658-i2c-2-4c"
set temp2_crit 75

# disabled because of some eeprom corruption risks
#chip "pmbus-i2c-3-4e"
#chip "pmbus-i2c-6-4e"
# label temp1 "Power controller sensor 1"
# set temp1_max 60
# set temp1_crit 70
Expand All @@ -37,7 +37,7 @@ chip "max6658-i2c-2-4c"

# ignore curr1

chip "dps460-i2c-5-58"
chip "dps460-i2c-8-58"
label temp1 "Power supply 1 inlet temp sensor"
# maximum and critical thresholds are not supported for this psu
set temp1_max 60
Expand All @@ -59,7 +59,7 @@ chip "dps460-i2c-5-58"
set curr2_max 36
set curr2_crit 37

chip "dps460-i2c-6-58"
chip "dps460-i2c-9-58"
label temp1 "Power supply 2 inlet temp sensor"
# maximum and critical thresholds are not supported for this psu
set temp1_max 60
Expand Down
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7050_qx32s/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# ------------------------------------------------
#

bus "i2c-2" "SCD SMBus master 0 bus 0"
bus "i2c-3" "SCD SMBus master 0 bus 1"
bus "i2c-5" "SCD SMBus master 0 bus 3"
bus "i2c-6" "SCD SMBus master 0 bus 4"
bus "i2c-7" "SCD SMBus master 0 bus 5"
bus "i2c-2" "SCD 0000:02:00.0 SMBus master 0 bus 0"
bus "i2c-3" "SCD 0000:02:00.0 SMBus master 0 bus 1"
bus "i2c-5" "SCD 0000:02:00.0 SMBus master 0 bus 3"
bus "i2c-6" "SCD 0000:02:00.0 SMBus master 0 bus 4"
bus "i2c-7" "SCD 0000:02:00.0 SMBus master 0 bus 5"

chip "k10temp-pci-00c3"
label temp1 "Cpu temp sensor"
Expand Down
6 changes: 4 additions & 2 deletions files/Aboot/boot0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ platform_specific() {
if [ "$platform" = "raven" ]; then
aboot_machine=arista_7050_qx32
flash_size=2000
echo "modprobe.blacklist=radeon" >>/tmp/append
echo "modprobe.blacklist=radeon,sp5100_tco acpi=off" >>/tmp/append
fi
if [ "$platform" = "crow" ]; then
aboot_machine=arista_7050_qx32s
flash_size=3700
echo "modprobe.blacklist=radeon" >>/tmp/append
echo "modprobe.blacklist=radeon,sp5100_tco" >>/tmp/append
fi
if [ "$sid" = "Upperlake" ] || [ "$sid" = "UpperlakeES" ]; then
aboot_machine=arista_7060_cx32s
Expand All @@ -185,6 +185,8 @@ platform_specific() {
fi

echo "varlog_size=$varlog_size" >>/tmp/append
# disable deterministic interface naming
echo "net.ifnames=0" >>/tmp/append
}

get_uuid_for() {
Expand Down
1 change: 1 addition & 0 deletions files/initramfs-tools/modules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
squashfs
overlay
vfat
nls_ascii
nls_cp437
nls_utf8
2 changes: 1 addition & 1 deletion platform/broadcom/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(PLATFORM_PATH)/sdk.mk
include $(PLATFORM_PATH)/sai.mk
include $(PLATFORM_PATH)/platform-modules-s6000.mk
include $(PLATFORM_PATH)/platform-modules-dell.mk
#include $(PLATFORM_PATH)/platform-modules-arista.mk
include $(PLATFORM_PATH)/platform-modules-arista.mk
include $(PLATFORM_PATH)/platform-modules-ingrasys.mk
include $(PLATFORM_PATH)/platform-modules-accton.mk
include $(PLATFORM_PATH)/platform-modules-inventec.mk
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 27 files
+5 −2 arista/components/common.py
+5 −3 arista/components/ds125br.py
+16 −18 arista/components/ds460.py
+138 −218 arista/components/scd.py
+35 −0 arista/core/inventory.py
+1 −1 arista/core/platform.py
+49 −0 arista/core/utils.py
+11 −10 arista/platforms/a7050qx32.py
+6 −4 arista/platforms/a7050qx32s.py
+3 −1 arista/platforms/a7060cx32s.py
+3 −1 arista/platforms/a7260cx364.py
+0 −14 confs/arista-drivers.service
+24 −0 confs/sonic-platform-arista.service
+2 −2 confs/watchdog-stop.service
+1 −1 debian/control
+2 −2 debian/rules
+0 −47 debian/sonic-platform-arista.init
+0 −1 src/Makefile
+0 −70 src/gpio-kversfix.h
+0 −1 src/raven-fan-driver.c
+15 −2 src/scd-hwmon.c
+12 −10 src/scd.c
+0 −1,269 src/sonic-support-driver.c
+0 −19 src/sonic-support-driver.h
+6 −0 tests/all-platforms.sh
+35 −0 utils/arista
+0 −144 utils/arista-gardena-watchdog