Skip to content

Commit

Permalink
[sonic-linux-kernel]: update kernel to 4.9.246 (#6461)
Browse files Browse the repository at this point in the history
kernel ABI from 4.9.0-12 -> 4.9.0-14

Signed-off-by: Guohan Lu <lguohan@gmail.com>
Co-authored-by: Samuel Angebault <angebault.samuel@gmail.com>
  • Loading branch information
lguohan and Staphylo authored Jan 16, 2021
1 parent b2e3ba8 commit bcda39f
Show file tree
Hide file tree
Showing 33 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set -x -e

## docker engine version (with platform)
DOCKER_VERSION=5:18.09.8~3-0~debian-stretch
LINUX_KERNEL_VERSION=4.9.0-9
LINUX_KERNEL_VERSION=4.9.0-14

## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot
Expand Down
4 changes: 2 additions & 2 deletions files/build_templates/swss.service.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Description=switch state service
Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules-4.9.0-9-amd64.service
Requires=opennsl-modules-4.9.0-14-amd64.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-9-amd64.service
Requires=nps-modules-4.9.0-14-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
Expand Down
8 changes: 4 additions & 4 deletions files/build_templates/syncd.service.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
Description=syncd service
Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules-4.9.0-9-amd64.service
Requires=opennsl-modules-4.9.0-14-amd64.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-9-amd64.service
Requires=nps-modules-4.9.0-14-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
{% if sonic_asic_platform == 'broadcom' %}
After=opennsl-modules-4.9.0-9-amd64.service
After=opennsl-modules-4.9.0-14-amd64.service
{% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-9-amd64.service
After=nps-modules-4.9.0-14-amd64.service
{% endif %}
After=swss.service
Before=ntp-config.service
Expand Down
4 changes: 2 additions & 2 deletions installer/x86_64/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -600,12 +600,12 @@ menuentry '$demo_grub_entry' {
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
insmod part_msdos
insmod ext2
linux /$image_dir/boot/vmlinuz-4.9.0-9-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
linux /$image_dir/boot/vmlinuz-4.9.0-14-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
initrd /$image_dir/boot/initrd.img-4.9.0-9-amd64
initrd /$image_dir/boot/initrd.img-4.9.0-14-amd64
}
EOF
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-modules/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: bfn-modules
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for bfn asic for mmap

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/sai-modules.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Broadcom SAI modules

KVERSION = 4.9.0-9-amd64
KVERSION = 4.9.0-14-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1

BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/saibcm-modules/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Standards-Version: 3.9.3
#Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/bcmsdk.git;a=summary

Package: opennsl-modules-4.9.0-9-amd64
Package: opennsl-modules-4.9.0-14-amd64
Architecture: amd64
Section: main
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for broadcom SAI
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lib/modules/4.9.0-14-amd64/extra
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ force-reload|restart)
;;

*)
echo "Usage: /etc/init.d/opennsl-modules-4.9.0-9-amd64.init {start|stop}"
echo "Usage: /etc/init.d/opennsl-modules-4.9.0-14-amd64.init {start|stop}"
exit 1
;;
esac
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-9-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-9-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-9-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-9-amd64/extra
systemd/opennsl-modules-4.9.0-9-amd64.service lib/systemd/system
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-14-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-14-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-14-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-14-amd64/extra
systemd/opennsl-modules-4.9.0-14-amd64.service lib/systemd/system

This file was deleted.

6 changes: 3 additions & 3 deletions platform/broadcom/saibcm-modules/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ kdist_config: prep-deb-files
kdist_clean: clean
dh_testdir
dh_clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
# rm -f driver/*.o driver/*.ko
#
### end KERNEL SETUP
Expand All @@ -78,7 +78,7 @@ build-arch-stamp:
dh_testdir

# Add here command to compile/build the package.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6

touch $@

Expand All @@ -103,7 +103,7 @@ clean:
rm -f build-arch-stamp build-indep-stamp configure-stamp

# Add here commands to clean up after the build process.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean

dh_clean

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Before=syncd.service

[Service]
Type=oneshot
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-9-amd64 start
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-14-amd64 start
# Don't remove opennsl driver when stopping service. Because
# removing knet drivers takes ~30 seconds to delete netdevs.
# This delay cuts too deep into warm reboot time budget.
# We could skip this step because we don't expect stopping
# opennsl service in any context other than rebooting.
# ExecStop=-/etc/init.d/opennsl-modules-4.9.0-9-amd64 stop
# ExecStop=-/etc/init.d/opennsl-modules-4.9.0-14-amd64 stop
RemainAfterExit=yes

[Install]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ if [ -s /usr/local/bin/done_idt_init ];then
echo "There is a done_idt_init file"
else

cat /etc/init.d/opennsl-modules-4.9.0-9-amd64|grep idt_init.sh
cat /etc/init.d/opennsl-modules-4.9.0-14-amd64|grep idt_init.sh
if [ $? -ne 0 ];then
echo "Add idt_init.sh to opennsl-modules for TD3 MAC"
sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-14-amd64
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-14-amd64
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-14-amd64
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-14-amd64

fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
if [ -s /usr/local/bin/done_idt_init ];then
echo "There is a done_idt_init file"
else
cat /etc/init.d/opennsl-modules-4.9.0-9-amd64|grep idt_init.sh
cat /etc/init.d/opennsl-modules-4.9.0-14-amd64|grep idt_init.sh
if [ $? -ne 0 ];then
echo "Add idt_init.sh to opennsl-modules for TD3 MAC"
sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-9-amd64
sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-14-amd64
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-14-amd64
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-14-amd64
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-14-amd64
fi

fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-cel/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp


Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp
8 changes: 4 additions & 4 deletions platform/broadcom/sonic-platform-modules-dell/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ Standards-Version: 3.9.3

Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-4.9.0-9-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
8 changes: 4 additions & 4 deletions platform/broadcom/sonic-platform-modules-delta/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ Standards-Version: 3.9.3

Package: platform-modules-ag9032v1
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag9064
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag5648
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-et-6248brb
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ start)
modprobe dni_gpio
modprobe delta_et-6248brb_platform

if [ `uname -a | awk '{print $3}'` = "4.9.0-9-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-14-amd64" ]; then
echo "453" > "/sys/class/gpio/export"
echo "454" > "/sys/class/gpio/export"
echo "455" > "/sys/class/gpio/export"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input"
FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag"
FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"

if [ `uname -a | awk '{print $3}'` = "4.9.0-9-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-14-amd64" ]; then
SYS_LED_G="/sys/class/gpio/gpio453/value"
SYS_LED_R="/sys/class/gpio/gpio454/value"
PWR_LED_G="/sys/class/gpio/gpio455/value"
Expand Down
10 changes: 5 additions & 5 deletions platform/broadcom/sonic-platform-modules-inventec/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ Standards-Version: 3.9.3

Package: platform-modules-d7032q28b
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7054q28b
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6254qs
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6556
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7264q28b
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led
4 changes: 2 additions & 2 deletions platform/centec/sonic-platform-modules-e582/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: platform-modules-e582-48x2q4z
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e582-48x6q
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: platform-modules-midstone-200i
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Standards-Version: 3.9.3

Package: platform-modules-et-c032if
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp


2 changes: 1 addition & 1 deletion platform/nephos/sdk.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SDK_VERSION = 3.0.0
LINUX_VER = 4.9.0-9
LINUX_VER = 4.9.0-14
SDK_COMMIT_ID = 529202
NEPHOS_NPS_KERNEL = nps-modules-$(LINUX_VER)_$(SDK_VERSION)_$(SDK_COMMIT_ID)_amd64.deb
$(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-$(LINUX_VER)_$(SDK_VERSION)_$(SDK_COMMIT_ID)_amd64.deb"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: sonic-platform-accton-as7116-54x
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp
6 changes: 3 additions & 3 deletions platform/nephos/sonic-platform-modules-cig/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Standards-Version: 3.9.3

Package: sonic-platform-cig-cs6436-56p
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-cig-cs6436-54p
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-cig-cs5435-54p
Architecture: amd64
Depends: linux-image-4.9.0-9-amd64
Depends: linux-image-4.9.0-14-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Loading

0 comments on commit bcda39f

Please sign in to comment.