Skip to content

Commit df724b7

Browse files
Staphylolguohan
authored andcommitted
[device]: Enable arista drivers for sonic-linux-kernel 4.9 (#21)
* 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
1 parent cc9f824 commit df724b7

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

device/arista/x86_64-arista_7050_qx32/sensors.conf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# ------------------------------------------------
33
#
44

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

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

14-
chip "lm73-i2c-3-48"
14+
chip "lm73-i2c-6-48"
1515
label temp1 "Back panel temp sensor"
1616
set temp1_max 65
1717
#set temp1_max_alarm 75 # read-only
1818

19-
chip "max6658-i2c-2-4c"
19+
chip "max6658-i2c-5-4c"
2020
label temp1 "Board temp sensor"
2121
set temp1_max 65
2222
set temp1_crit 75
@@ -26,7 +26,7 @@ chip "max6658-i2c-2-4c"
2626
set temp2_crit 75
2727

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

3838
# ignore curr1
3939

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

62-
chip "dps460-i2c-6-58"
62+
chip "dps460-i2c-9-58"
6363
label temp1 "Power supply 2 inlet temp sensor"
6464
# maximum and critical thresholds are not supported for this psu
6565
set temp1_max 60

device/arista/x86_64-arista_7050_qx32s/sensors.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# ------------------------------------------------
33
#
44

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

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

files/Aboot/boot0.j2

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ platform_specific() {
153153
if [ "$platform" = "raven" ]; then
154154
aboot_machine=arista_7050_qx32
155155
flash_size=2000
156-
echo "modprobe.blacklist=radeon" >>/tmp/append
156+
echo "modprobe.blacklist=radeon,sp5100_tco acpi=off" >>/tmp/append
157157
fi
158158
if [ "$platform" = "crow" ]; then
159159
aboot_machine=arista_7050_qx32s
160160
flash_size=3700
161-
echo "modprobe.blacklist=radeon" >>/tmp/append
161+
echo "modprobe.blacklist=radeon,sp5100_tco" >>/tmp/append
162162
fi
163163
if [ "$sid" = "Upperlake" ] || [ "$sid" = "UpperlakeES" ]; then
164164
aboot_machine=arista_7060_cx32s
@@ -185,6 +185,8 @@ platform_specific() {
185185
fi
186186

187187
echo "varlog_size=$varlog_size" >>/tmp/append
188+
# disable deterministic interface naming
189+
echo "net.ifnames=0" >>/tmp/append
188190
}
189191

190192
get_uuid_for() {

files/initramfs-tools/modules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
squashfs
22
overlay
33
vfat
4+
nls_ascii
45
nls_cp437
56
nls_utf8

platform/broadcom/rules.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(PLATFORM_PATH)/sdk.mk
22
include $(PLATFORM_PATH)/sai.mk
33
include $(PLATFORM_PATH)/platform-modules-s6000.mk
44
include $(PLATFORM_PATH)/platform-modules-dell.mk
5-
#include $(PLATFORM_PATH)/platform-modules-arista.mk
5+
include $(PLATFORM_PATH)/platform-modules-arista.mk
66
include $(PLATFORM_PATH)/platform-modules-ingrasys.mk
77
include $(PLATFORM_PATH)/platform-modules-accton.mk
88
include $(PLATFORM_PATH)/platform-modules-inventec.mk

0 commit comments

Comments
 (0)