Skip to content

Commit

Permalink
[202405] Update to Linux 6.1.94 (sonic-net#19885)
Browse files Browse the repository at this point in the history
* Update to Linux 6.1.94

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Integrate HW-MGMT 7.0040.1008 Changes (#18)

* Integrate HW-MGMT 7.0040.1011 Changes (#19)

* Update sonic-linux-kernel submodule (#20)

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Co-authored-by: Vivek <vivekreddykarri98@gmail.com>
  • Loading branch information
saiarcot895 and vivekrnv authored Sep 18, 2024
1 parent 50d8f21 commit f68065b
Show file tree
Hide file tree
Showing 36 changed files with 101 additions and 100 deletions.
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
## docker engine version (with platform)
DOCKER_VERSION=5:24.0.2-1~debian.12~$IMAGE_DISTRO
CONTAINERD_IO_VERSION=1.6.21-1
LINUX_KERNEL_VERSION=6.1.0-11-2
LINUX_KERNEL_VERSION=6.1.0-22-2

## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot
Expand Down
4 changes: 2 additions & 2 deletions files/dsc/install_debian.j2
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@ cat <<EOF >> $root_mnt/$BL_CONF
default main
label main
kernel /$image_dir/boot/vmlinuz-6.1.0-11-2-arm64
initrd /$image_dir/boot/initrd.img-6.1.0-11-2-arm64
kernel /$image_dir/boot/vmlinuz-6.1.0-22-2-arm64
initrd /$image_dir/boot/initrd.img-6.1.0-22-2-arm64
devicetree /$image_dir/boot/elba-asic-psci.dtb
append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
}
Expand Down
4 changes: 2 additions & 2 deletions installer/default_platform.conf
Original file line number Diff line number Diff line change
Expand Up @@ -588,13 +588,13 @@ menuentry '$demo_grub_entry' {
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
insmod part_msdos
insmod ext2
$GRUB_CFG_LINUX_CMD /$image_dir/boot/vmlinuz-6.1.0-11-2-${arch} root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
$GRUB_CFG_LINUX_CMD /$image_dir/boot/vmlinuz-6.1.0-22-2-${arch} 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 ...'
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-6.1.0-11-2-${arch}
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-6.1.0-22-2-${arch}
}
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-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
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-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

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

Package: sonic-platform-modules-bfn-newport-as9516
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-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-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel module for bfn platform fpga and scripts for the 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-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
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: platform-modules-wnc-osw1800
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Standards-Version: 3.9.3
Package: opennsl-modules
Architecture: amd64
Section: main
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for broadcom SAI
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib/modules/6.1.0-11-2-amd64/extra
lib/modules/6.1.0-22-2-amd64/extra
14 changes: 7 additions & 7 deletions platform/broadcom/saibcm-modules/debian/opennsl-modules.install
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/6.1.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/6.1.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/6.1.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/6.1.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/6.1.0-22-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/6.1.0-22-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/6.1.0-22-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/6.1.0-22-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
sdklt/build/bde/linux_ngbde.ko lib/modules/6.1.0-11-2-amd64/extra
sdklt/build/knet/linux_ngknet.ko lib/modules/6.1.0-11-2-amd64/extra
sdklt/build/knetcb/linux_ngknetcb.ko lib/modules/6.1.0-11-2-amd64/extra
sdklt/build/bde/linux_ngbde.ko lib/modules/6.1.0-22-2-amd64/extra
sdklt/build/knet/linux_ngknet.ko lib/modules/6.1.0-22-2-amd64/extra
sdklt/build/knetcb/linux_ngknetcb.ko lib/modules/6.1.0-22-2-amd64/extra
4 changes: 2 additions & 2 deletions platform/broadcom/saibcm-modules/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ sname:=opennsl
PACKAGE=opennsl-modules
# modifieable for experiments or debugging m-a
MA_DIR ?= /usr/share/modass
KVERSION ?= 6.1.0-11-2-amd64
KERNVERSION ?= 6.1.0-11-2
KVERSION ?= 6.1.0-22-2-amd64
KERNVERSION ?= 6.1.0-22-2

# load generic variable handling
-include $(MA_DIR)/include/generic.make
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ Standards-Version: 3.9.3

Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-alphanetworks-snj60d0-320f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-alphanetworks-bes2348t
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
10 changes: 5 additions & 5 deletions platform/broadcom/sonic-platform-modules-cel/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ Standards-Version: 3.9.3

Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp


Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-seastone2
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp

Package: platform-modules-silverstone
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp.

Package: platform-modules-belgite
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp
28 changes: 14 additions & 14 deletions platform/broadcom/sonic-platform-modules-dell/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,70 @@ Standards-Version: 3.9.3

Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5212f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5224f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5232f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5248f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-n3248te
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9332f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9432f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-n3248pxe
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e3224f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5296f
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ Standards-Version: 3.9.3

Package: platform-modules-e530-48t4x-p
Architecture: arm64
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Depends: linux-image-6.1.0-22-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-24x2c
Architecture: arm64
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Depends: linux-image-6.1.0-22-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-48s4x
Architecture: arm64
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Depends: linux-image-6.1.0-22-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-24x2q
Architecture: arm64
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Depends: linux-image-6.1.0-22-2-arm64-unsigned
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-s5800-48t4s
Architecture: arm64
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Depends: linux-image-6.1.0-22-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
4 changes: 2 additions & 2 deletions platform/centec-arm64/sonic_fit.its
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
images {
kernel_ctc {
description = "ARM64 Kernel";
data = /incbin/("./vmlinuz-6.1.0-11-2-arm64");
data = /incbin/("./vmlinuz-6.1.0-22-2-arm64");
type = "kernel";
arch = "arm64";
os = "linux";
Expand All @@ -25,7 +25,7 @@
};
initramfs {
description = "initramfs";
data = /incbin/("./initrd.img-6.1.0-11-2-arm64");
data = /incbin/("./initrd.img-6.1.0-22-2-arm64");
type = "ramdisk";
arch = "arm64";
os = "linux";
Expand Down
2 changes: 1 addition & 1 deletion platform/centec-arm64/tsingma-bsp/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: tsingma-bsp
Architecture: arm64
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Depends: linux-image-6.1.0-22-2-arm64-unsigned
Description: kernel modules for tsingma bsp
28 changes: 14 additions & 14 deletions platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc-phy/mars.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/ctc-phy/mars.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/6.1.0-22-2-arm64/kernel/extra
src/ctc-dts/e530-ctc5236.dtb /boot/
src/m2-w6010-48gt4x/m2-w6010-48gt4x-r0.dtb /boot/
src/config/fw_env.config /etc/
Expand Down
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-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e582-48x6q
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
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: platform-modules-embedway-es6220
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

6 changes: 3 additions & 3 deletions platform/centec/sonic-platform-modules-v682/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Standards-Version: 3.9.3

Package: platform-modules-v682-48y8c-d
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-v682-48y8c
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-v682-48x8c
Architecture: amd64
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Depends: linux-image-6.1.0-22-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Loading

0 comments on commit f68065b

Please sign in to comment.