Update to Linux 5.10.179 (#15926)
## How I did it Depends on sonic-net/sonic-linux-kernel#328 and sonic-net/saibcm-modules#12. #### How to verify it Verified that the image boots up, BGP comes up, and a basic warm-reboot works on VS, broadcom, and mellanox.
This commit is contained in:
Saikrishna Arcot
GitHub
parent
fc1c3ce1b9
commit
d62ad707bc
@ -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.11~$IMAGE_DISTRO
|
||||
CONTAINERD_IO_VERSION=1.6.21-1
|
||||
LINUX_KERNEL_VERSION=5.10.0-18-2
|
||||
LINUX_KERNEL_VERSION=5.10.0-23-2
|
||||
|
||||
## Working directory to prepare the file system
|
||||
FILESYSTEM_ROOT=./fsroot
|
||||
|
||||
@ -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-5.10.0-18-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
|
||||
$GRUB_CFG_LINUX_CMD /$image_dir/boot/vmlinuz-5.10.0-23-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 ...'
|
||||
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-5.10.0-18-2-amd64
|
||||
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-5.10.0-23-2-amd64
|
||||
}
|
||||
EOF
|
||||
|
||||
|
||||
@ -7,6 +7,6 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: bfn-modules
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for bfn asic for mmap
|
||||
|
||||
|
||||
@ -7,6 +7,6 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: sonic-platform-modules-bfn-montara
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: sonic-platform-modules-bfn-newport-as9516
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
|
||||
|
||||
|
||||
@ -7,6 +7,6 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: sonic-platform-modules-bfn
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
|
||||
@ -7,6 +7,6 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-wnc-osw1800
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit af0ed840c79ebdaeb7e97b265fe84467e254ebb3
|
||||
Subproject commit db443d1447677eb3278c0163e479379b6da7e547
|
||||
@ -10,5 +10,5 @@ Standards-Version: 3.9.3
|
||||
Package: opennsl-modules
|
||||
Architecture: amd64
|
||||
Section: main
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for broadcom SAI
|
||||
|
||||
@ -1 +1 @@
|
||||
lib/modules/5.10.0-18-2-amd64/extra
|
||||
lib/modules/5.10.0-23-2-amd64/extra
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-18-2-amd64/extra
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-18-2-amd64/extra
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-18-2-amd64/extra
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-18-2-amd64/extra
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-23-2-amd64/extra
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-23-2-amd64/extra
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-23-2-amd64/extra
|
||||
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-23-2-amd64/extra
|
||||
systemd/opennsl-modules.service lib/systemd/system
|
||||
sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-18-2-amd64/extra
|
||||
sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-18-2-amd64/extra
|
||||
sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-18-2-amd64/extra
|
||||
sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-23-2-amd64/extra
|
||||
sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-23-2-amd64/extra
|
||||
sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-23-2-amd64/extra
|
||||
|
||||
@ -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-18-2-amd64
|
||||
KERNVERSION ?= 5.10.0-18-2
|
||||
KVERSION ?= 5.10.0-23-2-amd64
|
||||
KERNVERSION ?= 5.10.0-23-2
|
||||
|
||||
# load generic variable handling
|
||||
-include $(MA_DIR)/include/generic.make
|
||||
|
||||
@ -7,20 +7,20 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: sonic-platform-alphanetworks-snh60a0-320fv2
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
Package: sonic-platform-alphanetworks-bes2348t
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
@ -7,26 +7,26 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-dx010
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as led, sfp.
|
||||
|
||||
Package: platform-modules-belgite
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as led, sfp
|
||||
|
||||
@ -7,70 +7,70 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-s6000
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
Package: platform-modules-z9432f
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
Package: platform-modules-e3224f
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
@ -132,7 +132,6 @@
|
||||
* @sregs: Start of software sequencer registers
|
||||
* @nregions: Maximum number of regions
|
||||
* @pr_num: Maximum number of protected range registers
|
||||
* @writeable: Is the chip writeable
|
||||
* @locked: Is SPI setting locked
|
||||
* @swseq_reg: Use SW sequencer in register reads/writes
|
||||
* @swseq_erase: Use SW sequencer in erase operation
|
||||
@ -150,7 +149,6 @@ struct intel_spi {
|
||||
void __iomem *sregs;
|
||||
size_t nregions;
|
||||
size_t pr_num;
|
||||
bool writeable;
|
||||
bool locked;
|
||||
bool swseq_reg;
|
||||
bool swseq_erase;
|
||||
@ -305,6 +303,14 @@ static int intel_spi_wait_sw_busy(struct intel_spi *ispi)
|
||||
INTEL_SPI_TIMEOUT * 1000);
|
||||
}
|
||||
|
||||
static bool intel_spi_set_writeable(struct intel_spi *ispi)
|
||||
{
|
||||
if (!ispi->info->set_writeable)
|
||||
return false;
|
||||
|
||||
return ispi->info->set_writeable(ispi->base, ispi->info->data);
|
||||
}
|
||||
|
||||
static int intel_spi_init(struct intel_spi *ispi)
|
||||
{
|
||||
u32 opmenu0, opmenu1, lvscc, uvscc, val;
|
||||
@ -317,19 +323,6 @@ static int intel_spi_init(struct intel_spi *ispi)
|
||||
ispi->nregions = BYT_FREG_NUM;
|
||||
ispi->pr_num = BYT_PR_NUM;
|
||||
ispi->swseq_reg = true;
|
||||
|
||||
if (writeable) {
|
||||
/* Disable write protection */
|
||||
val = readl(ispi->base + BYT_BCR);
|
||||
if (!(val & BYT_BCR_WPD)) {
|
||||
val |= BYT_BCR_WPD;
|
||||
writel(val, ispi->base + BYT_BCR);
|
||||
val = readl(ispi->base + BYT_BCR);
|
||||
}
|
||||
|
||||
ispi->writeable = !!(val & BYT_BCR_WPD);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case INTEL_SPI_LPT:
|
||||
@ -359,6 +352,12 @@ static int intel_spi_init(struct intel_spi *ispi)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Try to disable write protection if user asked to do so */
|
||||
if (writeable && !intel_spi_set_writeable(ispi)) {
|
||||
dev_warn(ispi->dev, "can't disable chip write protection\n");
|
||||
writeable = false;
|
||||
}
|
||||
|
||||
/* Disable #SMI generation from HW sequencer */
|
||||
val = readl(ispi->base + HSFSTS_CTL);
|
||||
val &= ~HSFSTS_CTL_FSMIE;
|
||||
@ -885,9 +884,12 @@ static void intel_spi_fill_partition(struct intel_spi *ispi,
|
||||
/*
|
||||
* If any of the regions have protection bits set, make the
|
||||
* whole partition read-only to be on the safe side.
|
||||
*
|
||||
* Also if the user did not ask the chip to be writeable
|
||||
* mask the bit too.
|
||||
*/
|
||||
if (intel_spi_is_protected(ispi, base, limit))
|
||||
ispi->writeable = false;
|
||||
if (!writeable || intel_spi_is_protected(ispi, base, limit))
|
||||
part->mask_flags |= MTD_WRITEABLE;
|
||||
|
||||
end = (limit << 12) + 4096;
|
||||
if (end > part->size)
|
||||
@ -928,7 +930,6 @@ struct intel_spi *intel_spi_probe(struct device *dev,
|
||||
|
||||
ispi->dev = dev;
|
||||
ispi->info = info;
|
||||
ispi->writeable = info->writeable;
|
||||
|
||||
ret = intel_spi_init(ispi);
|
||||
if (ret)
|
||||
@ -946,10 +947,6 @@ struct intel_spi *intel_spi_probe(struct device *dev,
|
||||
|
||||
intel_spi_fill_partition(ispi, &part);
|
||||
|
||||
/* Prevent writes if not explicitly enabled */
|
||||
if (!ispi->writeable || !writeable)
|
||||
ispi->nor.mtd.flags &= ~MTD_WRITEABLE;
|
||||
|
||||
ret = mtd_device_register(&ispi->nor.mtd, &part, 1);
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
|
||||
@ -84,7 +84,9 @@ static void intel_spi_enable_bios_write(struct pci_dev *pci_dev, struct intel_sp
|
||||
INTEL_SPI_PLATFORM_VERBOSE("Warning: Setting Bios Control at 0x%x from 0x%02x to 0x%02x failed.\n"
|
||||
"New value is 0x%02x.\n", BIOS_CNTL, value, want, new);
|
||||
} else {
|
||||
#if 0
|
||||
info->writeable = !!(new & BIOS_CNTL_WN);
|
||||
#endif
|
||||
}
|
||||
INTEL_SPI_PLATFORM_VERBOSE("Bios Control is 0x%x\n", new);
|
||||
} else {
|
||||
@ -123,8 +125,10 @@ static int intel_spi_platform_probe(struct platform_device *pdev)
|
||||
INTEL_SPI_PLATFORM_ERROR("info type[%d] not need set writeable.\n",info->type);
|
||||
break;
|
||||
}
|
||||
#if 0
|
||||
INTEL_SPI_PLATFORM_VERBOSE("intel spi boardinfo writeable is %sabled\n",
|
||||
info->writeable ? "en" : "dis");
|
||||
#endif
|
||||
|
||||
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
ispi = intel_spi_probe(&pdev->dev, mem, info);
|
||||
|
||||
@ -7,20 +7,20 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-e530-48t4x-p
|
||||
Architecture: arm64
|
||||
Depends: linux-image-5.10.0-18-2-arm64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-arm64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-arm64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-arm64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-arm64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
@ -7,5 +7,5 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-s5800-48t4s
|
||||
Architecture: arm64
|
||||
Depends: linux-image-5.10.0-18-2-arm64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-arm64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
images {
|
||||
kernel_ctc {
|
||||
description = "ARM64 Kernel";
|
||||
data = /incbin/("./vmlinuz-5.10.0-18-2-arm64");
|
||||
data = /incbin/("./vmlinuz-5.10.0-23-2-arm64");
|
||||
type = "kernel";
|
||||
arch = "arm64";
|
||||
os = "linux";
|
||||
@ -25,7 +25,7 @@
|
||||
};
|
||||
initramfs {
|
||||
description = "initramfs";
|
||||
data = /incbin/("./initrd.img-5.10.0-18-2-arm64");
|
||||
data = /incbin/("./initrd.img-5.10.0-23-2-arm64");
|
||||
type = "ramdisk";
|
||||
arch = "arm64";
|
||||
os = "linux";
|
||||
|
||||
@ -7,5 +7,5 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: tsingma-bsp
|
||||
Architecture: arm64
|
||||
Depends: linux-image-5.10.0-18-2-arm64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-arm64-unsigned
|
||||
Description: kernel modules for tsingma bsp
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/ctcmac/ctcmac.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/ctc-phy/mars.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
|
||||
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/ctcmac/ctcmac.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/ctc-phy/mars.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
|
||||
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-23-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
|
||||
|
||||
@ -7,11 +7,11 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-e582-48x2q4z
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
|
||||
@ -7,6 +7,6 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-embedway-es6220
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
|
||||
@ -7,15 +7,15 @@ Standards-Version: 3.9.3
|
||||
|
||||
Package: platform-modules-v682-48y8c-d
|
||||
Architecture: amd64
|
||||
Depends: linux-image-5.10.0-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-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-18-2-amd64-unsigned
|
||||
Depends: linux-image-5.10.0-23-2-amd64-unsigned
|
||||
Description: kernel modules for platform devices such as fan, led, sfp
|
||||
|
||||
@ -9,7 +9,7 @@ VAR_LOG=512
|
||||
UBOOT_FW_DEFAULT=1
|
||||
|
||||
kernel_addr=0x1100000
|
||||
kernel_version=5.10.0-18-2-arm64
|
||||
kernel_version=5.10.0-23-2-arm64
|
||||
kernel_fname="/boot/vmlinuz-$kernel_version"
|
||||
initrd_fname="/boot/initrd.img-$kernel_version"
|
||||
fit_fname="/boot/sonic_arm64.fit"
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
# Load required kernel-mode drivers
|
||||
load_kernel_drivers() {
|
||||
echo "Loading Kernel Drivers"
|
||||
sudo insmod /lib/modules/5.10.0-18-2-arm64/nokia_7215_ixs_a1_cpld.ko
|
||||
sudo insmod /lib/modules/5.10.0-18-2-arm64/ac5_thermal_sensor.ko
|
||||
sudo insmod /lib/modules/5.10.0-23-2-arm64/nokia_7215_ixs_a1_cpld.ko
|
||||
sudo insmod /lib/modules/5.10.0-23-2-arm64/ac5_thermal_sensor.ko
|
||||
}
|
||||
|
||||
nokia_7215_profile()
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
images {
|
||||
kernel_ac5x {
|
||||
description = "Linux Kernel for AC5x";
|
||||
data = /incbin/("/boot/vmlinuz-5.10.0-18-2-arm64");
|
||||
data = /incbin/("/boot/vmlinuz-5.10.0-23-2-arm64");
|
||||
type = "kernel";
|
||||
arch = "arm64";
|
||||
os = "linux";
|
||||
@ -31,7 +31,7 @@
|
||||
};
|
||||
fdt_7215_a1 {
|
||||
description = "Flattened Device Tree blob for 7215_IXS_A1";
|
||||
data = /incbin/("/usr/lib/linux-image-5.10.0-18-2-arm64/marvell/7215-ixs-a1.dtb");
|
||||
data = /incbin/("/usr/lib/linux-image-5.10.0-23-2-arm64/marvell/7215-ixs-a1.dtb");
|
||||
type = "flat_dt";
|
||||
arch = "arm64";
|
||||
compression = "none";
|
||||
@ -42,7 +42,7 @@
|
||||
};
|
||||
ramdisk_ac5x {
|
||||
description = "ramdisk for AC5x";
|
||||
data = /incbin/("/boot/initrd.img-5.10.0-18-2-arm64");
|
||||
data = /incbin/("/boot/initrd.img-5.10.0-23-2-arm64");
|
||||
type = "ramdisk";
|
||||
arch = "arm64";
|
||||
os = "linux";
|
||||
|
||||
@ -10,8 +10,8 @@ fdt_addr=0x2800000
|
||||
fdt_high=0x28fffff
|
||||
initrd_addr=0x2900000
|
||||
|
||||
kernel_fname="/boot/vmlinuz-5.10.0-18-2-armmp"
|
||||
initrd_fname="/boot/initrd.img-5.10.0-18-2-armmp"
|
||||
kernel_fname="/boot/vmlinuz-5.10.0-23-2-armmp"
|
||||
initrd_fname="/boot/initrd.img-5.10.0-23-2-armmp"
|
||||
fdt_fname="/boot/armada-385-ET6448M_4G_Nand.dtb"
|
||||
|
||||
if [ "$install_env" = "onie" ]; then
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/patch/series
|
||||
+++ b/patch/series
|
||||
@@ -108,6 +108,9 @@
|
||||
@@ -111,6 +111,9 @@
|
||||
0045-i2c-mlxcpld-Fix-criteria-for-frequency-setting.patch
|
||||
0046-i2c-mlxcpld-Reduce-polling-time-for-performance-impr.patch
|
||||
0047-i2c-mlxcpld-Allow-flexible-polling-time-setting-for-.patch
|
||||
@ -10,7 +10,7 @@
|
||||
0053-mlxsw-core-Avoid-creation-virtual-hwmon-objects-by-t.patch
|
||||
0054-mlxsw-minimal-Simplify-method-of-modules-number-dete.patch
|
||||
0055-platform_data-mlxreg-Add-new-type-to-support-modular.patch
|
||||
@@ -155,7 +158,68 @@
|
||||
@@ -158,7 +161,68 @@
|
||||
0097-1-mlxsw-Use-u16-for-local_port-field.patch
|
||||
0097-2-mlxsw-i2c-Fix-chunk-size-setting.patch
|
||||
0097-3-mlxsw-core_hwmon-Adjust-module-label-names.patch
|
||||
@ -79,7 +79,7 @@
|
||||
0157-platform-x86-mlx-platform-Make-activation-of-some-dr.patch
|
||||
0158-platform-x86-mlx-platform-Add-cosmetic-changes-for-a.patch
|
||||
0159-mlx-platform-Add-support-for-systems-equipped-with-t.patch
|
||||
@@ -166,21 +230,125 @@
|
||||
@@ -169,15 +233,119 @@
|
||||
0164-hwmon-jc42-Add-support-for-Seiko-Instruments-S-34TS0.patch
|
||||
0165-platform-mellanox-mlxreg-io-Add-locking-for-io-opera.patch
|
||||
0166-DS-leds-leds-mlxreg-Send-udev-event-from-leds-mlxreg.patch
|
||||
@ -110,17 +110,12 @@
|
||||
+0193-platform-mellanox-mlx-platform-Add-mux-selection-reg.patch
|
||||
+0194-platform-mellanox-mlx-platform-Move-bus-shift-assign.patch
|
||||
+0195-platform-mellanox-Add-support-for-dynamic-I2C-channe.patch
|
||||
0195-platform-x86-MLX_PLATFORM-select-REGMAP-instead-of-d.patch
|
||||
+0196-platform-mellanox-Relocate-mlx-platform-driver.patch
|
||||
+0197-platform-mellanox-Add-initial-support-for-PCIe-based.patch
|
||||
+0198-platform-mellanox-Introduce-support-for-switches-bas.patch
|
||||
+0199-platform-mellanox-mlx-platform-Add-reset-and-extend-.patch
|
||||
+0200-dt-bindings-i2c-mellanox-i2c-mlxbf-convert-txt-to-YA.patch
|
||||
0201-i2c-mlxbf-incorrect-base-address-passed-during-io-wr.patch
|
||||
0202-i2c-mlxbf-prevent-stack-overflow-in-mlxbf_i2c_smbus_.patch
|
||||
+0203-i2c-mlxbf-remove-IRQF_ONESHOT.patch
|
||||
0204-i2c-mlxbf-Fix-frequency-calculation.patch
|
||||
0205-i2c-mlxbf-support-lock-mechanism.patch
|
||||
+0206-i2c-mlxbf-add-multi-slave-functionality.patch
|
||||
+0207-i2c-mlxbf-support-BlueField-3-SoC.patch
|
||||
+0208-i2c-mlxbf-remove-device-tree-support.patch
|
||||
@ -180,7 +175,6 @@
|
||||
+0262-UBUNTU-SAUCE-mlxbf-pmc-Fix-event-string-typo.patch
|
||||
+0263-UBUNTU-SAUCE-mlxbf-pmc-Support-for-BlueField-3-perfo.patch
|
||||
+0264-UBUNTU-SAUCE-platform-mellanox-Add-ctrl-message-and-.patch
|
||||
0265-hwmon-mlxreg-fan-Return-zero-speed-for-broken-fan.patch
|
||||
+0266-UBUNTU-SAUCE-mlxbf-pmc-Bug-fix-for-BlueField-3-count.patch
|
||||
+0267-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-add-the-missing-de.patch
|
||||
+0268-DS-mlxsw-core_linecards-Disable-firmware-bundling-ma.patch
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# linux kernel package
|
||||
|
||||
KVERSION_SHORT = 5.10.0-18-2
|
||||
KVERSION_SHORT = 5.10.0-23-2
|
||||
KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
|
||||
KERNEL_VERSION = 5.10.140
|
||||
KERNEL_SUBVERSION = 1
|
||||
KERNEL_VERSION = 5.10.179
|
||||
KERNEL_SUBVERSION = 3
|
||||
ifeq ($(CONFIGURED_ARCH), armhf)
|
||||
# Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
|
||||
KVERSION = $(KVERSION_SHORT)-armmp
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit fa40db7b96f18329fc8b4a56a9295ffd92b139d5
|
||||
Subproject commit 3158031ebfda16989b10b75230beee8aa43deb97
|
||||
Loading…
Reference in New Issue
Block a user