[kernel]: update sonic kernel to 4.9.0-8-2 (#2468)

* [kernel]: update sonic kernel to 4.9.0-8-2

* 3b2114d 2019-01-20 | [sonic-linux-kernel] add udp_l3mdev_accept kernel upstream patch (#70) (HEAD, azure/master) [Harish Venkatraman]
* 37734aa 2019-01-10 | L3mdev cgroup (#73) [lguohan]
* d631eeb 2018-12-15 | yet another uart race condition fix (#75) [lguohan]

Signed-off-by: Guohan Lu <gulv@microsoft.com>

* Update Mellanox SDK

Signed-off-by: Guohan Lu <gulv@microsoft.com>

* Update arista platform driver to match 4.9.0-8-2 kernel

Signed-off-by: Guohan Lu <gulv@microsoft.com>
This commit is contained in:
lguohan 2019-01-25 00:46:09 -08:00 committed by GitHub
parent ffbe39ee73
commit 4ccd35bc25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 66 additions and 66 deletions

View File

@ -30,7 +30,7 @@ set -x -e
## docker engine version (with platform)
DOCKER_VERSION=5:18.09.0~3-0~debian-stretch
LINUX_KERNEL_VERSION=4.9.0-8
LINUX_KERNEL_VERSION=4.9.0-8-2
## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot

View File

@ -2,9 +2,9 @@
Description=switch state service
Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules-4.9.0-8-amd64.service
Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-8-amd64.service
Requires=nps-modules-4.9.0-8-2-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service

View File

@ -2,16 +2,16 @@
Description=syncd service
Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules-4.9.0-8-amd64.service
Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-8-amd64.service
Requires=nps-modules-4.9.0-8-2-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
{% if sonic_asic_platform == 'broadcom' %}
After=opennsl-modules-4.9.0-8-amd64.service
After=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-8-amd64.service
After=nps-modules-4.9.0-8-2-amd64.service
{% endif %}
Before=ntp-config.service

View File

@ -595,12 +595,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-8-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
linux /$image_dir/boot/vmlinuz-4.9.0-8-2-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-8-amd64
initrd /$image_dir/boot/initrd.img-4.9.0-8-2-amd64
}
EOF

View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: bfn-modules
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for bfn asic for mmap

@ -1 +1 @@
Subproject commit d377e78fc4a85ecf86110db2a757dfcdea8f8d46
Subproject commit d3ea6f30c11eab2dbbbb477099d9f54dd2a98883

View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -1,9 +1,9 @@
# Broadcom SAI modules
KVERSION = 4.9.0-8-amd64
KVERSION = 4.9.0-8-2-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1
BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
$(BRCM_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)

View File

@ -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-8-amd64
Package: opennsl-modules
Architecture: amd64
Section: main
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for broadcom SAI

View File

@ -1 +0,0 @@
lib/modules/4.9.0-8-amd64/extra

View File

@ -0,0 +1 @@
lib/modules/4.9.0-8-2-amd64/extra

View File

@ -64,7 +64,7 @@ force-reload|restart)
;;
*)
echo "Usage: /etc/init.d/opennsl-modules-4.9.0-8-amd64.init {start|stop}"
echo "Usage: /etc/init.d/opennsl-modules.init {start|stop}"
exit 1
;;
esac

View File

@ -1,5 +1,5 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-8-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-8-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-8-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-8-amd64/extra
systemd/opennsl-modules-4.9.0-8-amd64.service lib/systemd/system
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-8-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-8-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-8-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-8-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system

View File

@ -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-8-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-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-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
# rm -f driver/*.o driver/*.ko
#
### end KERNEL SETUP
@ -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-8-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-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-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
touch $@
@ -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-8-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-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-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
dh_clean

View File

@ -5,13 +5,13 @@ Before=syncd.service
[Service]
Type=oneshot
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-8-amd64 start
ExecStart=-/etc/init.d/opennsl-modules 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-8-amd64 stop
# ExecStop=-/etc/init.d/opennsl-modules stop
RemainAfterExit=yes
[Install]

View File

@ -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-8-amd64|grep idt_init.sh
cat /etc/init.d/opennsl-modules|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-8-amd64
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-8-amd64
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-8-amd64
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-8-amd64
sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules
fi

View File

@ -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-8-amd64|grep idt_init.sh
cat /etc/init.d/opennsl-modules|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-8-amd64
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-8-amd64
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-8-amd64
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-8-amd64
sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules
sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules
sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules
sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules
fi
fi

View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-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-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

@ -1 +1 @@
Subproject commit d377e78fc4a85ecf86110db2a757dfcdea8f8d46
Subproject commit 6c20cf62432bedbbf4dbe5452c85cde48aa78294

View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -7,16 +7,16 @@ Standards-Version: 3.9.3
Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -7,21 +7,21 @@ Standards-Version: 3.9.3
Package: platform-modules-ag9032v1
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag9064
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag5648
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-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-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -25,7 +25,7 @@ start)
modprobe dni_gpio
modprobe delta_et-6248brb_platform
if [ `uname -a | awk '{print $3}'` = "4.9.0-8-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-amd64" ]; then
echo "453" > "/sys/class/gpio/export"
echo "454" > "/sys/class/gpio/export"
echo "455" > "/sys/class/gpio/export"

View File

@ -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-8-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-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"

View File

@ -7,25 +7,25 @@ Standards-Version: 3.9.3
Package: platform-modules-d7032q28b
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d7054q28b
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d6254qs
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d6556
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d7264q28b
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led

View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: platform-modules-e582-48x2q4z
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-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-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -1,4 +1,4 @@
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/9248a185b7da775b11daa5cb79ea22195c0b99f1/sdk
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/e791ebf6e88933da35aa4bf11dda57655322bae5/sdk
MLNX_SDK_VERSION = 4.3.0134
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \

View File

@ -1,5 +1,5 @@
SDK_VERSION = 2.0.5
LINUX_VER = 4.9.0-8
LINUX_VER = 4.9.0-8-2
SDK_COMMIT_ID = f2e56f
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"

View File

@ -7,5 +7,5 @@ Standards-Version: 3.9.3
Package: sonic-platform-accton-as7116-54x
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-8-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

View File

@ -1,6 +1,6 @@
# linux kernel package
KVERSION_SHORT = 4.9.0-8
KVERSION_SHORT = 4.9.0-8-2
KVERSION = $(KVERSION_SHORT)-amd64
KERNEL_VERSION = 4.9.110
KERNEL_SUBVERSION = 3+deb9u6

@ -1 +1 @@
Subproject commit 39d0301743880f31e1900a719642af3acc7eacb6
Subproject commit 3b2114d6e07aa494fa8033b192b05fbd0d02f6cc