From 9a323b50e60673bea6b92b5952a83d80da641c45 Mon Sep 17 00:00:00 2001 From: Christian Svensson Date: Mon, 20 Nov 2023 21:35:26 +0100 Subject: [PATCH] octeon: upgrade to 6.1 kernel The kernel patches apply with only minor changes. The only other notable change is that octeon-usb has moved from staging and had its config macro renamed from CONFIG_OCTEON_USB to CONFIG_USB_OCTEON_HCD. Signed-off-by: Christian Svensson --- target/linux/octeon/Makefile | 2 +- .../linux/octeon/{config-5.15 => config-6.1} | 26 +++++++++++++++---- .../100-mips_image_cmdline_hack.patch | 2 +- .../100-ubnt_edgerouter2_support.patch | 0 .../110-er200-ethernet_probe_order.patch | 0 .../120-cmdline-hack.patch | 4 +-- .../130-add_itus_support.patch | 4 +-- .../150-ubnt_usg_support.patch | 4 +-- .../700-allocate_interface_by_label.patch | 2 +- ...-honor_sgmii_node_device_tree_status.patch | 0 10 files changed, 30 insertions(+), 14 deletions(-) rename target/linux/octeon/{config-5.15 => config-6.1} (90%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/100-mips_image_cmdline_hack.patch (95%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/100-ubnt_edgerouter2_support.patch (100%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/110-er200-ethernet_probe_order.patch (100%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/120-cmdline-hack.patch (90%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/130-add_itus_support.patch (94%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/150-ubnt_usg_support.patch (93%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/700-allocate_interface_by_label.patch (94%) rename target/linux/octeon/{patches-5.15 => patches-6.1}/701-honor_sgmii_node_device_tree_status.patch (100%) diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index 4b5c4c07c1..fa3da97579 100644 --- a/target/linux/octeon/Makefile +++ b/target/linux/octeon/Makefile @@ -10,7 +10,7 @@ BOARDNAME:=Cavium Networks Octeon FEATURES:=squashfs ramdisk pci usb CPU_TYPE:=octeonplus -KERNEL_PATCHVER:=5.15 +KERNEL_PATCHVER:=6.1 define Target/Description Build firmware images for Cavium Networks Octeon-based boards. diff --git a/target/linux/octeon/config-5.15 b/target/linux/octeon/config-6.1 similarity index 90% rename from target/linux/octeon/config-5.15 rename to target/linux/octeon/config-6.1 index 2350e45295..af5cdf4852 100644 --- a/target/linux/octeon/config-5.15 +++ b/target/linux/octeon/config-6.1 @@ -23,10 +23,16 @@ CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y CONFIG_CAVIUM_OCTEON_SOC=y +CONFIG_CAVIUM_RESERVE32=0 +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CEVT_R4K=y CONFIG_CLONE_BACKWARDS=y # CONFIG_COMMON_CLK is not set +CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_COMPAT_32BIT_TIME=y +CONFIG_CONTEXT_TRACKING=y +CONFIG_CONTEXT_TRACKING_IDLE=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_CAVIUM_OCTEON=y CONFIG_CPU_GENERIC_DUMP_TLB=y @@ -48,11 +54,16 @@ CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 +CONFIG_CRYPTO_LIB_SHA1=y +CONFIG_CRYPTO_LIB_UTILS=y # CONFIG_CRYPTO_MD5_OCTEON is not set CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_SHA1_OCTEON is not set # CONFIG_CRYPTO_SHA256_OCTEON is not set # CONFIG_CRYPTO_SHA512_OCTEON is not set +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_NONE=y +CONFIG_DEPRECATED_IRQ_CPU_ONOFFLINE=y CONFIG_DNOTIFY=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y @@ -66,6 +77,7 @@ CONFIG_EDAC_OCTEON_PC=y CONFIG_EDAC_OCTEON_PCI=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y +CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y CONFIG_FAT_FS=y @@ -74,11 +86,12 @@ CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y +CONFIG_FW_LOADER_SYSFS=y +CONFIG_GCC11_NO_ARRAY_BOUNDS=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_SHOW=y @@ -94,7 +107,6 @@ CONFIG_GLOB=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_OCTEON=y CONFIG_GRO_CELLS=y -CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -125,7 +137,6 @@ CONFIG_MIPS=y CONFIG_MIPS_ASID_BITS=8 CONFIG_MIPS_ASID_SHIFT=0 CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y -CONFIG_MIPS_EBPF_JIT=y CONFIG_MIPS_ELF_APPENDED_DTB=y CONFIG_MIPS_FP_SUPPORT=y CONFIG_MIPS_L1_CACHE_SHIFT=7 @@ -163,7 +174,6 @@ CONFIG_NVMEM_SYSFS=y CONFIG_OCTEON_ETHERNET=y CONFIG_OCTEON_ILM=y CONFIG_OCTEON_MGMT_ETHERNET=y -CONFIG_OCTEON_USB=y CONFIG_OCTEON_WDT=y CONFIG_OF=y CONFIG_OF_ADDRESS=y @@ -174,6 +184,9 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y +CONFIG_PAGE_POOL=y +CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SIZE_LESS_THAN_64KB=y # CONFIG_PARTITION_ADVANCED is not set CONFIG_PATA_OCTEON_CF=y CONFIG_PATA_TIMINGS=y @@ -189,9 +202,11 @@ CONFIG_PHYLINK=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y +CONFIG_RANDSTRUCT_NONE=y CONFIG_RAS=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y @@ -211,7 +226,7 @@ CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_SPARSEMEM=y -CONFIG_SPARSEMEM_STATIC=y +CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPI=y CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y @@ -239,6 +254,7 @@ CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y # CONFIG_USB_OCTEON_EHCI is not set +CONFIG_USB_OCTEON_HCD=y # CONFIG_USB_OCTEON_OHCI is not set CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_HCD=y diff --git a/target/linux/octeon/patches-5.15/100-mips_image_cmdline_hack.patch b/target/linux/octeon/patches-6.1/100-mips_image_cmdline_hack.patch similarity index 95% rename from target/linux/octeon/patches-5.15/100-mips_image_cmdline_hack.patch rename to target/linux/octeon/patches-6.1/100-mips_image_cmdline_hack.patch index 785fc1273c..08f30c5e03 100644 --- a/target/linux/octeon/patches-5.15/100-mips_image_cmdline_hack.patch +++ b/target/linux/octeon/patches-6.1/100-mips_image_cmdline_hack.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1182,6 +1182,10 @@ config MIPS_MSC +@@ -1114,6 +1114,10 @@ config MIPS_MSC config SYNC_R4K bool diff --git a/target/linux/octeon/patches-5.15/100-ubnt_edgerouter2_support.patch b/target/linux/octeon/patches-6.1/100-ubnt_edgerouter2_support.patch similarity index 100% rename from target/linux/octeon/patches-5.15/100-ubnt_edgerouter2_support.patch rename to target/linux/octeon/patches-6.1/100-ubnt_edgerouter2_support.patch diff --git a/target/linux/octeon/patches-5.15/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-6.1/110-er200-ethernet_probe_order.patch similarity index 100% rename from target/linux/octeon/patches-5.15/110-er200-ethernet_probe_order.patch rename to target/linux/octeon/patches-6.1/110-er200-ethernet_probe_order.patch diff --git a/target/linux/octeon/patches-5.15/120-cmdline-hack.patch b/target/linux/octeon/patches-6.1/120-cmdline-hack.patch similarity index 90% rename from target/linux/octeon/patches-5.15/120-cmdline-hack.patch rename to target/linux/octeon/patches-6.1/120-cmdline-hack.patch index 7e9ed9d29b..e65cf78da4 100644 --- a/target/linux/octeon/patches-5.15/120-cmdline-hack.patch +++ b/target/linux/octeon/patches-6.1/120-cmdline-hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c -@@ -650,6 +650,35 @@ void octeon_user_io_init(void) +@@ -653,6 +653,35 @@ void octeon_user_io_init(void) write_c0_derraddr1(0); } @@ -36,7 +36,7 @@ /** * prom_init - Early entry point for arch setup */ -@@ -873,6 +902,8 @@ void __init prom_init(void) +@@ -896,6 +925,8 @@ void __init prom_init(void) } } diff --git a/target/linux/octeon/patches-5.15/130-add_itus_support.patch b/target/linux/octeon/patches-6.1/130-add_itus_support.patch similarity index 94% rename from target/linux/octeon/patches-5.15/130-add_itus_support.patch rename to target/linux/octeon/patches-6.1/130-add_itus_support.patch index e51153096c..d76e8637ea 100644 --- a/target/linux/octeon/patches-5.15/130-add_itus_support.patch +++ b/target/linux/octeon/patches-6.1/130-add_itus_support.patch @@ -11,7 +11,7 @@ --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h -@@ -297,7 +297,7 @@ enum cvmx_board_types_enum { +@@ -298,7 +298,7 @@ enum cvmx_board_types_enum { CVMX_BOARD_TYPE_UBNT_E100 = 20002, CVMX_BOARD_TYPE_UBNT_E200 = 20003, CVMX_BOARD_TYPE_UBNT_E220 = 20005, @@ -20,7 +20,7 @@ CVMX_BOARD_TYPE_UBNT_E300 = 20300, CVMX_BOARD_TYPE_KONTRON_S1901 = 21901, CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000, -@@ -401,7 +401,7 @@ static inline const char *cvmx_board_typ +@@ -403,7 +403,7 @@ static inline const char *cvmx_board_typ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220) diff --git a/target/linux/octeon/patches-5.15/150-ubnt_usg_support.patch b/target/linux/octeon/patches-6.1/150-ubnt_usg_support.patch similarity index 93% rename from target/linux/octeon/patches-5.15/150-ubnt_usg_support.patch rename to target/linux/octeon/patches-6.1/150-ubnt_usg_support.patch index 88aa1c406f..00c268eda8 100644 --- a/target/linux/octeon/patches-5.15/150-ubnt_usg_support.patch +++ b/target/linux/octeon/patches-6.1/150-ubnt_usg_support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h -@@ -296,6 +296,7 @@ enum cvmx_board_types_enum { +@@ -297,6 +297,7 @@ enum cvmx_board_types_enum { CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001, CVMX_BOARD_TYPE_UBNT_E100 = 20002, CVMX_BOARD_TYPE_UBNT_E200 = 20003, @@ -8,7 +8,7 @@ CVMX_BOARD_TYPE_UBNT_E220 = 20005, CVMX_BOARD_TYPE_ITUS_SHIELD = 20006, CVMX_BOARD_TYPE_UBNT_E300 = 20300, -@@ -399,6 +400,7 @@ static inline const char *cvmx_board_typ +@@ -401,6 +402,7 @@ static inline const char *cvmx_board_typ /* Customer private range */ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100) diff --git a/target/linux/octeon/patches-5.15/700-allocate_interface_by_label.patch b/target/linux/octeon/patches-6.1/700-allocate_interface_by_label.patch similarity index 94% rename from target/linux/octeon/patches-5.15/700-allocate_interface_by_label.patch rename to target/linux/octeon/patches-6.1/700-allocate_interface_by_label.patch index e4dc3f96e5..22f284b2c0 100644 --- a/target/linux/octeon/patches-5.15/700-allocate_interface_by_label.patch +++ b/target/linux/octeon/patches-6.1/700-allocate_interface_by_label.patch @@ -22,7 +22,7 @@ Signed-off-by: Roman Kuzmitskii + if (priv->of_node) + label = of_get_property(priv->of_node, "label", NULL); + - ret = of_get_mac_address(priv->of_node, dev->dev_addr); + ret = of_get_ethdev_address(priv->of_node, dev); if (ret) eth_hw_addr_random(dev); @@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic diff --git a/target/linux/octeon/patches-5.15/701-honor_sgmii_node_device_tree_status.patch b/target/linux/octeon/patches-6.1/701-honor_sgmii_node_device_tree_status.patch similarity index 100% rename from target/linux/octeon/patches-5.15/701-honor_sgmii_node_device_tree_status.patch rename to target/linux/octeon/patches-6.1/701-honor_sgmii_node_device_tree_status.patch -- 2.30.2