Skip to content

Commit

Permalink
[device]: Enable arista drivers for sonic-linux-kernel 4.9 (#21)
Browse files Browse the repository at this point in the history
* Enable arista drivers

* Add vfat ascii charset in initramfs

* Update boot0.j2 for 4.9 kernel

* Fix i2c offsets in sensors.conf

* Bump sonic-platform-modules-arista submodule
  • Loading branch information
Staphylo authored and lguohan committed Jul 10, 2018
1 parent a748f53 commit 3209516
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
20 changes: 10 additions & 10 deletions device/arista/x86_64-arista_7050_qx32/sensors.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
# ------------------------------------------------
#

bus "i2c-2" "SCD 0000:04:00.0 SMBus master 0 bus 0"
bus "i2c-3" "SCD 0000:04:00.0 SMBus master 0 bus 1"
bus "i2c-5" "SCD 0000:04:00.0 SMBus master 0 bus 3"
bus "i2c-6" "SCD 0000:04:00.0 SMBus master 0 bus 4"
bus "i2c-7" "SCD 0000:04:00.0 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
6 changes: 4 additions & 2 deletions files/Aboot/boot0.j2
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 Down Expand Up @@ -191,6 +191,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
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
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

0 comments on commit 3209516

Please sign in to comment.