qualcommax: add kernel 6.18 as testing kernel

Enable linux 6.18 as the testing kernel; 6.12 stays the main kernel. The
config was created from config-6.12 and refreshed (defaults accepted for
new symbols; QCOM_PPE and PCS_QCOM_IPQ9574 - upstream's IPQ9574-generation
PPE/PCS drivers - stay disabled, this target uses its own EDMA/PPE/UNIPHY-PCS
drivers).

EC_HUAWEI_GAOKUN, EC_LENOVO_THINKPAD_T14S, VIDEO_QCOM_IRIS and QCOMTEE are
new ARCH_QCOM-gated symbols that are only visible in ALL_KMODS builds; answer
them explicitly so syncconfig stays non-interactive. QCOMTEE sits inside the
TEE menu, so it only became reachable once kmod-tee turned CONFIG_TEE on
(0f256a0a7adf "kernel: modules: package OP-TEE and fTPM modules").

Signed-off-by: Julius Bairaktaris <julius@bairaktaris.de>
Link: https://github.com/openwrt/openwrt/pull/24031
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/qualcommax/Makefile b/target/linux/qualcommax/Makefile
index 1ef9ac337966b0a151ceb09c780443ba08642008..29b7e8529bc32ce17ce6a2209446d352cc1b5e39 100644 (file)
--- a/target/linux/qualcommax/Makefile
+++ b/target/linux/qualcommax/Makefile
@@ -9,6 +9,7 @@ CPU_TYPE:=cortex-a53
 SUBTARGETS:=ipq807x ipq60xx ipq50xx
 
 KERNEL_PATCHVER:=6.12
+KERNEL_TESTING_PATCHVER:=6.18
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \

diff --git a/target/linux/qualcommax/config-6.18 b/target/linux/qualcommax/config-6.18
index 8daaff38322ad4a0c5c0efb7a81ba33cc652e84e..b49ea9f8eb8e6b4a0e779006bd776de8b48815ca 100644 (file)
--- a/target/linux/qualcommax/config-6.18
+++ b/target/linux/qualcommax/config-6.18
@@ -1,6 +1,5 @@
 CONFIG_64BIT=y
 CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
-CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_FORCE_MAX_ORDER=10
@@ -22,6 +21,7 @@ CONFIG_ARCH_WANTS_NO_INSTR=y
 CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_ARM64=y
 CONFIG_ARM64_4K_PAGES=y
+CONFIG_ARM64_BRBE=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_2051678=y
@@ -29,7 +29,6 @@ CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2077057=y
 CONFIG_ARM64_ERRATUM_2658417=y
-CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
 CONFIG_ARM64_PA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
@@ -46,9 +45,11 @@ CONFIG_ARM_AMBA=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_ITS_PARENT=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V5=y
 # CONFIG_ARM_MHU_V2 is not set
 # CONFIG_ARM_MHU_V3 is not set
 CONFIG_ARM_PSCI_CPUIDLE=y
@@ -60,18 +61,20 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUXILIARY_BUS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
 CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
+# CONFIG_CLK_GLYMUR_DISPCC is not set
+# CONFIG_CLK_GLYMUR_GCC is not set
+# CONFIG_CLK_GLYMUR_TCSRCC is not set
 # CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_CLK_X1E80100_CAMCC is not set
 # CONFIG_CLK_X1E80100_DISPCC is not set
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
+# CONFIG_CLK_X1P42100_GPUCC is not set
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_QCOM=y
@@ -103,6 +106,7 @@ CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CRC16=y
+CONFIG_CRC32_ARCH=y
 CONFIG_CRC8=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_CBC=y
@@ -111,10 +115,11 @@ CONFIG_CRYPTO_DEV_QCOM_RNG=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
-CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_SHA1_ARCH=y
+CONFIG_CRYPTO_LIB_SHA256_ARCH=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
@@ -135,6 +140,8 @@ CONFIG_DMA_OF=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DTC=y
 CONFIG_DT_IDLE_STATES=y
+# CONFIG_EC_HUAWEI_GAOKUN is not set
+# CONFIG_EC_LENOVO_THINKPAD_T14S is not set
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_FIXED_PHY=y
@@ -163,6 +170,7 @@ CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IOREMAP=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_ENTRY=y
 CONFIG_GENERIC_IRQ_KEXEC_CLEAR_VM_FORWARD=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
@@ -205,12 +213,14 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_CLK=y
 # CONFIG_INTERCONNECT_QCOM is not set
+# CONFIG_IPQ_APSS_5424 is not set
 CONFIG_IPQ_APSS_6018=y
 CONFIG_IPQ_APSS_PLL=y
 # CONFIG_IPQ_CMN_PLL is not set
 # CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_IPQ_GCC_5018 is not set
 # CONFIG_IPQ_GCC_5332 is not set
+# CONFIG_IPQ_GCC_5424 is not set
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
@@ -220,6 +230,7 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
 CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_IRQ_MSI_LIB=y
 CONFIG_IRQ_WORK=y
 # CONFIG_KPSS_XCC is not set
@@ -233,8 +244,6 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_MAILBOX=y
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
 CONFIG_MDIO_IPQ4019=y
 # CONFIG_MFD_QCOM_RPM is not set
 CONFIG_MFD_SYSCON=y
@@ -303,6 +312,7 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_MDIO=y
 CONFIG_PADATA=y
+CONFIG_PAGE_BLOCK_MAX_ORDER=10
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
@@ -316,13 +326,18 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_DW=y
+# CONFIG_PCIE_DW_DEBUGFS is not set
 CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_QCOM_COMMON=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_MSI=y
+CONFIG_PCI_PWRCTRL=y
+CONFIG_PCI_PWRCTRL_SLOT=y
 CONFIG_PCS_QCA_UNIPHY=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_PGTABLE_LEVELS=3
@@ -330,12 +345,14 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLIB_LEDS=y
 CONFIG_PHYLINK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PHY_PACKAGE=y
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 # CONFIG_PHY_QCOM_EDP is not set
 # CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
 # CONFIG_PHY_QCOM_IPQ4019_USB is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 # CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_EUSB is not set
 # CONFIG_PHY_QCOM_M31_USB is not set
 # CONFIG_PHY_QCOM_PCIE2 is not set
 CONFIG_PHY_QCOM_QMP=y
@@ -347,20 +364,24 @@ CONFIG_PHY_QCOM_QMP_USB=y
 # CONFIG_PHY_QCOM_QMP_USB_LEGACY is not set
 CONFIG_PHY_QCOM_QUSB2=y
 # CONFIG_PHY_QCOM_SGMII_ETH is not set
-# CONFIG_PHY_QCOM_SNPS_EUSB2 is not set
 # CONFIG_PHY_QCOM_UNIPHY_PCIE_28LP is not set
 # CONFIG_PHY_QCOM_USB_HS_28NM is not set
 # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
 # CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_SNPS_EUSB2 is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AW9523=y
+# CONFIG_PINCTRL_GLYMUR is not set
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
+# CONFIG_PINCTRL_IPQ5424 is not set
 # CONFIG_PINCTRL_IPQ6018 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL_IPQ9574 is not set
+# CONFIG_PINCTRL_MILOS is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_MSM8916 is not set
+# CONFIG_PINCTRL_MSM8917 is not set
 # CONFIG_PINCTRL_MSM8976 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
@@ -368,8 +389,11 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_QCM2290 is not set
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 # CONFIG_PINCTRL_QCS404 is not set
+# CONFIG_PINCTRL_QCS615 is not set
+# CONFIG_PINCTRL_QCS8300 is not set
 # CONFIG_PINCTRL_QDU1000 is not set
 # CONFIG_PINCTRL_SA8775P is not set
+# CONFIG_PINCTRL_SAR2130P is not set
 # CONFIG_PINCTRL_SC7180 is not set
 # CONFIG_PINCTRL_SC8280XP is not set
 # CONFIG_PINCTRL_SDM660 is not set
@@ -385,6 +409,7 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_SM8450 is not set
 # CONFIG_PINCTRL_SM8550 is not set
 # CONFIG_PINCTRL_SM8650 is not set
+# CONFIG_PINCTRL_SM8750 is not set
 # CONFIG_PINCTRL_X1E80100 is not set
 CONFIG_PM=y
 CONFIG_PM_CLK=y
@@ -400,6 +425,7 @@ CONFIG_QCA807X_PHY=y
 CONFIG_QCA808X_PHY=y
 # CONFIG_QCM_DISPCC_2290 is not set
 # CONFIG_QCM_GCC_2290 is not set
+# CONFIG_QCOMTEE is not set
 # CONFIG_QCOM_80211AX_PPE is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_AOSS_QMP is not set
@@ -428,6 +454,7 @@ CONFIG_QCOM_NET_PHYLIB=y
 # CONFIG_QCOM_OCMEM is not set
 # CONFIG_QCOM_PDC is not set
 CONFIG_QCOM_PIL_INFO=y
+# CONFIG_QCOM_PPE is not set
 # CONFIG_QCOM_Q6V5_ADSP is not set
 CONFIG_QCOM_Q6V5_COMMON=y
 # CONFIG_QCOM_Q6V5_MPD is not set
@@ -459,9 +486,15 @@ CONFIG_QCOM_TZMEM_MODE_GENERIC=y
 # CONFIG_QCOM_WCNSS_CTRL is not set
 # CONFIG_QCOM_WCNSS_PIL is not set
 CONFIG_QCOM_WDT=y
+# CONFIG_QCS_CAMCC_615 is not set
+# CONFIG_QCS_DISPCC_615 is not set
 # CONFIG_QCS_GCC_404 is not set
+# CONFIG_QCS_GCC_615 is not set
+# CONFIG_QCS_GCC_8300 is not set
+# CONFIG_QCS_GPUCC_615 is not set
 # CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
+# CONFIG_QCS_VIDEOCC_615 is not set
 # CONFIG_QDU_ECPRICC_1000 is not set
 # CONFIG_QDU_GCC_1000 is not set
 CONFIG_QUEUED_RWLOCKS=y
@@ -483,7 +516,6 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_QCOM_AOSS is not set
 # CONFIG_RESET_QCOM_PDC is not set
 CONFIG_RFS_ACCEL=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
 # CONFIG_RPMSG_CTRL is not set
@@ -497,8 +529,13 @@ CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
+# CONFIG_SAR_GCC_2130P is not set
+# CONFIG_SAR_GPUCC_2130P is not set
+# CONFIG_SA_CAMCC_8775P is not set
+# CONFIG_SA_DISPCC_8775P is not set
 # CONFIG_SA_GCC_8775P is not set
 # CONFIG_SA_GPUCC_8775P is not set
+# CONFIG_SA_VIDEOCC_8775P is not set
 # CONFIG_SCHED_CORE is not set
 CONFIG_SCHED_HW_PRESSURE=y
 CONFIG_SCHED_MC=y
@@ -508,6 +545,7 @@ CONFIG_SCSI_COMMON=y
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SC_CAMCC_7280 is not set
+# CONFIG_SC_CAMCC_8180X is not set
 # CONFIG_SC_CAMCC_8280XP is not set
 # CONFIG_SC_DISPCC_7180 is not set
 # CONFIG_SC_DISPCC_8280XP is not set
@@ -531,7 +569,6 @@ CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SGL_ALLOC=y
 CONFIG_SG_POOL=y
 CONFIG_SKB_EXTENSIONS=y
 CONFIG_SMP=y
@@ -542,6 +579,7 @@ CONFIG_SMP=y
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
 # CONFIG_SM_CAMCC_8650 is not set
+# CONFIG_SM_CAMCC_MILOS is not set
 # CONFIG_SM_GCC_4450 is not set
 # CONFIG_SM_GCC_7150 is not set
 # CONFIG_SM_GCC_8150 is not set
@@ -549,6 +587,8 @@ CONFIG_SMP=y
 # CONFIG_SM_GCC_8450 is not set
 # CONFIG_SM_GCC_8550 is not set
 # CONFIG_SM_GCC_8650 is not set
+# CONFIG_SM_GCC_8750 is not set
+# CONFIG_SM_GCC_MILOS is not set
 # CONFIG_SM_GPUCC_4450 is not set
 # CONFIG_SM_GPUCC_6115 is not set
 # CONFIG_SM_GPUCC_6125 is not set
@@ -560,13 +600,19 @@ CONFIG_SMP=y
 # CONFIG_SM_GPUCC_8450 is not set
 # CONFIG_SM_GPUCC_8550 is not set
 # CONFIG_SM_GPUCC_8650 is not set
+# CONFIG_SM_GPUCC_MILOS is not set
+# CONFIG_SM_LPASSCC_6115 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
+# CONFIG_SM_TCSRCC_8750 is not set
+# CONFIG_SM_VIDEOCC_6350 is not set
 # CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8350 is not set
 # CONFIG_SM_VIDEOCC_8450 is not set
+# CONFIG_SM_VIDEOCC_8550 is not set
+# CONFIG_SM_VIDEOCC_MILOS is not set
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SOC_BUS=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
@@ -607,6 +653,7 @@ CONFIG_USB_COMMON=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_VDSO_GETRANDOM=y
+# CONFIG_VIDEO_QCOM_IRIS is not set
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_ANCHOR=y
 # CONFIG_VIRTIO_BLK is not set