Skip to content

Commit c8c8294

Browse files
Alex-DaiAlex-Dai
authored
Merge pull request sonic-net#201 from SONIC-DEV/201911
update from 201911
2 parents dabe204 + a1243c3 commit c8c8294

File tree

368 files changed

+10225
-1950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

368 files changed

+10225
-1950
lines changed

‎.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,16 @@ src/**/debian/stamp-autotools-files
162162

163163
# .o files
164164
src/**/*.o
165+
166+
# platform
167+
platform/**/*.egg-info
168+
platform/**/*-none-any.whl
169+
platform/**/.pybuild
170+
platform/**/debian/*
171+
platform/**/build
172+
platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/ipmihelper.py
173+
platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_ich.c
174+
platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
175+
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
176+
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
177+
platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py

‎Makefile.work

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ SONIC_BUILD_INSTRUCTION := make \
169169
INSTALL_KUBERNETES=$(INSTALL_KUBERNETES) \
170170
KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
171171
K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
172-
K8s_CNI_CALICO_VERSION=$(K8s_CNI_CALICO_VERSION) \
172+
K8s_CNI_FLANNEL_VERSION=$(K8s_CNI_FLANNEL_VERSION) \
173173
SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
174174
SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
175175
SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \
@@ -252,8 +252,8 @@ reset :
252252
fi
253253
git clean -xfdf;
254254
git reset --hard;
255-
git submodule foreach --recursive git clean -xfdf;
256-
git submodule foreach --recursive git reset --hard;
255+
git submodule foreach --recursive 'git clean -xfdf || true';
256+
git submodule foreach --recursive 'git reset --hard || true';
257257
git submodule update --init --recursive;
258258
echo "Reset complete!";
259259
else

‎build_debian.sh

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
165165
sudo cp files/initramfs-tools/resize-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
166166
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
167167

168+
# Hook into initramfs: run fsck to repair a non-clean filesystem prior to be mounted
169+
sudo cp files/initramfs-tools/fsck-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
170+
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
171+
168172
## Hook into initramfs: after partition mount and loop file mount
169173
## 1. Prepare layered file system
170174
## 2. Bind-mount docker working directory (docker overlay storage cannot work over overlay rootfs)
@@ -213,6 +217,14 @@ then
213217
## Check out the sources list update matches current Debian version
214218
sudo cp files/image_config/kubernetes/kubernetes.list $FILESYSTEM_ROOT/etc/apt/sources.list.d/
215219
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
220+
if [[ $KUBERNETES_VERSION == 1.18.0 ]]; then
221+
# kubeadm 1.18.0 package auto install has some dependency error so install
222+
# those package explicitly.
223+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubernetes-cni=0.7.5-00
224+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=1.18.3-00
225+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=1.18.3-00
226+
fi
227+
# else kubeadm package auto install kubelet & kubectl
216228
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${KUBERNETES_VERSION}-00
217229
# kubeadm package auto install kubelet & kubectl
218230
else
@@ -362,59 +374,27 @@ EOF
362374
sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
363375
sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
364376

365-
## Config sysctl
366377
sudo mkdir -p $FILESYSTEM_ROOT/var/core
378+
379+
# Config sysctl
367380
sudo augtool --autosave "
368381
set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %t %p'
369-
370382
set /files/etc/sysctl.conf/kernel.softlockup_panic 1
371383
set /files/etc/sysctl.conf/kernel.panic 10
372384
set /files/etc/sysctl.conf/vm.panic_on_oom 2
373385
set /files/etc/sysctl.conf/fs.suid_dumpable 2
374-
375-
set /files/etc/sysctl.conf/net.ipv4.conf.default.forwarding 1
376-
set /files/etc/sysctl.conf/net.ipv4.conf.all.forwarding 1
377-
set /files/etc/sysctl.conf/net.ipv4.conf.eth0.forwarding 0
378-
379-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_accept 0
380-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_announce 0
381-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_filter 0
382-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_notify 0
383-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_ignore 0
384-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_accept 0
385-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_announce 1
386-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_filter 0
387-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_notify 1
388-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
389-
390-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
391-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
392-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh1 1024
393-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh1 1024
394-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh2 2048
395-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh2 2048
396-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh3 4096
397-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh3 4096
398-
399-
set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
400-
set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1
401-
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.forwarding 0
402-
403-
set /files/etc/sysctl.conf/net.ipv6.conf.default.accept_dad 0
404-
set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
405-
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_dad 0
406-
407-
set /files/etc/sysctl.conf/net.ipv6.conf.default.keep_addr_on_down 1
408-
set /files/etc/sysctl.conf/net.ipv6.conf.all.keep_addr_on_down 1
409-
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1
410-
411-
set /files/etc/sysctl.conf/net.ipv4.tcp_l3mdev_accept 1
412-
set /files/etc/sysctl.conf/net.ipv4.udp_l3mdev_accept 1
413-
414-
set /files/etc/sysctl.conf/net.core.rmem_max 2097152
415-
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
416386
" -r $FILESYSTEM_ROOT
417387

388+
sysctl_net_cmd_string=""
389+
while read line; do
390+
[[ "$line" =~ ^#.*$ ]] && continue
391+
sysctl_net_conf_key=`echo $line | awk -F '=' '{print $1}'`
392+
sysctl_net_conf_value=`echo $line | awk -F '=' '{print $2}'`
393+
sysctl_net_cmd_string=$sysctl_net_cmd_string"set /files/etc/sysctl.conf/$sysctl_net_conf_key $sysctl_net_conf_value"$'\n'
394+
done < files/image_config/sysctl/sysctl-net.conf
395+
396+
sudo augtool --autosave "$sysctl_net_cmd_string" -r $FILESYSTEM_ROOT
397+
418398
if [[ $CONFIGURED_ARCH == amd64 ]]; then
419399
# Configure mcelog to log machine checks to syslog
420400
sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf

‎device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ port_phy_addr=0xff
3535
robust_hash_disable_egress_vlan=1
3636
robust_hash_disable_mpls=1
3737
robust_hash_disable_vlan=1
38-
sram_scan_enable=0
3938
stable_size=0x5500000
4039
tdma_timeout_usec=15000000
4140
tslam_timeout_usec=15000000

‎device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,6 @@ port_phy_addr_147.0=0xff
872872
robust_hash_disable_egress_vlan.0=1
873873
robust_hash_disable_mpls.0=1
874874
robust_hash_disable_vlan.0=1
875-
sram_scan_enable.0=0
876875
tdma_timeout_usec.0=15000000
877876
tslam_timeout_usec.0=15000000
878877

‎device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,6 @@ port_phy_addr_143.0=0xff
744744
robust_hash_disable_egress_vlan.0=1
745745
robust_hash_disable_mpls.0=1
746746
robust_hash_disable_vlan.0=1
747-
sram_scan_enable.0=0
748747
tdma_timeout_usec.0=15000000
749748
tslam_timeout_usec.0=15000000
750749

‎device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"skip_thermalctld": true
3+
}
4+

‎device/barefoot/x86_64-accton_as9516bf_32d-r0/pmon_daemon_control.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2+
"skip_thermalctld": true,
3+
"skip_fancontrol": true,
24
"skip_ledd": true,
35
"skip_xcvrd": false,
46
"skip_psud": false,
5-
"skip_syseepromd": false
7+
"skip_syseepromd": false
68
}

‎device/barefoot/x86_64-accton_wedge100bf_32x-r0/pmon_daemon_control.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2+
"skip_thermalctld": true,
3+
"skip_fancontrol": true,
24
"skip_ledd": true,
35
"skip_xcvrd": false,
46
"skip_psud": false,
5-
"skip_syseepromd": false
7+
"skip_syseepromd": false
68
}

‎device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2+
"skip_thermalctld": true,
3+
"skip_fancontrol": true,
24
"skip_ledd": true,
35
"skip_xcvrd": false,
46
"skip_psud": false,
5-
"skip_syseepromd": false
7+
"skip_syseepromd": false
68
}

‎device/celestica/x86_64-cel_seastone-r0/fancontrol

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎device/celestica/x86_64-cel_seastone-r0/fancontrol-B2F

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Configuration file generated by pwmconfig, changes will be lost
2+
INTERVAL=2
3+
FCTEMPS=13-002e/pwm1=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm2=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm3=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm4=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-002e/pwm5=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm1=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm2=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm3=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm4=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input 13-004d/pwm5=/sys/bus/i2c/devices/15-004e/hwmon/hwmon*/temp1_input
4+
FCFANS=13-004d/pwm5=13-004d/fan5_input 13-004d/pwm4=13-004d/fan4_input 13-004d/pwm3=13-004d/fan3_input 13-004d/pwm2=13-004d/fan2_input 13-004d/pwm1=13-004d/fan1_input 13-002e/pwm5=13-002e/fan5_input 13-002e/pwm4=13-002e/fan4_input 13-002e/pwm3=13-002e/fan3_input 13-002e/pwm2=13-002e/fan2_input 13-002e/pwm1=13-002e/fan1_input
5+
MINTEMP=13-002e/pwm1=27 13-002e/pwm2=27 13-002e/pwm3=27 13-002e/pwm4=27 13-002e/pwm5=27 13-004d/pwm1=27 13-004d/pwm2=27 13-004d/pwm3=27 13-004d/pwm4=27 13-004d/pwm5=27
6+
MAXTEMP=13-002e/pwm1=46 13-002e/pwm2=46 13-002e/pwm3=46 13-002e/pwm4=46 13-002e/pwm5=46 13-004d/pwm1=46 13-004d/pwm2=46 13-004d/pwm3=46 13-004d/pwm4=46 13-004d/pwm5=46
7+
MINSTART=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
8+
MINSTOP=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
9+
MINPWM=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
10+
MAXPWM=13-002e/pwm1=255 13-002e/pwm2=255 13-002e/pwm3=255 13-002e/pwm4=255 13-002e/pwm5=255 13-004d/pwm1=255 13-004d/pwm2=255 13-004d/pwm3=255 13-004d/pwm4=255 13-004d/pwm5=255
11+
THYST=13-002e/pwm1=3 13-002e/pwm2=3 13-002e/pwm3=3 13-002e/pwm4=3 13-002e/pwm5=3 13-004d/pwm1=3 13-004d/pwm2=3 13-004d/pwm3=3 13-004d/pwm4=3 13-004d/pwm5=3

‎device/celestica/x86_64-cel_seastone-r0/fancontrol-F2B

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Configuration file generated by pwmconfig, changes will be lost
2+
INTERVAL=2
3+
FCTEMPS=13-002e/pwm1=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm2=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm3=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm4=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-002e/pwm5=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm1=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm2=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm3=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm4=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input 13-004d/pwm5=/sys/bus/i2c/devices/5-0048/hwmon/hwmon*/temp1_input
4+
FCFANS=13-004d/pwm5=13-004d/fan5_input 13-004d/pwm4=13-004d/fan4_input 13-004d/pwm3=13-004d/fan3_input 13-004d/pwm2=13-004d/fan2_input 13-004d/pwm1=13-004d/fan1_input 13-002e/pwm5=13-002e/fan5_input 13-002e/pwm4=13-002e/fan4_input 13-002e/pwm3=13-002e/fan3_input 13-002e/pwm2=13-002e/fan2_input 13-002e/pwm1=13-002e/fan1_input
5+
MINTEMP=13-002e/pwm1=26 13-002e/pwm2=26 13-002e/pwm3=26 13-002e/pwm4=26 13-002e/pwm5=26 13-004d/pwm1=26 13-004d/pwm2=26 13-004d/pwm3=26 13-004d/pwm4=26 13-004d/pwm5=26
6+
MAXTEMP=13-002e/pwm1=45 13-002e/pwm2=45 13-002e/pwm3=45 13-002e/pwm4=45 13-002e/pwm5=45 13-004d/pwm1=45 13-004d/pwm2=45 13-004d/pwm3=45 13-004d/pwm4=45 13-004d/pwm5=45
7+
MINSTART=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
8+
MINSTOP=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
9+
MINPWM=13-002e/pwm1=89 13-002e/pwm2=89 13-002e/pwm3=89 13-002e/pwm4=89 13-002e/pwm5=89 13-004d/pwm1=89 13-004d/pwm2=89 13-004d/pwm3=89 13-004d/pwm4=89 13-004d/pwm5=89
10+
MAXPWM=13-002e/pwm1=255 13-002e/pwm2=255 13-002e/pwm3=255 13-002e/pwm4=255 13-002e/pwm5=255 13-004d/pwm1=255 13-004d/pwm2=255 13-004d/pwm3=255 13-004d/pwm4=255 13-004d/pwm5=255
11+
THYST=13-002e/pwm1=3 13-002e/pwm2=3 13-002e/pwm3=3 13-002e/pwm4=3 13-002e/pwm5=3 13-004d/pwm1=3 13-004d/pwm2=3 13-004d/pwm3=3 13-004d/pwm4=3 13-004d/pwm5=3
12+

‎device/dell/x86_64-dell_s6000_s1220-r0/plugins/eeprom.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,21 @@
1010
#############################################################################
1111

1212
try:
13-
from sonic_eeprom import eeprom_tlvinfo
14-
except ImportError, e:
15-
raise ImportError (str(e) + "- required module not found")
13+
from sonic_eeprom.eeprom_tlvinfo import TlvInfoDecoder
14+
from sonic_platform.eeprom import EepromS6000
15+
except ImportError as e:
16+
raise ImportError(str(e) + "- required module not found")
1617

1718

18-
class board(eeprom_tlvinfo.TlvInfoDecoder):
19+
class board(object):
1920

20-
def __init__(self, name, path, cpld_root, ro):
21-
self.eeprom_path = "/sys/class/i2c-adapter/i2c-10/10-0053/eeprom"
22-
super(board, self).__init__(self.eeprom_path, 0, '', True)
21+
def __new__(cls, name, path, cpld_root, ro):
22+
eeprom_path = "/sys/class/i2c-adapter/i2c-10/10-0053/eeprom"
23+
24+
with open("/sys/class/dmi/id/product_name", "r") as fd:
25+
board_type = fd.read()
26+
27+
if 'S6000-ON' in board_type:
28+
return TlvInfoDecoder(eeprom_path, 0, '', True)
29+
else:
30+
return EepromS6000(is_plugin=True)

‎device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"skip_ledd": true
2+
"skip_ledd": true,
3+
"skip_thermalctld": true
34
}

‎device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# tmp75-i2c-11-4e is an ambient temperature sensor.
88

99
chip "tmp75-*"
10-
set temp1_max 50
11-
set temp1_max_hyst 25
10+
set temp1_max 80
11+
set temp1_max_hyst 70
1212

1313
# emc1403-i2c-10-4d has following temperature sensors:
1414
# temp1: CPU0 external Temp Sensor
@@ -32,5 +32,5 @@ chip "jc42-*"
3232
set temp1_crit 85
3333

3434
chip "dni_dps460-*"
35-
set temp1_max 50
36-
set temp2_max 50
35+
set temp1_max 80
36+
set temp2_max 80

‎device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"skip_ledd": true
2+
"skip_ledd": true,
3+
"skip_thermalctld": true
34
}

‎device/dell/x86_64-dell_z9100_c2538-r0/pmon_daemon_control.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"skip_ledd": true
2+
"skip_ledd": true,
3+
"skip_thermalctld": true
34
}

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/buffers.json.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{%- set default_topo = 't1' %}
2+
{%- include 'buffers_config.j2' %}

0 commit comments

Comments
 (0)