fix kernel config

diff --git a/config-16k.txt b/config-16k.txt
index 59f196711b08ca38d0f60c0b67d2005c8c6511ac..82791f1fa5d293842960cc467252e36ec7f03535 100644 (file)
--- a/config-16k.txt
+++ b/config-16k.txt
@@ -274,12 +274,12 @@ CONFIG_ARM64=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y

-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_PTE_SHIFT=4
-CONFIG_ARM64_CONT_PMD_SHIFT=4
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=33
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARM64_PAGE_SHIFT=14
+CONFIG_ARM64_CONT_PTE_SHIFT=7
+CONFIG_ARM64_CONT_PMD_SHIFT=5
+CONFIG_ARCH_MMAP_RND_BITS_MIN=16
+CONFIG_ARCH_MMAP_RND_BITS_MAX=31
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=9

 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000


@@ -394,9 +394,11 @@ CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
 
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
 

+# CONFIG_ARM64_4K_PAGES is not set

 CONFIG_ARM64_16K_PAGES=y
 # CONFIG_ARM64_64K_PAGES is not set
 CONFIG_ARM64_16K_PAGES=y
 # CONFIG_ARM64_64K_PAGES is not set

-# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_36 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set

 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y


@@ -425,7 +427,7 @@ CONFIG_PARAVIRT=y
 CONFIG_CRASH_DUMP=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
 CONFIG_CRASH_DUMP=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN=y

-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=12

 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y


@@ -1047,11 +1049,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m

-CONFIG_ARCH_WANTS_THP_SWAP=y

 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set

-CONFIG_THP_SWAP=y

 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y


@@ -2092,6 +2092,8 @@ CONFIG_PCIE_ROCKCHIP_HOST=y
 CONFIG_PCIE_BRCMSTB=y
 # CONFIG_PCIE_MICROCHIP_HOST is not set
 # CONFIG_PCIE_HISI_ERR is not set
 CONFIG_PCIE_BRCMSTB=y
 # CONFIG_PCIE_MICROCHIP_HOST is not set
 # CONFIG_PCIE_HISI_ERR is not set

+CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000
+CONFIG_PCIE_APPLE=y

 
 #
 # DesignWare PCI Core Support
 
 #
 # DesignWare PCI Core Support


@@ -2274,7 +2276,6 @@ CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_ARM=y
 # CONFIG_IMX_DSP is not set
 # CONFIG_IMX_SCU is not set
 CONFIG_UEFI_CPER_ARM=y
 # CONFIG_IMX_DSP is not set
 # CONFIG_IMX_SCU is not set

-CONFIG_MESON_SM=y

 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y


@@ -3502,10 +3503,6 @@ CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y

-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#

 CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m


@@ -3952,7 +3949,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_MOUSE_SERIAL is not set
 CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_MOUSE_SERIAL is not set

-# CONFIG_MOUSE_APPLETOUCH is not set
+CONFIG_MOUSE_APPLETOUCH=y

 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_CYAPA is not set
 CONFIG_MOUSE_ELAN_I2C=m
 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_CYAPA is not set
 CONFIG_MOUSE_ELAN_I2C=m


@@ -7296,7 +7293,7 @@ CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m

-# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_APPLEIR=m

 CONFIG_HID_ASUS=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_ASUS=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m


@@ -7461,7 +7458,7 @@ CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
 CONFIG_USB_ARCH_HAS_HCD=y

-CONFIG_USB=m
+CONFIG_USB=y

 CONFIG_USB_PCI=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 CONFIG_USB_PCI=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 


@@ -7753,6 +7750,7 @@ CONFIG_USB_NET2280=m
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_MAX3420_UDC is not set
 # CONFIG_USB_TEGRA_XUDC is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_MAX3420_UDC is not set
 # CONFIG_USB_TEGRA_XUDC is not set

+# CONFIG_USB_DUMMY_HCD is not set

 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=m
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=m


@@ -8838,7 +8836,6 @@ CONFIG_MESON_CLK_MEASURE=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_EE_PM_DOMAINS=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_EE_PM_DOMAINS=y

-CONFIG_MESON_SECURE_PM_DOMAINS=y

 # end of Amlogic SoC drivers
 
 #
 # end of Amlogic SoC drivers
 
 #


@@ -9791,7 +9788,6 @@ CONFIG_ROCKCHIP_EFUSE=m
 # CONFIG_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SPMI_MFD=y
 CONFIG_NVMEM_SUNXI_SID=m
 # CONFIG_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SPMI_MFD=y
 CONFIG_NVMEM_SUNXI_SID=m

-CONFIG_MESON_EFUSE=m

 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 # CONFIG_NVMEM_ZYNQMP is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 # CONFIG_NVMEM_ZYNQMP is not set


@@ -10910,14 +10906,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 # CONFIG_DEBUG_PER_CPU_MAPS is not set

-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
-CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
-CONFIG_HAVE_ARCH_KASAN_VMALLOC=y

 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y

-# CONFIG_KASAN is not set

 CONFIG_HAVE_ARCH_KFENCE=y
 # CONFIG_KFENCE is not set
 # end of Memory Debugging
 CONFIG_HAVE_ARCH_KFENCE=y
 # CONFIG_KFENCE is not set
 # end of Memory Debugging