apm821xx: add 6.6 testing kernel

refreshed kernel config + patches

otherwise same as 6.1/5.15.

Tested on: WNDAP620, WNDAP660, MyBook Live Single, MR24, MX60, WNDR4700
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

6 files changed, 33 insertions, 8 deletions

diff --git a/target/linux/apm821xx/Makefile b/target/linux/apm821xx/Makefile
index 66bbf3ef47..6719a69779 100644
--- a/target/linux/apm821xx/Makefile
+++ b/target/linux/apm821xx/Makefile
@@ -10,6 +10,7 @@ FEATURES:=fpu dt gpio ramdisk squashfs usb
 SUBTARGETS:=nand sata
 
 KERNEL_PATCHVER:=6.1
+KERNEL_TESTING_PATCHVER:=6.6
 
 define Target/Description
 	Build images for AppliedMicro APM821xx based boards.
diff --git a/target/linux/apm821xx/config-6.1 b/target/linux/apm821xx/config-6.6
index bde05e2f12..8814e5bdca 100644
--- a/target/linux/apm821xx/config-6.1
+++ b/target/linux/apm821xx/config-6.6
@@ -47,12 +47,16 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
 CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MD5_PPC is not set
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SHA1_PPC is not set
+CONFIG_CRYPTO_SHA3=y
 CONFIG_DATA_SHIFT=12
 CONFIG_DMADEVICES=y
 CONFIG_DMA_DIRECT_REMAP=y
@@ -71,6 +75,8 @@ CONFIG_EXTRA_TARGETS="uImage"
 CONFIG_FIXED_PHY=y
 CONFIG_FORCE_PCI=y
 # CONFIG_FSL_LBC is not set
+CONFIG_FS_IOMAP=y
+CONFIG_FUNCTION_ALIGNMENT=0
 CONFIG_FWNODE_MDIO=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
@@ -83,11 +89,12 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_GENERIC_IOREMAP=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
@@ -100,6 +107,7 @@ CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
@@ -129,13 +137,16 @@ CONFIG_LEDS_TRIGGER_PATTERN=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_DEVRES=y
-CONFIG_MEMFD_CREATE=y
 CONFIG_MIGRATION=y
+CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_MMU_GATHER_PAGE_SIZE=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -144,7 +155,10 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_INGRESS=y
 CONFIG_NET_SELFTESTS=y
+CONFIG_NET_XGRESS=y
 CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
@@ -152,6 +166,7 @@ CONFIG_NO_HZ_IDLE=y
 CONFIG_NR_CPUS=1
 CONFIG_NR_IRQS=512
 CONFIG_NVMEM=y
+CONFIG_NVMEM_LAYOUTS=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
@@ -159,6 +174,7 @@ CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
+CONFIG_OF_GPIO_MM_GPIOCHIP=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_MDIO=y
@@ -166,6 +182,10 @@ CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND=y
 CONFIG_PACKING=y
 CONFIG_PAGE_OFFSET=0xc0000000
+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_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
@@ -173,9 +193,9 @@ CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
+CONFIG_PHYLIB_LEDS=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHYS_64BIT=y
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -209,9 +229,11 @@ CONFIG_PPC_PAGE_SHIFT=12
 # CONFIG_PPC_PCI_BUS_NUM_DOMAIN_DEPENDENT is not set
 CONFIG_PPC_UDBG_16550=y
 CONFIG_PPC_WERROR=y
+CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_PTE_64BIT=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_RAINIER is not set
+CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 CONFIG_REGULATOR=y
@@ -223,8 +245,10 @@ CONFIG_RSEQ=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SGL_ALLOC=y
+# CONFIG_SMT_NUM_THREADS_DYNAMIC is not set
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SPARSE_IRQ=y
-CONFIG_SRCU=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
 # CONFIG_STATIC_CALL_SELFTEST is not set
 CONFIG_SWPHY=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
diff --git a/target/linux/apm821xx/patches-6.1/201-add-amcc-apollo3g-support.patch b/target/linux/apm821xx/patches-6.6/201-add-amcc-apollo3g-support.patch
index d26e74dfb7..d26e74dfb7 100644
--- a/target/linux/apm821xx/patches-6.1/201-add-amcc-apollo3g-support.patch
+++ b/target/linux/apm821xx/patches-6.6/201-add-amcc-apollo3g-support.patch
diff --git a/target/linux/apm821xx/patches-6.1/300-fix-atheros-nics-on-apm82181.patch b/target/linux/apm821xx/patches-6.6/300-fix-atheros-nics-on-apm82181.patch
index 706f86d0cf..48c57acde8 100644
--- a/target/linux/apm821xx/patches-6.1/300-fix-atheros-nics-on-apm82181.patch
+++ b/target/linux/apm821xx/patches-6.6/300-fix-atheros-nics-on-apm82181.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/platforms/4xx/pci.c
 +++ b/arch/powerpc/platforms/4xx/pci.c
-@@ -1061,15 +1061,24 @@ static int __init apm821xx_pciex_init_po
+@@ -1058,15 +1058,24 @@ static int __init apm821xx_pciex_init_po
  	u32 val;
  
  	/*
@@ -33,7 +33,7 @@
  
  	if (port->endpoint)
  		val = PTYPE_LEGACY_ENDPOINT << 20;
-@@ -1086,9 +1095,12 @@ static int __init apm821xx_pciex_init_po
+@@ -1083,9 +1092,12 @@ static int __init apm821xx_pciex_init_po
  	mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000130);
  	mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
  
diff --git a/target/linux/apm821xx/patches-6.1/301-fix-memory-map-wndr4700.patch b/target/linux/apm821xx/patches-6.6/301-fix-memory-map-wndr4700.patch
index 0c9fb370f1..bd022ca220 100644
--- a/target/linux/apm821xx/patches-6.1/301-fix-memory-map-wndr4700.patch
+++ b/target/linux/apm821xx/patches-6.6/301-fix-memory-map-wndr4700.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/platforms/4xx/pci.c
 +++ b/arch/powerpc/platforms/4xx/pci.c
-@@ -1903,9 +1903,9 @@ static void __init ppc4xx_configure_pcie
+@@ -1900,9 +1900,9 @@ static void __init ppc4xx_configure_pcie
  		 * if it works
  		 */
  		out_le32(mbase + PECFG_PIM0LAL, 0x00000000);
diff --git a/target/linux/apm821xx/patches-6.1/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch b/target/linux/apm821xx/patches-6.6/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
index 292a252a2e..3ea4faf202 100644
--- a/target/linux/apm821xx/patches-6.1/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
+++ b/target/linux/apm821xx/patches-6.6/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
@@ -18,7 +18,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -274,7 +274,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
+@@ -276,7 +276,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
  
  # args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
  quiet_cmd_wrap	= WRAP    $@