Skip to content

[arista] Update Arista drivers submodule #2097

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

Merged
lguohan merged 7 commits into from
Sep 29, 2018
Merged

[arista] Update Arista drivers submodule #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4185b31
[arista] Update Arista drivers submodule
Staphylo Sep 28, 2018
c4fbdf9
Fix 7050qx32 fancontrol for kernel 4.9
Staphylo Sep 28, 2018
aee3039
Fix 7260cx3 fancontrol for kernel 4.9
Staphylo Sep 28, 2018
decef28
Fix 7060cx32s fancontrol for kernel 4.9
Staphylo Sep 28, 2018
31ff271
Fix hwsku-init scripts and permissions
Staphylo Sep 28, 2018
435c0fc
Preserve old_config folder in boot0
Staphylo Sep 28, 2018
061fa7c
Install python3-yaml for sonic config tests
Staphylo Sep 28, 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
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32/fancontrol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
INTERVAL=5
DEVPATH=hwmon1=devices/platform/sb800-fans hwmon2=devices/pci0000:00/0000:00:09.0/0000:04:00.0/i2c-2/2-004c
DEVPATH=hwmon1=devices/platform/sb800-fans hwmon2=devices/pci0000:00/0000:00:09.0/0000:04:00.0/i2c-5/5-004c
DEVNAME=hwmon1=fans hwmon2=max6658
FCTEMPS=hwmon1/pwm4=hwmon2/temp1_input hwmon1/pwm3=hwmon2/temp1_input hwmon1/pwm2=hwmon2/temp1_input hwmon1/pwm1=hwmon2/temp1_input
FCFANS=hwmon1/pwm4=hwmon1/fan4_input hwmon1/pwm3=hwmon1/fan3_input hwmon1/pwm2=hwmon1/fan2_input hwmon1/pwm1=hwmon1/fan1_input
Expand Down
2 changes: 2 additions & 0 deletions device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/hwsku-init
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
#!/bin/bash

echo 0 > /sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/mux
2 changes: 2 additions & 0 deletions device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku-init
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
#!/bin/bash

echo 1 > /sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/mux
18 changes: 9 additions & 9 deletions device/arista/x86_64-arista_7060_cx32s/fancontrol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
INTERVAL=5
DEVPATH=hwmon1=devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-2/2-001a hwmon3=devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060
DEVNAME=hwmon1=max6697 hwmon3=crow_cpld
FCTEMPS=hwmon3/pwm4=hwmon1/temp1_input hwmon3/pwm3=hwmon1/temp1_input hwmon3/pwm2=hwmon1/temp1_input hwmon3/pwm1=hwmon1/temp1_input
FCFANS=hwmon3/pwm4=hwmon3/fan4_input hwmon3/pwm3=hwmon3/fan3_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm1=hwmon3/fan1_input
MINTEMP=hwmon3/pwm4=40 hwmon3/pwm3=40 hwmon3/pwm2=40 hwmon3/pwm1=40
MINPWM=hwmon3/pwm4=179 hwmon3/pwm3=179 hwmon3/pwm2=179 hwmon3/pwm1=179
MAXTEMP=hwmon3/pwm4=50 hwmon3/pwm3=50 hwmon3/pwm2=50 hwmon3/pwm1=50
MINSTART=hwmon3/pwm4=179 hwmon3/pwm3=179 hwmon3/pwm2=179 hwmon3/pwm1=179
MINSTOP=hwmon3/pwm4=179 hwmon3/pwm3=179 hwmon3/pwm2=179 hwmon3/pwm1=179
DEVPATH=hwmon2=devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-2/2-001a hwmon4=devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060
DEVNAME=hwmon2=max6697 hwmon4=crow_cpld
FCTEMPS=hwmon4/pwm4=hwmon2/temp1_input hwmon4/pwm3=hwmon2/temp1_input hwmon4/pwm2=hwmon2/temp1_input hwmon4/pwm1=hwmon2/temp1_input
FCFANS=hwmon4/pwm4=hwmon4/fan4_input hwmon4/pwm3=hwmon4/fan3_input hwmon4/pwm2=hwmon4/fan2_input hwmon4/pwm1=hwmon4/fan1_input
MINTEMP=hwmon4/pwm4=40 hwmon4/pwm3=40 hwmon4/pwm2=40 hwmon4/pwm1=40
MINPWM=hwmon4/pwm4=179 hwmon4/pwm3=179 hwmon4/pwm2=179 hwmon4/pwm1=179
MAXTEMP=hwmon4/pwm4=50 hwmon4/pwm3=50 hwmon4/pwm2=50 hwmon4/pwm1=50
MINSTART=hwmon4/pwm4=179 hwmon4/pwm3=179 hwmon4/pwm2=179 hwmon4/pwm1=179
MINSTOP=hwmon4/pwm4=179 hwmon4/pwm3=179 hwmon4/pwm2=179 hwmon4/pwm1=179
18 changes: 9 additions & 9 deletions device/arista/x86_64-arista_7260cx3_64/fancontrol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
INTERVAL=5
DEVPATH=hwmon1=devices/pci0000:00/0000:00:1c.0/0000:06:00.0/i2c-1/1-004c hwmon3=devices/pci0000:ff/0000:ff:0b.3/i2c-85/85-0060
DEVNAME=hwmon1=max6658 hwmon3=rook_cpld
FCTEMPS=hwmon3/pwm4=hwmon1/temp1_input hwmon3/pwm3=hwmon1/temp1_input hwmon3/pwm2=hwmon1/temp1_input hwmon3/pwm1=hwmon1/temp1_input
FCFANS=hwmon3/pwm4=hwmon3/fan4_input hwmon3/pwm3=hwmon3/fan3_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm1=hwmon3/fan1_input
MINTEMP=hwmon3/pwm4=50 hwmon3/pwm3=50 hwmon3/pwm2=50 hwmon3/pwm1=50
MINPWM=hwmon3/pwm4=128 hwmon3/pwm3=128 hwmon3/pwm2=128 hwmon3/pwm1=128
MAXTEMP=hwmon3/pwm4=60 hwmon3/pwm3=60 hwmon3/pwm2=60 hwmon3/pwm1=60
MINSTART=hwmon3/pwm4=128 hwmon3/pwm3=128 hwmon3/pwm2=128 hwmon3/pwm1=128
MINSTOP=hwmon3/pwm4=128 hwmon3/pwm3=128 hwmon3/pwm2=128 hwmon3/pwm1=128
DEVPATH=hwmon2=devices/pci0000:00/0000:00:1c.0/0000:06:00.0/i2c-1/1-004c hwmon4=devices/pci0000:ff/0000:ff:0b.3/i2c-85/85-0060
DEVNAME=hwmon2=max6658 hwmon4=rook_cpld
FCTEMPS=hwmon4/pwm4=hwmon2/temp1_input hwmon4/pwm3=hwmon2/temp1_input hwmon4/pwm2=hwmon2/temp1_input hwmon4/pwm1=hwmon2/temp1_input
FCFANS=hwmon4/pwm4=hwmon4/fan4_input hwmon4/pwm3=hwmon4/fan3_input hwmon4/pwm2=hwmon4/fan2_input hwmon4/pwm1=hwmon4/fan1_input
MINTEMP=hwmon4/pwm4=50 hwmon4/pwm3=50 hwmon4/pwm2=50 hwmon4/pwm1=50
MINPWM=hwmon4/pwm4=128 hwmon4/pwm3=128 hwmon4/pwm2=128 hwmon4/pwm1=128
MAXTEMP=hwmon4/pwm4=60 hwmon4/pwm3=60 hwmon4/pwm2=60 hwmon4/pwm1=60
MINSTART=hwmon4/pwm4=128 hwmon4/pwm3=128 hwmon4/pwm2=128 hwmon4/pwm1=128
MINSTOP=hwmon4/pwm4=128 hwmon4/pwm3=128 hwmon4/pwm2=128 hwmon4/pwm1=128
1 change: 1 addition & 0 deletions files/Aboot/boot0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ clean_flash() {
[ $f != "boot-config" ] &&
[ $f != "$kernel_params" ] &&
[ $f != "$cmdline_base" ] &&
[ $f != "old_config" ] &&
[ $f != "minigraph.xml" ]
then
rm -rf "$target_path/$f"
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 18 files
+93 −23 arista/components/scd.py
+6 −0 arista/core/component.py
+25 −3 arista/core/config.py
+28 −1 arista/core/driver.py
+30 −5 arista/core/inventory.py
+4 −2 arista/core/platform.py
+10 −2 arista/core/types.py
+14 −15 arista/platforms/a7050qx32.py
+17 −20 arista/platforms/a7050qx32s.py
+14 −17 arista/platforms/a7060cx32s.py
+15 −18 arista/platforms/a717064c.py
+17 −20 arista/platforms/a7260cx364.py
+0 −4 debian/rules
+1 −1 src/Makefile
+16 −0 src/crow-fan-driver.c
+218 −59 src/scd-hwmon.c
+32 −9 utils/arista
+0 −180 utils/reset
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 18 files
+93 −23 arista/components/scd.py
+6 −0 arista/core/component.py
+25 −3 arista/core/config.py
+28 −1 arista/core/driver.py
+30 −5 arista/core/inventory.py
+4 −2 arista/core/platform.py
+10 −2 arista/core/types.py
+14 −15 arista/platforms/a7050qx32.py
+17 −20 arista/platforms/a7050qx32s.py
+14 −17 arista/platforms/a7060cx32s.py
+15 −18 arista/platforms/a717064c.py
+17 −20 arista/platforms/a7260cx364.py
+0 −4 debian/rules
+1 −1 src/Makefile
+16 −0 src/crow-fan-driver.c
+218 −59 src/scd-hwmon.c
+32 −9 utils/arista
+0 −180 utils/reset
1 change: 1 addition & 0 deletions sonic-slave-stretch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ RUN apt-get update && apt-get install -y \
python-netaddr \
python-ipaddr \
python-yaml \
python3-yaml \
# For lockfile
procmail \
# For gtest
Expand Down