Update Linux kernel from 5.10.46 to 5.10.103

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
sonic-net · May 6, 2022 · 48d09b8 · 48d09b8
1 parent 05c6488
commit 48d09b8
Show file tree

Hide file tree

Showing 24 changed files with 70 additions and 70 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 ## docker engine version (with platform)
 DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO
 CONTAINERD_IO_VERSION=1.5.11-1
-LINUX_KERNEL_VERSION=5.10.0-8-2
+LINUX_KERNEL_VERSION=5.10.0-12-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot

diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
@@ -679,13 +679,13 @@ 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-5.10.0-8-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
+        linux   /$image_dir/boot/vmlinuz-5.10.0-12-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                 net.ifnames=0 biosdevname=0 \
                 loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
                 systemd.unified_cgroup_hierarchy=0 \
                 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-5.10.0-8-2-amd64
+        initrd  /$image_dir/boot/initrd.img-5.10.0-12-2-amd64
 }
 EOF
 

diff --git a/platform/barefoot/bfn-modules/debian/control b/platform/barefoot/bfn-modules/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: bfn-modules
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for bfn asic for mmap
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn-montara
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn-newport-as9516
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
 
 Package: sonic-platform-modules-bfn-newport-as9516bf
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/control b/platform/barefoot/sonic-platform-modules-bfn/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control b/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-wnc-osw1800
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/broadcom/saibcm-modules-dnx b/platform/broadcom/saibcm-modules-dnx
diff --git a/platform/broadcom/saibcm-modules/debian/control b/platform/broadcom/saibcm-modules/debian/control
@@ -10,5 +10,5 @@ Standards-Version: 3.9.3
 Package: opennsl-modules
 Architecture: amd64
 Section: main
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for broadcom SAI
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
@@ -1 +1 @@
-lib/modules/5.10.0-8-2-amd64/extra
+lib/modules/5.10.0-12-2-amd64/extra
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
@@ -1,8 +1,8 @@
-systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-8-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-8-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-8-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-8-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-12-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-12-2-amd64/extra
 systemd/opennsl-modules.service lib/systemd/system
-sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-8-2-amd64/extra
-sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-8-2-amd64/extra
-sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-8-2-amd64/extra
+sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-12-2-amd64/extra
+sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-12-2-amd64/extra
+sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-12-2-amd64/extra
diff --git a/platform/broadcom/saibcm-modules/debian/rules b/platform/broadcom/saibcm-modules/debian/rules
@@ -34,8 +34,8 @@ sname:=opennsl
 PACKAGE=opennsl-modules
 # modifieable for experiments or debugging m-a
 MA_DIR ?= /usr/share/modass
-KVERSION ?= 5.10.0-8-2-amd64
-KERNVERSION ?= 5.10.0-8-2
+KVERSION ?= 5.10.0-12-2-amd64
+KERNVERSION ?= 5.10.0-12-2
 
 # load generic variable handling
 -include $(MA_DIR)/include/generic.make

diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control
@@ -7,21 +7,21 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-dx010
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 
 Package: platform-modules-haliburton
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-seastone2
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as led, sfp
 
 Package: platform-modules-silverstone
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as led, sfp.
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/control b/platform/broadcom/sonic-platform-modules-dell/debian/control
@@ -7,60 +7,60 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-s6000
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9100
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s6100
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9264f
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5212f
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5224f
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5232f
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5248f
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-n3248te
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9332f
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-n3248pxe
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5296f
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/control b/platform/centec-arm64/sonic-platform-modules-e530/debian/control
@@ -7,20 +7,20 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-e530-48t4x-p
 Architecture: arm64
-Depends: linux-image-5.10.0-8-2-arm64-unsigned
+Depends: linux-image-5.10.0-12-2-arm64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e530-24x2c
 Architecture: arm64
-Depends: linux-image-5.10.0-8-2-arm64-unsigned
+Depends: linux-image-5.10.0-12-2-arm64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e530-48s4x
 Architecture: arm64
-Depends: linux-image-5.10.0-8-2-arm64-unsigned
+Depends: linux-image-5.10.0-12-2-arm64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e530-24x2q
 Architecture: arm64
-Depends: linux-image-5.10.0-8-2-arm64-unsigned
+Depends: linux-image-5.10.0-12-2-arm64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/centec-arm64/sonic_fit.its b/platform/centec-arm64/sonic_fit.its
@@ -12,7 +12,7 @@
 	images {
 		kernel_ctc {
 			description = "ARM64 Kernel";			
-			data = /incbin/("./vmlinuz-5.10.0-8-2-arm64");
+			data = /incbin/("./vmlinuz-5.10.0-12-2-arm64");
 			type = "kernel";			
 			arch = "arm64";			
 			os = "linux";			
@@ -25,7 +25,7 @@
 		};
 		initramfs {
 			description = "initramfs";
-			data = /incbin/("./initrd.img-5.10.0-8-2-arm64");
+			data = /incbin/("./initrd.img-5.10.0-12-2-arm64");
 			type = "ramdisk";
 			arch = "arm64";
 			os = "linux";

diff --git a/platform/centec-arm64/tsingma-bsp/debian/control b/platform/centec-arm64/tsingma-bsp/debian/control
@@ -7,5 +7,5 @@ Standards-Version: 3.9.3
 
 Package: tsingma-bsp
 Architecture: arm64
-Depends: linux-image-5.10.0-8-2-arm64-unsigned
+Depends: linux-image-5.10.0-12-2-arm64-unsigned
 Description: kernel modules for tsingma bsp
diff --git a/platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install b/platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
@@ -1,17 +1,17 @@
-src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/ctcmac/ctcmac.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/ctc-phy/mars.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
-src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-8-2-arm64/kernel/extra
+src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/ctcmac/ctcmac.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/ctc-phy/mars.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
+src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-12-2-arm64/kernel/extra
 src/ctc-dts/e530-ctc5236.dtb /boot/
 src/config/fw_env.config /etc/
 src/config/tsingma-bsp.service /lib/systemd/system
diff --git a/platform/centec/sonic-platform-modules-e582/debian/control b/platform/centec/sonic-platform-modules-e582/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-e582-48x2q4z
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e582-48x6q
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/centec/sonic-platform-modules-embedway/debian/control b/platform/centec/sonic-platform-modules-embedway/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-embedway-es6220
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/centec/sonic-platform-modules-v682/debian/control b/platform/centec/sonic-platform-modules-v682/debian/control
@@ -7,15 +7,15 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-v682-48y8c-d
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-v682-48y8c
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-v682-48x8c
 Architecture: amd64
-Depends: linux-image-5.10.0-8-2-amd64-unsigned
+Depends: linux-image-5.10.0-12-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
@@ -11,8 +11,8 @@ fdt_high=0x10fffff
 initrd_addr=0x2000000
 VAR_LOG=512
 
-kernel_fname="/boot/vmlinuz-5.10.0-8-2-armmp"
-initrd_fname="/boot/initrd.img-5.10.0-8-2-armmp"
+kernel_fname="/boot/vmlinuz-5.10.0-12-2-armmp"
+initrd_fname="/boot/initrd.img-5.10.0-12-2-armmp"
 fdt_fname="/boot/armada-385-ET6448M_4G_Nand.dtb"
 
 if [ "$install_env" = "onie" ]; then

diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk
@@ -1,9 +1,9 @@
 # linux kernel package
 
-KVERSION_SHORT = 5.10.0-8-2
+KVERSION_SHORT = 5.10.0-12-2
 KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
-KERNEL_VERSION = 5.10.46
-KERNEL_SUBVERSION = 4
+KERNEL_VERSION = 5.10.103
+KERNEL_SUBVERSION = 1
 ifeq ($(CONFIGURED_ARCH), armhf)
 # Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
 KVERSION = $(KVERSION_SHORT)-armmp

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		lib/modules/5.10.0-8-2-amd64/extra
		lib/modules/5.10.0-12-2-amd64/extra