qoriq: add kernel 6.1 support

Add support for kernel 6.1 as testing kernel for qoriq. Refresh config
using `make kernel_oldconfig`.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

diff --git a/target/linux/qoriq/Makefile b/target/linux/qoriq/Makefile
index 5e8e417d3f477eeba8969ca1a89d76325df13fef..b87e863513bc283507f9ff4ab4a3a50897319bb4 100644 (file)
--- a/target/linux/qoriq/Makefile
+++ b/target/linux/qoriq/Makefile
@@ -12,6 +12,7 @@ FEATURES:=boot-part ext4 fpu legacy-sdcard powerpc64 ramdisk rootfs-part rtc sou
 SUBTARGETS:=generic
 
 KERNEL_PATCHVER:=5.15
+KERNEL_TESTING_PATCHVER:=6.1
 
 KERNELNAME:=zImage
 

diff --git a/target/linux/qoriq/config-6.1 b/target/linux/qoriq/config-6.1
index 247bbdf2d3049e959cbc7536c1851397930977ab..bf3b2cfae8d9bb6a95e353b313fe91a2003cc489 100644 (file)
--- a/target/linux/qoriq/config-6.1
+++ b/target/linux/qoriq/config-6.1
@@ -1,6 +1,7 @@
 CONFIG_64BIT=y
 CONFIG_ALTIVEC=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_FORCE_MAX_ORDER=13
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -11,6 +12,7 @@ CONFIG_ARCH_MMAP_RND_BITS_MAX=32
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_STACKWALK=y
@@ -23,13 +25,19 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_PM=y
 CONFIG_BOOKE=y
+CONFIG_BOOKE_OR_40x=y
 CONFIG_BOOKE_WDT=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_CLK_QORIQ=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_CLZ_TAB=y
 CONFIG_COMMON_CLK=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_COMPAT_32BIT_TIME is not set
 CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
 CONFIG_CORENET_GENERIC=y
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_CPU_BIG_ENDIAN=y
@@ -66,6 +74,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
 # CONFIG_CRYPTO_DEV_NX is not set
@@ -75,6 +84,8 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_UTILS=y
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
@@ -91,7 +102,6 @@ CONFIG_DMA_OPS=y
 CONFIG_DMA_OPS_BYPASS=y
 CONFIG_DTC=y
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_E500=y
 # CONFIG_E5500_CPU is not set
 CONFIG_E6500_CPU=y
 CONFIG_EARLY_PRINTK=y
@@ -103,11 +113,11 @@ CONFIG_EDAC_LEGACY_SYSFS=y
 CONFIG_EDAC_MPC85XX=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EPAPR_PARAVIRT=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_F2FS_FS=y
 CONFIG_FIXED_PHY=y
-CONFIG_FORCE_MAX_ZONEORDER=13
 # CONFIG_FSL_BMAN_TEST is not set
 CONFIG_FSL_CORENET_CF=y
 CONFIG_FSL_CORENET_RCPM=y
@@ -131,17 +141,18 @@ CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_FTL=y
-CONFIG_FUNCTION_ALIGNMENT=0
 CONFIG_FUNCTION_ERROR_INJECTION=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_GCC10_NO_ARRAY_BOUNDS=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CMOS_UPDATE=y
-# CONFIG_GENERIC_CPU is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
@@ -180,7 +191,9 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IRQCHIP=y
@@ -222,6 +235,7 @@ CONFIG_MMC_SDHCI_OF_ESDHC=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_WBSD is not set
 CONFIG_MMIOWB=y
+CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_MMU_GATHER_PAGE_SIZE=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MPIC=y
@@ -272,13 +286,19 @@ CONFIG_OPTPROBES=y
 CONFIG_PACKING=y
 CONFIG_PADATA=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCS_LYNX=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_PHYLIB=y
+CONFIG_PHYLIB_LEDS=y
 CONFIG_PHYLINK=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHYS_64BIT=y
@@ -288,25 +308,27 @@ CONFIG_PM=y
 CONFIG_PM_CLK=y
 CONFIG_PPC=y
 CONFIG_PPC64=y
+CONFIG_PPC64_ELF_ABI_V1=y
 CONFIG_PPC_ADV_DEBUG_DACS=2
 CONFIG_PPC_ADV_DEBUG_DVCS=0
 CONFIG_PPC_ADV_DEBUG_IACS=2
 CONFIG_PPC_ADV_DEBUG_REGS=y
 CONFIG_PPC_BARRIER_NOSPEC=y
-CONFIG_PPC_BOOK3E=y
 CONFIG_PPC_BOOK3E_64=y
-CONFIG_PPC_BOOK3E_MMU=y
 # CONFIG_PPC_BOOK3S_64 is not set
 CONFIG_PPC_DAWR=y
 CONFIG_PPC_DOORBELL=y
+CONFIG_PPC_E500=y
 CONFIG_PPC_E500MC=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 CONFIG_PPC_EPAPR_HV_PIC=y
 CONFIG_PPC_FPU=y
 CONFIG_PPC_FPU_REGS=y
-CONFIG_PPC_FSL_BOOK3E=y
 CONFIG_PPC_INDIRECT_PCI=y
 # CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
+CONFIG_PPC_KUEP=y
 CONFIG_PPC_MMU_NOHASH=y
 CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
@@ -317,6 +339,7 @@ CONFIG_PPC_SMP_MUXED_IPI=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_PPC_WERROR=y
 CONFIG_PPS=y
+CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_PTE_64BIT=y
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
@@ -325,6 +348,7 @@ CONFIG_QORIQ_CPUFREQ=y
 CONFIG_QORIQ_THERMAL=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
@@ -354,6 +378,7 @@ CONFIG_SG_POOL=y
 CONFIG_SMP=y
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SOC_BUS=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPI=y
@@ -363,6 +388,7 @@ CONFIG_SRCU=y
 CONFIG_SWIOTLB=y
 CONFIG_SWPHY=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_TARGET_CPU="e6500"
 CONFIG_TARGET_CPU_BOOL=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@@ -371,6 +397,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_THREAD_SHIFT=14
+# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 # CONFIG_UACCE is not set