diff options
489 files changed, 10993 insertions, 6986 deletions
@@ -4,12 +4,12 @@ Patches to the kernel meta data should be submitted to the linux-yocto mailing list (subscripion only) and should cc' the maintainer. - list: https://lists.yoctoproject.org/listinfo/linux-yocto + list: https://lists.yoctoproject.org/g/linux-yocto Maintainers: Bruce Ashfield <bruce.ashfield@gmail.com> When sending single patches, please using something like: - $ git send-email -1 --to linux-yocto@yoctoproject.org --subject-prefix='kernel-cache][PATCH' + $ git send-email -1 --to=linux-yocto@lists.yoctoproject.org --subject-prefix='kernel-cache][PATCH' 1.0 Overview ============ diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..7d2ce1f6 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,24 @@ +How to Report a Potential Vulnerability? +======================================== + +If you would like to report a public issue (for example, one with a released +CVE number), please report it using the +[https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Security Security Bugzilla]. +If you have a patch ready, submit it following the same procedure as any other +patch as described in README.md. + +If you are dealing with a not-yet released or urgent issue, please send a +message to security AT yoctoproject DOT org, including as many details as +possible: the layer or software module affected, the recipe and its version, +and any example code, if available. + +Branches maintained with security fixes +--------------------------------------- + +See [https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS Stable release and LTS] +for detailed info regarding the policies and maintenance of Stable branches. + +The [https://wiki.yoctoproject.org/wiki/Releases Release page] contains a list of all +releases of the Yocto Project. Versions in grey are no longer actively maintained with +security patches, but well-tested patches may still be accepted for them for +significant issues. diff --git a/arch/arm/0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch b/arch/arm/0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch new file mode 100644 index 00000000..8282d25d --- /dev/null +++ b/arch/arm/0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch @@ -0,0 +1,98 @@ +From 72bad8cd7540f07ab54e08b83ad106dec0df123c Mon Sep 17 00:00:00 2001 +From: Jon Mason <jon.mason@arm.com> +Date: Tue, 8 Aug 2023 16:38:37 -0400 +Subject: [PATCH] drm/fb-helper: move zeroing code to drm_fb_helper_fill_var + +__fill_var is used by both drm_fb_helper_check_var and +drm_fb_helper_fill_var. In drm_fb_helper_check_var, it is possible that +some of the variables in fb_info-> var which are currently being zero'ed +have pre-existing values. Zeroing these causes some fb tests to fail +with (from the Xorg.log): + +[ 9.897] (II) Module fbdevhw: vendor="X.Org Foundation" +[ 9.897] compiled for 1.21.1.8, module version = 0.0.2 +[ 9.897] ABI class: X.Org Video Driver, version 25.2 +[ 9.898] (II) FBDEV(0): using default device +[ 9.901] (==) FBDEV(0): Depth 24, (==) framebuffer bpp 32 +[ 9.902] (==) FBDEV(0): RGB weight 888 +[ 9.902] (==) FBDEV(0): Default visual is TrueColor +[ 9.902] (==) FBDEV(0): Using gamma correction (1.0, 1.0, 1.0) +[ 9.902] (II) FBDEV(0): hardware: virtio_gpudrmfb (video memory: +4000kB) +[ 9.902] (DB) xf86MergeOutputClassOptions unsupported bus type 0 +[ 9.903] (II) FBDEV(0): checking modes against framebuffer device... +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" not found +[ 9.904] (II) FBDEV(0): checking modes against monitor... +[ 9.905] (II) FBDEV(0): Virtual size is 1280x800 (pitch 1280) +[ 9.905] (**) FBDEV(0): Built-in mode "current" +[ 9.905] (==) FBDEV(0): DPI set to (96, 96) + +Previously, these values were not modified. Moving the zero'ing of the +variables to drm_fb_helper_fill_var resolves the issue. + +Fixes: ee4cce0a8f03 ("drm/fb-helper: fix input validation gaps in check_var") +Signed-off-by: Jon Mason <jon.mason@arm.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/gpu/drm/drm_fb_helper.c | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c +index fd27f1978635..ddc12c080dcc 100644 +--- a/drivers/gpu/drm/drm_fb_helper.c ++++ b/drivers/gpu/drm/drm_fb_helper.c +@@ -1548,8 +1548,6 @@ static void drm_fb_helper_fill_pixel_fmt(struct fb_var_screeninfo *var, + static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, + struct drm_framebuffer *fb) + { +- int i; +- + var->xres_virtual = fb->width; + var->yres_virtual = fb->height; + var->accel_flags = 0; +@@ -1557,15 +1555,6 @@ static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, + + var->height = info->var.height; + var->width = info->var.width; +- +- var->left_margin = var->right_margin = 0; +- var->upper_margin = var->lower_margin = 0; +- var->hsync_len = var->vsync_len = 0; +- var->sync = var->vmode = 0; +- var->rotate = 0; +- var->colorspace = 0; +- for (i = 0; i < 4; i++) +- var->reserved[i] = 0; + } + + /** +@@ -2059,6 +2048,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, + { + struct drm_framebuffer *fb = fb_helper->fb; + const struct drm_format_info *format = fb->format; ++ int i; + + switch (format->format) { + case DRM_FORMAT_C1: +@@ -2076,6 +2066,14 @@ static void drm_fb_helper_fill_var(struct fb_info *info, + info->pseudo_palette = fb_helper->pseudo_palette; + info->var.xoffset = 0; + info->var.yoffset = 0; ++ info->var.left_margin = info->var.right_margin = 0; ++ info->var.upper_margin = info->var.lower_margin = 0; ++ info->var.hsync_len = info->var.vsync_len = 0; ++ info->var.sync = info->var.vmode = 0; ++ info->var.rotate = 0; ++ info->var.colorspace = 0; ++ for (i = 0; i < 4; i++) ++ info->var.reserved[i] = 0; + __fill_var(&info->var, info, fb); + info->var.activate = FB_ACTIVATE_NOW; + +-- +2.34.1 + diff --git a/arch/arm/arm-ARM-EABI-socketcall.patch b/arch/arm/arm-ARM-EABI-socketcall.patch index a24b8767..53173c96 100644 --- a/arch/arm/arm-ARM-EABI-socketcall.patch +++ b/arch/arm/arm-ARM-EABI-socketcall.patch @@ -1,4 +1,4 @@ -From 1f05ef36493eb57d2b7bc4201b6bc105869ea702 Mon Sep 17 00:00:00 2001 +From 3502bc5ce0d25aae81727455869af362099c15bf Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> Date: Tue, 15 Jul 2008 15:49:27 -0400 Subject: [PATCH] arm: ARM EABI socketcall @@ -14,13 +14,13 @@ Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S -index eb5cd77bf1d8..41021ceedca4 100644 +index 7f0b7aba1498..49719a7d721c 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S -@@ -316,7 +316,8 @@ ENTRY(\sym) +@@ -352,7 +352,8 @@ ENTRY(\sym) + * With EABI a couple syscalls are obsolete and defined as sys_ni_syscall. */ syscall_table_start sys_call_table - #define COMPAT(nr, native, compat) syscall nr, native -#ifdef CONFIG_AEABI + +#if defined(CONFIG_AEABI) && !defined(CONFIG_OABI_COMPAT) @@ -28,5 +28,5 @@ index eb5cd77bf1d8..41021ceedca4 100644 #else #include <calls-oabi.S> -- -2.5.0 +2.19.1 diff --git a/arch/arm/arm-Makefile-Fix-systemtap.patch b/arch/arm/arm-Makefile-Fix-systemtap.patch deleted file mode 100644 index 163f12cb..00000000 --- a/arch/arm/arm-Makefile-Fix-systemtap.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 37c8f2a3df1e3154087538a27228fad0c6e172c5 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Sun, 10 Mar 2019 06:43:15 +0000 -Subject: [PATCH] arm/Makefile: Fix systemtap - -Currently systemtap fails to operate correctly on armv7 systems such as beaglebone and -soon, qemuarm. - -root@qemuarm:/usr/src/kernel# env -uARCH -uKBUILD_EXTMOD -uCROSS_COMPILE -uKBUILD_IMAGE -uKCONFIG_CONFIG -uINSTALL_PATH -uLD_LIBRARY_PATH PATH=/usr/bin:/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin make -C /lib/modules/4.19.19-yocto-standard/build M=/tmp/staptcNU6M modules CONFIG_DEBUG_INFO= CONFIG_STACK_VALIDATION= ARCH=arm stap_4321_src.i --no-print-directory -j2 V=1 -test -e include/generated/autoconf.h -a -e include/config/auto.conf || ( \ -echo >&2; \ -echo >&2 " ERROR: Kernel configuration is invalid."; \ -echo >&2 " include/generated/autoconf.h or include/config/auto.conf are missing.";\ -echo >&2 " Run 'make oldconfig && make prepare' on kernel src to fix it."; \ -echo >&2 ; \ -/bin/false) -mkdir -p /tmp/staptcNU6M/.tmp_versions ; rm -f /tmp/staptcNU6M/.tmp_versions/* -make -f ./scripts/Makefile.build obj=/tmp/staptcNU6M -(cat /dev/null; echo kernel//tmp/staptcNU6M/stap_4321.ko;) > /tmp/staptcNU6M/modules.order - gcc -Wp,-MD,/tmp/staptcNU6M/.stap_4321_src.o.d -nostdinc -isystem /usr/lib/gcc/arm-poky-linux-gnueabi/8.3.0/include -I./arch/arm/include -I./arch/arm/include/generated -I./include -I./arch/arm/include/uapi -I./arch/arm/include/generated/uapi -I./include/uapi -I./include/generated/uapi -include ./include/linux/kconfig.h -include ./include/linux/compiler_types.h -D__KERNEL__ -mlittle-endian -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fshort-wchar -Werror-implicit-function-declaration -Wno-format-security -std=gnu89 -fno-PIE -DCC_HAVE_ASM_GOTO -fno-dwarf2-cfi-asm -fno-omit-frame-pointer -mapcs -mno-sched-prolog -fno-ipa-sra -mabi=aapcs-linux -mfpu=vfp -funwind-tables -marm -Wa,-mno-warn-deprecated -D__LINUX_ARM_ARCH__=7 -march=armv5t -Wa,-march=armv7-a -msoft-float -Uarm -fno-delete-null-pointer-checks -Wno-frame-address -Wno-format-truncation -Wno-format-overflow -Wno-int-in-bool-context -Os -Wno-maybe-uninitialized --param=allow-store-data-races=0 -Wframe-larger-than=1024 -fstack-protector-strong -Wno-unused-but-set-variable -Wno-unused-const-variable -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-var-tracking-assignments -pg -Wdeclaration-after-statement -Wno-pointer-sign -Wno-stringop-truncation -fno-strict-overflow -fno-merge-all-constants -fmerge-constants -fno-stack-check -fconserve-stack -Werror=implicit-int -Werror=strict-prototypes -Werror=date-time -Werror=incompatible-pointer-types -Werror=designated-init -fmacro-prefix-map=./= -Wno-packed-not-aligned -Iinclude2/asm/mach-default -I/lib/modules/4.19.19-yocto-standard/build -include /tmp/staptcNU6M/stapconf_4321.h -D "STP_NO_VELREL_CHECK" -freorder-blocks -fasynchronous-unwind-tables -Wframe-larger-than=512 -fno-ipa-icf -Wno-unused -Wno-tautological-compare -Werror -I/usr/share/systemtap/runtime -DMODULE -DKBUILD_BASENAME='"stap_4321_src"' -DKBUILD_MODNAME='"stap_4321"' -c -o /tmp/staptcNU6M/stap_4321_src.o /tmp/staptcNU6M/stap_4321_src.c -/tmp/ccaE9CMG.s: Assembler messages: -/tmp/ccaE9CMG.s:49: Error: selected processor does not support `dmb ish' in ARM mode -/tmp/ccaE9CMG.s:52: Error: architectural extension `mp' is not allowed for the current b - -(which was from running the stap command with -v -v -v -k and then being able to run the command individually) - -Note that it says armv5t above. - -That comes from the code this patch changes - -root@qemuarm:/usr/src/kernel# gcc -march=armv7-a /tmp/staptcNU6M/stap_4321_aux_0.c -cc1: error: -mfloat-abi=hard: selected processor lacks an FPU - -which makes me wonder if cc-option fails unless -mfpu-vfp is on the commandline too. - -Since we have a gcc which accepts the armv7-a arch, just remove the cc-option -wrapper unconditionally here. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - arch/arm/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/Makefile b/arch/arm/Makefile -index 1f95ede8063f..9253b7533cb1 100644 ---- a/arch/arm/Makefile -+++ b/arch/arm/Makefile -@@ -64,7 +64,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra) - # macro, but instead defines a whole series of macros which makes - # testing for a specific architecture or later rather impossible. - arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m --arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) -+arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a -Wa$(comma)-march=armv7-a - arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) - # Only override the compiler option if ARMv6. The ARMv6K extensions are - # always available in ARMv7 --- -2.19.1 - diff --git a/arch/arm/arm.cfg b/arch/arm/arm.cfg index d5380436..f2b36dca 100644 --- a/arch/arm/arm.cfg +++ b/arch/arm/arm.cfg @@ -2,8 +2,6 @@ # Build EABI kernels that support EABI system calls. CONFIG_AEABI=y -# Provide support for the old ABI's system calls. -CONFIG_OABI_COMPAT=y CONFIG_ARM_THUMB=y # Failure to use this on ARM results in lots of interesting runtime bugs. @@ -11,4 +9,4 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_UNWINDER_ARM=y -# CONFIG_FUNCTION_GRAPH_TRACER is not set +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/arch/arm/arm.scc b/arch/arm/arm.scc index cfac7f13..39e0e6d7 100644 --- a/arch/arm/arm.scc +++ b/arch/arm/arm.scc @@ -10,4 +10,6 @@ include v7-A15/v7-A15.scc patch arm-ARM-EABI-socketcall.patch patch vexpress-Pass-LOADADDR-to-Makefile.patch -patch arm-Makefile-Fix-systemtap.patch +patch arm64-defconfig-cleanup-config-options.patch +patch 0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch +patch arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch diff --git a/arch/arm/arm64-16kb-pages.cfg b/arch/arm/arm64-16kb-pages.cfg new file mode 100644 index 00000000..a83e1a50 --- /dev/null +++ b/arch/arm/arm64-16kb-pages.cfg @@ -0,0 +1 @@ +CONFIG_ARM64_16K_PAGES=y diff --git a/arch/arm/arm64-16kb-pages.scc b/arch/arm/arm64-16kb-pages.scc new file mode 100644 index 00000000..d2706c08 --- /dev/null +++ b/arch/arm/arm64-16kb-pages.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Use 16KB pages" +define KFEATURE_COMPATIBILITY arch + +kconf hardware arm64-16kb-pages.cfg diff --git a/arch/arm/arm64-4kb-pages.cfg b/arch/arm/arm64-4kb-pages.cfg new file mode 100644 index 00000000..5df91df1 --- /dev/null +++ b/arch/arm/arm64-4kb-pages.cfg @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/arch/arm/arm64-4kb-pages.scc b/arch/arm/arm64-4kb-pages.scc new file mode 100644 index 00000000..4ee7cac2 --- /dev/null +++ b/arch/arm/arm64-4kb-pages.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Use 4KB pages" +define KFEATURE_COMPATIBILITY arch + +kconf hardware arm64-4kb-pages.cfg diff --git a/arch/arm/arm64-64kb-pages.cfg b/arch/arm/arm64-64kb-pages.cfg new file mode 100644 index 00000000..bda5426d --- /dev/null +++ b/arch/arm/arm64-64kb-pages.cfg @@ -0,0 +1 @@ +CONFIG_ARM64_64K_PAGES=y diff --git a/arch/arm/arm64-64kb-pages.scc b/arch/arm/arm64-64kb-pages.scc new file mode 100644 index 00000000..efe60dae --- /dev/null +++ b/arch/arm/arm64-64kb-pages.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Use 64KB pages" +define KFEATURE_COMPATIBILITY arch + +kconf hardware arm64-64kb-pages.cfg diff --git a/arch/arm/arm64-defconfig-cleanup-config-options.patch b/arch/arm/arm64-defconfig-cleanup-config-options.patch new file mode 100644 index 00000000..46023e3c --- /dev/null +++ b/arch/arm/arm64-defconfig-cleanup-config-options.patch @@ -0,0 +1,49 @@ +From 14e71de7e9d610c2ce6d2cfa064e6c392304bd38 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross@burtonini.com> +Date: Tue, 11 Jan 2022 12:02:36 +0000 +Subject: [PATCH] arm64: defconfig: cleanup config options + +arm64: defconfig: drop unused POWER_AVS option +Commit 785b5bb41b0a ("PM: AVS: Drop the avs directory and the +corresponding Kconfig") moved AVS code to SOC-specific folders, and +removed corresponding Kconfig from drivers/power, leaving original +POWER_AVS config option enabled in some defconfigs. +Remove the options, which have no references in the tree anymore. + +arm64: defconfig: set CONFIG_USB_CONN_GPIO=y +Since 10a7b37b5b ("arm64: Update default configuration") PHY_TEGRA_XUSB +is set to y. That option needs USB_CONN_GPIO to also be y not m, so +set USB_CONN_GPIO explicitly to y to reflect reality. + +arm64: defconfig: remove obsolete CONFIG_ARCH_AGILEX and CONFIG_ARCH_N5X +These config options were removed in 4a9a1a5602 ("arm64: socfpga: merge +Agilex and N5X into ARCH_INTEL_SOCFPGA"), so remove them from the +defconfig. + +arm64: defconfig: don't set CONFIG_ACPI_APEI_PCIEAER +Since 8c8ff55 ("PCI/AER: Don't select CONFIG_PCIEAER by default"), PCIe +Advanced Error Reporting isn't enabled by default.. As this means just +enabling CONFIG_CPI_APEI_PCIEAR does not have an effect, remove it from +the defconfig for clarity. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/configs/defconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 50aa3d75ab4f..cd1b2d865baf 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -103,7 +103,6 @@ CONFIG_QORIQ_CPUFREQ=y + CONFIG_ACPI=y + CONFIG_ACPI_APEI=y + CONFIG_ACPI_APEI_GHES=y +-CONFIG_ACPI_APEI_PCIEAER=y + CONFIG_ACPI_APEI_MEMORY_FAILURE=y + CONFIG_ACPI_APEI_EINJ=y + CONFIG_VIRTUALIZATION=y +-- +2.19.1 + diff --git a/arch/arm/arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch b/arch/arm/arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch new file mode 100644 index 00000000..e36c20ff --- /dev/null +++ b/arch/arm/arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch @@ -0,0 +1,29 @@ +From b0dbb1ddc539b556ac1920ff704ec4099f8ca392 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Thu, 4 Jan 2024 13:32:41 +0000 +Subject: [PATCH] arm64: defconfig: remove CONFIG_IPQ_APSS_5018 + +This was added in 7f0c873 ("Enable IPQ5018 SoC base configs"), but there +is no IPQ_APSS_5018 config defined in the kconfig at present. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/configs/defconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 88c0cfdd5581..bd6b6be68d3f 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -1248,7 +1248,6 @@ CONFIG_QCOM_CLK_APCC_MSM8996=y + CONFIG_QCOM_CLK_SMD_RPM=y + CONFIG_QCOM_CLK_RPMH=y + CONFIG_IPQ_APSS_6018=y +-CONFIG_IPQ_APSS_5018=y + CONFIG_IPQ_GCC_5018=y + CONFIG_IPQ_GCC_5332=y + CONFIG_IPQ_GCC_6018=y +-- +2.39.2 + diff --git a/arch/microblaze/microblaze.cfg b/arch/microblaze/microblaze.cfg index ba4773ba..db506551 100644 --- a/arch/microblaze/microblaze.cfg +++ b/arch/microblaze/microblaze.cfg @@ -15,5 +15,5 @@ CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=0 CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 # Disable FTRACE, does not work with MicroBlaze -# CONFIG_FTRACE is not set +CONFIG_FTRACE=n diff --git a/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch b/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch index 44d92966..1c1d9408 100644 --- a/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch +++ b/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch @@ -1,4 +1,4 @@ -From 8b05f6af70cc61956a8563a3bc79789dcffecfc5 Mon Sep 17 00:00:00 2001 +From 63911f5a1a7753ef0fb2a1b82fa268d7e13c3935 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Tue, 7 Jan 2020 03:34:12 +0000 Subject: [PATCH] mips: Kconfig: add QEMUMIPS64 option @@ -39,12 +39,12 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 797d7f1ad5fe..9337527d778f 100644 +index d89efba3d8a4..bc0d3e1cf297 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -92,6 +92,10 @@ config MIPS - select SYSCTL_EXCEPTION_TRACE - select VIRT_TO_BUS +@@ -118,6 +118,10 @@ config MACH_INGENIC + select CPU_SUPPORTS_CPUFREQ + select MIPS_EXTERNAL_TIMER +config QEMUMIPS64 + bool "Enable for qemumips64 specific configurations" @@ -53,7 +53,7 @@ index 797d7f1ad5fe..9337527d778f 100644 menu "Machine selection" choice -@@ -103,17 +107,17 @@ config MIPS_GENERIC +@@ -131,17 +135,17 @@ config MIPS_GENERIC_KERNEL select BOOT_RAW select BUILTIN_DTB select CEVT_R4K @@ -62,7 +62,7 @@ index 797d7f1ad5fe..9337527d778f 100644 select CPU_MIPSR2_IRQ_EI select CPU_MIPSR2_IRQ_VI - select CSRC_R4K - select DMA_PERDEV_COHERENT + select DMA_NONCOHERENT select HAVE_PCI select IRQ_MIPS_CPU select MIPS_AUTO_PFN_OFFSET @@ -73,7 +73,7 @@ index 797d7f1ad5fe..9337527d778f 100644 select MIPS_L1_CACHE_SHIFT_7 select NO_EXCEPT_FILL select PCI_DRIVERS_GENERIC -@@ -535,9 +539,9 @@ config MIPS_MALTA +@@ -546,9 +550,9 @@ config MIPS_MALTA select BOOT_RAW select BUILTIN_DTB select CEVT_R4K @@ -82,7 +82,7 @@ index 797d7f1ad5fe..9337527d778f 100644 + select CSRC_R4K if !QEMUMIPS64 select COMMON_CLK - select CSRC_R4K - select DMA_MAYBE_COHERENT + select DMA_NONCOHERENT select GENERIC_ISA_DMA select HAVE_PCSPKR_PLATFORM -- diff --git a/arch/mips/mips-make-current_cpu_data-preempt-safe.patch b/arch/mips/mips-make-current_cpu_data-preempt-safe.patch new file mode 100644 index 00000000..c68b5f46 --- /dev/null +++ b/arch/mips/mips-make-current_cpu_data-preempt-safe.patch @@ -0,0 +1,68 @@ +From 5b2595c3e0dce2912b32ef69aaaacd52cd0e720c Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Fri, 29 Sep 2023 00:11:41 +0000 +Subject: [PATCH] mips: make current_cpu_data preempt safe + +When DEBUG_PREEMPT is enabled, mips/mips64 boots are filled with +backtraces similar to: + + [ 130.730686] BUG: using smp_processor_id() in preemptible [00000000] code: systemd/1 + [ 130.738542] caller is blast_dcache32+0x40/0x190 + [ 130.745908] CPU: 0 PID: 1 Comm: systemd Not tainted 6.4.11-yocto-standard #1 + [ 130.753928] Stack : 0000000000000001 0000000000000000 0000000000000018 9000000004937798 + [ 130.762192] 9000000004937798 90000000049378c8 0000000000000000 0000000000000000 + [ 130.770458] 008fac6060240fea 0000000000014f20 9000000004937728 0000000000000000 + [ 130.778826] 00000000000b61b4 0000000000000030 ffffffff80e8eed0 0000000000000004 + [ 130.787111] 9000000084937577 0000000000000000 0000000000000000 ffffffff810c3b18 + [ 130.795440] ffffffff811f0000 0000000000000000 ffffffff81440000 0000000000000000 + [ 130.803830] 0000000000000000 0000000000000000 ffffffff809842e8 0000000000175097 + [ 130.812272] 0000000000000001 9000000004934000 9000000004937790 c0000000005d9000 + [ 130.820722] ffffffff8010b6fc 0000000000000000 0000000000000000 0000000000000000 + [ 130.829134] 0000000000000000 0000000000000000 ffffffff8010b71c 008fac6060240fea + [ 130.837649] ... + [ 130.845556] Call Trace: + [ 130.853432] [<ffffffff8010b71c>] show_stack+0x64/0x158 + [ 130.861534] [<ffffffff80ea1790>] dump_stack_lvl+0x5c/0x7c + [ 130.869565] [<ffffffff80ea29c4>] check_preemption_disabled+0x10c/0x118 + [ 130.877605] [<ffffffff8012d7c8>] blast_dcache32+0x40/0x190 + [ 130.885585] [<ffffffff8039f648>] __vmalloc_node_range+0x3e0/0x780 + [ 130.893527] [<ffffffff8039fbbc>] vzalloc+0x6c/0x78 + [ 130.901378] [<ffffffff8095d6c4>] n_tty_open+0x1c/0xb8 + [ 130.909252] [<ffffffff8095f5a8>] tty_ldisc_open+0x50/0xd0 + [ 130.917053] [<ffffffff80960150>] tty_ldisc_setup+0x20/0x70 + [ 130.924927] [<ffffffff80958694>] tty_init_dev.part.0+0xbc/0x2c0 + [ 130.932742] [<ffffffff80958da8>] tty_open+0x4b8/0x730 + [ 130.940486] [<ffffffff803e6960>] chrdev_open+0xe0/0x250 + [ 130.948211] [<ffffffff803da7f4>] do_dentry_open+0x274/0x520 + [ 130.955960] [<ffffffff803f642c>] path_openat+0xbc4/0x10d8 + [ 130.963718] [<ffffffff803f7460>] do_filp_open+0x148/0x190 + [ 130.971482] [<ffffffff803dc264>] do_sys_openat2+0xcc/0x1b0 + [ 130.979288] [<ffffffff803dc710>] sys_openat+0x50/0xa8 + [ 130.987077] [<ffffffff80119490>] syscall_common+0x34/0x58 + +We don't control the locking around current_cpu_data, so it cannot use +smp_processor_id() as the cpu index. + +To make ourselves safe in any context, we must use raw_smp_processor_id() + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/mips/include/asm/cpu-info.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h +index a600670d00e9..07f9cddd6c77 100644 +--- a/arch/mips/include/asm/cpu-info.h ++++ b/arch/mips/include/asm/cpu-info.h +@@ -117,7 +117,7 @@ struct cpuinfo_mips { + } __attribute__((aligned(SMP_CACHE_BYTES))); + + extern struct cpuinfo_mips cpu_data[]; +-#define current_cpu_data cpu_data[smp_processor_id()] ++#define current_cpu_data cpu_data[raw_smp_processor_id()] + #define raw_current_cpu_data cpu_data[raw_smp_processor_id()] + #define boot_cpu_data cpu_data[0] + +-- +2.34.1 + diff --git a/arch/mips/mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch b/arch/mips/mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch index 5eb1f280..da88515c 100644 --- a/arch/mips/mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch +++ b/arch/mips/mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch @@ -1,4 +1,4 @@ -From 96f71c147809df7880100edeecb197d5d5095206 Mon Sep 17 00:00:00 2001 +From e8f6bebe11eb365466cfde324f99698dc8f7f4f8 Mon Sep 17 00:00:00 2001 From: Victor Kamensky <kamensky@cisco.com> Date: Fri, 31 Jan 2020 09:39:44 -0800 Subject: [PATCH] mips: vdso: fix 'jalr $t9' crash in vdso code @@ -31,15 +31,15 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile -index 996a934ece7d..25b5adee5ade 100644 +index 57fe83235281..374e1eca2791 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile -@@ -31,7 +31,9 @@ cflags-vdso := $(ccflags-vdso) \ +@@ -35,7 +35,9 @@ cflags-vdso := $(ccflags-vdso) \ -O3 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \ + -mrelax-pic-calls $(call cc-option, -mexplicit-relocs) \ -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \ - $(call cc-option, -fno-asynchronous-unwind-tables) \ -- $(call cc-option, -fno-stack-protector) -+ $(call cc-option, -fno-stack-protector) \ +- $(call cc-option, -fno-asynchronous-unwind-tables) ++ $(call cc-option, -fno-asynchronous-unwind-tables) \ + $(call cc-option, -mrelax-pic-calls) \ + $(call cc-option, -mexplicit-relocs) aflags-vdso := $(ccflags-vdso) \ diff --git a/arch/mips/mips.scc b/arch/mips/mips.scc index 299c3c74..088a934b 100644 --- a/arch/mips/mips.scc +++ b/arch/mips/mips.scc @@ -9,3 +9,4 @@ patch malta-uhci-quirks-make-allowance-for-slow-4k-e-c.patch patch 4kc-cache-tlb-hazard-tlbp-cache-coherency.patch patch mips-Kconfig-add-QEMUMIPS64-option.patch patch mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch +patch mips-make-current_cpu_data-preempt-safe.patch diff --git a/arch/powerpc/crtsavres-fixups-for-5.4.patch b/arch/powerpc/crtsavres-fixups-for-5.4.patch deleted file mode 100644 index e3f09715..00000000 --- a/arch/powerpc/crtsavres-fixups-for-5.4.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f103dbd2b479057481bef2bc21060e05304be15e Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Tue, 15 Oct 2019 22:55:17 -0400 -Subject: [PATCH] crtsavres: fixups for 5.4+ - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - arch/powerpc/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index c76c406faa59..7471b0160e84 100644 ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -416,6 +416,9 @@ endif - archclean: - $(Q)$(MAKE) $(clean)=$(boot) - -+arch/powerpc/lib/crtsavres.o: arch/powerpc/lib/crtsavres.S -+ $(Q)$(MAKE) $(build)=arch/powerpc/lib arch/powerpc/lib/crtsavres.o -+ - archprepare: checkbin arch/powerpc/lib/crtsavres.o - - archheaders: --- -2.19.1 - diff --git a/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch b/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch deleted file mode 100644 index a6b43fd4..00000000 --- a/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 87398e3c68b21d06817c44ca39449ef382d2ce31 Mon Sep 17 00:00:00 2001 -From: Liming Wang <liming.wang@windriver.com> -Date: Fri, 19 Dec 2008 11:16:39 +0800 -Subject: [PATCH 1/3] powerpc: Add unwind information for SPE registers of E500 core - -SPE registers use the high part bit0~bit31 of E500 GPR0~GPR31. -The unwind information in "eh_frame" section is used during exception -handling and describes register information in the signal frame. But -current unwind information doesn't cover SPE registers, which have -been saved in the signal frame. This patch adds this unwind information -to "eh_frame" section. - -SPE registers use register number 1200+N to identify register 'N', but -they start from 113 in unwind column, which is computed from gcc -source code, macro DWARF_REG_TO_UNWIND_COLUMN: - - #define FIRST_PSEUDO_REGISTER 114 - #define DWARF_REG_TO_UNWIND_COLUMN(r) \ - ((r) > 1200 ? ((r) - 1200 + FIRST_PSEUDO_REGISTER - 1) : (r)) - -Signed-off-by: Liming Wang <liming.wang@windriver.com> ---- - arch/powerpc/kernel/vdso32/sigtramp.S | 34 +++++++++++++++++++++++++++++++++ - 1 files changed, 34 insertions(+), 0 deletions(-) - -diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S -index 68d49dd..789a343 100644 ---- a/arch/powerpc/kernel/vdso32/sigtramp.S -+++ b/arch/powerpc/kernel/vdso32/sigtramp.S -@@ -251,6 +251,40 @@ V_FUNCTION_END(__kernel_sigtramp_rt32) - vsave_msr1 (31); \ - vsave_msr2 (33, 32*16+12); \ - vsave (32, 32*16) -+#elif defined(CONFIG_SPE) -+#define EH_FRAME_VMX \ -+ rsave (113, VREGS); \ -+ rsave (114, VREGS + 1*4); \ -+ rsave (115, VREGS + 2*4); \ -+ rsave (116, VREGS + 3*4); \ -+ rsave (117, VREGS + 4*4); \ -+ rsave (118, VREGS + 5*4); \ -+ rsave (119, VREGS + 6*4); \ -+ rsave (120, VREGS + 7*4); \ -+ rsave (121, VREGS + 8*4); \ -+ rsave (122, VREGS + 9*4); \ -+ rsave (123, VREGS + 10*4); \ -+ rsave (124, VREGS + 11*4); \ -+ rsave (125, VREGS + 12*4); \ -+ rsave (126, VREGS + 13*4); \ -+ rsave (127, VREGS + 14*4); \ -+ rsave (128, VREGS + 15*4); \ -+ rsave (129, VREGS + 16*4); \ -+ rsave (130, VREGS + 17*4); \ -+ rsave (131, VREGS + 18*4); \ -+ rsave (132, VREGS + 19*4); \ -+ rsave (133, VREGS + 20*4); \ -+ rsave (134, VREGS + 21*4); \ -+ rsave (135, VREGS + 22*4); \ -+ rsave (136, VREGS + 23*4); \ -+ rsave (137, VREGS + 24*4); \ -+ rsave (138, VREGS + 25*4); \ -+ rsave (139, VREGS + 26*4); \ -+ rsave (140, VREGS + 27*4); \ -+ rsave (141, VREGS + 28*4); \ -+ rsave (142, VREGS + 29*4); \ -+ rsave (143, VREGS + 30*4); \ -+ rsave (144, VREGS + 31*4); - #else - #define EH_FRAME_VMX - #endif --- -1.6.5.2 - diff --git a/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch b/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch deleted file mode 100644 index 2e93b857..00000000 --- a/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 59e401ffeda487d9b3bd092199ec9a98faf5abfe Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 May 2018 09:46:42 -0700 -Subject: [PATCH 1/2] powerpc: Disable attribute-alias warnings from gcc8 - -Fixes -alias between functions of incompatible types warnings -which are new with gcc8 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/kernel/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile -index 1b6bc7fba996..7fab5ab9edc2 100644 ---- a/arch/powerpc/kernel/Makefile -+++ b/arch/powerpc/kernel/Makefile -@@ -3,7 +3,8 @@ - # Makefile for the linux kernel. - # - --CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -+CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' $(call cc-disable-warning, attribute-alias) -+CFLAGS_syscalls.o += $(call cc-disable-warning, attribute-alias) - - subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror - --- -2.5.0 - diff --git a/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch b/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch deleted file mode 100644 index 27119879..00000000 --- a/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f13fd6af4120b8b42d77377c9989457cda41899f Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Sun, 15 Feb 2009 16:57:14 -0500 -Subject: [PATCH 3/3] powerpc: add crtsavres.o to archprepare for kbuild - -upstream commit da3de6df33f5f42ff9dc40093fbc884f524c9a49 adds -a dependency to all kernel modules to crtsavres. This -ensures that out-of-line register saves/restores work when -CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled. - -What it didn't do was ensure that it was built when -modules_prepare was run and hence out of tree powerpc kernel -modules can't properly link. - -The fix is to add crtsavres.o to the archprepare rule in -the arch/powerpc/Makefile - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index c3811ab..ad16ff3 100644 ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -218,7 +218,7 @@ endif - archclean: - $(Q)$(MAKE) $(clean)=$(boot) - --archprepare: checkbin -+archprepare: checkbin arch/powerpc/lib/crtsavres.o - - # Use the file '.tmp_gas_check' for binutils tests, as gas won't output - # to stdout and these checks are run even on install targets. --- -1.6.5.2 - diff --git a/arch/powerpc/powerpc-debug.cfg b/arch/powerpc/powerpc-debug.cfg new file mode 100644 index 00000000..6ea12a12 --- /dev/null +++ b/arch/powerpc/powerpc-debug.cfg @@ -0,0 +1 @@ +CONFIG_PPC_DISABLE_WERROR=y diff --git a/arch/powerpc/powerpc-debug.scc b/arch/powerpc/powerpc-debug.scc new file mode 100644 index 00000000..aedb597c --- /dev/null +++ b/arch/powerpc/powerpc-debug.scc @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT + +kconf non-hardware powerpc-debug.cfg diff --git a/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch b/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch deleted file mode 100644 index d979885a..00000000 --- a/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 85388aad8ca15fcc28f5d0989265217351bada19 Mon Sep 17 00:00:00 2001 -From: Benjamin Walsh <benjamin.walsh@windriver.com> -Date: Mon, 9 Feb 2009 14:25:47 -0500 -Subject: [PATCH] powerpc: kexec fix for powerpc64 - -slbia instruction invalidates the SLB, but there was a hang on the first -instruction that caused an SLB miss exception. Doing a full sync after -the slbia causes the SLB to be in a consistent state for the handling of -the SLB exception. - -Signed-off by: Benjamin Walsh <benjamin.walsh@windriver.com> ---- - arch/powerpc/mm/book3s64/slb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/powerpc/mm/book3s64/slb.c b/arch/powerpc/mm/book3s64/slb.c -index 515730e499fe..7a8b335003b6 100644 ---- a/arch/powerpc/mm/book3s64/slb.c -+++ b/arch/powerpc/mm/book3s64/slb.c -@@ -331,6 +331,7 @@ void slb_initialize(void) - asm volatile("isync":::"memory"); - asm volatile("slbmte %0,%0"::"r" (0) : "memory"); - asm volatile("isync; slbia; isync":::"memory"); -+ mb(); - create_shadowed_slbe(PAGE_OFFSET, mmu_kernel_ssize, lflags, LINEAR_INDEX); - create_shadowed_slbe(VMALLOC_START, mmu_kernel_ssize, vflags, VMALLOC_INDEX); - --- -2.1.0 - diff --git a/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch b/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch deleted file mode 100644 index 6033c020..00000000 --- a/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8632f470f02c70d9501ae21f57740ea23c14773f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 May 2018 09:50:05 -0700 -Subject: [PATCH 2/2] powerpc/ptrace: Disable array-bounds warning with gcc8 - -This masks the new gcc8 warning -include/linux/regset.h:270:4: error: 'memcpy' offset [-527, -529] is out of the bounds [0, 16] of object 'vrsave' with type 'union <anonymous>' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/kernel/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile -index 7fab5ab9edc2..601118b43545 100644 ---- a/arch/powerpc/kernel/Makefile -+++ b/arch/powerpc/kernel/Makefile -@@ -4,6 +4,7 @@ - # - - CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' $(call cc-disable-warning, attribute-alias) -+CFLAGS_ptrace.o += $(call cc-disable-warning, array-bounds) - CFLAGS_syscalls.o += $(call cc-disable-warning, attribute-alias) - - subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror --- -2.5.0 - diff --git a/arch/powerpc/powerpc.scc b/arch/powerpc/powerpc.scc index d3f7e2fb..548d2d44 100644 --- a/arch/powerpc/powerpc.scc +++ b/arch/powerpc/powerpc.scc @@ -1,7 +1 @@ # SPDX-License-Identifier: MIT -patch powerpc-Add-unwind-information-for-SPE-registers-of-.patch -patch powerpc-kexec-fix-for-powerpc64.patch -patch powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch -patch powerpc-Disable-attribute-alias-warnings-from-gcc8.patch -patch powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch -patch crtsavres-fixups-for-5.4.patch diff --git a/arch/x86/Revert-platform-x86-wmi-Destroy-on-cleanup-rather-th.patch b/arch/x86/Revert-platform-x86-wmi-Destroy-on-cleanup-rather-th.patch deleted file mode 100644 index 796d2fc2..00000000 --- a/arch/x86/Revert-platform-x86-wmi-Destroy-on-cleanup-rather-th.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a697f299723ca6e735d1d01315d0236b0c47cae5 Mon Sep 17 00:00:00 2001 -From: Yongxin Liu <yongxin.liu@windriver.com> -Date: Wed, 27 Nov 2019 16:46:58 +0800 -Subject: [PATCH] Revert "platform/x86: wmi: Destroy on cleanup rather than - unregister" - -This reverts commit 7b11e8989618581bc0226ad313264cdc05d48d86. - -Consider the following hardware setting. - -|-PNP0C14:00 -| |-- device #1 -|-PNP0C14:01 -| |-- device #2 - -When unloading wmi driver module, device #2 will be first unregistered. -But device_destroy() using MKDEV(0, 0) will locate PNP0C14:00 first -and unregister it. This is incorrect. Should use device_unregister() to -unregister the real parent device. - -Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - drivers/platform/x86/wmi.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c -index dc2e966a5c25..de44fb87a0b1 100644 ---- a/drivers/platform/x86/wmi.c -+++ b/drivers/platform/x86/wmi.c -@@ -1347,7 +1347,7 @@ static int acpi_wmi_remove(struct platform_device *device) - acpi_remove_address_space_handler(acpi_device->handle, - ACPI_ADR_SPACE_EC, &acpi_wmi_ec_space_handler); - wmi_free_devices(acpi_device); -- device_destroy(&wmi_bus_class, MKDEV(0, 0)); -+ device_unregister((struct device *)dev_get_drvdata(&device->dev)); - - return 0; - } -@@ -1401,7 +1401,7 @@ static int acpi_wmi_probe(struct platform_device *device) - return 0; - - err_remove_busdev: -- device_destroy(&wmi_bus_class, MKDEV(0, 0)); -+ device_unregister(wmi_bus_dev); - - err_remove_notify_handler: - acpi_remove_notify_handler(acpi_device->handle, ACPI_DEVICE_NOTIFY, --- -2.19.1 - diff --git a/arch/x86/x86.scc b/arch/x86/x86.scc index 90382f43..a055f389 100644 --- a/arch/x86/x86.scc +++ b/arch/x86/x86.scc @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -patch Revert-platform-x86-wmi-Destroy-on-cleanup-rather-th.patch +patch x86_64_defconfig-Fix-warnings.patch diff --git a/arch/x86/x86_64_defconfig-Fix-warnings.patch b/arch/x86/x86_64_defconfig-Fix-warnings.patch new file mode 100644 index 00000000..163effb2 --- /dev/null +++ b/arch/x86/x86_64_defconfig-Fix-warnings.patch @@ -0,0 +1,109 @@ +From a9590c3b985938a5882f4b6f83deb0b108cceabd Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Fri, 21 Jan 2022 16:46:21 +0800 +Subject: [PATCH] x86_64_defconfig: Fix warnings + +Configure CONFIG_EEEPC_LAPTOP & CONFIG_SND_SEQ_DUMMY as modules, because +dependencies are configured as modules. + [NOTE]: 'CONFIG_EEEPC_LAPTOP' last val (y) and .config val (m) do not match + [NOTE]: 'CONFIG_SND_SEQ_DUMMY' last val (y) and .config val (m) do not match + +Added dependency configurations: + CONFIG_HID_LOGITECH for CONFIG_LOGITECH_FF + CONFIG_NET_VENDOR_DEC for CONFIG_NET_TULIP + CONFIG_IOMMU_SUPPORT for CONFIG_AMD_IOOMU & CONFIG_INTEL_IOMMU + CONFIG_NET_VENDOR_NVIDIA for CONFIG_FORCEDETH + + Config 'LOGITECH_FF' has the following Direct dependencies (LOGITECH_FF=n): + HID_LOGITECH(=n) && HID(=y) && INPUT(=y) + Parent dependencies are: + HID_LOGITECH [n] HID [y] INPUT [y] + [INFO]: config 'CONFIG_LOGITECH_FF' was set, but it wasn't assignable, check (parent) dependencies + + Config 'NET_TULIP' has the following Direct dependencies (NET_TULIP=n): + PCI(=y) || EISA(=n) || CARDBUS(=y) (=y) && NET_VENDOR_DEC(=n) && ETHERNET(=y) && NETDEVICES(=y) + Parent dependencies are: + NET_VENDOR_DEC [n] ETHERNET [y] EISA [n] PCI [y] CARDBUS [y] NETDEVICES [y] + [INFO]: config 'CONFIG_NET_TULIP' was set, but it wasn't assignable, check (parent) dependencies + + Config 'FORCEDETH' has the following Direct dependencies (FORCEDETH=n): + PCI(=y) && NET_VENDOR_NVIDIA(=n) && ETHERNET(=y) && NETDEVICES(=y) + Parent dependencies are: + NETDEVICES [y] PCI [y] NET_VENDOR_NVIDIA [n] ETHERNET [y] + [INFO]: config 'CONFIG_FORCEDETH' was set, but it wasn't assignable, check (parent) dependencies + +Tested with qemux86-64 machine: +$ oe-selftest --run-tests kerneldevelopment.KernelConfigs + +Disabled debug configurations. Yocto-kernel-cahce have seperate debug configurations. + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/x86/configs/x86_64_defconfig | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig +index 27759236fd60..a3d260605161 100644 +--- a/arch/x86/configs/x86_64_defconfig ++++ b/arch/x86/configs/x86_64_defconfig +@@ -132,7 +132,7 @@ CONFIG_PCCARD=y + CONFIG_YENTA=y + CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y +-CONFIG_DEBUG_DEVRES=y ++CONFIG_DEBUG_DEVRES=n + CONFIG_CONNECTOR=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_VIRTIO_BLK=y +@@ -160,11 +160,13 @@ CONFIG_NETCONSOLE=y + CONFIG_VIRTIO_NET=y + CONFIG_TIGON3=y + CONFIG_NET_TULIP=y ++CONFIG_NET_VENDOR_DEC=y + CONFIG_E100=y + CONFIG_E1000=y + CONFIG_E1000E=y + CONFIG_SKY2=y + CONFIG_FORCEDETH=y ++CONFIG_NET_VENDOR_NVIDIA=y + CONFIG_8139TOO=y + CONFIG_R8169=y + CONFIG_INPUT_EVDEV=y +@@ -201,12 +203,13 @@ CONFIG_SOUND=y + CONFIG_SND=y + CONFIG_SND_HRTIMER=y + CONFIG_SND_SEQUENCER=y +-CONFIG_SND_SEQ_DUMMY=y ++CONFIG_SND_SEQ_DUMMY=m + CONFIG_SND_HDA_INTEL=y + CONFIG_SND_HDA_HWDEP=y + CONFIG_HIDRAW=y + CONFIG_HID_GYRATION=y + CONFIG_LOGITECH_FF=y ++CONFIG_HID_LOGITECH=y + CONFIG_HID_NTRIG=y + CONFIG_HID_PANTHERLORD=y + CONFIG_PANTHERLORD_FF=y +@@ -231,10 +234,11 @@ CONFIG_RTC_CLASS=y + CONFIG_DMADEVICES=y + CONFIG_VIRTIO_PCI=y + CONFIG_VIRTIO_INPUT=y +-CONFIG_EEEPC_LAPTOP=y ++CONFIG_EEEPC_LAPTOP=m + CONFIG_AMD_IOMMU=y + CONFIG_INTEL_IOMMU=y + # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set ++CONFIG_IOMMU_SUPPORT=y + CONFIG_EXT4_FS=y + CONFIG_EXT4_FS_POSIX_ACL=y + CONFIG_EXT4_FS_SECURITY=y +@@ -276,4 +280,4 @@ CONFIG_SCHEDSTATS=y + CONFIG_BLK_DEV_IO_TRACE=y + CONFIG_PROVIDE_OHCI1394_DMA_INIT=y + CONFIG_EARLY_PRINTK_DBGP=y +-CONFIG_DEBUG_BOOT_PARAMS=y ++CONFIG_DEBUG_BOOT_PARAMS=n +-- +2.34.1 + diff --git a/bsp/amd-x86/amd-x86-64-preempt-rt.scc b/bsp/amd-x86/amd-x86-64-preempt-rt.scc new file mode 100644 index 00000000..2e503bbe --- /dev/null +++ b/bsp/amd-x86/amd-x86-64-preempt-rt.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +define KMACHINE amd-x86-64 +define KTYPE preempt-rt +define KARCH x86-64 + +include ktypes/preempt-rt/preempt-rt.scc + +include amd-x86-64.scc diff --git a/bsp/amd-x86/amd-x86-64-standard.scc b/bsp/amd-x86/amd-x86-64-standard.scc new file mode 100644 index 00000000..d5a2a788 --- /dev/null +++ b/bsp/amd-x86/amd-x86-64-standard.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +define KMACHINE amd-x86-64 +define KTYPE standard +define KARCH x86-64 + +include ktypes/standard/standard.scc +include features/transparent-hugepage/transparent-hugepage.scc +include amd-x86-64.scc diff --git a/bsp/amd-x86/amd-x86-64.scc b/bsp/amd-x86/amd-x86-64.scc new file mode 100644 index 00000000..87f23b51 --- /dev/null +++ b/bsp/amd-x86/amd-x86-64.scc @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: MIT +# Core configuration settings for x86_64 +include cfg/x86_64.scc + +include cfg/vesafb.scc +include cfg/8250.scc +include cfg/sound.scc +include cfg/efi-ext.scc +include cfg/virtio.scc +include cfg/boot-live.scc +include cfg/usb-mass-storage.scc +include features/profiling/profiling.scc + +include features/netfilter/netfilter.scc +include features/scsi/cdrom.scc +include features/usb/ehci-hcd.scc +include features/usb/uhci-hcd.scc +include features/usb/ohci-hcd.scc +include features/usb/xhci-hcd.scc +include features/usb/touchscreen-composite.scc +include features/scsi/cdrom.scc +include features/spi/spi.scc +include features/spi/spidev.scc +include features/sound/snd_hda_intel.scc +include features/igb/igb.scc + +kconf hardware bsp/common-pc/common-pc-drivers.cfg +kconf hardware bsp/common-pc/common-pc-eth.cfg +kconf hardware bsp/common-pc/common-pc-gfx.cfg +kconf hardware bsp/common-pc/common-pc-wifi.cfg + +kconf hardware amd-x86.cfg diff --git a/bsp/amd-x86/amd-x86.cfg b/bsp/amd-x86/amd-x86.cfg new file mode 100644 index 00000000..45fa2b92 --- /dev/null +++ b/bsp/amd-x86/amd-x86.cfg @@ -0,0 +1,96 @@ +# SPDX-License-Identifier: MIT + +# +# Processor type and features +# +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_MICROCODE=y +CONFIG_PERF_EVENTS_AMD_POWER=y +CONFIG_PERF_EVENTS_AMD_UNCORE=y +CONFIG_AMD_MEM_ENCRYPT=y + +# +# Device Drivers +# +CONFIG_PCI_IOV=y +CONFIG_AMD_PMC=y +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_V2=y +CONFIG_E1000E=y +CONFIG_AMD_XGBE=y + +# +# DMA engine configuration +# +CONFIG_DMADEVICES=y + +# +# Serial drivers +# +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=16 +CONFIG_SERIAL_8250_DW=y + +# +# Graphics support +# +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_USERPTR=y + +# +# PPS generators support +# +CONFIG_PINCTRL_AMD=y + +# +# Native drivers +# +CONFIG_SENSORS_K10TEMP=m + +# +# Watchdog Device Drivers +# +CONFIG_SP5100_TCO=m + +# +#Miscellaneous filesystems +# +CONFIG_PSTORE=m + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS_PSTORE=m + +# +# I2C support +# +CONFIG_I2C_CHARDEV=m + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PIIX4=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m +CONFIG_I2C_DESIGNWARE_PCI=m + +# +# CPU frequency scaling drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y +CONFIG_X86_AMD_FREQ_SENSITIVITY=m + +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg index 5e7519e0..83c71ae6 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg @@ -1,8 +1,16 @@ # SPDX-License-Identifier: MIT +CONFIG_INPUT=y +CONFIG_USB_HID=y + +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y + +CONFIG_DRM_PANEL=y +CONFIG_DRM_PANEL_ARM_VERSATILE=y +CONFIG_DRM_PL111=y + CONFIG_FB=y CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_INPUT_TABLET=y -CONFIG_HID_WACOM=y -CONFIG_INPUT_MISC=y +CONFIG_AUXDISPLAY=y +CONFIG_ARM_CHARLCD=y diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg new file mode 100644 index 00000000..90b54382 --- /dev/null +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_LEDS_TRIGGER_CPU=n +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc index 8dbe0e86..c1a9d34e 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc @@ -1,10 +1,14 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE preempt-rt define KARCH arm # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc +branch arm-versatile-926ejs + include arm-versatile-926ejs.scc +kconf hardware arm-versatile-926ejs-preempt-rt.cfg + +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc index 6edfe67b..a88f385d 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE standard define KARCH arm diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc index d22969f0..51d59703 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc @@ -1,13 +1,13 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE tiny define KARCH arm include ktypes/tiny/tiny.scc branch arm-versatile-926ejs +include features/hid/hid.scc include arm-versatile-926ejs.scc patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg index 99f8aeb7..c1964054 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg @@ -1,77 +1,78 @@ # SPDX-License-Identifier: MIT -#......................................................................... -# WARNING -# -# This file is a kernel configuration fragment, and not a full kernel -# configuration file. The final kernel configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on kernel configuration, please -# consult the product documentation. -# -#......................................................................... CONFIG_ARM=y -CONFIG_ARM_AMBA=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=n +CONFIG_ARCH_MULTI_V6=n CONFIG_ARCH_MULTI_V5=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_PCI_VERSATILE=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_ABRT_EV5TJ=y CONFIG_ARCH_VERSATILE=y +CONFIG_PLAT_VERSATILE=y +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_FPE_NWFPE=y CONFIG_VFP=y - -# CONFIG_PHYLIB is not set - +CONFIG_CMA=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_PHYSMAP_VERSATILE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_VERSATILE=y +CONFIG_SPI=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_PL061=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_DS1307=y -# CONFIG_SERIAL_8250 is not set -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_TTY=y +CONFIG_NULL_TTY=y +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_MMC=y -CONFIG_MMC_BLOCK=y CONFIG_MMC_ARMMMCI=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_SYSCON=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_ARM_VIC=y +CONFIG_ARM_TIMER_SP804=y +CONFIG_ARM_MODULE_PLTS=y +CONFIG_CLKSRC_VERSATILE=y +CONFIG_POWER_RESET_VERSATILE=y +CONFIG_VERSATILE_FPGA_IRQ=y +CONFIG_VERSATILE_FPGA_IRQ_NR=4 -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC91X=y CONFIG_PCI=y +CONFIG_PCI_VERSATILE=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y - +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_ARM=y +CONFIG_SND_ARMAACI=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y - -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_INPUT_EVDEV=y - -CONFIG_FRAME_POINTER=y - -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set - -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc index 9b1ea4b4..ca7b9682 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc @@ -2,11 +2,8 @@ kconf hardware arm-versatile-926ejs.cfg kconf hardware arm-versatile-926ejs-gfx.cfg -include features/profiling/profiling.scc -include features/latencytop/latencytop.scc - -include features/usb/ehci-hcd.scc -include features/usb/uhci-hcd.scc include features/usb/ohci-hcd.scc -include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/virtio.scc diff --git a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg index 0b6eb65c..5df913c9 100644 --- a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg +++ b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg @@ -17,6 +17,7 @@ CONFIG_MMU=y CONFIG_ARM64=y # CPU Core family selection +CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y @@ -29,7 +30,8 @@ CONFIG_SMP=y CONFIG_NR_CPUS=4 # CPU Idle -# CONFIG_ATAGS is not set +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ATAGS=n CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y @@ -41,7 +43,12 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_ARM_CPUIDLE=y + +# +# CPU frequency +# +CONFIG_CPUFREQ_DT=y +CONFIG_ARM_RASPBERRYPI_CPUFREQ=y # MTD devices CONFIG_MTD=y @@ -50,6 +57,8 @@ CONFIG_MTD_BLOCK=m # Ethernet devices CONFIG_NET=y CONFIG_BCMGENET=y +CONFIG_BROADCOM_PHY=y +CONFIG_MICREL_PHY=y # Serial drivers CONFIG_SERIAL_8250=y @@ -68,10 +77,12 @@ CONFIG_SERIAL_DEV_BUS=y # I2C device CONFIG_I2C=y +CONFIG_I2C_MUX=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m +CONFIG_I2C_MUX_PINCTRL=m CONFIG_EEPROM_AT24=m # SPI device @@ -90,20 +101,25 @@ CONFIG_FB_SIMPLE=y CONFIG_BCM_VCIO=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_DRM=m +CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_UDL=m CONFIG_DRM_VC4=m CONFIG_DRM_V3D=m +CONFIG_DRM_VC4_HDMI_CEC=y +CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_SIMPLE_BRIDGE=m #PCIe Bus support CONFIG_PCI=y CONFIG_PCIE_BRCMSTB=y +CONFIG_PCI_HOST_GENERIC=y # USB support CONFIG_USB=y CONFIG_USB_USBNET=y CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_AQC111=y CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_EPSON2888=y @@ -115,6 +131,12 @@ CONFIG_USB_DWCOTG=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_PCI=y +# +# Input Device +# +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m + #Media support CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y @@ -122,18 +144,25 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_SUPPORT=m +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y -CCONFIG_USB_VIDEO_CLASS=m -CONFIG_VIDEO_V4L2=m +CONFIG_MEDIA_CEC_RC=y +CONFIG_RC_CORE=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_VIDEO_DEV=m CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_BCM2835=m +CONFIG_VIDEO_CODEC_BCM2835=m +CONFIG_VIDEO_ISP_BCM2835=m CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # Thermal configuration CONFIG_THERMAL=y +CONFIG_BCM2711_THERMAL=y CONFIG_BCM2835_THERMAL=y # MMC/SD/SDIO Card Drivers @@ -188,16 +217,23 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m +CONFIG_SND_BCM2708_SOC_PIFI_40=m CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m +CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m +CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m +CONFIG_SND_AUDIOSENSE_PI=m CONFIG_SND_DIGIDAC1_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m @@ -207,16 +243,20 @@ CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m +CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m +CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m CONFIG_SND_PISOUND=m CONFIG_SND_BCM2835=m +CONFIG_SND_SOC_CS4271_I2C=m +CONFIG_SND_SOC_MA120X0P=m +CONFIG_SND_SOC_MAX98357A=m # GPIO Support CONFIG_MFD_CORE=y CONFIG_MFD_STMPE=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_BCM_VIRT=y CONFIG_MFD_ARIZONA_I2C=m -CONFIG_MFD_ARIZONA=y CONFIG_GPIO_ARIZONA=m CONFIG_GPIO_STMPE=y @@ -237,14 +277,12 @@ CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIVHCI=m CONFIG_HOSTAP=y -CONFIG_WIMAX=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m -CONFIG_WIMAX_I2400M_USB=m # Regulator configuration CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ARIZONA_LDO1=m CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_GPIO=y @@ -252,6 +290,23 @@ CONFIG_REGULATOR_GPIO=y # Clock configuration CONFIG_CLK_RASPBERRYPI=y +# +# DMABUF options +# +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y + +# +# Multifunction device +# +CONFIG_MFD_SYSCON=y +CONFIG_MFD_WM5102=y + +# NVME configuration +CONFIG_BLK_DEV_NVME=y +CONFIG_NVMEM_RMEM=m + # Misc configuration CONFIG_BINFMT_MISC=m CONFIG_BRCM_CHAR_DRIVERS=y @@ -266,11 +321,11 @@ CONFIG_BCM_VIDEOCORE=y CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y CONFIG_HW_RANDOM=y -CONFIG_RAW_DRIVER=y CONFIG_HID_LOGITECH=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y -CONFIG_SENSORS_RPI_POE_FAN=m CONFIG_LEDS_CLASS=y -CONFIG_NEW_LEDS=y
\ No newline at end of file +CONFIG_NEW_LEDS=y +CONFIG_OF_OVERLAY=y +CONFIG_EXPERT=y diff --git a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc index 42b9c691..8c654b99 100755 --- a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc +++ b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc @@ -3,7 +3,6 @@ kconf hardware bcm-2xxx-rpi.cfg include cfg/usb-mass-storage.scc include features/profiling/profiling.scc -include features/latencytop/latencytop.scc include features/hostapd/hostapd.scc include features/mac80211/mac80211.scc diff --git a/bsp/beaglebone/beaglebone-non_hardware.cfg b/bsp/beaglebone/beaglebone-non_hardware.cfg index 3fffd627..1e355515 100644 --- a/bsp/beaglebone/beaglebone-non_hardware.cfg +++ b/bsp/beaglebone/beaglebone-non_hardware.cfg @@ -7,7 +7,7 @@ CONFIG_NFS_DEF_FILE_IO_SIZE=1024 # # Multiple Device Support # -# CONFIG_MD is not set +CONFIG_MD=n # Kernel Features # diff --git a/bsp/beaglebone/beaglebone.cfg b/bsp/beaglebone/beaglebone.cfg index ce13e1a7..6e29ca3f 100644 --- a/bsp/beaglebone/beaglebone.cfg +++ b/bsp/beaglebone/beaglebone.cfg @@ -7,9 +7,7 @@ CONFIG_ARCH_OMAP3=y CONFIG_SOC_AM33XX=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_DM_TIMER=y -CONFIG_OMAP_RESET_CLOCKS=y # # Processor Features @@ -93,6 +91,8 @@ CONFIG_SMSC911X=y CONFIG_TI_CPSW_PHY_SEL=y CONFIG_TI_CPSW=y CONFIG_TI_DAVINCI_MDIO=y +CONFIG_NET_SWITCHDEV=y +CONFIG_TI_CPSW_SWITCHDEV=y # # MII PHY device drivers @@ -148,7 +148,6 @@ CONFIG_PINMUX=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y CONFIG_PINCTRL_SINGLE=y -CONFIG_GPIO_SYSFS=y # # I2C GPIO expanders: @@ -194,15 +193,11 @@ CONFIG_DRM=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_TILCDC=y CONFIG_DRM_OMAP=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers -CONFIG_OMAP2_DSS=y CONFIG_OMAP2_DSS_DPI=y CONFIG_OMAP2_DSS_VENC=y CONFIG_OMAP2_DSS_DSI=y @@ -214,7 +209,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y # # Console display driver support @@ -245,7 +239,6 @@ CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_MUSB_DSPS=y -CONFIG_USB_MUSB_AM335X_CHILD=y CONFIG_USB_TI_CPPI41_DMA=y # @@ -262,7 +255,6 @@ CONFIG_USB_GADGET=y # CONFIG_USB_G_NCM=m CONFIG_USB_MASS_STORAGE=m -CONFIG_MMC=y # # MMC/SD/SDIO Card Drivers @@ -272,8 +264,10 @@ CONFIG_SDIO_UART=y # # MMC/SD/SDIO Host Controller Drivers # -CONFIG_MMC_OMAP=y -CONFIG_MMC_OMAP_HS=y +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OMAP=y CONFIG_NEW_LEDS=y # diff --git a/bsp/common-pc-64/common-pc-64-tiny.scc b/bsp/common-pc-64/common-pc-64-tiny.scc new file mode 100644 index 00000000..0d083b0d --- /dev/null +++ b/bsp/common-pc-64/common-pc-64-tiny.scc @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: MIT +define KMACHINE common-pc-64 +define KMACHINE qemux86-64 +define KTYPE tiny +define KARCH i386 + +include ktypes/tiny/tiny.scc + +include features/hid/hid.scc +include bsp/common-pc-64/common-pc-64.scc diff --git a/bsp/common-pc-64/common-pc-64.scc b/bsp/common-pc-64/common-pc-64.scc index d01e9e92..82b5e2e7 100644 --- a/bsp/common-pc-64/common-pc-64.scc +++ b/bsp/common-pc-64/common-pc-64.scc @@ -23,7 +23,7 @@ include features/intel-e1xxxx/intel-e100.scc include features/intel-e1xxxx/intel-e1xxxx.scc include features/igb/igb.scc include features/scsi/cdrom.scc - +include features/igc/igc.scc include features/x2apic/x2apic.scc # generic Bluetooth support diff --git a/bsp/common-pc/common-pc-cpu.cfg b/bsp/common-pc/common-pc-cpu.cfg index 34888cf7..dfe3f9a1 100644 --- a/bsp/common-pc/common-pc-cpu.cfg +++ b/bsp/common-pc/common-pc-cpu.cfg @@ -16,4 +16,4 @@ CONFIG_X86_GENERIC=y CONFIG_X86_TSC=y CONFIG_X86_MCE=y CONFIG_PM=y -# CONFIG_64BIT is not set +CONFIG_64BIT=n diff --git a/bsp/common-pc/common-pc-drivers.cfg b/bsp/common-pc/common-pc-drivers.cfg index 4965d442..5e2018d6 100644 --- a/bsp/common-pc/common-pc-drivers.cfg +++ b/bsp/common-pc/common-pc-drivers.cfg @@ -4,7 +4,7 @@ CONFIG_ATA=y CONFIG_ATA_ACPI=y CONFIG_ATA_SFF=y CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=m +CONFIG_ATA_PIIX=y CONFIG_PATA_SCH=y CONFIG_INPUT=y @@ -51,15 +51,12 @@ CONFIG_USB_SERIAL_PL2303=y CONFIG_I2C=y CONFIG_I2C_I801=y -CONFIG_IDE=y -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -CONFIG_BLK_DEV_PIIX=y CONFIG_SATA_AHCI=y -CONFIG_BLK_DEV_IDECD=y +CONFIG_ISA_DMA_API=y CONFIG_BLK_DEV_FD=m +CONFIG_BLK_DEV=y CONFIG_EEPROM_AT24=m diff --git a/bsp/common-pc/common-pc-preempt-rt.scc b/bsp/common-pc/common-pc-preempt-rt.scc index cdba3bd0..7044022d 100644 --- a/bsp/common-pc/common-pc-preempt-rt.scc +++ b/bsp/common-pc/common-pc-preempt-rt.scc @@ -12,6 +12,5 @@ include bsp/common-pc/common-pc.scc # default policy for preempt-rt kernels include cfg/boot-live.scc include cfg/usb-mass-storage.scc -include features/latencytop/latencytop.scc include features/profiling/profiling.scc include cfg/virtio.scc diff --git a/bsp/common-pc/common-pc-tiny.scc b/bsp/common-pc/common-pc-tiny.scc index 687414ae..9fe725ac 100644 --- a/bsp/common-pc/common-pc-tiny.scc +++ b/bsp/common-pc/common-pc-tiny.scc @@ -7,5 +7,5 @@ define KARCH i386 include ktypes/tiny/tiny.scc branch common-pc +include features/hid/hid.scc include common-pc.scc - diff --git a/bsp/common-pc/common-pc.cfg b/bsp/common-pc/common-pc.cfg index be09ed6a..f58d7b33 100644 --- a/bsp/common-pc/common-pc.cfg +++ b/bsp/common-pc/common-pc.cfg @@ -9,5 +9,5 @@ # value CONFIG_NR_CPUS=8 -# CONFIG_IRQ_REMAP is not set -# CONFIG_X86_X2APIC is not set +CONFIG_IRQ_REMAP=n +CONFIG_X86_X2APIC=n diff --git a/bsp/common-pc/common-pc.scc b/bsp/common-pc/common-pc.scc index 5956ec24..f5d782ff 100644 --- a/bsp/common-pc/common-pc.scc +++ b/bsp/common-pc/common-pc.scc @@ -34,6 +34,10 @@ include features/drm-gma500/drm-gma500.scc # generic Bluetooth support include features/bluetooth/bluetooth.scc +if [ "$KMACHINE" = "qemux86" ]; then +kconf hardware qemux86.cfg +fi + # This stays last in the list, since it is our final override of the # common fragments (if required) kconf hardware common-pc.cfg diff --git a/bsp/common-pc/non-hardware.cfg b/bsp/common-pc/non-hardware.cfg index 84cd8954..b3202f6c 100644 --- a/bsp/common-pc/non-hardware.cfg +++ b/bsp/common-pc/non-hardware.cfg @@ -20,5 +20,4 @@ CONFIG_IWLMVM CONFIG_IWLEGACY CONFIG_IWL3945 CONFIG_IWL4965 -CONFIG_DRM_KMS_FB_HELPER CONFIG_DRM_KMS_HELPER diff --git a/bsp/common-pc/qemux86.cfg b/bsp/common-pc/qemux86.cfg new file mode 100644 index 00000000..984b4377 --- /dev/null +++ b/bsp/common-pc/qemux86.cfg @@ -0,0 +1 @@ +CONFIG_QEMUX86=y diff --git a/bsp/edgerouter/edgerouter.cfg b/bsp/edgerouter/edgerouter.cfg index c8a11962..1fc7604b 100644 --- a/bsp/edgerouter/edgerouter.cfg +++ b/bsp/edgerouter/edgerouter.cfg @@ -48,7 +48,7 @@ CONFIG_BCM87XX_PHY=y #USB CONFIG_USB=y -CONFIG_OCTEON_USB=y +CONFIG_USB_OCTEON_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OCTEON_EHCI=y CONFIG_USB_OHCI_HCD=y diff --git a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc index 4f8bcf25..231d5654 100644 --- a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc +++ b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc @@ -9,5 +9,4 @@ include ktypes/preempt-rt/preempt-rt.scc include fsl-mpc8315e-rdb.scc # default policy for preempt-rt kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc index 0f00d23e..fa797bad 100644 --- a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc +++ b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc @@ -10,5 +10,4 @@ branch fsl-mpc8315e-rdb include fsl-mpc8315e-rdb.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg index d202a1d6..f5d2ede4 100644 --- a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg +++ b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg @@ -23,8 +23,8 @@ CONFIG_PPC_83xx=y # Platform support # CONFIG_MPC831x_RDB=y -# CONFIG_PPC_CHRP is not set -# CONFIG_PPC_PMAC is not set +CONFIG_PPC_CHRP=n +CONFIG_PPC_PMAC=n # # Bus options @@ -101,7 +101,7 @@ CONFIG_EEPROM_AT24=y # SPI support # CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_DEBUG=n CONFIG_SPI_MASTER=y # diff --git a/bsp/genericarm64/genericarm64-arch.cfg b/bsp/genericarm64/genericarm64-arch.cfg new file mode 100644 index 00000000..6f341ed7 --- /dev/null +++ b/bsp/genericarm64/genericarm64-arch.cfg @@ -0,0 +1,131 @@ +# Actions Semi Platforms +CONFIG_ARCH_ACTIONS=y +# Allwinner sunxi 64-bit SoC Family +CONFIG_ARCH_SUNXI=y +# Annapurna Labs Alpine platform +CONFIG_ARCH_ALPINE=y +# Apple Silicon SoC family +CONFIG_ARCH_APPLE=y +# Broadcom SoC Support +CONFIG_ARCH_BCM=y +# Broadcom BCM2835 family +CONFIG_ARCH_BCM2835=y +# Broadcom iProc SoC Family +CONFIG_ARCH_BCM_IPROC=y +# Broadcom Broadband Carrier Access (BCA) origin SoC +CONFIG_ARCH_BCMBCA=y +# Broadcom Set-Top-Box SoCs +CONFIG_ARCH_BRCMSTB=y +# Marvell Berlin SoC Family +CONFIG_ARCH_BERLIN=y +# Samsung Exynos SoC family +CONFIG_ARCH_EXYNOS=y +# Microchip Sparx5 SoC family +CONFIG_ARCH_SPARX5=y +# Texas Instruments Inc. K3 multicore SoC architecture +CONFIG_ARCH_K3=y +# LG Electronics LG1K SoC Family +CONFIG_ARCH_LG1K=y +# Hisilicon SoC Family +CONFIG_ARCH_HISI=y +# Keem Bay SoC +CONFIG_ARCH_KEEMBAY=y +# MediaTek SoC Family +CONFIG_ARCH_MEDIATEK=y +# Amlogic Platforms +CONFIG_ARCH_MESON=y +# Marvell EBU SoC Family +CONFIG_ARCH_MVEBU=y +# NXP SoC support +CONFIG_ARCH_NXP=y +# Freescale Layerscape SoC family +CONFIG_ARCH_LAYERSCAPE=y +# NXP i.MX SoC family +CONFIG_ARCH_MXC=y +# NXP S32 SoC Family +CONFIG_ARCH_S32=y +# Nuvoton MA35 Architecture +CONFIG_ARCH_MA35=y +# Nuvoton NPCM Architecture +CONFIG_ARCH_NPCM=y +# Qualcomm Platforms +CONFIG_ARCH_QCOM=y +# Realtek Platforms +CONFIG_ARCH_REALTEK=y +# Renesas SoC Platforms +CONFIG_ARCH_RENESAS=y +# Rockchip Platforms +CONFIG_ARCH_ROCKCHIP=y +# AMD Seattle SoC Family +CONFIG_ARCH_SEATTLE=y +# Intel's SoCFPGA ARMv8 Families +CONFIG_ARCH_INTEL_SOCFPGA=y +# STMicroelectronics STM32 SoC Family +CONFIG_ARCH_STM32=y +# Socionext SynQuacer SoC Family +CONFIG_ARCH_SYNQUACER=y +# NVIDIA Tegra SoC Family +CONFIG_ARCH_TEGRA=y +# Tesla platform +CONFIG_ARCH_TESLA_FSD=y +# Spreadtrum SoC platform +CONFIG_ARCH_SPRD=y +# Cavium Inc. Thunder SoC Family +CONFIG_ARCH_THUNDER=y +# Cavium ThunderX2 Server Processors +CONFIG_ARCH_THUNDER2=y +# Socionext UniPhier SoC Family +CONFIG_ARCH_UNIPHIER=y +# ARMv8 software model (Versatile Express) +CONFIG_ARCH_VEXPRESS=y +# Toshiba Visconti SoC Family +CONFIG_ARCH_VISCONTI=y +# AppliedMicro X-Gene SOC Family +CONFIG_ARCH_XGENE=y +# Xilinx ZynqMP Family +CONFIG_ARCH_ZYNQMP=y + + +# Qualcomm SoC drivers +# Qualcomm AOSS Driver +CONFIG_QCOM_AOSS_QMP=y +# Qualcomm Command DB +CONFIG_QCOM_COMMAND_DB=y +# QCOM Core Power Reduction (CPR) support +CONFIG_QCOM_CPR=y +# QCOM GENI Serial Engine Driver +CONFIG_QCOM_GENI_SE=y +# Qualcomm Technologies, Inc. LLCC driver +CONFIG_QCOM_LLCC=m +# Qualcomm On Chip Memory (OCMEM) driver +CONFIG_QCOM_OCMEM=m +# Qualcomm PMIC GLINK driver +CONFIG_QCOM_PMIC_GLINK=m +# Qualcomm Remote Filesystem memory driver +CONFIG_QCOM_RMTFS_MEM=m +# Qualcomm RPM-Hardened (RPMH) Communication +CONFIG_QCOM_RPMH=y +# Qualcomm RPMh Power domain driver +CONFIG_QCOM_RPMHPD=y +# Qualcomm RPM Power domain driver +CONFIG_QCOM_RPMPD=y +# Qualcomm Shared Memory Manager (SMEM) +CONFIG_QCOM_SMEM=y +# Qualcomm Resource Power Manager (RPM) over SMD +CONFIG_QCOM_SMD_RPM=y +# Qualcomm Shared Memory Point to Point support +CONFIG_QCOM_SMP2P=y +# Qualcomm Shared Memory State Machine +CONFIG_QCOM_SMSM=y +# Qualcomm socinfo driver +CONFIG_QCOM_SOCINFO=m +# Qualcomm Subsystem Power Manager (SPM) +CONFIG_QCOM_SPM=m +# Qualcomm Technologies, Inc. (QTI) Sleep stats driver +CONFIG_QCOM_STATS=m +# Qualcomm WCNSS control driver +CONFIG_QCOM_WCNSS_CTRL=m +# Qualcomm APR/GPR Bus (Asynchronous/Generic Packet Router) +CONFIG_QCOM_APR=m +# QCOM Interconnect Bandwidth Monitor driver +CONFIG_QCOM_ICC_BWMON=m diff --git a/bsp/genericarm64/genericarm64-clock.cfg b/bsp/genericarm64/genericarm64-clock.cfg new file mode 100644 index 00000000..d3850278 --- /dev/null +++ b/bsp/genericarm64/genericarm64-clock.cfg @@ -0,0 +1,173 @@ +# Common Clock Framework +CONFIG_COMMON_CLK=y + +# Clock driver for RK805/RK808/RK809/RK817/RK818 +CONFIG_COMMON_CLK_RK808=m +# Clock driver controlled via SCMI interface +CONFIG_COMMON_CLK_SCMI=y +# Clock driver controlled via SCPI interface +CONFIG_COMMON_CLK_SCPI=m +# Clock driver for CS2000 Fractional-N Clock Synthesizer & Clock Multiplier +CONFIG_COMMON_CLK_CS2000_CP=m +# Clock driver for BCLK of Freescale SAI cores +CONFIG_COMMON_CLK_FSL_SAI=y +# Clock driver for S2MPS1X/S5M8767 MFD +CONFIG_COMMON_CLK_S2MPS11=m +# Clock driver for PWMs used as clock outputs +CONFIG_COMMON_CLK_PWM=m +# Clock driver for Renesas 9-series PCIe clock generators +CONFIG_COMMON_CLK_RS9_PCIE=m +# Clock driver for IDT VersaClock 5,6 devices +CONFIG_COMMON_CLK_VC5=m +# Clock driver for 32K clk gates on ROHM PMICs +CONFIG_COMMON_CLK_BD718XX=m +# Raspberry Pi firmware based clock support +CONFIG_CLK_RASPBERRYPI=m +# IMX8MM CCM Clock Driver +CONFIG_CLK_IMX8MM=y +# IMX8MN CCM Clock Driver +CONFIG_CLK_IMX8MN=y +# IMX8MP CCM Clock Driver +CONFIG_CLK_IMX8MP=y +# IMX8MQ CCM Clock Driver +CONFIG_CLK_IMX8MQ=y +# IMX8QXP SCU Clock +CONFIG_CLK_IMX8QXP=y +# IMX8ULP CCM Clock Driver +CONFIG_CLK_IMX8ULP=y +# IMX93 CCM Clock Driver +CONFIG_CLK_IMX93=y +# TI System Control Interface clock drivers +CONFIG_TI_SCI_CLK=m + +# Clock driver for MediaTek SoC +# Clock driver for MediaTek MT8192 audsys +CONFIG_COMMON_CLK_MT8192_AUDSYS=m +# Clock driver for MediaTek MT8192 camsys +CONFIG_COMMON_CLK_MT8192_CAMSYS=m +# Clock driver for MediaTek MT8192 imgsys +CONFIG_COMMON_CLK_MT8192_IMGSYS=m +# Clock driver for MediaTek MT8192 imp_iic_wrap +CONFIG_COMMON_CLK_MT8192_IMP_IIC_WRAP=m +# Clock driver for MediaTek MT8192 ipesys +CONFIG_COMMON_CLK_MT8192_IPESYS=m +# Clock driver for MediaTek MT8192 mdpsys +CONFIG_COMMON_CLK_MT8192_MDPSYS=m +# Clock driver for MediaTek MT8192 mfgcfg +CONFIG_COMMON_CLK_MT8192_MFGCFG=m +# Clock driver for MediaTek MT8192 mmsys +CONFIG_COMMON_CLK_MT8192_MMSYS=m +# Clock driver for MediaTek MT8192 msdc +CONFIG_COMMON_CLK_MT8192_MSDC=m +# Clock driver for MediaTek MT8192 scp_adsp +CONFIG_COMMON_CLK_MT8192_SCP_ADSP=m +# Clock driver for MediaTek MT8192 vdecsys +CONFIG_COMMON_CLK_MT8192_VDECSYS=m +# Clock driver for MediaTek MT8192 vencsys +CONFIG_COMMON_CLK_MT8192_VENCSYS=m +# Support for Qualcomm's clock controllers +CONFIG_COMMON_CLK_QCOM=m +# MSM8916 A53 PLL +CONFIG_QCOM_A53PLL=m +# MSM8916 APCS Clock Controller +CONFIG_QCOM_CLK_APCS_MSM8916=m +# MSM8996 CPU Clock Controller +CONFIG_QCOM_CLK_APCC_MSM8996=m +# RPM over SMD based Clock Controller +CONFIG_QCOM_CLK_SMD_RPM=m +# RPMh Clock Driver +CONFIG_QCOM_CLK_RPMH=m +# IPQ APSS Clock Controller +CONFIG_IPQ_APSS_6018=m +# IPQ5018 Global Clock Controller +CONFIG_IPQ_GCC_5018=m +# IPQ5332 Global Clock Controller +CONFIG_IPQ_GCC_5332=m +# IPQ6018 Global Clock Controller +CONFIG_IPQ_GCC_6018=m +# IPQ8074 Global Clock Controller +CONFIG_IPQ_GCC_8074=m +# IPQ9574 Global Clock Controller +CONFIG_IPQ_GCC_9574=m +# MSM8916 Global Clock Controller +CONFIG_MSM_GCC_8916=m +# MSM8994 Multimedia Clock Controller +CONFIG_MSM_MMCC_8994=m +# MSM8994 Global Clock Controller +CONFIG_MSM_GCC_8994=m +# MSM8996 Global Clock Controller +CONFIG_MSM_GCC_8996=m +# MSM8996 Multimedia Clock Controller +CONFIG_MSM_MMCC_8996=m +# MSM8998 Global Clock Controller +CONFIG_MSM_GCC_8998=m +# MSM8998 Multimedia Clock Controller +CONFIG_MSM_MMCC_8998=m +# QCM2290 Global Clock Controller +CONFIG_QCM_GCC_2290=m +# QCM2290 Display Clock Controller +CONFIG_QCM_DISPCC_2290=m +# QCS404 Global Clock Controller +CONFIG_QCS_GCC_404=m +# SC8280XP Display Clock Controller +CONFIG_SC_DISPCC_8280XP=m +# SA8775 Global Clock Controller +CONFIG_SA_GCC_8775P=m +# SA8775P Graphics clock controller +CONFIG_SA_GPUCC_8775P=m +# SC7180 Global Clock Controller +CONFIG_SC_GCC_7180=m +# SC7280 Global Clock Controller +CONFIG_SC_GCC_7280=m +# SC8180X Global Clock Controller +CONFIG_SC_GCC_8180X=m +# SC8280XP Global Clock Controller +CONFIG_SC_GCC_8280XP=m +# SC8280XP Graphics Clock Controller +CONFIG_SC_GPUCC_8280XP=m +# SC8280 Low Power Audio Subsystem (LPASS) Clock Controller +CONFIG_SC_LPASSCC_8280XP=m +# SDM845 Camera Clock Controller +CONFIG_SDM_CAMCC_845=m +# SDM845 Graphics Clock Controller +CONFIG_SDM_GPUCC_845=m +# SDM845 Video Clock Controller +CONFIG_SDM_VIDEOCC_845=m +# SDM845 Display Clock Controller +CONFIG_SDM_DISPCC_845=m +# SDM845 Low Power Audio Subsystem (LPAAS) Clock Controller +CONFIG_SDM_LPASSCC_845=m +# SM8250 Camera Clock Controller +CONFIG_SM_CAMCC_8250=m +# SM6115 Display Clock Controller +CONFIG_SM_DISPCC_6115=m +# SM8150/SM8250/SM8350 Display Clock Controller +CONFIG_SM_DISPCC_8250=m +# SM8450 Display Clock Controller +CONFIG_SM_DISPCC_8450=m +# SM8550 Display Clock Controller +CONFIG_SM_DISPCC_8550=m +# SM6115 and SM4250 Global Clock Controller +CONFIG_SM_GCC_6115=m +# SM8350 Global Clock Controller +CONFIG_SM_GCC_8350=m +# SM8450 Global Clock Controller +CONFIG_SM_GCC_8450=m +# SM8550 Global Clock Controller +CONFIG_SM_GCC_8550=m +# SM6115 Graphics Clock Controller +CONFIG_SM_GPUCC_6115=m +# SM8150 Graphics Clock Controller +CONFIG_SM_GPUCC_8150=m +# SM8250 Graphics Clock Controller +CONFIG_SM_GPUCC_8250=m +# SM8550 TCSR Clock Controller +CONFIG_SM_TCSRCC_8550=m +# SM8250 Video Clock Controller +CONFIG_SM_VIDEOCC_8250=m +# High-Frequency PLL (HFPLL) Clock Controller +CONFIG_QCOM_HFPLL=m +# SM8250 GFM LPASS Clocks +CONFIG_CLK_GFM_LPASS_SM8250=m +# Renesas R-Car USB2 clock selector support +CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y diff --git a/bsp/genericarm64/genericarm64-gpio.cfg b/bsp/genericarm64/genericarm64-gpio.cfg new file mode 100644 index 00000000..126b193f --- /dev/null +++ b/bsp/genericarm64/genericarm64-gpio.cfg @@ -0,0 +1,54 @@ +# GPIO Support +# Memory mapped GPIO drivers +# Altera GPIO +CONFIG_GPIO_ALTERA=m +# Cadence GPIO support +CONFIG_GPIO_CADENCE=m +# TI Davinci/Keystone GPIO support +CONFIG_GPIO_DAVINCI=m +# Synopsys DesignWare APB GPIO driver +CONFIG_GPIO_DWAPB=m +# GPIO support for Fujitsu MB86S7x Platforms +CONFIG_GPIO_MB86S7X=m +# MPC512x/MPC8xxx/QorIQ GPIO support +CONFIG_GPIO_MPC8XXX=y +# i.MX GPIO support +CONFIG_GPIO_MXC=m +# PrimeCell PL061 GPIO support +CONFIG_GPIO_PL061=m +# Renesas R-Car and RZ/G GPIO support +CONFIG_GPIO_RCAR=m +# GPIO based on SYSCON +CONFIG_GPIO_SYSCON=m +# Cavium ThunderX/OCTEON-TX GPIO +CONFIG_GPIO_THUNDERX=m +# UniPhier GPIO support +CONFIG_GPIO_UNIPHIER=m +# Toshiba Visconti GPIO support +CONFIG_GPIO_VISCONTI=m +# APM X-Gene GPIO controller support +CONFIG_GPIO_XGENE=y +# APM X-Gene GPIO standby controller support +CONFIG_GPIO_XGENE_SB=m +# Xilinx GPIO support +CONFIG_GPIO_XILINX=m +# Xilinx Zynq GPIO support +CONFIG_GPIO_ZYNQ=m + +# I2C GPIO expanders +# MAX7319, MAX7320-7327 I2C Port Expanders +CONFIG_GPIO_MAX732X=m +# PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports +CONFIG_GPIO_PCA953X=m +# Interrupt controller support for PCA953x +CONFIG_GPIO_PCA953X_IRQ=y + +# MFD GPIO expanders +# ROHM BD9571 GPIO support +CONFIG_GPIO_BD9571MWV=m +# GPIO support for PMIC MAX77620 and MAX20024 +CONFIG_GPIO_MAX77620=m +# Kontron sl28cpld GPIO support +CONFIG_GPIO_SL28CPLD=m +# TI TPS65086 GPO +CONFIG_GPIO_TPS65086=m diff --git a/bsp/genericarm64/genericarm64-i2c.cfg b/bsp/genericarm64/genericarm64-i2c.cfg new file mode 100644 index 00000000..46777402 --- /dev/null +++ b/bsp/genericarm64/genericarm64-i2c.cfg @@ -0,0 +1,63 @@ +# I2C support +CONFIG_I2C=y + +# I2C device interface +CONFIG_I2C_CHARDEV=y +# I2C bus multiplexing support +CONFIG_I2C_MUX=m + +# Multiplexer I2C Chip support +# NXP PCA954x/PCA984x and Maxim MAX735x/MAX736x I2C Mux/switches +CONFIG_I2C_MUX_PCA954x=m + +# I2C Hardware Bus support +# Broadcom BCM2835 I2C controller +CONFIG_I2C_BCM2835=m +# Cadence I2C Controller +CONFIG_I2C_CADENCE=m +# Synopsys DesignWare Platform +CONFIG_I2C_DESIGNWARE_PLATFORM=m +# GPIO-based bitbanging I2C +CONFIG_I2C_GPIO=m +# IMX I2C interface +CONFIG_I2C_IMX=m +# IMX Low Power I2C interface +CONFIG_I2C_IMX_LPI2C=m +# Amlogic Meson I2C controller +CONFIG_I2C_MESON=m +# MediaTek I2C adapter +CONFIG_I2C_MT65XX=m +# Marvell mv64xxx I2C Controller +CONFIG_I2C_MV64XXX=m +# OMAP I2C adapter +CONFIG_I2C_OMAP=m +# Actions Semiconductor Owl I2C Controller +CONFIG_I2C_OWL=m +# Intel PXA2XX I2C adapter +CONFIG_I2C_PXA=m +# Qualcomm Camera Control Interface +CONFIG_I2C_QCOM_CCI=m +# Qualcomm Technologies Inc.'s GENI based I2C controller +CONFIG_I2C_QCOM_GENI=m +# Qualcomm QUP based I2C controller +CONFIG_I2C_QUP=m +# Renesas RIIC adapter +CONFIG_I2C_RIIC=m +# Rockchip RK3xxx I2C adapter +CONFIG_I2C_RK3X=m +# Renesas RZ/V2M adapter +CONFIG_I2C_RZV2M=m +# S3C/Exynos I2C Driver +CONFIG_I2C_S3C2410=m +# SuperH Mobile I2C Controller +CONFIG_I2C_SH_MOBILE=m +# NVIDIA Tegra internal I2C controller +CONFIG_I2C_TEGRA=m +# UniPhier FIFO-builtin I2C controller +CONFIG_I2C_UNIPHIER_F=m +# Cavium ThunderX I2C bus support +CONFIG_I2C_THUNDERX=m +# Xilinx I2C Controller +CONFIG_I2C_XILINX=m +# Renesas R-Car I2C Controller +CONFIG_I2C_RCAR=m diff --git a/bsp/genericarm64/genericarm64-mmc.cfg b/bsp/genericarm64/genericarm64-mmc.cfg new file mode 100644 index 00000000..7e0489eb --- /dev/null +++ b/bsp/genericarm64/genericarm64-mmc.cfg @@ -0,0 +1,62 @@ +# MMC/SD/SDIO card support +CONFIG_MMC=m +# MMC block device driver +CONFIG_MMC_BLOCK=m +# Number of minors per block device +CONFIG_MMC_BLOCK_MINORS=32 +# ARM AMBA Multimedia Card Interface support +CONFIG_MMC_ARMMMCI=m +# Secure Digital Host Controller Interface support +CONFIG_MMC_SDHCI=m +# SDHCI support for ACPI enumerated SDHCI controllers +CONFIG_MMC_SDHCI_ACPI=m +# SDHCI platform and OF driver helper +CONFIG_MMC_SDHCI_PLTFM=m +# SDHCI OF support for the Arasan SDHCI controllers +CONFIG_MMC_SDHCI_OF_ARASAN=m +# SDHCI OF support for the Freescale eSDHC controller +CONFIG_MMC_SDHCI_OF_ESDHC=m +# SDHCI OF support for the Synopsys DWC MSHC +CONFIG_MMC_SDHCI_OF_DWCMSHC=m +# SDHCI OF support for the MCHP Sparx5 SoC +CONFIG_MMC_SDHCI_OF_SPARX5=m +# SDHCI support for the Cadence SD/SDIO/eMMC controller +CONFIG_MMC_SDHCI_CADENCE=m +# SDHCI support for the Freescale eSDHC/uSDHC i.MX controller +CONFIG_MMC_SDHCI_ESDHC_IMX=m +# SDHCI platform support for the Tegra SD/MMC Controller +CONFIG_MMC_SDHCI_TEGRA=m +# SDHCI support for Fujitsu Semiconductor F_SDH30 +CONFIG_MMC_SDHCI_F_SDH30=m +# Amlogic S905/GX*/AXG SD/MMC Host Controller support +CONFIG_MMC_MESON_GX=m +# Qualcomm SDHCI Controller Support +CONFIG_MMC_SDHCI_MSM=m +# MMC/SD/SDIO over SPI +CONFIG_MMC_SPI=m +# Renesas SDHI SD/SDIO controller support +CONFIG_MMC_SDHI=m +# UniPhier SD/eMMC Host Controller support +CONFIG_MMC_UNIPHIER=m +# Synopsys DesignWare Memory Card Interface +CONFIG_MMC_DW=m +# Exynos specific extensions for Synopsys DW Memory Card Interface +CONFIG_MMC_DW_EXYNOS=m +# Hi3798CV200 specific extensions for Synopsys DW Memory Card Interface +CONFIG_MMC_DW_HI3798CV200=m +# Rockchip specific extensions for Synopsys DW Memory Card Interface +CONFIG_MMC_DW_ROCKCHIP=m +# Allwinner sunxi SD/MMC Host Controller support +CONFIG_MMC_SUNXI=m +# Broadcom BCM2835 SDHOST MMC Controller support +CONFIG_MMC_BCM2835=m +# MediaTek SD/MMC Card Interface support +CONFIG_MMC_MTK=m +# Marvell Xenon eMMC/SD/SDIO SDHCI driver +CONFIG_MMC_SDHCI_XENON=m +# Support for the SDHCI Controller in TI's AM654 SOCs +CONFIG_MMC_SDHCI_AM654=m +# Actions Semi Owl SD/MMC Host Controller support +CONFIG_MMC_OWL=m +# Cavium ThunderX SD/MMC Card Interface support +CONFIG_MMC_CAVIUM_THUNDERX=m diff --git a/bsp/genericarm64/genericarm64-pinctrl.cfg b/bsp/genericarm64/genericarm64-pinctrl.cfg new file mode 100644 index 00000000..89f968e5 --- /dev/null +++ b/bsp/genericarm64/genericarm64-pinctrl.cfg @@ -0,0 +1,110 @@ +# MAX77620/MAX20024 Pincontrol support +CONFIG_PINCTRL_MAX77620=m +# Pinctrl and GPIO driver for RK805 PMIC +CONFIG_PINCTRL_RK805=m +# One-register-per-pin type device tree based pinctrl driver +CONFIG_PINCTRL_SINGLE=m +# Actions Semi OWL pinctrl driver +CONFIG_PINCTRL_OWL=y +# Actions Semi S700 pinctrl driver +CONFIG_PINCTRL_S700=y +# Actions Semi S900 pinctrl driver +CONFIG_PINCTRL_S900=y +# IMX8MM pinctrl driver +CONFIG_PINCTRL_IMX8MM=m +# IMX8MN pinctrl driver +CONFIG_PINCTRL_IMX8MN=m +# IMX8MP pinctrl driver +CONFIG_PINCTRL_IMX8MP=m +# IMX8MQ pinctrl driver +CONFIG_PINCTRL_IMX8MQ=m +# IMX8QM pinctrl driver +CONFIG_PINCTRL_IMX8QM=m +# IMX8QXP pinctrl driver +CONFIG_PINCTRL_IMX8QXP=m +# IMX8DXL pinctrl driver +CONFIG_PINCTRL_IMX8DXL=m +# IMX8ULP pinctrl driver +CONFIG_PINCTRL_IMX8ULP=m +# IMX93 pinctrl driver +CONFIG_PINCTRL_IMX93=m +# Qualcomm core pin controller driver +CONFIG_PINCTRL_MSM=m +# Qualcomm Technologies, Inc. IPQ5018 pin controller driver +CONFIG_PINCTRL_IPQ5018=m +# Qualcomm Technologies Inc IPQ5332 pin controller driver +CONFIG_PINCTRL_IPQ5332=m +# Qualcomm Technologies, Inc. IPQ8074 pin controller driver +CONFIG_PINCTRL_IPQ8074=m +# Qualcomm Technologies, Inc. IPQ6018 pin controller driver +CONFIG_PINCTRL_IPQ6018=m +# Qualcomm Technologies, Inc. IPQ9574 pin controller driver +CONFIG_PINCTRL_IPQ9574=m +# Qualcomm 8916 pin controller driver +CONFIG_PINCTRL_MSM8916=m +# Qualcomm 8953 pin controller driver +CONFIG_PINCTRL_MSM8953=m +# Qualcomm 8976 pin controller driver +CONFIG_PINCTRL_MSM8976=m +# Qualcomm 8994 pin controller driver +CONFIG_PINCTRL_MSM8994=m +# Qualcomm MSM8996 pin controller driver +CONFIG_PINCTRL_MSM8996=m +# Qualcomm MSM8998 pin controller driver +CONFIG_PINCTRL_MSM8998=m +# Qualcomm QCM2290 pin controller driver +CONFIG_PINCTRL_QCM2290=m +# Qualcomm QCS404 pin controller driver +CONFIG_PINCTRL_QCS404=m +# Qualcomm Technologies QDF2xxx pin controller driver +CONFIG_PINCTRL_QDF2XXX=m +# Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver +CONFIG_PINCTRL_QDU1000=m +# Qualcomm Technologies Inc SA8775P pin controller driver +CONFIG_PINCTRL_SA8775P=m +# Qualcomm Technologies Inc SC7180 pin controller driver +CONFIG_PINCTRL_SC7180=m +# Qualcomm Technologies Inc SC7280 pin controller driver +CONFIG_PINCTRL_SC7280=m +# Qualcomm Technologies Inc SC8180x pin controller driver +CONFIG_PINCTRL_SC8180X=m +# Qualcomm Technologies Inc SC8280xp pin controller driver +CONFIG_PINCTRL_SC8280XP=m +# Qualcomm Technologies Inc SDM660 pin controller driver +CONFIG_PINCTRL_SDM660=m +# Qualcomm Technologies Inc SDM670 pin controller driver +CONFIG_PINCTRL_SDM670=m +# Qualcomm Technologies Inc SDM845 pin controller driver +CONFIG_PINCTRL_SDM845=m +# Qualcomm Technologies Inc SM6115,SM4250 pin controller driver +CONFIG_PINCTRL_SM6115=m +# Qualcomm Technologies Inc SM6125 pin controller driver +CONFIG_PINCTRL_SM6125=m +# Qualcomm Technologies Inc SM6350 pin controller driver +CONFIG_PINCTRL_SM6350=m +# Qualcomm Technologies Inc SM6375 pin controller driver +CONFIG_PINCTRL_SM6375=m +# Qualcomm Technologies Inc SM8150 pin controller driver +CONFIG_PINCTRL_SM8150=m +# Qualcomm Technologies Inc SM8250 pin controller driver +CONFIG_PINCTRL_SM8250=m +# Qualcomm Technologies Inc SM8350 pin controller driver +CONFIG_PINCTRL_SM8350=m +# Qualcomm Technologies Inc SM8450 pin controller driver +CONFIG_PINCTRL_SM8450=m +# Qualcomm Technologies Inc SM8550 pin controller driver +CONFIG_PINCTRL_SM8550=m +# Qualcomm SPMI PMIC pin controller driver +CONFIG_PINCTRL_QCOM_SPMI_PMIC=m +# Qualcomm Technologies Inc LPASS LPI pin controller driver +CONFIG_PINCTRL_LPASS_LPI=m +# Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver +CONFIG_PINCTRL_SC7280_LPASS_LPI=m +# Qualcomm Technologies Inc SM8250 LPASS LPI pin controller driver +CONFIG_PINCTRL_SM8250_LPASS_LPI=m +# Qualcomm Technologies Inc SM8450 LPASS LPI pin controller driver +CONFIG_PINCTRL_SM8450_LPASS_LPI=m +# Qualcomm Technologies Inc SC8280XP LPASS LPI pin controller driver +CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m +# Qualcomm Technologies Inc SM8550 LPASS LPI pin controller driver +CONFIG_PINCTRL_SM8550_LPASS_LPI=m diff --git a/bsp/genericarm64/genericarm64-regulator.cfg b/bsp/genericarm64/genericarm64-regulator.cfg new file mode 100644 index 00000000..d6102c60 --- /dev/null +++ b/bsp/genericarm64/genericarm64-regulator.cfg @@ -0,0 +1,64 @@ +# Voltage and Current Regulator Support +CONFIG_REGULATOR=y +# Fixed voltage regulator support +CONFIG_REGULATOR_FIXED_VOLTAGE=m +# X-POWERS AXP20X PMIC Regulators +CONFIG_REGULATOR_AXP20X=m +# ROHM BD71837 Power Regulator +CONFIG_REGULATOR_BD718XX=m +# ROHM BD9571MWV Regulators +CONFIG_REGULATOR_BD9571MWV=m +# Fairchild FAN53555 Regulator +CONFIG_REGULATOR_FAN53555=m +# GPIO regulator support +CONFIG_REGULATOR_GPIO=m +# HiSilicon Hi6421v530 PMIC voltage regulator support +CONFIG_REGULATOR_HI6421V530=m +# Hisilicon HI655X PMIC regulators support +CONFIG_REGULATOR_HI655X=m +# Maxim 77620/MAX20024 voltage regulator +CONFIG_REGULATOR_MAX77620=m +# Maxim MAX8973A voltage regulator +CONFIG_REGULATOR_MAX8973=m +# MPS MP8859 regulator driver +CONFIG_REGULATOR_MP8859=m +# MediaTek MT6315 PMIC +CONFIG_REGULATOR_MT6315=m +# MediaTek MT6357 PMIC +CONFIG_REGULATOR_MT6357=m +# MediaTek MT6358 PMIC +CONFIG_REGULATOR_MT6358=m +# MediaTek MT6359 PMIC +CONFIG_REGULATOR_MT6359=m +# MT6360 SubPMIC Regulator +CONFIG_REGULATOR_MT6360=m +# MediaTek MT6397 PMIC +CONFIG_REGULATOR_MT6397=m +# NXP PCA9450A/PCA9450B/PCA9450C regulator driver +CONFIG_REGULATOR_PCA9450=m +# NXP PF8100/PF8121A/PF8200 regulator driver +CONFIG_REGULATOR_PF8X00=m +# Freescale PFUZE100/200/3000/3001 regulator driver +CONFIG_REGULATOR_PFUZE100=m +# PWM voltage regulator +CONFIG_REGULATOR_PWM=m +# Qualcomm Technologies, Inc. RPMh regulator driver +CONFIG_REGULATOR_QCOM_RPMH=m +# Qualcomm SMD based RPM regulator driver +CONFIG_REGULATOR_QCOM_SMD_RPM=m +# Qualcomm SPMI regulator driver +CONFIG_REGULATOR_QCOM_SPMI=m +# Renesas RAA215300 driver +CONFIG_REGULATOR_RAA215300=m +# Rockchip RK805/RK808/RK809/RK817/RK818 Power regulators +CONFIG_REGULATOR_RK808=m +# Samsung S2MPS11/13/14/15/S2MPU02 voltage regulator +CONFIG_REGULATOR_S2MPS11=m +# TI TPS65132 Dual Output Power regulators +CONFIG_REGULATOR_TPS65132=m +# TI TPS65219 Power regulators +CONFIG_REGULATOR_TPS65219=m +# TI TPS6594 Power regulators +CONFIG_REGULATOR_TPS6594=m +# Voltage controlled regulators +CONFIG_REGULATOR_VCTRL=m diff --git a/bsp/genericarm64/genericarm64-remoteproc.cfg b/bsp/genericarm64/genericarm64-remoteproc.cfg new file mode 100644 index 00000000..aba5fba4 --- /dev/null +++ b/bsp/genericarm64/genericarm64-remoteproc.cfg @@ -0,0 +1,35 @@ +# Remoteproc drivers +# Support for Remote Processor subsystem +CONFIG_REMOTEPROC=y +# i.MX remoteproc support +CONFIG_IMX_REMOTEPROC=m +# Mediatek SCP support +CONFIG_MTK_SCP=m +# Qualcomm Technology Inc ADSP Peripheral Image Loader +CONFIG_QCOM_Q6V5_ADSP=m +# Qualcomm Hexagon V5 self-authenticating modem subsystem support +CONFIG_QCOM_Q6V5_MSS=m +# Qualcomm Hexagon v5 Peripheral Authentication Service support +CONFIG_QCOM_Q6V5_PAS=m +# Qualcomm sysmon driver +CONFIG_QCOM_SYSMON=m +# Qualcomm WCNSS Peripheral Image Loader +CONFIG_QCOM_WCNSS_PIL=m +# TI K3 DSP remoteproc support +CONFIG_TI_K3_DSP_REMOTEPROC=m +# TI K3 R5 remoteproc support +CONFIG_TI_K3_R5_REMOTEPROC=m +# TI PRU remoteproc support +CONFIG_PRU_REMOTEPROC=m + +# Rpmsg drivers +# RPMSG device interface +CONFIG_RPMSG_CHAR=m +# RPMSG control interface +CONFIG_RPMSG_CTRL=m +# Qualcomm RPM Glink driver +CONFIG_RPMSG_QCOM_GLINK_RPM=y +# Qualcomm SMEM Glink driver +CONFIG_RPMSG_QCOM_GLINK_SMEM=m +# Qualcomm Shared Memory Driver (SMD) +CONFIG_RPMSG_QCOM_SMD=y diff --git a/bsp/genericarm64/genericarm64-serial.cfg b/bsp/genericarm64/genericarm64-serial.cfg new file mode 100644 index 00000000..4d565dbc --- /dev/null +++ b/bsp/genericarm64/genericarm64-serial.cfg @@ -0,0 +1,72 @@ +# Serial drivers + +# 8250/16550 and compatible serial support +CONFIG_SERIAL_8250=m +# Console on 8250/16550 and compatible serial port +CONFIG_SERIAL_8250_CONSOLE=m +# Extended 8250/16550 serial driver options +CONFIG_SERIAL_8250_EXTENDED=y +# Support for sharing serial interrupts +CONFIG_SERIAL_8250_SHARE_IRQ=y +# BCM2835 auxiliar mini UART support +CONFIG_SERIAL_8250_BCM2835AUX=y +# Support for Synopsys DesignWare 8250 quirks +CONFIG_SERIAL_8250_DW=m +# Support for Emma Mobile integrated serial port +CONFIG_SERIAL_8250_EM=m +# Support for OMAP internal UART (8250 based driver) +CONFIG_SERIAL_8250_OMAP=m +# Mediatek serial port support +CONFIG_SERIAL_8250_MT6577=m +# Support for UniPhier on-chip UART +CONFIG_SERIAL_8250_UNIPHIER=m +# Devicetree based probing for 8250 ports +CONFIG_SERIAL_OF_PLATFORM=m +# ARM AMBA PL011 serial port support +CONFIG_SERIAL_AMBA_PL011=y +# Support for console on AMBA serial port +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +# Meson serial port support +CONFIG_SERIAL_MESON=m +# Support for console on meson +CONFIG_SERIAL_MESON_CONSOLE=y +# Samsung SoC serial support +CONFIG_SERIAL_SAMSUNG=m +# Support for console on Samsung SoC serial port +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +# IMX serial port support +CONFIG_SERIAL_IMX=m +# Console on IMX serial port +CONFIG_SERIAL_IMX_CONSOLE=m +# SuperH SCI(F) serial port support +CONFIG_SERIAL_SH_SCI=m +# MSM on-chip serial port support +CONFIG_SERIAL_MSM=y +# MSM serial console support +CONFIG_SERIAL_MSM_CONSOLE=y +# QCOM on-chip GENI based serial port support +CONFIG_SERIAL_QCOM_GENI=m +# QCOM GENI Serial Console support +CONFIG_SERIAL_QCOM_GENI_CONSOLE=y +# Cadence (Xilinx Zynq) UART support +CONFIG_SERIAL_XILINX_PS_UART=y +# Cadence UART console support +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y +# Freescale lpuart serial port support +CONFIG_SERIAL_FSL_LPUART=y +# Console on Freescale lpuart serial port +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +# Freescale LINFlexD UART serial port support +CONFIG_SERIAL_FSL_LINFLEXUART=y +# Console on Freescale LINFlexD UART serial port +CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y +# STMicroelectronics STM32 serial port support +CONFIG_SERIAL_STM32=y +# Support for console on STM32 +CONFIG_SERIAL_STM32_CONSOLE=y +# Marvell EBU serial port support +CONFIG_SERIAL_MVEBU_UART=y +# Actions Semi Owl serial port support +CONFIG_SERIAL_OWL=m +# Serial device bus +CONFIG_SERIAL_DEV_BUS=m diff --git a/bsp/genericarm64/genericarm64-standard.scc b/bsp/genericarm64/genericarm64-standard.scc new file mode 100644 index 00000000..25598192 --- /dev/null +++ b/bsp/genericarm64/genericarm64-standard.scc @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT +define KMACHINE genericarm64 +define KTYPE standard +define KARCH arm64 + +include ktypes/standard/standard.scc + +include genericarm64.scc + +# default policy for standard kernels +include features/profiling/profiling.scc diff --git a/bsp/genericarm64/genericarm64.cfg b/bsp/genericarm64/genericarm64.cfg new file mode 100644 index 00000000..a782dac5 --- /dev/null +++ b/bsp/genericarm64/genericarm64.cfg @@ -0,0 +1,994 @@ +CONFIG_ARM64=y + +# Kernel Features +# Virtual address space size +# 48-bit +CONFIG_ARM64_VA_BITS_48=y +# Multi-core scheduler support +CONFIG_SCHED_MC=y +# SMT scheduler support +CONFIG_SCHED_SMT=y +# Enable the tagged user addresses syscall ABI +CONFIG_ARM64_TAGGED_ADDR_ABI=y + +# ARMv8.1 architectural features +# Support for hardware updates of the Access and Dirty page flags +CONFIG_ARM64_HW_AFDBM=y +# Enable support for Privileged Access Never (PAN) +CONFIG_ARM64_PAN=y +CONFIG_ARM64_LSE_ATOMICS=y +# Atomic instructions +CONFIG_ARM64_USE_LSE_ATOMICS=y + +# ARMv8.2 architectural features +# Enable support for RAS CPU Extensions +CONFIG_ARM64_RAS_EXTN=y +# Enable support for Common Not Private (CNP) translations +CONFIG_ARM64_CNP=y +# ARM Scalable Vector Extension support +CONFIG_ARM64_SVE=y +# ARM Scalable Matrix Extension support +CONFIG_ARM64_SME=y + +# Boot options +# UEFI runtime support +CONFIG_EFI=y +# Enable support for SMBIOS (DMI) tables +CONFIG_DMI=y + +# Power management options +# Enable workqueue power-efficient mode by default +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +# Energy Model for devices with DVFS (CPUs, GPUs, etc) +CONFIG_ENERGY_MODEL=y + +# CPU Power Management +# CPU Idle +# ARM CPU Idle Drivers +# PSCI CPU idle Driver +CONFIG_ARM_PSCI_CPUIDLE=y + +# CPU Frequency scaling +# 'powersave' governor +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +# 'userspace' governor for userspace frequency scaling +CONFIG_CPU_FREQ_GOV_USERSPACE=m +# 'ondemand' cpufreq policy governor +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# 'conservative' cpufreq governor +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +# Generic DT based cpufreq driver +CONFIG_CPUFREQ_DT=m +# CPUFreq driver based on the ACPI CPPC spec +CONFIG_ACPI_CPPC_CPUFREQ=m +# Allwinner nvmem based SUN50I CPUFreq driver +CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m +# Armada 37xx CPUFreq support +CONFIG_ARM_ARMADA_37XX_CPUFREQ=m +# SCPI based CPUfreq driver +CONFIG_ARM_SCPI_CPUFREQ=m +# Freescale i.MX8M cpufreq support +CONFIG_ARM_IMX_CPUFREQ_DT=m +# CPU Frequency scaling support for MediaTek SoCs +CONFIG_ARM_MEDIATEK_CPUFREQ=m +# Qualcomm nvmem based CPUFreq +CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m +# QCOM CPUFreq HW driver +CONFIG_ARM_QCOM_CPUFREQ_HW=m +# Raspberry Pi cpufreq support +CONFIG_ARM_RASPBERRYPI_CPUFREQ=m +# SCMI based CPUfreq driver +CONFIG_ARM_SCMI_CPUFREQ=m +# Texas Instruments CPUFreq support +CONFIG_ARM_TI_CPUFREQ=y +# CPU frequency scaling driver for Freescale QorIQ SoCs +CONFIG_QORIQ_CPUFREQ=m + +# ACPI (Advanced Configuration and Power Interface) Support +CONFIG_ACPI=y + +# Memory Management options +# Contiguous Memory Allocator +CONFIG_CMA=y + +# Networking support +# CAN bus subsystem support +CONFIG_CAN=m + +# Device Drivers +# PCI support +# PCI controller drivers +# Cavium Thunder PCIe controller to off-chip devices +CONFIG_PCI_HOST_THUNDER_PEM=y +# Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon +CONFIG_PCI_HOST_THUNDER_ECAM=y +# Generic PCI host controller +CONFIG_PCI_HOST_GENERIC=m +# Xilinx AXI PCIe controller +CONFIG_PCIE_XILINX=y +# Xilinx NWL PCIe controller +CONFIG_PCIE_XILINX_NWL=y + +# DesignWare-based PCIe controllers +# Freescale i.MX6/7/8 PCIe controller (host mode) +CONFIG_PCI_IMX6_HOST=y +# Freescale Layerscape PCIe controller (host mode) +CONFIG_PCI_LAYERSCAPE=y + +# Bus devices + +CONFIG_ARM_CCI=y +CONFIG_ARM_CCI400_COMMON=y +# TI sysc interconnect target module driver +CONFIG_TI_SYSC=y +# QorIQ DPAA2 fsl-mc bus driver +CONFIG_FSL_MC_BUS=y + +# Firmware Drivers +# ARM System Control and Management Interface Protocol +# ARM System Control and Management Interface (SCMI) Message Protocol +CONFIG_ARM_SCMI_PROTOCOL=y +# ARM System Control and Power Interface (SCPI) Message Protocol +CONFIG_ARM_SCPI_PROTOCOL=y +# Raspberry Pi Firmware Driver +CONFIG_RASPBERRYPI_FIRMWARE=y +# IMX SCU Protocol driver +CONFIG_IMX_SCU=y +# IMX SCU Power Domain driver +CONFIG_IMX_SCU_PD=y + +# Memory Technology Device (MTD) support +# RAM/ROM/Flash chip drivers +# Detect flash chips by Common Flash Interface (CFI) probe +CONFIG_MTD_CFI=m + +# NAND +# Raw/Parallel NAND Device Support +CONFIG_MTD_RAW_NAND=y +# Denali NAND controller as a DT device +CONFIG_MTD_NAND_DENALI_DT=y +# Marvell EBU NAND controller +CONFIG_MTD_NAND_MARVELL=y +# Broadcom STB NAND controller +CONFIG_MTD_NAND_BRCMNAND=m +# Freescale IFC NAND controller +CONFIG_MTD_NAND_FSL_IFC=y +# QCOM NAND controller +CONFIG_MTD_NAND_QCOM=y + +# SPI NOR device support +CONFIG_MTD_SPI_NOR=y + +# Enable UBI - Unsorted block images +CONFIG_MTD_UBI=m + +# Misc devices +# EEPROM support +# I2C EEPROMs / RAMs / ROMs from most vendors +CONFIG_EEPROM_AT24=m +# SPI EEPROMs (FRAMs) from most vendors +CONFIG_EEPROM_AT25=m + +# Serial ATA and Parallel ATA drivers (libata) +CONFIG_ATA=m +# AHCI SATA support +CONFIG_SATA_AHCI=m +# Platform AHCI SATA support +CONFIG_SATA_AHCI_PLATFORM=m + +# Network device support +# Ethernet driver support +# Cadence MACB/GEM support +CONFIG_MACB=m +# Use IEEE 1588 hwstamp +CONFIG_MACB_USE_HWSTAMP=y +# FEC ethernet controller (of ColdFire and some i.MX CPUs) +CONFIG_FEC=m +# ENETC PF driver +CONFIG_FSL_ENETC=m +# ENETC VF driver +CONFIG_FSL_ENETC_VF=m +# Intel(R) PRO/1000 Gigabit Ethernet support +CONFIG_E1000=m +# Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support +CONFIG_E1000E=m +# Marvell OcteonTX2 RVU Admin Function driver +CONFIG_OCTEONTX2_AF=m +# Marvell OcteonTX2 NIC Physical Function driver +CONFIG_OCTEONTX2_PF=m +# Marvell OcteonTX2 NIC Virtual Function driver +CONFIG_OCTEONTX2_VF=m +# STMicroelectronics Multi-Gigabit Ethernet driver +CONFIG_STMMAC_ETH=m +# TI K3 AM654x/J721E CPSW Ethernet driver +CONFIG_TI_K3_AM65_CPSW_NUSS=m +# Xilinx 10/100 Ethernet Lite support +CONFIG_XILINX_EMACLITE=m +# Xilinx 10/100/1000 AXI Ethernet support +CONFIG_XILINX_AXI_EMAC=m +# Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver +CONFIG_XILINX_LL_TEMAC=m + +# PHY Device support and infrastructure +CONFIG_PHYLINK=m +# Amlogic Meson GXL Internal PHY +CONFIG_MESON_GXL_PHY=m +# Aquantia PHYs +CONFIG_AQUANTIA_PHY=m +# Broadcom BCM54140 PHY +CONFIG_BCM54140_PHY=m +# Marvell Alaska PHYs +CONFIG_MARVELL_PHY=m +# Marvell Alaska 10Gbit PHYs +CONFIG_MARVELL_10G_PHY=m +# Micrel PHYs +CONFIG_MICREL_PHY=m +# Microsemi PHYs +CONFIG_MICROSEMI_PHY=m +# Qualcomm Atheros AR803X PHYs and QCA833x PHYs +CONFIG_AT803X_PHY=m +# Realtek PHYs +CONFIG_REALTEK_PHY=m +# Rockchip Ethernet PHYs +CONFIG_ROCKCHIP_PHY=m +# Texas Instruments DP83867 Gigabit PHY +CONFIG_DP83867_PHY=m +# Texas Instruments DP83869 Gigabit PHY +CONFIG_DP83869_PHY=m +# Texas Instruments DP83TD510 Ethernet 10Base-T1L PHY +CONFIG_DP83TD510_PHY=m +# Vitesse PHYs +CONFIG_VITESSE_PHY=m +# Xilinx GMII2RGMII converter driver +CONFIG_XILINX_GMII2RGMII=m + +# CAN Device Drivers +CONFIG_CAN_DEV=m +# CAN device drivers with Netlink support +CONFIG_CAN_NETLINK=y +# Xilinx CAN +CONFIG_CAN_XILINXCAN=m + +# MDIO bus device drivers +# GPIO lib-based bitbanged MDIO buses +CONFIG_MDIO_GPIO=m +# ThunderX SOCs MDIO buses +CONFIG_MDIO_THUNDER=m +# MDIO bus multiplexer using kernel multiplexer subsystem +CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y +# MMIO device-controlled MDIO bus multiplexers +CONFIG_MDIO_BUS_MUX_MMIOREG=y + +# Wireless LAN +# Atheros 802.11ac wireless cards support +CONFIG_ATH10K=m +# Atheros ath10k PCI support +CONFIG_ATH10K_PCI=m +# Atheros ath10k SDIO support +CONFIG_ATH10K_SDIO=m +# Qualcomm ath10k SNOC support +CONFIG_ATH10K_SNOC=m +# Qualcomm Atheros WCN3660/3680 support +CONFIG_WCN36XX=m +# Qualcomm Technologies 802.11ax chipset support +CONFIG_ATH11K=m +# Atheros ath11k AHB support +CONFIG_ATH11K_AHB=m +# Atheros ath11k PCI support +CONFIG_ATH11K_PCI=m +# Broadcom FullMAC WLAN driver +CONFIG_BRCMFMAC=m +# Marvell WiFi-Ex Driver +CONFIG_MWIFIEX=m +# Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8978/SD8987/SD8997 +CONFIG_MWIFIEX_SDIO=m +# Marvell WiFi-Ex Driver for PCIE 8766/8897/8997 +CONFIG_MWIFIEX_PCIE=m +# MediaTek MT7921E (PCIe) support +CONFIG_MT7921E=m +# Redpine Signals Inc 91x WLAN driver support +CONFIG_RSI_91X=m +# TI wl18xx support +CONFIG_WL18XX=m +# TI wlcore support +CONFIG_WLCORE=m +# TI wlcore SDIO support +CONFIG_WLCORE_SDIO=m + +# Input device support +# Miscellaneous devices +# TPS65219 Power button driver +CONFIG_INPUT_TPS65219_PWRBUTTON=m + +# Character devices +# TPM Hardware Support +CONFIG_TCG_TPM=m +# TPM HW Random Number Generator support +CONFIG_HW_RANDOM_TPM=y +# TPM Interface Specification 1.3 Interface / TPM 2.0 FIFO Interface - (SPI) +CONFIG_TCG_TIS_SPI=m +# Cr50 SPI Interface +CONFIG_TCG_TIS_SPI_CR50=y + +# SPI support +# Marvell Armada 3700 SPI Controller +CONFIG_SPI_ARMADA_3700=m +# BCM2835 SPI controller +CONFIG_SPI_BCM2835=m +# BCM2835 SPI auxiliary controller +CONFIG_SPI_BCM2835AUX=m +# Cadence SPI controller +CONFIG_SPI_CADENCE=m +# Cadence Quad SPI controller +CONFIG_SPI_CADENCE_QUADSPI=m +# Cadence XSPI controller +CONFIG_SPI_CADENCE_XSPI=m +# DesignWare SPI controller core support +CONFIG_SPI_DESIGNWARE=m +# DMA support for DW SPI controller +CONFIG_SPI_DW_DMA=y +# Memory-mapped io interface driver for DW SPI core +CONFIG_SPI_DW_MMIO=m +# Freescale i.MX LPSPI controller +CONFIG_SPI_FSL_LPSPI=m +# Freescale QSPI controller +CONFIG_SPI_FSL_QUADSPI=m +# NXP Flex SPI controller +CONFIG_SPI_NXP_FLEXSPI=m +# Freescale i.MX SPI controllers +CONFIG_SPI_IMX=m +# Freescale DSPI controller +CONFIG_SPI_FSL_DSPI=m +# Amlogic Meson SPICC controller +CONFIG_SPI_MESON_SPICC=m +# Amlogic Meson SPIFC controller +CONFIG_SPI_MESON_SPIFC=m +# MediaTek SPI controller +CONFIG_SPI_MT65XX=m +# MediaTek SPI NOR controller +CONFIG_SPI_MTK_NOR=m +# McSPI driver for OMAP +CONFIG_SPI_OMAP24XX=m +# Orion SPI master +CONFIG_SPI_ORION=m +# ARM AMBA PL022 SSP controller +CONFIG_SPI_PL022=m +# Rockchip SPI controller driver +CONFIG_SPI_ROCKCHIP=m +# Rockchip Serial Flash Controller (SFC) +CONFIG_SPI_ROCKCHIP_SFC=m +# Renesas RSPI/QSPI controller +CONFIG_SPI_RSPI=m +# Renesas RZ/V2M CSI controller +CONFIG_SPI_RZV2M_CSI=m +# QTI QSPI controller +CONFIG_SPI_QCOM_QSPI=m +# Qualcomm SPI controller with QUP interface +CONFIG_SPI_QUP=m +# Qualcomm GENI based SPI controller +CONFIG_SPI_QCOM_GENI=m +# Samsung S3C64XX/Exynos SoC series type SPI +CONFIG_SPI_S3C64XX=m +# SuperH MSIOF SPI controller +CONFIG_SPI_SH_MSIOF=m +# Allwinner A31 SPI controller +CONFIG_SPI_SUN6I=m +# NVIDIA Tegra QSPI Controller +CONFIG_SPI_TEGRA210_QUAD=m +# Cavium ThunderX SPI controller +CONFIG_SPI_THUNDERX=m +# Xilinx SPI controller common module +CONFIG_SPI_XILINX=m +# Xilinx ZynqMP GQSPI controller +CONFIG_SPI_ZYNQMP_GQSPI=m +# User mode SPI device driver support +CONFIG_SPI_SPIDEV=m + +# SPMI support +CONFIG_SPMI=y + +# Hardware Monitoring support +# PWM fan +CONFIG_SENSORS_PWM_FAN=m + +# Thermal drivers +# Temperature sensor driver for Freescale i.MX8MM SoC +CONFIG_IMX8MM_THERMAL=m +# Texas Instruments K3 thermal support +CONFIG_K3_THERMAL=m + +# Watchdog Timer Support +CONFIG_WATCHDOG=y +# Xilinx Watchdog timer +CONFIG_XILINX_WATCHDOG=m +# Kontron sl28cpld Watchdog +CONFIG_SL28CPLD_WATCHDOG=m +# ARM SP805 Watchdog +CONFIG_ARM_SP805_WATCHDOG=m +# ARM SBSA Generic Watchdog +CONFIG_ARM_SBSA_WATCHDOG=m +# Cadence Watchdog Timer +CONFIG_CADENCE_WATCHDOG=m +# S3C6410/S5Pv210/Exynos Watchdog +CONFIG_S3C2410_WATCHDOG=m +# Synopsys DesignWare watchdog +CONFIG_DW_WATCHDOG=m +# Texas Instruments K3 RTI watchdog +CONFIG_K3_RTI_WATCHDOG=m +# Allwinner SoCs watchdog support +CONFIG_SUNXI_WATCHDOG=m +# Nuvoton NPCM750 watchdog +CONFIG_NPCM7XX_WATCHDOG=m +# IMX2+ Watchdog +CONFIG_IMX2_WDT=m +# IMX SC Watchdog +CONFIG_IMX_SC_WDT=m +# IMX7ULP Watchdog +CONFIG_IMX7ULP_WDT=m +# QCOM watchdog +CONFIG_QCOM_WDT=m +# Amlogic Meson GXBB SoCs watchdog support +CONFIG_MESON_GXBB_WATCHDOG=m +# Amlogic Meson SoCs watchdog support +CONFIG_MESON_WATCHDOG=m +# ARM Secure Monitor Call based watchdog support +CONFIG_ARM_SMC_WATCHDOG=m +# Renesas WDT Watchdog +CONFIG_RENESAS_WDT=m +# Renesas RZ/G2L WDT Watchdog +CONFIG_RENESAS_RZG2LWDT=m +# UniPhier watchdog support +CONFIG_UNIPHIER_WATCHDOG=m +# QCOM PM8916 pmic watchdog +CONFIG_PM8916_WATCHDOG=m +# Broadcom BCM2835 hardware watchdog +CONFIG_BCM2835_WDT=m +# BCM63xx/BCM7038 Watchdog +CONFIG_BCM7038_WDT=m + +# Multifunction device drivers +# Altera SOCFPGA System Manager +CONFIG_MFD_ALTERA_SYSMGR=y +# ROHM BD9571MWV PMIC +CONFIG_MFD_BD9571MWV=m +# X-Powers AXP series PMICs with I2C +CONFIG_MFD_AXP20X_I2C=m +# X-Powers AXP series PMICs with RSB +CONFIG_MFD_AXP20X_RSB=m +# Samsung Exynos SoC Low Power Audio Subsystem +CONFIG_MFD_EXYNOS_LPASS=m +# HiSilicon Hi6421 PMU/Codec IC +CONFIG_MFD_HI6421_PMIC=m +# HiSilicon Hi655X series PMU/Codec IC +CONFIG_MFD_HI655X_PMIC=m +# Maxim Semiconductor MAX77620 and MAX20024 PMIC Support +CONFIG_MFD_MAX77620=y +# Mediatek MT6360 SubPMIC +CONFIG_MFD_MT6360=m +# MediaTek MT6397 PMIC Support +CONFIG_MFD_MT6397=m +# Qualcomm SPMI PMICs +CONFIG_MFD_SPMI_PMIC=m +# Rockchip RK805/RK808/RK809/RK817/RK818 Power Management Chip +CONFIG_MFD_RK8XX_I2C=m +# Rockchip RK806 Power Management Chip +CONFIG_MFD_RK8XX_SPI=m +# Samsung Electronics PMIC Series Support +CONFIG_MFD_SEC_CORE=m +# Kontron sl28cpld Board Management Controller +CONFIG_MFD_SL28CPLD=m +# TI ADC / Touch Screen chip support +CONFIG_MFD_TI_AM335X_TSCADC=m +# TI TPS65086 Power Management Integrated Chips (PMICs) +CONFIG_MFD_TPS65086=m +# TI TPS65219 Power Management IC +CONFIG_MFD_TPS65219=m +# TI TPS6594 Power Management chip with I2C +CONFIG_MFD_TPS6594_I2C=m +# ROHM BD71837 Power Management IC +CONFIG_MFD_ROHM_BD718XX=m + +# Graphics support +# DRM DP AUX Interface +CONFIG_DRM_DP_AUX_CHARDEV=y +# Enable DisplayPort CEC-Tunneling-over-AUX HDMI support +CONFIG_DRM_DP_CEC=y + +# Display Interface Bridges +# Display connector support +CONFIG_DRM_DISPLAY_CONNECTOR=m +# ITE IT66121 HDMI bridge +CONFIG_DRM_ITE_IT66121=m +# LIMA (DRM support for ARM Mali 400/450 GPU) +CONFIG_DRM_LIMA=m +# DRM Support for TI Keystone +CONFIG_DRM_TIDSS=m +# ZynqMP DisplayPort Controller Driver +CONFIG_DRM_ZYNQMP_DPSUB=m + +# Sound card support +# Advanced Linux Sound Architecture +# ALSA for SoC audio support +CONFIG_SND_SOC=m + +# Audio support for Texas Instruments SoCs +# Multichannel Audio Serial Port (McASP) support +CONFIG_SND_SOC_DAVINCI_MCASP=m + +# CODEC drivers +# Dialog DA7213 CODEC +CONFIG_SND_SOC_DA7213=m + +# USB support +# OTG support +CONFIG_USB_OTG=y +# DesignWare USB3 DRD Core Support +CONFIG_USB_DWC3=m +# Texas Instruments AM62 Platforms +CONFIG_USB_DWC3_AM62=m +# ChipIdea Highspeed Dual Role Controller +CONFIG_USB_CHIPIDEA=m +# ChipIdea device controller +CONFIG_USB_CHIPIDEA_UDC=y +# ChipIdea host controller +CONFIG_USB_CHIPIDEA_HOST=y +# Onboard USB hub support +CONFIG_USB_ONBOARD_HUB=m + +# USB Physical Layer drivers +# NOP USB Transceiver Driver +CONFIG_NOP_USB_XCEIV=m +# Freescale MXS USB PHY support +CONFIG_USB_MXS_PHY=m + +# USB Gadget Support +CONFIG_USB_GADGET=m + +# USB Peripheral Controller +# Xilinx USB Driver +CONFIG_USB_GADGET_XILINX=m + +# USB Type-C Support +CONFIG_TYPEC=m +# USB Type-C Port Controller Manager +CONFIG_TYPEC_TCPM=m +# Type-C Port Controller Interface driver +CONFIG_TYPEC_TCPCI=m +# Fairchild FUSB302 Type-C chip driver +CONFIG_TYPEC_FUSB302=m +# USB Type-C Connector System Software Interface driver +CONFIG_TYPEC_UCSI=m +# UCSI Interface Driver for Cypress CCGx +CONFIG_UCSI_CCG=m +# UCSI Qualcomm PMIC GLINK Interface Driver +CONFIG_UCSI_PMIC_GLINK=m +# TI TPS6598x USB Power Delivery controller driver +CONFIG_TYPEC_TPS6598X=m +# TI HD3SS3220 Type-C DRP Port controller driver +CONFIG_TYPEC_HD3SS3220=m + +# USB Type-C Multiplexer/DeMultiplexer Switch support +# ON Semi FSA4480 Analog Audio Switch driver +CONFIG_TYPEC_MUX_FSA4480=m +# Generic GPIO based SBU mux for USB Type-C applications +CONFIG_TYPEC_MUX_GPIO_SBU=m + +# LED Support +# LED Support for GPIO connected LEDs +CONFIG_LEDS_GPIO=m + +# EDAC (Error Detection And Correction) reporting +CONFIG_EDAC=m +# Cavium ThunderX EDAC +CONFIG_EDAC_THUNDERX=m +# Synopsys DDR Memory Controller +CONFIG_EDAC_SYNOPSYS=m +# Xilinx ZynqMP OCM Controller +CONFIG_EDAC_ZYNQMP=m + +# Real Time Clock +# TI BQ32000 +CONFIG_RTC_DRV_BQ32K=m +# Xilinx Zynq Ultrascale+ MPSoC RTC +CONFIG_RTC_DRV_ZYNQMP=m +# TI K3 RTC +CONFIG_RTC_DRV_TI_K3=m + +# DMA Engine support +CONFIG_DMADEVICES=y +# i.MX SDMA support +CONFIG_IMX_SDMA=m +# Xilinx AXI DMAS Engine +CONFIG_XILINX_DMA=m +# Xilinx ZynqMP DMA Engine +CONFIG_XILINX_ZYNQMP_DMA=m +# Xilinx DPDMA Engine +CONFIG_XILINX_ZYNQMP_DPDMA=m +# Texas Instruments UDMA support +CONFIG_TI_K3_UDMA=m +# Texas Instruments UDMA Glue layer for non DMAengine users +CONFIG_TI_K3_UDMA_GLUE_LAYER=m + +# Common Clock Framework +# TI System Control Interface clock drivers +CONFIG_TI_SCI_CLK=m +# Syscon based clock driver for K2/K3 SoCs +CONFIG_TI_SYSCON_CLK=m +# Xilinx VCU logicoreIP Init +CONFIG_XILINX_VCU=m +# Xilinx Clocking Wizard +CONFIG_COMMON_CLK_XLNX_CLKWZRD=m + +# Hardware Spinlock drivers +CONFIG_HWSPINLOCK=y +# OMAP Hardware Spinlock device +CONFIG_HWSPINLOCK_OMAP=y +# Qualcomm Hardware Spinlock device +CONFIG_HWSPINLOCK_QCOM=y + +# Mailbox Hardware Support +CONFIG_MAILBOX=y +# ARM MHU Mailbox +CONFIG_ARM_MHU=y +# i.MX Mailbox +CONFIG_IMX_MBOX=y +# Platform MHU Mailbox +CONFIG_PLATFORM_MHU=y +# OMAP2+ Mailbox framework support +CONFIG_OMAP2PLUS_MBOX=y +# BCM2835 Mailbox +CONFIG_BCM2835_MBOX=y +# Qualcomm APCS IPC driver +CONFIG_QCOM_APCS_IPC=y +# Qualcomm Technologies, Inc. IPCC driver +CONFIG_QCOM_IPCC=y + +# IOMMU Hardware Support +CONFIG_IOMMU_SUPPORT=y +# Rockchip IOMMU Support +CONFIG_ROCKCHIP_IOMMU=y +# NVIDIA Tegra SMMU Support +CONFIG_TEGRA_IOMMU_SMMU=y +# ARM Ltd. System MMU (SMMU) Support +CONFIG_ARM_SMMU=y +# ARM Ltd. System MMU Version 3 (SMMUv3) Support +CONFIG_ARM_SMMU_V3=y +# MediaTek IOMMU Support +CONFIG_MTK_IOMMU=y +# Qualcomm IOMMU Support +CONFIG_QCOM_IOMMU=y + +# SOC (System On Chip) specific Drivers +# TI SOC drivers support +# TI SCI PM Domains Driver +CONFIG_TI_SCI_PM_DOMAINS=m +# TI PRU-ICSS Subsystem Platform drivers +CONFIG_TI_PRUSS=m + +# Generic Dynamic Voltage and Frequency Scaling (DVFS) support +CONFIG_PM_DEVFREQ=y + +# Memory Controller drivers +# Texas Instruments OMAP SoC GPMC driver +CONFIG_OMAP_GPMC=m + +# Industrial I/O support +CONFIG_IIO=y + +# Analog to digital converters +# Texas Instruments ADC128S052/ADC122S021/ADC124S021 +CONFIG_TI_ADC128S052=m +# Xilinx XADC driver +CONFIG_XILINX_XADC=m +# Xilinx AMS driver +CONFIG_XILINX_AMS=m + +# Pulse-Width Modulation (PWM) Support +CONFIG_PWM=y +# BCM2835 PWM support +CONFIG_PWM_BCM2835=m +# Broadcom STB PWM support +CONFIG_PWM_BRCMSTB=m +# i.MX27 PWM support +CONFIG_PWM_IMX27=m +# Amlogic Meson PWM driver +CONFIG_PWM_MESON=m +# MediaTek display PWM driver +CONFIG_PWM_MTK_DISP=m +# MediaTek PWM support +CONFIG_PWM_MEDIATEK=m +# Renesas R-Car PWM support +CONFIG_PWM_RCAR=m +# Renesas TPU PWM support +CONFIG_PWM_RENESAS_TPU=m +# Rockchip PWM support +CONFIG_PWM_ROCKCHIP=y +# Samsung PWM support +CONFIG_PWM_SAMSUNG=y +# Kontron sl28cpld PWM support +CONFIG_PWM_SL28CPLD=m +# Allwinner PWM support +CONFIG_PWM_SUN4I=m +# NVIDIA Tegra PWM support +CONFIG_PWM_TEGRA=m +# ECAP PWM support +CONFIG_PWM_TIECAP=m +# EHRPWM PWM support +CONFIG_PWM_TIEHRPWM=m +# Toshiba Visconti PWM support +CONFIG_PWM_VISCONTI=m +# Xilinx AXI Timer PWM support +CONFIG_PWM_XILINX=m + +# IRQ chip support +# Xilinx Interrupt Controller IP +CONFIG_XILINX_INTC=y + +# Reset Controller Support +# i.MX7/8 Reset Driver +CONFIG_RESET_IMX7=y +# TI System Control Interface (TI-SCI) reset driver +CONFIG_RESET_TI_SCI=m + +# PHY Subsystem +# APM X-Gene 15Gbps PHY support +CONFIG_PHY_XGENE=m +# CAN transceiver PHY +CONFIG_PHY_CAN_TRANSCEIVER=m +# Allwinner sunxi SoC USB PHY driver +CONFIG_PHY_SUN4I_USB=m +# Cadence Torrent PHY driver +CONFIG_PHY_CADENCE_TORRENT=m +# Cadence Sierra PHY Driver +CONFIG_PHY_CADENCE_SIERRA=m +# Mixel MIPI DSI PHY support +CONFIG_PHY_MIXEL_MIPI_DPHY=m +# Freescale i.MX8M PCIE PHY +CONFIG_PHY_FSL_IMX8M_PCIE=m +# hi6220 USB PHY support +CONFIG_PHY_HI6220_USB=m +# HiSilicon STB SoCs COMBPHY support +CONFIG_PHY_HISTB_COMBPHY=m +# HiSilicon INNO USB2 PHY support +CONFIG_PHY_HISI_INNO_USB2=m +# Marvell CP110 comphy driver +CONFIG_PHY_MVEBU_CP110_COMPHY=m +# MediaTek T-PHY Driver +CONFIG_PHY_MTK_TPHY=m +# Qualcomm eDP PHY driver +CONFIG_PHY_QCOM_EDP=m +# Qualcomm PCIe Gen2 PHY Driver +CONFIG_PHY_QCOM_PCIE2=m +# Qualcomm QMP PHY Drivers +CONFIG_PHY_QCOM_QMP=m +# Qualcomm QUSB2 PHY Driver +CONFIG_PHY_QCOM_QUSB2=m +# Qualcomm SNPS eUSB2 PHY Driver +CONFIG_PHY_QCOM_SNPS_EUSB2=m +# Qualcomm SNPS eUSB2 Repeater Driver +CONFIG_PHY_QCOM_EUSB2_REPEATER=m +# Qualcomm SNPS FEMTO USB HS PHY V2 module +CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m +# Qualcomm 28nm High-Speed PHY +CONFIG_PHY_QCOM_USB_HS_28NM=m +# Qualcomm USB Super-Speed PHY driver +CONFIG_PHY_QCOM_USB_SS=m +# Qualcomm DWMAC SGMII SerDes/PHY driver +CONFIG_PHY_QCOM_SGMII_ETH=m +# Renesas R-Car S4-8 Ethernet SERDES driver +CONFIG_PHY_R8A779F0_ETHERNET_SERDES=m +# Renesas R-Car generation 3 PCIe PHY driver +CONFIG_PHY_RCAR_GEN3_PCIE=m +# Renesas R-Car generation 3 USB 2.0 PHY driver +CONFIG_PHY_RCAR_GEN3_USB2=m +# Renesas R-Car generation 3 USB 3.0 PHY driver +CONFIG_PHY_RCAR_GEN3_USB3=m +# Rockchip EMMC PHY Driver +CONFIG_PHY_ROCKCHIP_EMMC=m +# Rockchip INNO HDMI PHY Driver +CONFIG_PHY_ROCKCHIP_INNO_HDMI=m +# Rockchip INNO USB2PHY Driver +CONFIG_PHY_ROCKCHIP_INNO_USB2=m +# Rockchip Innosilicon MIPI/LVDS/TTL PHY driver +CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m +# Rockchip NANENG COMBO PHY Driver +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m +# Rockchip PCIe PHY Driver +CONFIG_PHY_ROCKCHIP_PCIE=m +# Rockchip Snps PCIe3 PHY Driver +CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m +# Rockchip TYPEC PHY Driver +CONFIG_PHY_ROCKCHIP_TYPEC=m +# Exynos SoC series UFS PHY driver +CONFIG_PHY_SAMSUNG_UFS=m +# UniPhier USB2 PHY driver +CONFIG_PHY_UNIPHIER_USB2=m +# UniPhier USB3 PHY driver +CONFIG_PHY_UNIPHIER_USB3=m +# NVIDIA Tegra XUSB pad controller driver +CONFIG_PHY_TEGRA_XUSB=m +# TI AM654 SERDES support +CONFIG_PHY_AM654_SERDES=m +# TI J721E WIZ (SERDES Wrapper) support +CONFIG_PHY_J721E_WIZ=m +# Xilinx ZynqMP PHY driver +CONFIG_PHY_XILINX_ZYNQMP=m + +# Performance monitor support +# ARM CCI PMU driver +CONFIG_ARM_CCI_PMU=m +# support CCI-400 +CONFIG_ARM_CCI400_PMU=y +# support CCI-500/CCI-550 +CONFIG_ARM_CCI5xx_PMU=y +# ARM PMUv3 support +CONFIG_ARM_PMUV3=y + +# Reliability, Availability and Serviceability (RAS) features +CONFIG_RAS=y + +# NVMEM Support +CONFIG_NVMEM=y + +# Layout Types +# Kontron sl28 VPD layout support +CONFIG_NVMEM_LAYOUT_SL28_VPD=m +# i.MX 6/7/8 On-Chip OTP Controller support +CONFIG_NVMEM_IMX_OCOTP=m +# i.MX On-Chip OTP Controller support +CONFIG_NVMEM_IMX_OCOTP_ELE=m +# i.MX8 SCU On-Chip OTP Controller support +CONFIG_NVMEM_IMX_OCOTP_SCU=m +# Layerscape SFP (Security Fuse Processor) support +CONFIG_NVMEM_LAYERSCAPE_SFP=m +# Amlogic Meson GX eFuse Support +CONFIG_NVMEM_MESON_EFUSE=m +# Mediatek SoCs EFUSE support +CONFIG_NVMEM_MTK_EFUSE=m +# QCOM QFPROM Support +CONFIG_NVMEM_QCOM_QFPROM=m +# Reserved Memory Based Driver Support +CONFIG_NVMEM_RMEM=m +# Rockchip eFuse Support +CONFIG_NVMEM_ROCKCHIP_EFUSE=m +# Rockchip OTP controller support +CONFIG_NVMEM_ROCKCHIP_OTP=m +# Support for Low Power General Purpose Register +CONFIG_NVMEM_SNVS_LPGPR=m +# SPMI SDAM Support +CONFIG_NVMEM_SPMI_SDAM=m +# Allwinner SoCs SID support +CONFIG_NVMEM_SUNXI_SID=m +# UniPhier SoCs eFuse support +CONFIG_NVMEM_UNIPHIER_EFUSE=m +# Xilinx ZYNQMP SoC nvmem firmware support +CONFIG_NVMEM_ZYNQMP=m + +# FPGA Configuration Framework +CONFIG_FPGA=m +# Xilinx Configuration over Slave Serial (SPI) +CONFIG_FPGA_MGR_XILINX_SPI=m +# FPGA Bridge Framework +CONFIG_FPGA_BRIDGE=m +# Xilinx LogiCORE PR Decoupler +CONFIG_XILINX_PR_DECOUPLER=m +# FPGA Region +CONFIG_FPGA_REGION=m +# FPGA Region Device Tree Overlay Support +CONFIG_OF_FPGA_REGION=m +# Xilinx ZynqMP FPGA +CONFIG_FPGA_MGR_ZYNQMP_FPGA=m +# Xilinx Versal FPGA +CONFIG_FPGA_MGR_VERSAL_FPGA=m + +# Multiplexer drivers +CONFIG_MULTIPLEXER=y +# GPIO-controlled Multiplexer +CONFIG_MUX_GPIO=y +# MMIO/Regmap register bitfield-controlled Multiplexer +CONFIG_MUX_MMIO=y + +# On-Chip Interconnect management support +CONFIG_INTERCONNECT=y +# i.MX interconnect drivers +CONFIG_INTERCONNECT_IMX=m +# i.MX8MM interconnect driver +CONFIG_INTERCONNECT_IMX8MM=m +# i.MX8MN interconnect driver +CONFIG_INTERCONNECT_IMX8MN=m +# i.MX8MQ interconnect driver +CONFIG_INTERCONNECT_IMX8MQ=m +# i.MX8MP interconnect driver +CONFIG_INTERCONNECT_IMX8MP=m +# Qualcomm Network-on-Chip interconnect drivers +CONFIG_INTERCONNECT_QCOM=m +# Qualcomm MSM8916 interconnect driver +CONFIG_INTERCONNECT_QCOM_MSM8916=m +# Qualcomm MSM8996 interconnect driver +CONFIG_INTERCONNECT_QCOM_MSM8996=m +# Qualcomm OSM L3 interconnect driver +CONFIG_INTERCONNECT_QCOM_OSM_L3=m +# Qualcomm QCM2290 interconnect driver +CONFIG_INTERCONNECT_QCOM_QCM2290=m +# Qualcomm QCS404 interconnect driver +CONFIG_INTERCONNECT_QCOM_QCS404=m +# Qualcomm SA8775P interconnect driver +CONFIG_INTERCONNECT_QCOM_SA8775P=m +# Qualcomm SC7180 interconnect driver +CONFIG_INTERCONNECT_QCOM_SC7180=m +# Qualcomm SC7280 interconnect driver +CONFIG_INTERCONNECT_QCOM_SC7280=m +# Qualcomm SC8180X interconnect driver +CONFIG_INTERCONNECT_QCOM_SC8180X=m +# Qualcomm SC8280XP interconnect driver +CONFIG_INTERCONNECT_QCOM_SC8280XP=m +# Qualcomm SDM845 interconnect driver +CONFIG_INTERCONNECT_QCOM_SDM845=m +# Qualcomm SM8150 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8150=m +# Qualcomm SM8250 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8250=m +# Qualcomm SM8350 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8350=m +# Qualcomm SM8450 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8450=m +# Qualcomm SM8550 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8550=m + +# File systems +# Inotify support for userspace +CONFIG_INOTIFY_USER=y +# Filesystem wide access notification +CONFIG_FANOTIFY=y +# fanotify permissions checking +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y + +# Cryptographic API +# Accelerated Cryptographic Algorithms for CPU (arm64) +# Hash functions: GHASH (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_GHASH_ARM64_CE=m +# Hash functions: SHA-1 (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_SHA1_ARM64_CE=m +# Hash functions: SHA-224 and SHA-256 (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_SHA2_ARM64_CE=m +# Hash functions: SHA-384 and SHA-512 (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_SHA512_ARM64_CE=m +# Hash functions: SHA-3 (ARMv8.2 Crypto Extensions) +CONFIG_CRYPTO_SHA3_ARM64=m +# Hash functions: SM3 (ARMv8.2 Crypto Extensions) +CONFIG_CRYPTO_SM3_ARM64_CE=m +# Ciphers: AES, modes: ECB/CBC/CTR/XTS (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_AES_ARM64_CE_BLK=m +# Ciphers: ChaCha (NEON) +CONFIG_CRYPTO_CHACHA20_NEON=m +# Ciphers: AES, modes: ECB/CBC/CTR/XCTR/XTS modes (bit-sliced NEON) +CONFIG_CRYPTO_AES_ARM64_BS=m +# AEAD cipher: AES in CCM mode (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_AES_ARM64_CE_CCM=m + +# Hardware crypto devices +CONFIG_CRYPTO_HW=y +# Support for Allwinner Crypto Engine cryptographic offloader +CONFIG_CRYPTO_DEV_SUN8I_CE=m +# Freescale CAAM-Multicore platform driver backend +CONFIG_CRYPTO_DEV_FSL_CAAM=m +# Qualcomm crypto engine accelerator +CONFIG_CRYPTO_DEV_QCE=m +# Qualcomm Random Number Generator Driver +CONFIG_CRYPTO_DEV_QCOM_RNG=m +# Support for Xilinx ZynqMP AES hw accelerator +CONFIG_CRYPTO_DEV_ZYNQMP_AES=m +# Support for Xilinx ZynqMP SHA3 hardware accelerator +CONFIG_CRYPTO_DEV_ZYNQMP_SHA3=m +# Support for ARM TrustZone CryptoCell family of security processors +CONFIG_CRYPTO_DEV_CCREE=m +# Support for HiSilicon SEC2 crypto block cipher accelerator +CONFIG_CRYPTO_DEV_HISI_SEC2=m +# Support for HiSilicon ZIP accelerator +CONFIG_CRYPTO_DEV_HISI_ZIP=m +# Support for HISI HPRE accelerator +CONFIG_CRYPTO_DEV_HISI_HPRE=m +# Support for HISI TRNG Driver +CONFIG_CRYPTO_DEV_HISI_TRNG=m +# Support for TI security accelerator +CONFIG_CRYPTO_DEV_SA2UL=m diff --git a/bsp/genericarm64/genericarm64.scc b/bsp/genericarm64/genericarm64.scc new file mode 100644 index 00000000..7856fa82 --- /dev/null +++ b/bsp/genericarm64/genericarm64.scc @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: MIT +kconf hardware genericarm64.cfg +kconf hardware genericarm64-arch.cfg +kconf hardware genericarm64-clock.cfg +kconf hardware genericarm64-i2c.cfg +kconf hardware genericarm64-gpio.cfg +kconf hardware genericarm64-mmc.cfg +kconf hardware genericarm64-pinctrl.cfg +kconf hardware genericarm64-regulator.cfg +kconf hardware genericarm64-remoteproc.cfg +kconf hardware genericarm64-serial.cfg + +include cfg/8250.scc +include cfg/boot-live.scc +include cfg/efi-ext.scc +include cfg/net/mdio.scc +include cfg/sound.scc +include cfg/timer/no_hz.scc +include cfg/timer/rtc.scc +include cfg/usb-mass-storage.scc +include cfg/virtio.scc +include cfg/fs/flash_fs.scc + +include features/bluetooth/bluetooth.scc +include features/input/input.scc +include features/input/keyboard-gpio.scc +include features/hid/hid.scc +include features/hugetlb/hugetlb.scc +include features/leds/leds.scc +include features/mmc/mmc-block.scc +include features/mmc/mmc-sdhci.scc +include features/mtd/mtd.scc +include features/net/net.scc +include features/netfilter/netfilter.scc +include features/numa/numa.scc +include features/pci-iov/pci-iov.scc +include features/pci/pci.scc +include features/power/arm.scc +include features/usb-net/usb-net.scc +include features/usb/ehci-hcd.scc +include features/usb/ohci-hcd.scc +include features/usb/uhci-hcd.scc +include features/usb/xhci-hcd.scc +include features/wifi/wifi-all.scc +include features/optee/optee.scc +include features/security/security.scc +include features/spi/spi.scc diff --git a/bsp/nsimhs/nsimhs-standard.scc b/bsp/hapshs/hapshs-standard.scc index 3201ca52..1842b00c 100644 --- a/bsp/nsimhs/nsimhs-standard.scc +++ b/bsp/hapshs/hapshs-standard.scc @@ -1,8 +1,8 @@ # SPDX-License-Identifier: MIT -define KMACHINE nsimhs +define KMACHINE hapshs define KTYPE standard define KARCH arc include ktypes/standard/standard.scc -include nsimhs.scc +include hapshs.scc diff --git a/bsp/hapshs/hapshs.cfg b/bsp/hapshs/hapshs.cfg new file mode 100644 index 00000000..adcc0531 --- /dev/null +++ b/bsp/hapshs/hapshs.cfg @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# ARCv2 ISA +CONFIG_ISA_ARCV2=y + +# Serial port +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y + +# Built-in .dtb +CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs" diff --git a/bsp/nsimhs/nsimhs.scc b/bsp/hapshs/hapshs.scc index 3c1613a6..ea2b8b6c 100644 --- a/bsp/nsimhs/nsimhs.scc +++ b/bsp/hapshs/hapshs.scc @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -kconf hardware nsimhs.cfg +kconf hardware hapshs.cfg diff --git a/bsp/hsdk/hsdk.cfg b/bsp/hsdk/hsdk.cfg index 1d75fb92..ee4d8b17 100644 --- a/bsp/hsdk/hsdk.cfg +++ b/bsp/hsdk/hsdk.cfg @@ -13,7 +13,7 @@ CONFIG_ARC_BUILTIN_DTB_NAME="hsdk" CONFIG_ARC_UBOOT_SUPPORT=y # Auto-selected by U-Boot support but if it is enabled slave cores won't start -# CONFIG_ARC_SMP_HALT_ON_RESET is not set +CONFIG_ARC_SMP_HALT_ON_RESET=n # Serial port CONFIG_SERIAL_8250=y @@ -42,7 +42,6 @@ CONFIG_MICREL_PHY=y # GPIO CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DWAPB=y # Video diff --git a/bsp/intel-common/intel-common-drivers.scc b/bsp/intel-common/intel-common-drivers.scc index d452157c..33451730 100644 --- a/bsp/intel-common/intel-common-drivers.scc +++ b/bsp/intel-common/intel-common-drivers.scc @@ -42,6 +42,7 @@ include features/igb/igb.scc include features/iwlwifi/iwlwifi.scc include features/iwlegacy/iwlegacy.scc include features/i40e/i40e.scc +include features/igc/igc.scc # Various RF/Wireless technologies include features/nfc/nfc.scc @@ -84,8 +85,6 @@ include features/input/keyboard-gpio.scc include features/ciphers/ciphers.scc include features/pci-iov/pci-iov.scc include features/intel-tco/intel-tco.scc -include features/inline/inline.cfg -include features/random/random.scc # default policy for standard kernels include cfg/usb-mass-storage.scc diff --git a/bsp/intel-common/intel-core2-32.cfg b/bsp/intel-common/intel-core2-32.cfg index 10745035..0ecc393c 100644 --- a/bsp/intel-common/intel-core2-32.cfg +++ b/bsp/intel-common/intel-core2-32.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # Must explicitly disable 64BIT -# CONFIG_64BIT is not set +CONFIG_64BIT=n CONFIG_MCORE2=y diff --git a/bsp/intel-common/intel-corei7-64.scc b/bsp/intel-common/intel-corei7-64.scc index 9fa60099..ad9122c1 100644 --- a/bsp/intel-common/intel-corei7-64.scc +++ b/bsp/intel-common/intel-corei7-64.scc @@ -19,6 +19,12 @@ include features/dca/dca.scc # INTEL_TELEMETRY is currently 64 bit only include features/telemetry/intel-telemetry.scc +# CONFIG_X86_X2APIC is 64-bit +include features/x2apic/x2apic.scc + +# CONFIG_INTEL_SPEED_SELECT_INTERFACE is 64-bit only +include features/intel-sst/intel-sst.scc + # This line comes last as it has the final word on # CONFIG values. kconf hardware intel-corei7-64.cfg diff --git a/bsp/intel-common/intel-developer-drivers.scc b/bsp/intel-common/intel-developer-drivers.scc index 5bb73e3e..090d05ed 100644 --- a/bsp/intel-common/intel-developer-drivers.scc +++ b/bsp/intel-common/intel-developer-drivers.scc @@ -1,4 +1,3 @@ # SPDX-License-Identifier: MIT # Additional features for developer bsps -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/intel-common/intel-quark.cfg b/bsp/intel-common/intel-quark.cfg index b53a1a5e..13a7d6e0 100644 --- a/bsp/intel-common/intel-quark.cfg +++ b/bsp/intel-common/intel-quark.cfg @@ -5,7 +5,7 @@ CONFIG_X86_MCE=y CONFIG_PM=y # Must explicitly disable 64BIT -# CONFIG_64BIT is not set +CONFIG_64BIT=n CONFIG_X86_INTEL_QUARK=y CONFIG_MFD_INTEL_QUARK_I2C_GPIO=y diff --git a/bsp/intel-x86/intel-x86-32-preempt-rt.scc b/bsp/intel-x86/intel-x86-32-preempt-rt.scc index 59e708c0..34f76ad7 100644 --- a/bsp/intel-x86/intel-x86-32-preempt-rt.scc +++ b/bsp/intel-x86/intel-x86-32-preempt-rt.scc @@ -1,10 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-32 define KTYPE preempt-rt -define KARCH x86 +define KARCH i386 include ktypes/preempt-rt -branch intel-x86 +branch x86 include intel-x86-32.scc kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-32-standard.scc b/bsp/intel-x86/intel-x86-32-standard.scc index bad28176..4b038ac0 100644 --- a/bsp/intel-x86/intel-x86-32-standard.scc +++ b/bsp/intel-x86/intel-x86-32-standard.scc @@ -1,11 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-32 define KTYPE standard -define KARCH x86 +define KARCH i386 include ktypes/standard -branch intel-x86 - +branch x86 +include features/transparent-hugepage/transparent-hugepage.scc include intel-x86-32.scc -kconf hardware intel-x86-hugepage.cfg kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-32-tiny.scc b/bsp/intel-x86/intel-x86-32-tiny.scc index 9f00b536..2263c27f 100644 --- a/bsp/intel-x86/intel-x86-32-tiny.scc +++ b/bsp/intel-x86/intel-x86-32-tiny.scc @@ -1,9 +1,9 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-32 define KTYPE tiny -define KARCH x86 +define KARCH i386 include ktypes/tiny/tiny.scc -branch intel-x86 +branch x86 include bsp/intel-x86/intel-x86-32.scc diff --git a/bsp/intel-x86/intel-x86-32.cfg b/bsp/intel-x86/intel-x86-32.cfg index c4340925..67f06dbc 100644 --- a/bsp/intel-x86/intel-x86-32.cfg +++ b/bsp/intel-x86/intel-x86-32.cfg @@ -14,7 +14,7 @@ # Switch back to x86-32 from x86-64 CONFIG_X86_32=y -# CONFIG_64BIT is not set +CONFIG_64BIT=n # # Processor type and features diff --git a/bsp/intel-x86/intel-x86-64-preempt-rt.scc b/bsp/intel-x86/intel-x86-64-preempt-rt.scc index e759c884..e776cfa9 100644 --- a/bsp/intel-x86/intel-x86-64-preempt-rt.scc +++ b/bsp/intel-x86/intel-x86-64-preempt-rt.scc @@ -1,9 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-64 define KTYPE preempt-rt -define KARCH x86 +define KARCH x86_64 include ktypes/preempt-rt include intel-x86-64.scc +include features/tsn/tsn.scc kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-64-standard.scc b/bsp/intel-x86/intel-x86-64-standard.scc index 64d89533..ba29fa80 100644 --- a/bsp/intel-x86/intel-x86-64-standard.scc +++ b/bsp/intel-x86/intel-x86-64-standard.scc @@ -1,10 +1,9 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-64 define KTYPE standard -define KARCH x86 +define KARCH x86_64 include ktypes/standard - +include features/transparent-hugepage/transparent-hugepage.scc include intel-x86-64.scc -kconf hardware intel-x86-hugepage.cfg kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-64-tiny.scc b/bsp/intel-x86/intel-x86-64-tiny.scc index 798c4a1f..5eaa689c 100644 --- a/bsp/intel-x86/intel-x86-64-tiny.scc +++ b/bsp/intel-x86/intel-x86-64-tiny.scc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-64 define KTYPE tiny -define KARCH x86 +define KARCH x86_64 include ktypes/tiny/tiny.scc diff --git a/bsp/intel-x86/intel-x86-64.cfg b/bsp/intel-x86/intel-x86-64.cfg index 0e03c6de..da9bc7b5 100644 --- a/bsp/intel-x86/intel-x86-64.cfg +++ b/bsp/intel-x86/intel-x86-64.cfg @@ -2,28 +2,6 @@ # # General setup # -CONFIG_NUMA_BALANCING=y -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y - -# -# ACPI NUMA -# -CONFIG_X86_64_ACPI_NUMA=y -CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m -CONFIG_CRYPTO_SHA1_SSSE3=m -CONFIG_CRYPTO_SHA256_SSSE3=m -CONFIG_CRYPTO_SHA512_SSSE3=m - -# EDAC -CONFIG_EDAC=y -CONFIG_EDAC_DEBUG=y -CONFIG_EDAC_SBRIDGE=m -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_EINJ=m -CONFIG_ACPI_APEI_GHES=y -CONFIG_EDAC_PND2=m -CONFIG_EDAC_SKX=m - # ISH CONFIG_INTEL_ISH_HID=m @@ -36,6 +14,10 @@ CONFIG_PCI_IOV=y CONFIG_CRYPTO=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_AES_NI_INTEL=m # For different QAT devices @@ -43,11 +25,9 @@ CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62X=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +CONFIG_CRYPTO_DEV_QAT_4XXX=m CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m # x86 CPU resource control support CONFIG_X86_CPU_RESCTRL=y - -# Processor type and features -CONFIG_NR_CPUS=256 diff --git a/bsp/intel-x86/intel-x86-64.scc b/bsp/intel-x86/intel-x86-64.scc index af8f474f..f50668c9 100644 --- a/bsp/intel-x86/intel-x86-64.scc +++ b/bsp/intel-x86/intel-x86-64.scc @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -branch intel-x86 +branch x86 # Core configuration settings for x86_64 include cfg/x86_64.scc nopatch diff --git a/bsp/intel-x86/intel-x86-acpi.cfg b/bsp/intel-x86/intel-x86-acpi.cfg index 8adc00f7..d5c2993b 100644 --- a/bsp/intel-x86/intel-x86-acpi.cfg +++ b/bsp/intel-x86/intel-x86-acpi.cfg @@ -1,6 +1,5 @@ # SPDX-License-Identifier: MIT CONFIG_ACPI=y -CONFIG_ACPI_PROCFS_POWER=y CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/features/random/random.cfg b/bsp/intel-x86/intel-x86-dptf-overrides.cfg index bacab3cb..2c206883 100644 --- a/features/random/random.cfg +++ b/bsp/intel-x86/intel-x86-dptf-overrides.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_RANDOM_TRUST_CPU=y +CONFIG_ACPI_DPTF=y diff --git a/cfg/debug/misc/debug-optimize-inlining.cfg b/bsp/intel-x86/intel-x86-i40e-overrides.cfg index efb301db..0e92b020 100644 --- a/cfg/debug/misc/debug-optimize-inlining.cfg +++ b/bsp/intel-x86/intel-x86-i40e-overrides.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_OPTIMIZE_INLINING=y +CONFIG_I40E=y diff --git a/features/inline/inline.cfg b/bsp/intel-x86/intel-x86-i915-overrides.cfg index efb301db..8c0dac18 100644 --- a/features/inline/inline.cfg +++ b/bsp/intel-x86/intel-x86-i915-overrides.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_OPTIMIZE_INLINING=y +CONFIG_DRM_KMS_HELPER=y diff --git a/bsp/intel-x86/intel-x86-igc-overrides.cfg b/bsp/intel-x86/intel-x86-igc-overrides.cfg new file mode 100644 index 00000000..870e9883 --- /dev/null +++ b/bsp/intel-x86/intel-x86-igc-overrides.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_IGC=y diff --git a/bsp/intel-x86/intel-x86-serial-8250-overrides.cfg b/bsp/intel-x86/intel-x86-serial-8250-overrides.cfg new file mode 100644 index 00000000..76e13ade --- /dev/null +++ b/bsp/intel-x86/intel-x86-serial-8250-overrides.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=16 diff --git a/bsp/intel-x86/intel-x86.cfg b/bsp/intel-x86/intel-x86.cfg index 4ab56886..8266bf8f 100644 --- a/bsp/intel-x86/intel-x86.cfg +++ b/bsp/intel-x86/intel-x86.cfg @@ -28,12 +28,15 @@ CONFIG_PROCESSOR_SELECT=y CONFIG_CPU_SUP_INTEL=y CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_KSM=y -CONFIG_CLEANCACHE=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCELOG_LEGACY=y + +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m CONFIG_X86_INTEL_LPSS=y # @@ -68,11 +71,9 @@ CONFIG_LPC_SCH=m # GPIO drivers # CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m -CONFIG_GPIO_LYNXPOINT=y -GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_GENERIC_PLATFORM=m # # x86 CPU frequency scaling drivers @@ -142,7 +143,7 @@ CONFIG_EEPROM_LEGACY=m # # Intel Wireless WiFi Next Gen AGN # -# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUG=n CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_HOSTAP=y @@ -153,11 +154,6 @@ CONFIG_HOSTAP=y CONFIG_RTL8723BE=m # -# Intel devices -# -CONFIG_IXGB=y - -# # nvram support # CONFIG_NVRAM=m @@ -254,7 +250,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=m # HID # CONFIG_HID=y -CONFIG_I2C_HID=y +CONFIG_I2C_HID_ACPI=y CONFIG_HID_SENSOR_HUB=y # @@ -268,11 +264,23 @@ CONFIG_HSU_DMA_PCI=y # #SPI # +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_DMA=y +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MMIO=m CONFIG_SPI_PXA2XX=y CONFIG_SPI_PXA2XX_PCI=y CONFIG_VT_HW_CONSOLE_BINDING=y +# +# MTD SPI +# +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_SPI_INTEL_PCI=m +CONFIG_SPI_INTEL_PLATFORM=m + # Bluetooth device drivers CONFIG_BT_HCIBTUSB=m @@ -285,6 +293,7 @@ CONFIG_PWM_SYSFS=y CONFIG_PWM_LPSS=y CONFIG_PWM_LPSS_PCI=y CONFIG_PWM_LPSS_PLATFORM=y +CONFIG_PWM_DWC=m # # USB Device Class drivers @@ -304,9 +313,10 @@ CONFIG_NOP_USB_XCEIV=y # NVMe support CONFIG_BLK_DEV_NVME=y +CONFIG_NVME_HWMON=y # PMC -CONFIG_INTEL_PMC_IPC=m +CONFIG_MFD_INTEL_PMC_BXT=m #CMA CONFIG_CMA=y @@ -315,7 +325,7 @@ CONFIG_DMA_CMA=y # Realtek Network Driver CONFIG_STAGING=y CONFIG_NET_VENDOR_REALTEK=y -CONFIG_R8169=y +CONFIG_R8169=m # Marvell WiFi-Ex Driver for PCIE 8766/8897/8997 CONFIG_MWIFIEX=m @@ -336,6 +346,9 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y +# AST server chips +CONFIG_DRM_AST=m + # x86 CPU resource control support CONFIG_X86_CPU_RESCTRL=y @@ -345,3 +358,7 @@ CONFIG_POWERCAP=y CONFIG_INTEL_RAPL=m CONFIG_EXTCON=y + +# MII PHY device drivers +CONFIG_MARVELL_PHY=y +CONFIG_DP83867_PHY=y diff --git a/bsp/intel-x86/intel-x86.scc b/bsp/intel-x86/intel-x86.scc index c4dad375..7825075d 100644 --- a/bsp/intel-x86/intel-x86.scc +++ b/bsp/intel-x86/intel-x86.scc @@ -19,16 +19,19 @@ include features/i915/i915.scc include features/intel-e1xxxx/intel-e1xxxx.scc include features/igb/igb.scc include features/ixgbe/ixgbe.scc +include features/igc/igc.scc include features/iwlwifi/iwlwifi.scc include features/i40e/i40e.scc +include features/ice/ice.scc +include features/net/stmicro/stmmac.scc include features/usb/uhci-hcd.scc include features/usb/ehci-hcd.scc include features/usb/xhci-hcd.scc include features/hostapd/hostapd.scc -include features/latencytop/latencytop.scc include features/uio/uio.scc include features/spi/spi.scc +include features/mtd/mtd.scc include features/spi/spidev.scc include features/bluetooth/bluetooth.scc include features/input/input.scc @@ -42,9 +45,23 @@ include features/mmc/mmc-realtek.scc include features/intel-pinctrl/intel-pinctrl.scc include features/mgag200/mgag200.scc include features/thunderbolt/thunderbolt.scc +include features/intel-th/intel-th.scc +include features/stm/stm.scc +include features/media/media-usb-webcams.scc +include features/intel-idxd/intel-idxd.scc +include features/intel-uncore-frequency/intel-uncore-frequency.scc +include features/intel-dptf/intel-dptf.scc +include features/can/m_can.scc +include features/vfio/vfio.scc +include features/i3c/i3c.scc kconf hardware intel-x86.cfg kconf hardware intel-x86-mga.cfg kconf hardware intel-x86-acpi.cfg kconf hardware intel-x86-igb-overrides.cfg kconf hardware intel-x86-ixgbe-overrides.cfg +kconf hardware intel-x86-i915-overrides.cfg +kconf hardware intel-x86-dptf-overrides.cfg +kconf hardware intel-x86-serial-8250-overrides.cfg +kconf hardware intel-x86-i40e-overrides.cfg +kconf hardware intel-x86-igc-overrides.cfg diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg index bc0b7f80..1b1c4af3 100644 --- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg +++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg @@ -83,6 +83,7 @@ CONFIG_GPIO_THUNDERX=y # HWMON CONFIG_SENSORS_MAX6697=y CONFIG_SENSORS_JC42=y +CONFIG_SENSORS_ARM_SCMI=y # RTC CONFIG_RTC_CLASS=y @@ -104,3 +105,20 @@ CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_CAVIUM=y CONFIG_OCTEONTX2_RM=y CONFIG_OCTEONTX2_RM_DOM_SYSFS=y + +# BPHY +CONFIG_MARVELL_OTX_BPHY_CTR=y + +# Mailbox +CONFIG_MAILBOX=y +CONFIG_MVL_MHU=y + +# SCMI +CONFIG_ARM_SCMI_PROTOCOL=y + +# CLK +CONFIG_COMMON_CLK_SCMI=y + +# CPU freq +CONFIG_CPU_FREQ=y +CONFIG_ARM_SCMI_CPUFREQ=y diff --git a/bsp/minnow/minnow-no-pch-gpio.cfg b/bsp/minnow/minnow-no-pch-gpio.cfg index d175ec96..b8548fe9 100644 --- a/bsp/minnow/minnow-no-pch-gpio.cfg +++ b/bsp/minnow/minnow-no-pch-gpio.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_GPIO_PCH is not set +CONFIG_GPIO_PCH=n diff --git a/bsp/minnow/minnow-preempt-rt.scc b/bsp/minnow/minnow-preempt-rt.scc index f551544d..20710e7f 100644 --- a/bsp/minnow/minnow-preempt-rt.scc +++ b/bsp/minnow/minnow-preempt-rt.scc @@ -21,7 +21,6 @@ include cfg/efi-ext.scc # default policy for preempt-rt kernels include cfg/usb-mass-storage.scc include cfg/boot-live.scc -include features/latencytop/latencytop.scc include features/profiling/profiling.scc # Requested drivers that don't have an existing scc diff --git a/bsp/minnow/minnow-standard.scc b/bsp/minnow/minnow-standard.scc index 5591a330..46363027 100644 --- a/bsp/minnow/minnow-standard.scc +++ b/bsp/minnow/minnow-standard.scc @@ -18,7 +18,6 @@ include cfg/usb-mass-storage.scc include cfg/boot-live.scc # Basic profiling -include features/latencytop/latencytop.scc include features/profiling/profiling.scc # Requested drivers that don't have an existing scc diff --git a/bsp/minnow/minnow.cfg b/bsp/minnow/minnow.cfg index 89a86e6d..311ebcca 100644 --- a/bsp/minnow/minnow.cfg +++ b/bsp/minnow/minnow.cfg @@ -48,7 +48,6 @@ CONFIG_SERIAL_PCH_UART_CONSOLE=y ### Non-essential on-board features ### # GPIO Support -CONFIG_GPIO_SYSFS=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y @@ -63,7 +62,7 @@ CONFIG_INPUT_EVDEV=y # Ensure the performance govenor is the default for optimal boot time # (Leave it to userspace to change it after boot) -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=n CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # Enable readahead @@ -71,9 +70,9 @@ CONFIG_FANOTIFY=y CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y ### Standard configs we just do not need ### -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_SERIO_I8042 is not set -# CONFIG_MOUSE_PS2 is not set +CONFIG_KEYBOARD_ATKBD=n +CONFIG_SERIO_I8042=n +CONFIG_MOUSE_PS2=n ### Should be specified elsewhere ### # Make sure these are on, otherwise the bootup won't be fun @@ -90,9 +89,5 @@ CONFIG_PRINTK_TIME=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y -# Cleanup some warnings -# Avoid warnings with the x86.scc -# CONFIG_MICROCODE_AMD is not set - # No need to emulate an RTC, we have one, avoid the warning of it missing -# CONFIG_HPET_EMULATE_RTC is not set +CONFIG_HPET_EMULATE_RTC=n diff --git a/bsp/mti-malta32/mti-malta32-common.cfg b/bsp/mti-malta32/mti-malta32-common.cfg index 9f72dafe..5786da2e 100644 --- a/bsp/mti-malta32/mti-malta32-common.cfg +++ b/bsp/mti-malta32/mti-malta32-common.cfg @@ -28,9 +28,9 @@ CONFIG_MTD_PHYSMAP=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_SUPERIO=y -# CONFIG_PARPORT_SERIAL is not set +CONFIG_PARPORT_SERIAL=n -# CONFIG_BLK_DEV_FD is not set +CONFIG_BLK_DEV_FD=n CONFIG_PCI=y @@ -39,13 +39,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SR=m CONFIG_CHR_DEV_SG=m -CONFIG_IDE=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IDEDMA=y - CONFIG_PCNET32=y CONFIG_SERIAL_CORE=y @@ -69,7 +62,7 @@ CONFIG_USB_STORAGE=m CONFIG_INPUT_EVDEV=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_SERPORT=n CONFIG_USB_MON=y CONFIG_USB_OHCI_HCD=y @@ -77,3 +70,5 @@ CONFIG_USB_OHCI_HCD=y # Board reset CONFIG_POWER_RESET=y CONFIG_POWER_RESET_PIIX4_POWEROFF=y + +CONFIG_COMPACTION=n diff --git a/bsp/mti-malta32/mti-malta32-rt.cfg b/bsp/mti-malta32/mti-malta32-rt.cfg index c80c1b6f..0ced014d 100644 --- a/bsp/mti-malta32/mti-malta32-rt.cfg +++ b/bsp/mti-malta32/mti-malta32-rt.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_HIGHMEM is not set +CONFIG_HIGHMEM=n diff --git a/bsp/mti-malta32/mti-malta32.scc b/bsp/mti-malta32/mti-malta32.scc index 25f7b68d..e1b00f58 100644 --- a/bsp/mti-malta32/mti-malta32.scc +++ b/bsp/mti-malta32/mti-malta32.scc @@ -3,7 +3,6 @@ kconf hardware mti-malta32-common.cfg kconf hardware mti-malta32-gfx.cfg include features/profiling/profiling.scc -include features/latencytop/latencytop.scc include features/usb/ehci-hcd.scc include features/usb/uhci-hcd.scc @@ -17,3 +16,5 @@ patch Revert-Input-i8042-io-fix-up-region-handling-on-MIPS.patch # v3.8+ kernels have broken mips ftrace function tracing, disable it for now include features/ftrace/ftrace-function-tracer-disable.scc + +include cfg/net/mdio.scc diff --git a/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch b/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch index ef47a72f..e9679a96 100644 --- a/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch +++ b/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch @@ -1,4 +1,4 @@ -From ce7d0fb9680e32c86883a2689b394d57b5f3b7cd Mon Sep 17 00:00:00 2001 +From e4a8151a5225a9a547c70066e1c11f6b8206f73a Mon Sep 17 00:00:00 2001 From: Jack Tan <jack.tan@windriver.com> Date: Wed, 10 Mar 2010 15:05:39 +0800 Subject: [PATCH] mti_malta32: fix the pci resource conflicts @@ -40,22 +40,48 @@ pcnet32: No access methods ...... ...... +And a fixup to the original change: + +[ + mips: malta PCI fixup, fix __init annotation warning + + Currently we see the following link warning: + + WARNING: vmlinux.o(.pci_fixup_final+0xefc): Section mismatch in + reference from the variable __pci_fixup_malta_pcnet32_ioports_fixup164 + to the function .init.text:malta_pcnet32_ioports_fixup() + The variable __pci_fixup_malta_pcnet32_ioports_fixup164 references + a function __init malta_pcnet32_ioports_fixup(). + This is often seen when error handling in the init function + uses functionality in the exit path. + The fix is often to remove the __init annotation of + malta_pcnet32_ioports_fixup() so it may be used outside an exit section. + + This is from the addition of "mti_malta32: fix the pci resource conflicts" + (5c19c1c31c77 on v5.2/standard/mti-malta32) - which is a relatively old + commit, but w/o a malta+PCnet32, I can't speak to whether this commit is + still needed, or if the PCI resource overlap was solved another way. + + Hence here, we take the safe path and just remove the __init annotation. +] + Signed-off-by: Jack Tan <jack.tan@windriver.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- - arch/mips/pci/fixup-malta.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + arch/mips/pci/fixup-malta.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c -index 0f48498..d4075bb 100644 +index 8131e0ffe735..df1cae42ff9e 100644 --- a/arch/mips/pci/fixup-malta.c +++ b/arch/mips/pci/fixup-malta.c -@@ -101,3 +101,24 @@ static void __init malta_piix_func1_fixup(struct pci_dev *pdev) - +@@ -142,6 +142,27 @@ static void malta_piix_func1_fixup(struct pci_dev *pdev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB, malta_piix_func1_fixup); -+ + +/* Use the io resource allocated by YAMON */ -+static void __init malta_pcnet32_ioports_fixup(struct pci_dev *pdev) ++static void malta_pcnet32_ioports_fixup(struct pci_dev *pdev) +{ + u32 check = 0, new = 0x1060; + @@ -74,6 +100,10 @@ index 0f48498..d4075bb 100644 + +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE, + malta_pcnet32_ioports_fixup); ++ + /* Enable PCI 2.1 compatibility in PIIX4 */ + static void quirk_dlcsetup(struct pci_dev *dev) + { -- -1.6.5.2 +2.19.1 diff --git a/bsp/mti-malta64/0001-oprofile-mips-override-register-writes-for-qemu-mips.patch b/bsp/mti-malta64/0001-oprofile-mips-override-register-writes-for-qemu-mips.patch deleted file mode 100644 index 8e67d62c..00000000 --- a/bsp/mti-malta64/0001-oprofile-mips-override-register-writes-for-qemu-mips.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 473b4ece7967902bc2acac6dadc21e76ed83acea Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Wed, 4 Apr 2012 13:58:38 -0400 -Subject: [PATCH] oprofile/mips: override register writes for qemu mips 64 - -Even when oprofile timer mode is enabled, during oprofile arch init -there are writes to registers that do not exist in the qemu malta -64 bit pseudo machine. - -To allow initialization to continue and the fallback to oprofile -timer mode to take effect, we stub the register writes. - -These two defines are only appropriate for qemu-system-mips. -This should not merge to a common location, and only be applied -to emulated boards. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/mips/oprofile/op_model_mipsxx.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c -index 54759f1..b0c1381 100644 ---- a/arch/mips/oprofile/op_model_mipsxx.c -+++ b/arch/mips/oprofile/op_model_mipsxx.c -@@ -122,6 +122,17 @@ __define_perf_accessors(perfctrl, 1, 3) - __define_perf_accessors(perfctrl, 2, 0) - __define_perf_accessors(perfctrl, 3, 1) - -+ -+/* These two defines are only appropriate for qemu-system-mips. -+ They prevent illegal writes to performance registers and allow -+ oprofile timer mode to continue and be initialized fully. -+ -+ This should not merge to a common location, and only be applied -+ to emulated boards. -+*/ -+#define w_c0_perfctrl0(reg) {} -+#define w_c0_perfcntr0(reg) {} -+ - struct op_mips_model op_model_mipsxx_ops; - - static struct mipsxx_register_config { --- -1.7.0.4 - diff --git a/bsp/mti-malta64/mti-malta64-be-developer.scc b/bsp/mti-malta64/mti-malta64-be-developer.scc new file mode 100644 index 00000000..f8ccdf43 --- /dev/null +++ b/bsp/mti-malta64/mti-malta64-be-developer.scc @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MIT +define KMACHINE mti-malta64-be +define KMACHINE qemumips-64 +define KMACHINE qemumips64 +define KTYPE developer +define KARCH mips + +include ktypes/standard/standard.scc +branch mti-malta64 + +include mti-malta64.scc +kconf hardware mti-malta64-be.cfg + +include features/profiling/profiling.scc +include cfg/tracing.scc + diff --git a/bsp/mti-malta64/mti-malta64-common.cfg b/bsp/mti-malta64/mti-malta64-common.cfg index 52c44573..d920aa8b 100644 --- a/bsp/mti-malta64/mti-malta64-common.cfg +++ b/bsp/mti-malta64/mti-malta64-common.cfg @@ -14,7 +14,7 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_MIPS64_R1=y -# CONFIG_CPU_MIPS64_R2 is not set +CONFIG_CPU_MIPS64_R2=n CONFIG_CPU_MIPS64=y CONFIG_CPU_MIPSR1=y CONFIG_64BIT=y @@ -31,24 +31,17 @@ CONFIG_MTD_PHYSMAP=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_SUPERIO=y -# CONFIG_PARPORT_SERIAL is not set +CONFIG_PARPORT_SERIAL=n -# CONFIG_BLK_DEV_FD is not set +CONFIG_BLK_DEV_FD=n CONFIG_PCI=y -CONFIG_SCSI=m +CONFIG_SCSI=y CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SR=m CONFIG_CHR_DEV_SG=m -CONFIG_IDE=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IDEDMA=y - CONFIG_PCNET32=y CONFIG_SERIAL_CORE=y @@ -72,13 +65,13 @@ CONFIG_USB_STORAGE=m CONFIG_INPUT_EVDEV=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_SERPORT=n CONFIG_USB_MON=y CONFIG_USB_OHCI_HCD=y -# CONFIG_VGA_CONSOLE is not set +CONFIG_VGA_CONSOLE=n # Board reset CONFIG_POWER_RESET=y diff --git a/bsp/mti-malta64/mti-malta64.scc b/bsp/mti-malta64/mti-malta64.scc index c1eaa82a..0025d971 100644 --- a/bsp/mti-malta64/mti-malta64.scc +++ b/bsp/mti-malta64/mti-malta64.scc @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT -include features/profiling/profiling.scc -include features/latencytop/latencytop.scc -include cfg/tracing.scc + include cfg/mips64.scc include features/usb/ehci-hcd.scc @@ -14,8 +12,6 @@ patch bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch patch bsp/mti-malta32/mousedev-mousedev-patch-for-qemumips.patch patch bsp/mti-malta32/Revert-Input-i8042-io-fix-up-region-handling-on-MIPS.patch -patch 0001-oprofile-mips-override-register-writes-for-qemu-mips.patch -patch oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch # v3.8+ kernels have broken mips ftrace function tracing, disable it for now include features/ftrace/ftrace-function-tracer-disable.scc diff --git a/bsp/mti-malta64/oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch b/bsp/mti-malta64/oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch deleted file mode 100644 index 19c0825f..00000000 --- a/bsp/mti-malta64/oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bbefde394205a1b317eae31942bfc13afce0b0ac Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Fri, 5 Apr 2013 00:11:33 -0400 -Subject: [PATCH 2/2] oprofile/mips: do not set perf_irq for qemu mips 64 - -In a similar manner to the following commit: - - oprofile/mips: override register writes for qemu mips 64 - - Even when oprofile timer mode is enabled, during oprofile arch init - there are writes to registers that do not exist in the qemu malta - 64 bit pseudo machine. - - To allow initialization to continue and the fallback to oprofile - timer mode to take effect, we stub the register writes. - - These two defines are only appropriate for qemu-system-mips. - This should not merge to a common location, and only be applied - to emulated boards. - -We also cannot set perf_irq to mipsxx_perfcount_handler during oprofile -arch init, or unsupported register reads will be triggered before the -fallback to timer mode occurs. This commit is also only appropriate for -qemu mips based boards, and should not be applied to any general branch. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/mips/oprofile/op_model_mipsxx.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c -index 1ab4f15..16ecbf4 100644 ---- a/arch/mips/oprofile/op_model_mipsxx.c -+++ b/arch/mips/oprofile/op_model_mipsxx.c -@@ -419,7 +419,9 @@ static int __init mipsxx_init(void) - } - - save_perf_irq = perf_irq; -+#if 0 - perf_irq = mipsxx_perfcount_handler; -+#endif - - if ((cp0_perfcount_irq >= 0) && (cp0_compare_irq != cp0_perfcount_irq)) - return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int, --- -1.7.10.4 - diff --git a/bsp/nsimhs/nsimhs.cfg b/bsp/nsimhs/nsimhs.cfg deleted file mode 100644 index 34580a39..00000000 --- a/bsp/nsimhs/nsimhs.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: MIT -# ARCv2 ISA -CONFIG_ISA_ARCV2=y - -# Legacy ARC UART -CONFIG_SERIAL_ARC=y -CONFIG_SERIAL_ARC_CONSOLE=y - -# Built-in .dtb -CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs" diff --git a/bsp/nxp-ls20xx/nxp-ls20xx.cfg b/bsp/nxp-ls20xx/nxp-ls20xx.cfg index 5c21f211..a6850fb2 100755 --- a/bsp/nxp-ls20xx/nxp-ls20xx.cfg +++ b/bsp/nxp-ls20xx/nxp-ls20xx.cfg @@ -153,7 +153,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_GHASH_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set +CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=n # EDAC CONFIG_EDAC_LAYERSCAPE=y diff --git a/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch b/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch deleted file mode 100644 index ae9d48d7..00000000 --- a/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9df586c4b4b112f55f1984697bfd6de663774118 Mon Sep 17 00:00:00 2001 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Wed, 3 Feb 2010 13:51:19 -0500 -Subject: [PATCH 2/3] powerpc: special load offset for qemu - -Patch the load offset to work correctly with qemu_boot_loader. - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/kernel/vmlinux.lds.S | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S -index dcd01c8..4397f44 100644 ---- a/arch/powerpc/kernel/vmlinux.lds.S -+++ b/arch/powerpc/kernel/vmlinux.lds.S -@@ -8,6 +8,11 @@ - #include <asm/cache.h> - #include <asm/thread_info.h> - -+#ifdef CONFIG_PPC_QEMU -+#undef LOAD_OFFSET -+#define LOAD_OFFSET 0 -+#endif /* CONFIG_PPC_QEMU */ -+ - ENTRY(_stext) - - PHDRS { --- -1.6.5.2 - diff --git a/bsp/qemu-ppc32/qemu-platform-v2.patch b/bsp/qemu-ppc32/qemu-platform-v2.patch deleted file mode 100644 index 59b3fa3f..00000000 --- a/bsp/qemu-ppc32/qemu-platform-v2.patch +++ /dev/null @@ -1,1640 +0,0 @@ -From ed6c530bc35a3366a04dcf77ec0fd456da5ce480 Mon Sep 17 00:00:00 2001 -From: Milton Miller <miltonm@bga.com> -Date: Sat, 22 Sep 2007 09:08:31 +1000 -Subject: [PATCH 1/3] qemu platform, v2 - -Here is the second rev of patches to boot a arch powerpc kernel on -qemu with the prep architecture. - -The goal is to provide an environment for use with the existing qemu -hardware suppplied hardware, as oposed to changing the qemu -machine description. - -This patch contains only the kernel portion. While the diff was -generated against for-2.6.24, this first patch applies cleanly -to 2.6.23-rc7. With the rom image created in the next patch, -a kernel built by this patch should boot when using qemu -kernel. - -I debated putting this in the embedded6xx tree, especially when I -discovered that the bridge is suposedly a '105, but saw no advantage -in the end. - -pci config space is now working, however cirrusfb causes crashes -and ohci times out, so at least pci memory is likely still broken. - -ide and serial work, floppy and parallel are untested. - -I added a defconfig based on chrp32; hardware options still need -tweaking (eg isa ne2k). - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index c33e3ad..a0d28dc 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -636,7 +636,7 @@ menu "Bus options" - - config ISA - bool "Support for ISA-bus hardware" -- depends on PPC_CHRP -+ depends on PPC_CHRP || PPC_QEMU - select PPC_I8259 - help - Find out whether you have ISA slots on your motherboard. ISA is the -diff --git a/arch/powerpc/configs/qemu_defconfig b/arch/powerpc/configs/qemu_defconfig -new file mode 100644 -index 0000000..a6d6721 ---- /dev/null -+++ b/arch/powerpc/configs/qemu_defconfig -@@ -0,0 +1,1217 @@ -+# -+# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.23-rc6 -+# Tue Sep 18 15:18:32 2007 -+# -+# CONFIG_PPC64 is not set -+ -+# -+# Processor support -+# -+CONFIG_6xx=y -+# CONFIG_PPC_85xx is not set -+# CONFIG_PPC_8xx is not set -+# CONFIG_40x is not set -+# CONFIG_44x is not set -+# CONFIG_E200 is not set -+CONFIG_PPC_FPU=y -+# CONFIG_ALTIVEC is not set -+CONFIG_PPC_STD_MMU=y -+CONFIG_PPC_STD_MMU_32=y -+# CONFIG_PPC_MM_SLICES is not set -+# CONFIG_SMP is not set -+CONFIG_PPC32=y -+CONFIG_PPC_MERGE=y -+CONFIG_MMU=y -+CONFIG_GENERIC_HARDIRQS=y -+CONFIG_IRQ_PER_CPU=y -+CONFIG_RWSEM_XCHGADD_ALGORITHM=y -+CONFIG_ARCH_HAS_ILOG2_U32=y -+CONFIG_GENERIC_HWEIGHT=y -+CONFIG_GENERIC_CALIBRATE_DELAY=y -+CONFIG_GENERIC_FIND_NEXT_BIT=y -+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set -+CONFIG_PPC=y -+CONFIG_EARLY_PRINTK=y -+CONFIG_GENERIC_NVRAM=y -+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -+CONFIG_ARCH_MAY_HAVE_PC_FDC=y -+CONFIG_PPC_OF=y -+CONFIG_OF=y -+CONFIG_PPC_UDBG_16550=y -+# CONFIG_GENERIC_TBSYNC is not set -+CONFIG_AUDIT_ARCH=y -+CONFIG_GENERIC_BUG=y -+# CONFIG_DEFAULT_UIMAGE is not set -+# CONFIG_PPC_DCR_NATIVE is not set -+# CONFIG_PPC_DCR_MMIO is not set -+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -+ -+# -+# General setup -+# -+CONFIG_EXPERIMENTAL=y -+CONFIG_BROKEN_ON_SMP=y -+CONFIG_INIT_ENV_ARG_LIMIT=32 -+CONFIG_LOCALVERSION="" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SWAP=y -+CONFIG_SYSVIPC=y -+CONFIG_SYSVIPC_SYSCTL=y -+CONFIG_POSIX_MQUEUE=y -+# CONFIG_BSD_PROCESS_ACCT is not set -+# CONFIG_TASKSTATS is not set -+# CONFIG_USER_NS is not set -+# CONFIG_AUDIT is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_LOG_BUF_SHIFT=15 -+CONFIG_SYSFS_DEPRECATED=y -+# CONFIG_RELAY is not set -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="" -+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -+CONFIG_SYSCTL=y -+# CONFIG_EMBEDDED is not set -+CONFIG_SYSCTL_SYSCALL=y -+CONFIG_KALLSYMS=y -+# CONFIG_KALLSYMS_ALL is not set -+# CONFIG_KALLSYMS_EXTRA_PASS is not set -+CONFIG_HOTPLUG=y -+CONFIG_PRINTK=y -+CONFIG_BUG=y -+CONFIG_ELF_CORE=y -+CONFIG_BASE_FULL=y -+CONFIG_FUTEX=y -+CONFIG_ANON_INODES=y -+CONFIG_EPOLL=y -+CONFIG_SIGNALFD=y -+CONFIG_TIMERFD=y -+CONFIG_EVENTFD=y -+CONFIG_SHMEM=y -+CONFIG_VM_EVENT_COUNTERS=y -+CONFIG_SLAB=y -+# CONFIG_SLUB is not set -+# CONFIG_SLOB is not set -+CONFIG_RT_MUTEXES=y -+# CONFIG_TINY_SHMEM is not set -+CONFIG_BASE_SMALL=0 -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODULE_FORCE_UNLOAD=y -+# CONFIG_MODVERSIONS is not set -+# CONFIG_MODULE_SRCVERSION_ALL is not set -+CONFIG_KMOD=y -+CONFIG_BLOCK=y -+CONFIG_LBD=y -+# CONFIG_BLK_DEV_IO_TRACE is not set -+# CONFIG_LSF is not set -+# CONFIG_BLK_DEV_BSG is not set -+ -+# -+# IO Schedulers -+# -+CONFIG_IOSCHED_NOOP=y -+CONFIG_IOSCHED_AS=y -+CONFIG_IOSCHED_DEADLINE=y -+CONFIG_IOSCHED_CFQ=y -+CONFIG_DEFAULT_AS=y -+# CONFIG_DEFAULT_DEADLINE is not set -+# CONFIG_DEFAULT_CFQ is not set -+# CONFIG_DEFAULT_NOOP is not set -+CONFIG_DEFAULT_IOSCHED="anticipatory" -+ -+# -+# Platform support -+# -+CONFIG_PPC_MULTIPLATFORM=y -+# CONFIG_EMBEDDED6xx is not set -+# CONFIG_PPC_82xx is not set -+# CONFIG_PPC_83xx is not set -+# CONFIG_PPC_86xx is not set -+CONFIG_CLASSIC32=y -+# CONFIG_PPC_CHRP is not set -+# CONFIG_PPC_MPC52xx is not set -+# CONFIG_PPC_MPC5200 is not set -+# CONFIG_PPC_EFIKA is not set -+# CONFIG_PPC_LITE5200 is not set -+# CONFIG_PPC_PMAC is not set -+CONFIG_PPC_QEMU=y -+# CONFIG_PPC_CELL is not set -+# CONFIG_PPC_CELL_NATIVE is not set -+# CONFIG_PQ2ADS is not set -+CONFIG_PPC_NATIVE=y -+# CONFIG_MPIC is not set -+# CONFIG_MPIC_WEIRD is not set -+CONFIG_PPC_I8259=y -+# CONFIG_PPC_RTAS is not set -+# CONFIG_MMIO_NVRAM is not set -+# CONFIG_PPC_MPC106 is not set -+# CONFIG_PPC_970_NAP is not set -+# CONFIG_PPC_INDIRECT_IO is not set -+# CONFIG_GENERIC_IOMAP is not set -+# CONFIG_CPU_FREQ is not set -+# CONFIG_TAU is not set -+# CONFIG_CPM2 is not set -+# CONFIG_FSL_ULI1575 is not set -+ -+# -+# Kernel options -+# -+CONFIG_HIGHMEM=y -+# CONFIG_HZ_100 is not set -+CONFIG_HZ_250=y -+# CONFIG_HZ_300 is not set -+# CONFIG_HZ_1000 is not set -+CONFIG_HZ=250 -+CONFIG_PREEMPT_NONE=y -+# CONFIG_PREEMPT_VOLUNTARY is not set -+# CONFIG_PREEMPT is not set -+CONFIG_BINFMT_ELF=y -+CONFIG_BINFMT_MISC=y -+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -+# CONFIG_KEXEC is not set -+CONFIG_ARCH_FLATMEM_ENABLE=y -+CONFIG_ARCH_POPULATES_NODE_MAP=y -+CONFIG_SELECT_MEMORY_MODEL=y -+CONFIG_FLATMEM_MANUAL=y -+# CONFIG_DISCONTIGMEM_MANUAL is not set -+# CONFIG_SPARSEMEM_MANUAL is not set -+CONFIG_FLATMEM=y -+CONFIG_FLAT_NODE_MEM_MAP=y -+# CONFIG_SPARSEMEM_STATIC is not set -+CONFIG_SPLIT_PTLOCK_CPUS=4 -+# CONFIG_RESOURCES_64BIT is not set -+CONFIG_ZONE_DMA_FLAG=1 -+CONFIG_BOUNCE=y -+CONFIG_VIRT_TO_BUS=y -+CONFIG_PROC_DEVICETREE=y -+# CONFIG_CMDLINE_BOOL is not set -+# CONFIG_PM is not set -+CONFIG_SUSPEND_UP_POSSIBLE=y -+CONFIG_HIBERNATION_UP_POSSIBLE=y -+CONFIG_SECCOMP=y -+CONFIG_WANT_DEVICE_TREE=y -+CONFIG_DEVICE_TREE="qemu.dts" -+CONFIG_ISA_DMA_API=y -+ -+# -+# Bus options -+# -+CONFIG_ZONE_DMA=y -+CONFIG_GENERIC_ISA_DMA=y -+CONFIG_PPC_INDIRECT_PCI=y -+CONFIG_PCI=y -+CONFIG_PCI_DOMAINS=y -+CONFIG_PCI_SYSCALL=y -+# CONFIG_PCIEPORTBUS is not set -+CONFIG_ARCH_SUPPORTS_MSI=y -+# CONFIG_PCI_MSI is not set -+# CONFIG_PCI_DEBUG is not set -+ -+# -+# PCCARD (PCMCIA/CardBus) support -+# -+# CONFIG_PCCARD is not set -+# CONFIG_HOTPLUG_PCI is not set -+ -+# -+# Advanced setup -+# -+# CONFIG_ADVANCED_OPTIONS is not set -+ -+# -+# Default settings for advanced configuration options are used -+# -+CONFIG_HIGHMEM_START=0xfe000000 -+CONFIG_LOWMEM_SIZE=0x30000000 -+CONFIG_KERNEL_START=0xc0000000 -+CONFIG_TASK_SIZE=0x80000000 -+CONFIG_BOOT_LOAD=0x00800000 -+ -+# -+# Networking -+# -+CONFIG_NET=y -+ -+# -+# Networking options -+# -+CONFIG_PACKET=y -+# CONFIG_PACKET_MMAP is not set -+CONFIG_UNIX=y -+# CONFIG_NET_KEY is not set -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+# CONFIG_IP_ADVANCED_ROUTER is not set -+CONFIG_IP_FIB_HASH=y -+# CONFIG_IP_PNP is not set -+# CONFIG_NET_IPIP is not set -+# CONFIG_NET_IPGRE is not set -+# CONFIG_IP_MROUTE is not set -+# CONFIG_ARPD is not set -+CONFIG_SYN_COOKIES=y -+# CONFIG_INET_AH is not set -+# CONFIG_INET_ESP is not set -+# CONFIG_INET_IPCOMP is not set -+# CONFIG_INET_XFRM_TUNNEL is not set -+# CONFIG_INET_TUNNEL is not set -+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -+# CONFIG_INET_XFRM_MODE_TUNNEL is not set -+# CONFIG_INET_XFRM_MODE_BEET is not set -+CONFIG_INET_DIAG=y -+CONFIG_INET_TCP_DIAG=y -+# CONFIG_TCP_CONG_ADVANCED is not set -+CONFIG_TCP_CONG_CUBIC=y -+CONFIG_DEFAULT_TCP_CONG="cubic" -+# CONFIG_TCP_MD5SIG is not set -+# CONFIG_IP_VS is not set -+# CONFIG_IPV6 is not set -+# CONFIG_INET6_XFRM_TUNNEL is not set -+# CONFIG_INET6_TUNNEL is not set -+# CONFIG_NETWORK_SECMARK is not set -+CONFIG_NETFILTER=y -+# CONFIG_NETFILTER_DEBUG is not set -+ -+# -+# Core Netfilter Configuration -+# -+# CONFIG_NETFILTER_NETLINK is not set -+CONFIG_NF_CONNTRACK_ENABLED=m -+CONFIG_NF_CONNTRACK=m -+# CONFIG_NF_CT_ACCT is not set -+# CONFIG_NF_CONNTRACK_MARK is not set -+# CONFIG_NF_CONNTRACK_EVENTS is not set -+# CONFIG_NF_CT_PROTO_SCTP is not set -+# CONFIG_NF_CT_PROTO_UDPLITE is not set -+# CONFIG_NF_CONNTRACK_AMANDA is not set -+CONFIG_NF_CONNTRACK_FTP=m -+# CONFIG_NF_CONNTRACK_H323 is not set -+CONFIG_NF_CONNTRACK_IRC=m -+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set -+# CONFIG_NF_CONNTRACK_PPTP is not set -+# CONFIG_NF_CONNTRACK_SANE is not set -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+CONFIG_NETFILTER_XTABLES=m -+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -+# CONFIG_NETFILTER_XT_TARGET_MARK is not set -+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set -+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set -+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -+# CONFIG_NETFILTER_XT_MATCH_ESP is not set -+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set -+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set -+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set -+# CONFIG_NETFILTER_XT_MATCH_MAC is not set -+# CONFIG_NETFILTER_XT_MATCH_MARK is not set -+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set -+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -+# CONFIG_NETFILTER_XT_MATCH_REALM is not set -+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -+# CONFIG_NETFILTER_XT_MATCH_STATE is not set -+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -+# CONFIG_NETFILTER_XT_MATCH_STRING is not set -+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set -+# CONFIG_NETFILTER_XT_MATCH_U32 is not set -+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set -+ -+# -+# IP: Netfilter Configuration -+# -+CONFIG_NF_CONNTRACK_IPV4=m -+CONFIG_NF_CONNTRACK_PROC_COMPAT=y -+# CONFIG_IP_NF_QUEUE is not set -+CONFIG_IP_NF_IPTABLES=m -+# CONFIG_IP_NF_MATCH_IPRANGE is not set -+# CONFIG_IP_NF_MATCH_TOS is not set -+# CONFIG_IP_NF_MATCH_RECENT is not set -+# CONFIG_IP_NF_MATCH_ECN is not set -+# CONFIG_IP_NF_MATCH_AH is not set -+# CONFIG_IP_NF_MATCH_TTL is not set -+# CONFIG_IP_NF_MATCH_OWNER is not set -+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_TARGET_LOG=m -+# CONFIG_IP_NF_TARGET_ULOG is not set -+CONFIG_NF_NAT=m -+CONFIG_NF_NAT_NEEDED=y -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+# CONFIG_IP_NF_TARGET_NETMAP is not set -+# CONFIG_IP_NF_TARGET_SAME is not set -+# CONFIG_NF_NAT_SNMP_BASIC is not set -+CONFIG_NF_NAT_FTP=m -+CONFIG_NF_NAT_IRC=m -+CONFIG_NF_NAT_TFTP=m -+# CONFIG_NF_NAT_AMANDA is not set -+# CONFIG_NF_NAT_PPTP is not set -+# CONFIG_NF_NAT_H323 is not set -+CONFIG_NF_NAT_SIP=m -+# CONFIG_IP_NF_MANGLE is not set -+# CONFIG_IP_NF_RAW is not set -+# CONFIG_IP_NF_ARPTABLES is not set -+# CONFIG_IP_DCCP is not set -+# CONFIG_IP_SCTP is not set -+# CONFIG_TIPC is not set -+# CONFIG_ATM is not set -+# CONFIG_BRIDGE is not set -+# CONFIG_VLAN_8021Q is not set -+# CONFIG_DECNET is not set -+# CONFIG_LLC2 is not set -+# CONFIG_IPX is not set -+# CONFIG_ATALK is not set -+# CONFIG_X25 is not set -+# CONFIG_LAPB is not set -+# CONFIG_ECONET is not set -+# CONFIG_WAN_ROUTER is not set -+ -+# -+# QoS and/or fair queueing -+# -+# CONFIG_NET_SCHED is not set -+ -+# -+# Network testing -+# -+# CONFIG_NET_PKTGEN is not set -+# CONFIG_HAMRADIO is not set -+# CONFIG_IRDA is not set -+# CONFIG_BT is not set -+# CONFIG_AF_RXRPC is not set -+ -+# -+# Wireless -+# -+# CONFIG_CFG80211 is not set -+# CONFIG_WIRELESS_EXT is not set -+# CONFIG_MAC80211 is not set -+# CONFIG_IEEE80211 is not set -+# CONFIG_RFKILL is not set -+# CONFIG_NET_9P is not set -+ -+# -+# Device Drivers -+# -+ -+# -+# Generic Driver Options -+# -+# CONFIG_STANDALONE is not set -+CONFIG_PREVENT_FIRMWARE_BUILD=y -+# CONFIG_FW_LOADER is not set -+# CONFIG_DEBUG_DRIVER is not set -+# CONFIG_DEBUG_DEVRES is not set -+# CONFIG_SYS_HYPERVISOR is not set -+# CONFIG_CONNECTOR is not set -+# CONFIG_MTD is not set -+CONFIG_OF_DEVICE=y -+# CONFIG_PARPORT is not set -+CONFIG_BLK_DEV=y -+CONFIG_BLK_DEV_FD=y -+# CONFIG_BLK_CPQ_DA is not set -+# CONFIG_BLK_CPQ_CISS_DA is not set -+# CONFIG_BLK_DEV_DAC960 is not set -+# CONFIG_BLK_DEV_UMEM is not set -+# CONFIG_BLK_DEV_COW_COMMON is not set -+CONFIG_BLK_DEV_LOOP=y -+# CONFIG_BLK_DEV_CRYPTOLOOP is not set -+# CONFIG_BLK_DEV_NBD is not set -+# CONFIG_BLK_DEV_SX8 is not set -+# CONFIG_BLK_DEV_UB is not set -+CONFIG_BLK_DEV_RAM=y -+CONFIG_BLK_DEV_RAM_COUNT=16 -+CONFIG_BLK_DEV_RAM_SIZE=4096 -+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -+# CONFIG_CDROM_PKTCDVD is not set -+# CONFIG_ATA_OVER_ETH is not set -+CONFIG_MISC_DEVICES=y -+# CONFIG_PHANTOM is not set -+# CONFIG_EEPROM_93CX6 is not set -+# CONFIG_SGI_IOC4 is not set -+# CONFIG_TIFM_CORE is not set -+CONFIG_IDE=y -+CONFIG_BLK_DEV_IDE=y -+ -+# -+# Please see Documentation/ide.txt for help/info on IDE drives -+# -+# CONFIG_BLK_DEV_IDE_SATA is not set -+CONFIG_BLK_DEV_IDEDISK=y -+CONFIG_IDEDISK_MULTI_MODE=y -+CONFIG_BLK_DEV_IDECD=y -+# CONFIG_BLK_DEV_IDETAPE is not set -+# CONFIG_BLK_DEV_IDEFLOPPY is not set -+# CONFIG_IDE_TASK_IOCTL is not set -+CONFIG_IDE_PROC_FS=y -+ -+# -+# IDE chipset support/bugfixes -+# -+CONFIG_IDE_GENERIC=y -+CONFIG_BLK_DEV_IDEPCI=y -+CONFIG_IDEPCI_SHARE_IRQ=y -+CONFIG_IDEPCI_PCIBUS_ORDER=y -+# CONFIG_BLK_DEV_OFFBOARD is not set -+CONFIG_BLK_DEV_GENERIC=y -+# CONFIG_BLK_DEV_OPTI621 is not set -+CONFIG_BLK_DEV_IDEDMA_PCI=y -+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -+# CONFIG_IDEDMA_ONLYDISK is not set -+# CONFIG_BLK_DEV_AEC62XX is not set -+# CONFIG_BLK_DEV_ALI15X3 is not set -+# CONFIG_BLK_DEV_AMD74XX is not set -+# CONFIG_BLK_DEV_CMD64X is not set -+# CONFIG_BLK_DEV_TRIFLEX is not set -+# CONFIG_BLK_DEV_CY82C693 is not set -+# CONFIG_BLK_DEV_CS5520 is not set -+# CONFIG_BLK_DEV_CS5530 is not set -+# CONFIG_BLK_DEV_HPT34X is not set -+# CONFIG_BLK_DEV_HPT366 is not set -+# CONFIG_BLK_DEV_JMICRON is not set -+# CONFIG_BLK_DEV_SC1200 is not set -+# CONFIG_BLK_DEV_PIIX is not set -+# CONFIG_BLK_DEV_IT8213 is not set -+# CONFIG_BLK_DEV_IT821X is not set -+# CONFIG_BLK_DEV_NS87415 is not set -+# CONFIG_BLK_DEV_PDC202XX_OLD is not set -+# CONFIG_BLK_DEV_PDC202XX_NEW is not set -+# CONFIG_BLK_DEV_SVWKS is not set -+# CONFIG_BLK_DEV_SIIMAGE is not set -+# CONFIG_BLK_DEV_SL82C105 is not set -+# CONFIG_BLK_DEV_SLC90E66 is not set -+# CONFIG_BLK_DEV_TRM290 is not set -+# CONFIG_BLK_DEV_VIA82CXXX is not set -+# CONFIG_BLK_DEV_TC86C001 is not set -+# CONFIG_IDE_ARM is not set -+CONFIG_BLK_DEV_IDEDMA=y -+# CONFIG_IDEDMA_IVB is not set -+# CONFIG_BLK_DEV_HD is not set -+ -+# -+# SCSI device support -+# -+# CONFIG_RAID_ATTRS is not set -+# CONFIG_SCSI is not set -+# CONFIG_SCSI_DMA is not set -+# CONFIG_SCSI_NETLINK is not set -+# CONFIG_ATA is not set -+# CONFIG_MD is not set -+ -+# -+# Fusion MPT device support -+# -+# CONFIG_FUSION is not set -+ -+# -+# IEEE 1394 (FireWire) support -+# -+# CONFIG_FIREWIRE is not set -+# CONFIG_IEEE1394 is not set -+# CONFIG_I2O is not set -+# CONFIG_MACINTOSH_DRIVERS is not set -+CONFIG_NETDEVICES=y -+# CONFIG_NETDEVICES_MULTIQUEUE is not set -+# CONFIG_DUMMY is not set -+# CONFIG_BONDING is not set -+# CONFIG_MACVLAN is not set -+# CONFIG_EQUALIZER is not set -+# CONFIG_TUN is not set -+# CONFIG_ARCNET is not set -+# CONFIG_PHYLIB is not set -+CONFIG_NET_ETHERNET=y -+CONFIG_MII=y -+# CONFIG_HAPPYMEAL is not set -+# CONFIG_SUNGEM is not set -+# CONFIG_CASSINI is not set -+# CONFIG_NET_VENDOR_3COM is not set -+# CONFIG_NET_TULIP is not set -+# CONFIG_HP100 is not set -+CONFIG_NET_PCI=y -+CONFIG_PCNET32=y -+# CONFIG_PCNET32_NAPI is not set -+# CONFIG_AMD8111_ETH is not set -+# CONFIG_ADAPTEC_STARFIRE is not set -+# CONFIG_B44 is not set -+# CONFIG_FORCEDETH is not set -+# CONFIG_DGRS is not set -+# CONFIG_EEPRO100 is not set -+# CONFIG_E100 is not set -+# CONFIG_FEALNX is not set -+# CONFIG_NATSEMI is not set -+CONFIG_NE2K_PCI=m -+CONFIG_8139CP=y -+CONFIG_8139TOO=y -+# CONFIG_8139TOO_PIO is not set -+# CONFIG_8139TOO_TUNE_TWISTER is not set -+# CONFIG_8139TOO_8129 is not set -+# CONFIG_8139_OLD_RX_RESET is not set -+# CONFIG_SIS900 is not set -+# CONFIG_EPIC100 is not set -+# CONFIG_SUNDANCE is not set -+# CONFIG_TLAN is not set -+# CONFIG_VIA_RHINE is not set -+# CONFIG_SC92031 is not set -+# CONFIG_NETDEV_1000 is not set -+# CONFIG_NETDEV_10000 is not set -+# CONFIG_TR is not set -+ -+# -+# Wireless LAN -+# -+# CONFIG_WLAN_PRE80211 is not set -+# CONFIG_WLAN_80211 is not set -+ -+# -+# USB Network Adapters -+# -+# CONFIG_USB_CATC is not set -+# CONFIG_USB_KAWETH is not set -+# CONFIG_USB_PEGASUS is not set -+# CONFIG_USB_RTL8150 is not set -+# CONFIG_USB_USBNET_MII is not set -+# CONFIG_USB_USBNET is not set -+# CONFIG_WAN is not set -+# CONFIG_FDDI is not set -+# CONFIG_HIPPI is not set -+CONFIG_PPP=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_MPPE=m -+CONFIG_PPPOE=m -+# CONFIG_PPPOL2TP is not set -+# CONFIG_SLIP is not set -+CONFIG_SLHC=m -+# CONFIG_SHAPER is not set -+# CONFIG_NETCONSOLE is not set -+# CONFIG_NETPOLL is not set -+# CONFIG_NET_POLL_CONTROLLER is not set -+# CONFIG_ISDN is not set -+# CONFIG_PHONE is not set -+ -+# -+# Input device support -+# -+CONFIG_INPUT=y -+# CONFIG_INPUT_FF_MEMLESS is not set -+# CONFIG_INPUT_POLLDEV is not set -+ -+# -+# Userland interfaces -+# -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_MOUSEDEV_PSAUX=y -+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -+# CONFIG_INPUT_JOYDEV is not set -+CONFIG_INPUT_TSDEV=m -+CONFIG_INPUT_TSDEV_SCREEN_X=240 -+CONFIG_INPUT_TSDEV_SCREEN_Y=320 -+CONFIG_INPUT_EVDEV=y -+# CONFIG_INPUT_EVBUG is not set -+ -+# -+# Input Device Drivers -+# -+CONFIG_INPUT_KEYBOARD=y -+CONFIG_KEYBOARD_ATKBD=y -+# CONFIG_KEYBOARD_SUNKBD is not set -+# CONFIG_KEYBOARD_LKKBD is not set -+# CONFIG_KEYBOARD_XTKBD is not set -+# CONFIG_KEYBOARD_NEWTON is not set -+# CONFIG_KEYBOARD_STOWAWAY is not set -+CONFIG_INPUT_MOUSE=y -+CONFIG_MOUSE_PS2=y -+CONFIG_MOUSE_PS2_ALPS=y -+CONFIG_MOUSE_PS2_LOGIPS2PP=y -+CONFIG_MOUSE_PS2_SYNAPTICS=y -+CONFIG_MOUSE_PS2_LIFEBOOK=y -+CONFIG_MOUSE_PS2_TRACKPOINT=y -+# CONFIG_MOUSE_PS2_TOUCHKIT is not set -+# CONFIG_MOUSE_SERIAL is not set -+# CONFIG_MOUSE_APPLETOUCH is not set -+# CONFIG_MOUSE_VSXXXAA is not set -+# CONFIG_INPUT_JOYSTICK is not set -+CONFIG_INPUT_TABLET=y -+# CONFIG_TABLET_USB_ACECAD is not set -+# CONFIG_TABLET_USB_AIPTEK is not set -+# CONFIG_TABLET_USB_GTCO is not set -+# CONFIG_TABLET_USB_KBTAB is not set -+# CONFIG_TABLET_USB_WACOM is not set -+# CONFIG_INPUT_TOUCHSCREEN is not set -+CONFIG_INPUT_MISC=y -+# CONFIG_INPUT_ATI_REMOTE is not set -+# CONFIG_INPUT_ATI_REMOTE2 is not set -+# CONFIG_INPUT_KEYSPAN_REMOTE is not set -+# CONFIG_INPUT_POWERMATE is not set -+# CONFIG_INPUT_YEALINK is not set -+CONFIG_INPUT_UINPUT=y -+ -+# -+# Hardware I/O ports -+# -+CONFIG_SERIO=y -+CONFIG_SERIO_I8042=y -+# CONFIG_SERIO_SERPORT is not set -+# CONFIG_SERIO_PCIPS2 is not set -+CONFIG_SERIO_LIBPS2=y -+# CONFIG_SERIO_RAW is not set -+# CONFIG_GAMEPORT is not set -+ -+# -+# Character devices -+# -+CONFIG_VT=y -+CONFIG_VT_CONSOLE=y -+CONFIG_HW_CONSOLE=y -+# CONFIG_VT_HW_CONSOLE_BINDING is not set -+# CONFIG_SERIAL_NONSTANDARD is not set -+ -+# -+# Serial drivers -+# -+CONFIG_SERIAL_8250=y -+CONFIG_SERIAL_8250_CONSOLE=y -+CONFIG_SERIAL_8250_PCI=y -+CONFIG_SERIAL_8250_NR_UARTS=4 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -+# CONFIG_SERIAL_8250_EXTENDED is not set -+ -+# -+# Non-8250 serial port support -+# -+# CONFIG_SERIAL_UARTLITE is not set -+CONFIG_SERIAL_CORE=y -+CONFIG_SERIAL_CORE_CONSOLE=y -+# CONFIG_SERIAL_JSM is not set -+# CONFIG_SERIAL_OF_PLATFORM is not set -+CONFIG_UNIX98_PTYS=y -+CONFIG_LEGACY_PTYS=y -+CONFIG_LEGACY_PTY_COUNT=256 -+# CONFIG_IPMI_HANDLER is not set -+# CONFIG_WATCHDOG is not set -+CONFIG_HW_RANDOM=m -+CONFIG_NVRAM=y -+CONFIG_GEN_RTC=y -+# CONFIG_GEN_RTC_X is not set -+# CONFIG_R3964 is not set -+# CONFIG_APPLICOM is not set -+# CONFIG_AGP is not set -+# CONFIG_DRM is not set -+# CONFIG_RAW_DRIVER is not set -+# CONFIG_TCG_TPM is not set -+CONFIG_DEVPORT=y -+CONFIG_I2C=y -+CONFIG_I2C_BOARDINFO=y -+# CONFIG_I2C_CHARDEV is not set -+ -+# -+# I2C Algorithms -+# -+CONFIG_I2C_ALGOBIT=y -+# CONFIG_I2C_ALGOPCF is not set -+# CONFIG_I2C_ALGOPCA is not set -+ -+# -+# I2C Hardware Bus support -+# -+# CONFIG_I2C_ALI1535 is not set -+# CONFIG_I2C_ALI1563 is not set -+# CONFIG_I2C_ALI15X3 is not set -+# CONFIG_I2C_AMD756 is not set -+# CONFIG_I2C_AMD8111 is not set -+# CONFIG_I2C_I801 is not set -+# CONFIG_I2C_I810 is not set -+# CONFIG_I2C_PIIX4 is not set -+# CONFIG_I2C_MPC is not set -+# CONFIG_I2C_NFORCE2 is not set -+# CONFIG_I2C_OCORES is not set -+# CONFIG_I2C_PARPORT_LIGHT is not set -+# CONFIG_I2C_PROSAVAGE is not set -+# CONFIG_I2C_SAVAGE4 is not set -+# CONFIG_I2C_SIMTEC is not set -+# CONFIG_I2C_SIS5595 is not set -+# CONFIG_I2C_SIS630 is not set -+# CONFIG_I2C_SIS96X is not set -+# CONFIG_I2C_TAOS_EVM is not set -+# CONFIG_I2C_STUB is not set -+# CONFIG_I2C_TINY_USB is not set -+# CONFIG_I2C_VIA is not set -+# CONFIG_I2C_VIAPRO is not set -+# CONFIG_I2C_VOODOO3 is not set -+ -+# -+# Miscellaneous I2C Chip support -+# -+# CONFIG_SENSORS_DS1337 is not set -+# CONFIG_SENSORS_DS1374 is not set -+# CONFIG_DS1682 is not set -+# CONFIG_SENSORS_EEPROM is not set -+# CONFIG_SENSORS_PCF8574 is not set -+# CONFIG_SENSORS_PCA9539 is not set -+# CONFIG_SENSORS_PCF8591 is not set -+# CONFIG_SENSORS_M41T00 is not set -+# CONFIG_SENSORS_MAX6875 is not set -+# CONFIG_SENSORS_TSL2550 is not set -+# CONFIG_I2C_DEBUG_CORE is not set -+# CONFIG_I2C_DEBUG_ALGO is not set -+# CONFIG_I2C_DEBUG_BUS is not set -+# CONFIG_I2C_DEBUG_CHIP is not set -+ -+# -+# SPI support -+# -+# CONFIG_SPI is not set -+# CONFIG_SPI_MASTER is not set -+# CONFIG_W1 is not set -+# CONFIG_POWER_SUPPLY is not set -+# CONFIG_HWMON is not set -+ -+# -+# Multifunction device drivers -+# -+# CONFIG_MFD_SM501 is not set -+ -+# -+# Multimedia devices -+# -+# CONFIG_VIDEO_DEV is not set -+# CONFIG_DVB_CORE is not set -+# CONFIG_DAB is not set -+ -+# -+# Graphics support -+# -+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -+ -+# -+# Display device support -+# -+CONFIG_DISPLAY_SUPPORT=m -+ -+# -+# Display hardware drivers -+# -+# CONFIG_VGASTATE is not set -+# CONFIG_VIDEO_OUTPUT_CONTROL is not set -+# CONFIG_FB is not set -+# CONFIG_FB_IBM_GXT4500 is not set -+ -+# -+# Console display driver support -+# -+CONFIG_VGA_CONSOLE=y -+# CONFIG_VGACON_SOFT_SCROLLBACK is not set -+CONFIG_DUMMY_CONSOLE=y -+ -+# -+# Sound -+# -+# CONFIG_SOUND is not set -+CONFIG_HID_SUPPORT=y -+CONFIG_HID=y -+# CONFIG_HID_DEBUG is not set -+ -+# -+# USB Input Devices -+# -+CONFIG_USB_HID=y -+# CONFIG_USB_HIDINPUT_POWERBOOK is not set -+# CONFIG_HID_FF is not set -+# CONFIG_USB_HIDDEV is not set -+CONFIG_USB_SUPPORT=y -+CONFIG_USB_ARCH_HAS_HCD=y -+CONFIG_USB_ARCH_HAS_OHCI=y -+CONFIG_USB_ARCH_HAS_EHCI=y -+CONFIG_USB=y -+# CONFIG_USB_DEBUG is not set -+ -+# -+# Miscellaneous USB options -+# -+CONFIG_USB_DEVICEFS=y -+CONFIG_USB_DEVICE_CLASS=y -+# CONFIG_USB_DYNAMIC_MINORS is not set -+# CONFIG_USB_OTG is not set -+ -+# -+# USB Host Controller Drivers -+# -+# CONFIG_USB_EHCI_HCD is not set -+# CONFIG_USB_ISP116X_HCD is not set -+CONFIG_USB_OHCI_HCD=y -+# CONFIG_USB_OHCI_HCD_PPC_OF is not set -+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -+CONFIG_USB_OHCI_LITTLE_ENDIAN=y -+# CONFIG_USB_UHCI_HCD is not set -+# CONFIG_USB_SL811_HCD is not set -+# CONFIG_USB_R8A66597_HCD is not set -+ -+# -+# USB Device Class drivers -+# -+# CONFIG_USB_ACM is not set -+# CONFIG_USB_PRINTER is not set -+ -+# -+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -+# -+ -+# -+# may also be needed; see USB_STORAGE Help for more information -+# -+# CONFIG_USB_LIBUSUAL is not set -+ -+# -+# USB Imaging devices -+# -+# CONFIG_USB_MDC800 is not set -+CONFIG_USB_MON=y -+ -+# -+# USB port drivers -+# -+ -+# -+# USB Serial Converter support -+# -+# CONFIG_USB_SERIAL is not set -+ -+# -+# USB Miscellaneous drivers -+# -+# CONFIG_USB_EMI62 is not set -+# CONFIG_USB_EMI26 is not set -+# CONFIG_USB_ADUTUX is not set -+# CONFIG_USB_AUERSWALD is not set -+# CONFIG_USB_RIO500 is not set -+# CONFIG_USB_LEGOTOWER is not set -+# CONFIG_USB_LCD is not set -+# CONFIG_USB_BERRY_CHARGE is not set -+# CONFIG_USB_LED is not set -+# CONFIG_USB_CYPRESS_CY7C63 is not set -+# CONFIG_USB_CYTHERM is not set -+# CONFIG_USB_PHIDGET is not set -+# CONFIG_USB_IDMOUSE is not set -+# CONFIG_USB_FTDI_ELAN is not set -+# CONFIG_USB_APPLEDISPLAY is not set -+# CONFIG_USB_LD is not set -+# CONFIG_USB_TRANCEVIBRATOR is not set -+# CONFIG_USB_IOWARRIOR is not set -+# CONFIG_USB_TEST is not set -+ -+# -+# USB DSL modem support -+# -+ -+# -+# USB Gadget Support -+# -+# CONFIG_USB_GADGET is not set -+# CONFIG_MMC is not set -+# CONFIG_NEW_LEDS is not set -+# CONFIG_INFINIBAND is not set -+# CONFIG_EDAC is not set -+# CONFIG_RTC_CLASS is not set -+ -+# -+# DMA Engine support -+# -+# CONFIG_DMA_ENGINE is not set -+ -+# -+# DMA Clients -+# -+ -+# -+# DMA Devices -+# -+ -+# -+# Userspace I/O -+# -+# CONFIG_UIO is not set -+ -+# -+# File systems -+# -+CONFIG_EXT2_FS=y -+# CONFIG_EXT2_FS_XATTR is not set -+# CONFIG_EXT2_FS_XIP is not set -+CONFIG_EXT3_FS=y -+CONFIG_EXT3_FS_XATTR=y -+# CONFIG_EXT3_FS_POSIX_ACL is not set -+# CONFIG_EXT3_FS_SECURITY is not set -+# CONFIG_EXT4DEV_FS is not set -+CONFIG_JBD=y -+# CONFIG_JBD_DEBUG is not set -+CONFIG_FS_MBCACHE=y -+# CONFIG_REISERFS_FS is not set -+# CONFIG_JFS_FS is not set -+# CONFIG_FS_POSIX_ACL is not set -+# CONFIG_XFS_FS is not set -+# CONFIG_GFS2_FS is not set -+# CONFIG_OCFS2_FS is not set -+# CONFIG_MINIX_FS is not set -+# CONFIG_ROMFS_FS is not set -+CONFIG_INOTIFY=y -+CONFIG_INOTIFY_USER=y -+# CONFIG_QUOTA is not set -+CONFIG_DNOTIFY=y -+# CONFIG_AUTOFS_FS is not set -+# CONFIG_AUTOFS4_FS is not set -+# CONFIG_FUSE_FS is not set -+ -+# -+# CD-ROM/DVD Filesystems -+# -+CONFIG_ISO9660_FS=y -+# CONFIG_JOLIET is not set -+# CONFIG_ZISOFS is not set -+# CONFIG_UDF_FS is not set -+ -+# -+# DOS/FAT/NT Filesystems -+# -+CONFIG_FAT_FS=m -+CONFIG_MSDOS_FS=m -+CONFIG_VFAT_FS=m -+CONFIG_FAT_DEFAULT_CODEPAGE=437 -+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -+# CONFIG_NTFS_FS is not set -+ -+# -+# Pseudo filesystems -+# -+CONFIG_PROC_FS=y -+CONFIG_PROC_KCORE=y -+CONFIG_PROC_SYSCTL=y -+CONFIG_SYSFS=y -+CONFIG_TMPFS=y -+# CONFIG_TMPFS_POSIX_ACL is not set -+# CONFIG_HUGETLB_PAGE is not set -+CONFIG_RAMFS=y -+# CONFIG_CONFIGFS_FS is not set -+ -+# -+# Miscellaneous filesystems -+# -+# CONFIG_ADFS_FS is not set -+# CONFIG_AFFS_FS is not set -+# CONFIG_HFS_FS is not set -+# CONFIG_HFSPLUS_FS is not set -+# CONFIG_BEFS_FS is not set -+# CONFIG_BFS_FS is not set -+# CONFIG_EFS_FS is not set -+# CONFIG_CRAMFS is not set -+# CONFIG_VXFS_FS is not set -+# CONFIG_HPFS_FS is not set -+# CONFIG_QNX4FS_FS is not set -+# CONFIG_SYSV_FS is not set -+# CONFIG_UFS_FS is not set -+ -+# -+# Network File Systems -+# -+# CONFIG_NFS_FS is not set -+# CONFIG_NFSD is not set -+# CONFIG_SMB_FS is not set -+# CONFIG_CIFS is not set -+# CONFIG_NCP_FS is not set -+# CONFIG_CODA_FS is not set -+# CONFIG_AFS_FS is not set -+ -+# -+# Partition Types -+# -+CONFIG_PARTITION_ADVANCED=y -+# CONFIG_ACORN_PARTITION is not set -+# CONFIG_OSF_PARTITION is not set -+# CONFIG_AMIGA_PARTITION is not set -+# CONFIG_ATARI_PARTITION is not set -+CONFIG_MAC_PARTITION=y -+CONFIG_MSDOS_PARTITION=y -+# CONFIG_BSD_DISKLABEL is not set -+# CONFIG_MINIX_SUBPARTITION is not set -+# CONFIG_SOLARIS_X86_PARTITION is not set -+# CONFIG_UNIXWARE_DISKLABEL is not set -+# CONFIG_LDM_PARTITION is not set -+# CONFIG_SGI_PARTITION is not set -+# CONFIG_ULTRIX_PARTITION is not set -+# CONFIG_SUN_PARTITION is not set -+# CONFIG_KARMA_PARTITION is not set -+# CONFIG_EFI_PARTITION is not set -+# CONFIG_SYSV68_PARTITION is not set -+ -+# -+# Native Language Support -+# -+CONFIG_NLS=y -+CONFIG_NLS_DEFAULT="iso8859-1" -+# CONFIG_NLS_CODEPAGE_437 is not set -+# CONFIG_NLS_CODEPAGE_737 is not set -+# CONFIG_NLS_CODEPAGE_775 is not set -+# CONFIG_NLS_CODEPAGE_850 is not set -+# CONFIG_NLS_CODEPAGE_852 is not set -+# CONFIG_NLS_CODEPAGE_855 is not set -+# CONFIG_NLS_CODEPAGE_857 is not set -+# CONFIG_NLS_CODEPAGE_860 is not set -+# CONFIG_NLS_CODEPAGE_861 is not set -+# CONFIG_NLS_CODEPAGE_862 is not set -+# CONFIG_NLS_CODEPAGE_863 is not set -+# CONFIG_NLS_CODEPAGE_864 is not set -+# CONFIG_NLS_CODEPAGE_865 is not set -+# CONFIG_NLS_CODEPAGE_866 is not set -+# CONFIG_NLS_CODEPAGE_869 is not set -+# CONFIG_NLS_CODEPAGE_936 is not set -+# CONFIG_NLS_CODEPAGE_950 is not set -+# CONFIG_NLS_CODEPAGE_932 is not set -+# CONFIG_NLS_CODEPAGE_949 is not set -+# CONFIG_NLS_CODEPAGE_874 is not set -+# CONFIG_NLS_ISO8859_8 is not set -+# CONFIG_NLS_CODEPAGE_1250 is not set -+# CONFIG_NLS_CODEPAGE_1251 is not set -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+# CONFIG_NLS_ISO8859_2 is not set -+# CONFIG_NLS_ISO8859_3 is not set -+# CONFIG_NLS_ISO8859_4 is not set -+# CONFIG_NLS_ISO8859_5 is not set -+# CONFIG_NLS_ISO8859_6 is not set -+# CONFIG_NLS_ISO8859_7 is not set -+# CONFIG_NLS_ISO8859_9 is not set -+# CONFIG_NLS_ISO8859_13 is not set -+# CONFIG_NLS_ISO8859_14 is not set -+# CONFIG_NLS_ISO8859_15 is not set -+# CONFIG_NLS_KOI8_R is not set -+# CONFIG_NLS_KOI8_U is not set -+# CONFIG_NLS_UTF8 is not set -+ -+# -+# Distributed Lock Manager -+# -+# CONFIG_DLM is not set -+# CONFIG_UCC_SLOW is not set -+ -+# -+# Library routines -+# -+CONFIG_BITREVERSE=y -+CONFIG_CRC_CCITT=m -+# CONFIG_CRC16 is not set -+# CONFIG_CRC_ITU_T is not set -+CONFIG_CRC32=y -+# CONFIG_CRC7 is not set -+# CONFIG_LIBCRC32C is not set -+CONFIG_ZLIB_INFLATE=m -+CONFIG_ZLIB_DEFLATE=m -+CONFIG_PLIST=y -+CONFIG_HAS_IOMEM=y -+CONFIG_HAS_IOPORT=y -+CONFIG_HAS_DMA=y -+ -+# -+# Instrumentation Support -+# -+# CONFIG_PROFILING is not set -+# CONFIG_KPROBES is not set -+ -+# -+# Kernel hacking -+# -+# CONFIG_PRINTK_TIME is not set -+CONFIG_ENABLE_MUST_CHECK=y -+CONFIG_MAGIC_SYSRQ=y -+# CONFIG_UNUSED_SYMBOLS is not set -+# CONFIG_DEBUG_FS is not set -+# CONFIG_HEADERS_CHECK is not set -+CONFIG_DEBUG_KERNEL=y -+# CONFIG_DEBUG_SHIRQ is not set -+CONFIG_DETECT_SOFTLOCKUP=y -+CONFIG_SCHED_DEBUG=y -+# CONFIG_SCHEDSTATS is not set -+# CONFIG_TIMER_STATS is not set -+# CONFIG_DEBUG_SLAB is not set -+# CONFIG_DEBUG_RT_MUTEXES is not set -+# CONFIG_RT_MUTEX_TESTER is not set -+# CONFIG_DEBUG_SPINLOCK is not set -+CONFIG_DEBUG_MUTEXES=y -+CONFIG_DEBUG_SPINLOCK_SLEEP=y -+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -+# CONFIG_DEBUG_KOBJECT is not set -+# CONFIG_DEBUG_HIGHMEM is not set -+CONFIG_DEBUG_BUGVERBOSE=y -+# CONFIG_DEBUG_INFO is not set -+# CONFIG_DEBUG_VM is not set -+# CONFIG_DEBUG_LIST is not set -+CONFIG_FORCED_INLINING=y -+# CONFIG_RCU_TORTURE_TEST is not set -+# CONFIG_FAULT_INJECTION is not set -+# CONFIG_DEBUG_STACKOVERFLOW is not set -+# CONFIG_DEBUG_STACK_USAGE is not set -+# CONFIG_DEBUG_PAGEALLOC is not set -+CONFIG_DEBUGGER=y -+CONFIG_XMON=y -+CONFIG_XMON_DEFAULT=y -+CONFIG_XMON_DISASSEMBLY=y -+# CONFIG_BDI_SWITCH is not set -+# CONFIG_BOOTX_TEXT is not set -+# CONFIG_PPC_EARLY_DEBUG is not set -+ -+# -+# Security options -+# -+# CONFIG_KEYS is not set -+# CONFIG_SECURITY is not set -+CONFIG_CRYPTO=y -+CONFIG_CRYPTO_ALGAPI=m -+CONFIG_CRYPTO_BLKCIPHER=m -+CONFIG_CRYPTO_MANAGER=m -+# CONFIG_CRYPTO_HMAC is not set -+# CONFIG_CRYPTO_XCBC is not set -+# CONFIG_CRYPTO_NULL is not set -+# CONFIG_CRYPTO_MD4 is not set -+# CONFIG_CRYPTO_MD5 is not set -+CONFIG_CRYPTO_SHA1=m -+# CONFIG_CRYPTO_SHA256 is not set -+# CONFIG_CRYPTO_SHA512 is not set -+# CONFIG_CRYPTO_WP512 is not set -+# CONFIG_CRYPTO_TGR192 is not set -+# CONFIG_CRYPTO_GF128MUL is not set -+CONFIG_CRYPTO_ECB=m -+CONFIG_CRYPTO_CBC=m -+CONFIG_CRYPTO_PCBC=m -+# CONFIG_CRYPTO_LRW is not set -+# CONFIG_CRYPTO_CRYPTD is not set -+# CONFIG_CRYPTO_DES is not set -+# CONFIG_CRYPTO_FCRYPT is not set -+# CONFIG_CRYPTO_BLOWFISH is not set -+# CONFIG_CRYPTO_TWOFISH is not set -+# CONFIG_CRYPTO_SERPENT is not set -+# CONFIG_CRYPTO_AES is not set -+# CONFIG_CRYPTO_CAST5 is not set -+# CONFIG_CRYPTO_CAST6 is not set -+# CONFIG_CRYPTO_TEA is not set -+CONFIG_CRYPTO_ARC4=m -+# CONFIG_CRYPTO_KHAZAD is not set -+# CONFIG_CRYPTO_ANUBIS is not set -+# CONFIG_CRYPTO_DEFLATE is not set -+# CONFIG_CRYPTO_MICHAEL_MIC is not set -+# CONFIG_CRYPTO_CRC32C is not set -+# CONFIG_CRYPTO_CAMELLIA is not set -+# CONFIG_CRYPTO_TEST is not set -+# CONFIG_CRYPTO_HW is not set -diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig -index b62aab3..572132c 100644 ---- a/arch/powerpc/platforms/Kconfig -+++ b/arch/powerpc/platforms/Kconfig -@@ -6,6 +6,7 @@ source "arch/powerpc/platforms/chrp/Kconfig" - source "arch/powerpc/platforms/512x/Kconfig" - source "arch/powerpc/platforms/52xx/Kconfig" - source "arch/powerpc/platforms/powermac/Kconfig" -+source "arch/powerpc/platforms/qemu/Kconfig" - source "arch/powerpc/platforms/maple/Kconfig" - source "arch/powerpc/platforms/pasemi/Kconfig" - source "arch/powerpc/platforms/ps3/Kconfig" -diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile -index 879b4a4..946ba60 100644 ---- a/arch/powerpc/platforms/Makefile -+++ b/arch/powerpc/platforms/Makefile -@@ -15,6 +15,7 @@ obj-$(CONFIG_PPC_83xx) += 83xx/ - obj-$(CONFIG_FSL_SOC_BOOKE) += 85xx/ - obj-$(CONFIG_PPC_86xx) += 86xx/ - obj-$(CONFIG_PPC_POWERNV) += powernv/ -+obj-$(CONFIG_PPC_QEMU) += qemu/ - obj-$(CONFIG_PPC_PSERIES) += pseries/ - obj-$(CONFIG_PPC_MAPLE) += maple/ - obj-$(CONFIG_PPC_PASEMI) += pasemi/ -diff --git a/arch/powerpc/platforms/qemu/Kconfig b/arch/powerpc/platforms/qemu/Kconfig -new file mode 100644 -index 0000000..d64ed92 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/Kconfig -@@ -0,0 +1,10 @@ -+config PPC_QEMU -+ bool "QEMU emulated PowerPC Reference Platform (PReP) system" -+ depends on PPC_MULTIPLATFORM && PPC32 -+ select PPC_I8259 -+ select PPC_INDIRECT_PCI -+ select PPC_UDBG_16550 -+ select PPC_NATIVE -+ select WANT_DEVICE_TREE -+ default n -+ -diff --git a/arch/powerpc/platforms/qemu/Makefile b/arch/powerpc/platforms/qemu/Makefile -new file mode 100644 -index 0000000..b7288e8 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/Makefile -@@ -0,0 +1,2 @@ -+obj-y += setup.o -+obj-$(CONFIG_PCI) += pci.o -diff --git a/arch/powerpc/platforms/qemu/pci.c b/arch/powerpc/platforms/qemu/pci.c -new file mode 100644 -index 0000000..2bd3b00 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/pci.c -@@ -0,0 +1,133 @@ -+/* -+ * prep Port to arch/powerpc: -+ * Copyright 2007 David Gibson, IBM Corporation. -+ * -+ * prep Port to qemu: -+ * Copyright 2007 Milton Miller, IBM Corporation. -+ * -+ * Based on OpenHackware 0.4 -+ * Copyright (c) 2004-2005 Jocelyn Mayer -+ * -+ * pci config based on arch/powerpc/platforms/chrp/pci.c GoldenGate code -+ * -+ */ -+ -+#include <linux/init.h> -+ -+#include <asm/io.h> -+#include <asm/prom.h> -+#include <asm/pci-bridge.h> -+#include <asm/udbg.h> -+ -+static volatile void __iomem *qemu_config_addr(struct pci_bus *bus, -+ unsigned int devfn, int off) -+{ -+ int dev, fn; -+ struct pci_controller *hose = bus->sysdata; -+ -+ if (!hose->cfg_data) -+ return NULL; -+ -+ if (bus->number != 0) -+ return NULL; -+ -+ dev = devfn >> 3; -+ fn = devfn & 7; -+ -+ if (dev < 11 || dev > 21) -+ return NULL; -+ -+ return hose->cfg_data + ((1 << dev) | (fn << 8) | off); -+} -+ -+int qemu_read_config(struct pci_bus *bus, unsigned int devfn, int off, -+ int len, u32 *val) -+{ -+ volatile void __iomem *cfg_data = qemu_config_addr(bus, devfn, off); -+ -+ if (cfg_data == NULL) -+ return PCIBIOS_DEVICE_NOT_FOUND; -+ -+ /* -+ * Note: the caller has already checked that off is -+ * suitably aligned and that len is 1, 2 or 4. -+ */ -+ switch (len) { -+ case 1: -+ *val = in_8(cfg_data); -+ break; -+ case 2: -+ *val = in_le16(cfg_data); -+ break; -+ default: -+ *val = in_le32(cfg_data); -+ break; -+ } -+ return PCIBIOS_SUCCESSFUL; -+} -+ -+int qemu_write_config(struct pci_bus *bus, unsigned int devfn, int off, -+ int len, u32 val) -+{ -+ volatile void __iomem *cfg_data = qemu_config_addr(bus, devfn, off); -+ -+ if (cfg_data == NULL) -+ return PCIBIOS_DEVICE_NOT_FOUND; -+ -+ /* -+ * Note: the caller has already checked that off is -+ * suitably aligned and that len is 1, 2 or 4. -+ */ -+ switch (len) { -+ case 1: -+ out_8(cfg_data, val); -+ break; -+ case 2: -+ out_le16(cfg_data, val); -+ break; -+ default: -+ out_le32(cfg_data, val); -+ break; -+ } -+ return PCIBIOS_SUCCESSFUL; -+} -+ -+static struct pci_ops qemu_pci_ops = -+{ -+ qemu_read_config, -+ qemu_write_config -+}; -+ -+void __init qemu_find_bridges(void) -+{ -+ struct device_node *phb; -+ struct pci_controller *hose; -+ -+ phb = of_find_node_by_type(NULL, "pci"); -+ if (!phb) { -+ printk(KERN_ERR "PReP: Cannot find PCI bridge OF node\n"); -+ return; -+ } -+ -+ hose = pcibios_alloc_controller(phb); -+ if (!hose) -+ return; -+ -+ pci_process_bridge_OF_ranges(hose, phb, 1); -+ -+#define PREP_PCI_DRAM_OFFSET 0x80000000 -+ -+ pci_dram_offset = PREP_PCI_DRAM_OFFSET; -+ ISA_DMA_THRESHOLD = 0x00ffffff; -+ DMA_MODE_READ = 0x44; -+ DMA_MODE_WRITE = 0x48; -+ -+ hose->cfg_data = ioremap(0x80800000, 1 << 22); -+ -+ hose->ops = &qemu_pci_ops; -+ -+ udbg_init_uart(hose->io_base_virt + 0x3f8, 0, 0); -+ register_early_udbg_console(); -+ printk(KERN_INFO "qemu_find_bridges: config at %p\n", hose->cfg_data); -+} -+ -diff --git a/arch/powerpc/platforms/qemu/setup.c b/arch/powerpc/platforms/qemu/setup.c -new file mode 100644 -index 0000000..2d1ecf2 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/setup.c -@@ -0,0 +1,180 @@ -+/* -+ * Copyright (C) 1995 Linus Torvalds -+ * Adapted from 'alpha' version by Gary Thomas -+ * Modified by Cort Dougan (cort@cs.nmt.edu) -+ * -+ * Support for PReP (Motorola MTX/MVME) -+ * by Troy Benjegerdes (hozer@drgw.net) -+ * -+ * Port to arch/powerpc: -+ * Copyright 2007 David Gibson, IBM Corporation. -+ * -+ * Port to qemu: -+ * Copyright 2007 Milton Miller, IBM Corporation. -+ * -+ * Some information based on OpenHackware 0.4 -+ * Copyright (c) 2004-2005 Jocelyn Mayer -+ * -+ */ -+ -+#include <linux/init.h> -+#include <linux/seq_file.h> -+#include <linux/initrd.h> -+#include <linux/ide.h> -+ -+#include <asm/io.h> -+#include <asm/prom.h> -+#include <asm/pci-bridge.h> -+/* #include <asm/mpic.h> */ -+#include <asm/i8259.h> -+#include <asm/time.h> -+#include <asm/udbg.h> -+ -+static const char *qemu_model = "(unknown)"; -+ -+extern void qemu_find_bridges(void); -+ -+/* cpuinfo code common to all IBM PReP */ -+static void qemu_ibm_cpuinfo(struct seq_file *m) -+{ -+ seq_printf(m, "machine\t\t: PReP %s\n", qemu_model); -+} -+ -+#define NVRAM_AS0 0x74 -+#define NVRAM_AS1 0x75 -+#define NVRAM_DAT 0x77 -+ -+static unsigned char qemu_nvram_read_val(int addr) -+{ -+ outb(NVRAM_AS0, addr & 0xff); -+ outb(NVRAM_AS1, (addr >> 8) & 0xff); -+ return inb(NVRAM_DAT); -+} -+ -+ -+static void qemu_nvram_write_val(int addr, unsigned char val) -+{ -+ outb(NVRAM_AS0, addr & 0xff); -+ outb(NVRAM_AS1, (addr >> 8) & 0xff); -+ outb(NVRAM_DAT, val); -+} -+ -+ -+static void __init qemu_setup_arch(void) -+{ -+ struct device_node *root; -+ const char *model; -+ -+ root = of_find_node_by_path("/"); -+ model = of_get_property(root, "model", NULL); -+ of_node_put(root); -+ if (model) -+ qemu_model = model; -+ -+ /* Lookup PCI host bridges */ -+ qemu_find_bridges(); -+ -+ /* Read in NVRAM data */ -+/* init_qemu_nvram(); */ -+} -+ -+static void __init qemu_init_IRQ(void) -+{ -+ struct device_node *pic = NULL; -+ unsigned long int_ack = 0; -+ -+ pic = of_find_node_by_type(NULL, "i8259"); -+ if (!pic) { -+ printk(KERN_ERR "No interrupt controller found!\n"); -+ return; -+ } -+ -+ /* polling */ -+ i8259_init(pic, int_ack); -+ ppc_md.get_irq = i8259_irq; -+ -+ /* set default host */ -+ irq_set_default_host(i8259_get_host()); -+} -+ -+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) -+/* -+ * IDE stuff. -+ */ -+static int qemu_ide_default_irq(unsigned long base) -+{ -+ switch (base) { -+ case 0x1f0: return 13; -+ case 0x170: return 13; -+ case 0x1e8: return 11; -+ case 0x168: return 10; -+ case 0xfff0: return 14; /* MCP(N)750 ide0 */ -+ case 0xffe0: return 15; /* MCP(N)750 ide1 */ -+ default: return 0; -+ } -+} -+ -+static unsigned long qemu_ide_default_io_base(int index) -+{ -+ switch (index) { -+ case 0: return 0x1f0; -+ case 1: return 0x170; -+ case 2: return 0x1e8; -+ case 3: return 0x168; -+ default: -+ return 0; -+ } -+} -+#endif -+ -+#if 0 -+static int __init prep_request_io(void) -+{ -+#ifdef CONFIG_NVRAM -+ request_region(PREP_NVRAM_AS0, 0x8, "nvram"); -+#endif -+ request_region(0x00,0x20,"dma1"); -+ request_region(0x40,0x20,"timer"); -+ request_region(0x80,0x10,"dma page reg"); -+ request_region(0xc0,0x20,"dma2"); -+ -+ return 0; -+} -+device_initcall(prep_request_io); -+#endif -+ -+ -+static int __init qemu_probe(void) -+{ -+ if (!of_flat_dt_is_compatible(of_get_flat_dt_root(), "qemu-prep")) -+ return 0; -+ -+#if 0 -+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) -+ ppc_ide_md.default_irq = qemu_ide_default_irq; -+ ppc_ide_md.default_io_base = qemu_ide_default_io_base; -+#endif -+#endif -+ -+ return 1; -+} -+ -+define_machine(qemu) { -+ .name = "QEMU", -+ .probe = qemu_probe, -+ .setup_arch = qemu_setup_arch, -+ .progress = udbg_progress, -+ .show_cpuinfo = qemu_ibm_cpuinfo, -+ .init_IRQ = qemu_init_IRQ, -+/* .pcibios_fixup = qemu_pcibios_fixup, */ -+/* .restart = qemu_restart, */ -+/* .power_off = qemu_halt, */ -+/* .halt = qemu_halt, */ -+/* .time_init = todc_time_init, */ -+/* .set_rtc_time = todc_set_rtc_time, */ -+/* .get_rtc_time = todc_get_rtc_time, */ -+ .calibrate_decr = generic_calibrate_decr, -+ .nvram_read_val = qemu_nvram_read_val, -+ .nvram_write_val = qemu_nvram_write_val, -+ .phys_mem_access_prot = pci_phys_mem_access_prot, -+}; diff --git a/bsp/qemu-ppc32/qemu-powerpc-Added-qemu_restart-function.patch b/bsp/qemu-ppc32/qemu-powerpc-Added-qemu_restart-function.patch deleted file mode 100644 index 23713f10..00000000 --- a/bsp/qemu-ppc32/qemu-powerpc-Added-qemu_restart-function.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4ea81210af681a20d425b52d42285e8c729b6f75 Mon Sep 17 00:00:00 2001 -From: J. Aaron Gamble <john.gamble@windriver.com> -Date: Wed, 22 Sep 2010 11:20:03 -0400 -Subject: [PATCH] qemu/powerpc: Added qemu_restart() function - -qemu_restart code taken from: - - http://www.mail-archive.com/linuxppc-dev@lists.ozlabs.org/msg03147.html - -Updated qemu machine description to use this function - -Signed-off-by: J. Aaron Gamble <john.gamble@windriver.com> ---- - arch/powerpc/platforms/qemu/setup.c | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -diff --git a/arch/powerpc/platforms/qemu/setup.c b/arch/powerpc/platforms/qemu/setup.c -index 2d1ecf2..1f37f71 100644 ---- a/arch/powerpc/platforms/qemu/setup.c -+++ b/arch/powerpc/platforms/qemu/setup.c -@@ -159,6 +159,22 @@ static int __init qemu_probe(void) - return 1; - } - -+void qemu_restart(char *cmd) -+{ -+ local_irq_disable(); /* no interrupts */ -+ /* set exception prefix high - to the prom */ -+ mtmsr(mfmsr() | MSR_IP); -+ -+ /* make sure bit 0 (reset) is a 0 */ -+ outb(inb(0x92) & ~1L, 0x92); -+ /* signal a reset to system control port A - soft reset */ -+ outb(inb(0x92) | 1, 0x92); -+ -+ while(1); -+ -+ /* not reached */ -+} -+ - define_machine(qemu) { - .name = "QEMU", - .probe = qemu_probe, -@@ -167,7 +183,7 @@ define_machine(qemu) { - .show_cpuinfo = qemu_ibm_cpuinfo, - .init_IRQ = qemu_init_IRQ, - /* .pcibios_fixup = qemu_pcibios_fixup, */ --/* .restart = qemu_restart, */ -+ .restart = qemu_restart, - /* .power_off = qemu_halt, */ - /* .halt = qemu_halt, */ - /* .time_init = todc_time_init, */ --- -1.6.5.2 - diff --git a/bsp/qemu-ppc32/qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch b/bsp/qemu-ppc32/qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch deleted file mode 100644 index 313a04d7..00000000 --- a/bsp/qemu-ppc32/qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 209ea269a862451a4bed62f2930c4ba82aaf5368 Mon Sep 17 00:00:00 2001 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Wed, 3 Feb 2010 13:51:19 -0500 -Subject: [PATCH] qemu, powerpc: work around for qemu powerpc 32 interrupts - -Workaround for QEMU powerpc 32 to force interrupt acknoledgement - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> -diff --git a/arch/powerpc/platforms/qemu/Kconfig b/arch/powerpc/platforms/qemu/Kconfig -index d64ed92..366e50c 100644 ---- a/arch/powerpc/platforms/qemu/Kconfig -+++ b/arch/powerpc/platforms/qemu/Kconfig -@@ -1,6 +1,6 @@ - config PPC_QEMU - bool "QEMU emulated PowerPC Reference Platform (PReP) system" -- depends on PPC_MULTIPLATFORM && PPC32 -+ depends on PPC32 - select PPC_I8259 - select PPC_INDIRECT_PCI - select PPC_UDBG_16550 -diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c -index 616ec1c..4a22fa6 100644 ---- a/kernel/irq/chip.c -+++ b/kernel/irq/chip.c -@@ -137,9 +137,18 @@ struct irq_data *irq_get_irq_data(unsigned int irq) - } - EXPORT_SYMBOL_GPL(irq_get_irq_data); - -+#define IRQ_DELAYED_DISABLE 0x10000000 /* IRQ disable (masking) happens delayed. */ -+ - static void irq_state_clr_disabled(struct irq_desc *desc) - { -+#ifdef CONFIG_PPC_QEMU -+ struct irq_desc *desc = irq_data_to_desc(irq); -+ -+ if (!(desc->status & IRQ_DELAYED_DISABLE)) -+ desc->chip->mask(irq); -+#else - irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED); -+#endif /* CONFIG_PPC_QEMU */ - } - - static void irq_state_set_disabled(struct irq_desc *desc) diff --git a/bsp/qemu-ppc32/qemu-ppc32-rt.cfg b/bsp/qemu-ppc32/qemu-ppc32-rt.cfg index 4de14194..4c8775e6 100644 --- a/bsp/qemu-ppc32/qemu-ppc32-rt.cfg +++ b/bsp/qemu-ppc32/qemu-ppc32-rt.cfg @@ -1,3 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_PROFILING is not set -# CONFIG_OPROFILE is not set +CONFIG_PROFILING=n diff --git a/bsp/qemu-ppc32/qemu-ppc32.cfg b/bsp/qemu-ppc32/qemu-ppc32.cfg index 39a71e5d..ff770844 100644 --- a/bsp/qemu-ppc32/qemu-ppc32.cfg +++ b/bsp/qemu-ppc32/qemu-ppc32.cfg @@ -10,23 +10,13 @@ # consult the product documentation. # #......................................................................... -# CONFIG_PPC_CHRP is not set +CONFIG_PPC_CHRP=n CONFIG_PPC_PMAC=y CONFIG_PCNET32=y CONFIG_NE2K_PCI=y CONFIG_MACE=y CONFIG_BMAC=y -CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_PMACZILOG_TTYS=y -CONFIG_SERIAL_PMACZILOG_CONSOLE=y - -CONFIG_IDE=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_IDE_PMAC=y -CONFIG_BLK_DEV_IDEDMA=y - CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_INPUT_ADBHID=y @@ -34,7 +24,7 @@ CONFIG_INPUT_ADBHID=y CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_MOUSE=y -CONFIG_SCSI=m +CONFIG_SCSI=y CONFIG_BLK_DEV_SD=m CONFIG_USB_MON=y @@ -43,6 +33,11 @@ CONFIG_USB_STORAGE=m CONFIG_INPUT_EVDEV=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_SERPORT=n CONFIG_ALTIVEC=y + + +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_TTYS=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=n diff --git a/bsp/qemu-ppc32/qemu-ppc32.scc b/bsp/qemu-ppc32/qemu-ppc32.scc index 30144cf4..c4e82cd7 100644 --- a/bsp/qemu-ppc32/qemu-ppc32.scc +++ b/bsp/qemu-ppc32/qemu-ppc32.scc @@ -3,17 +3,8 @@ kconf hardware qemu-ppc32.cfg kconf hardware qemu-ppc32-gfx.cfg include features/profiling/profiling.scc -include features/latencytop/latencytop.scc include features/usb/ehci-hcd.scc include features/usb/uhci-hcd.scc include features/usb/ohci-hcd.scc include features/usb/xhci-hcd.scc - -# patch qemu-platform-v2.patch -# patch powerpc-special-load-offset-for-qemu.patch -# patch qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch -# patch qemu_ppc32-support-multiple-ethernet-interfaces.patch -# patch qemu_ppc-enable-IDE-support.patch -# patch qemu-powerpc-Added-qemu_restart-function.patch -# patch qemuppc-irq-disable-fixups.patch diff --git a/bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch b/bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch deleted file mode 100644 index 54b1ad46..00000000 --- a/bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e22320e51878054af4863c7b8ee1f7c76f82030f Mon Sep 17 00:00:00 2001 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Thu, 24 Jun 2010 04:10:55 -0700 -Subject: [PATCH] qemu_ppc: enable IDE support - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - drivers/ide/Kconfig | 2 +- - drivers/ide/ide-generic.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig -index 8fb46aab2d87..da2d105db376 100644 ---- a/drivers/ide/Kconfig -+++ b/drivers/ide/Kconfig -@@ -197,7 +197,7 @@ comment "IDE chipset support/bugfixes" - - config IDE_GENERIC - tristate "generic/default IDE chipset support" -- depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC -+ depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || PPC_QEMU - default ARM && ARCH_RPC - help - This is the generic IDE driver. This driver attaches to the -diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c -index 54d7c4685d23..eb74ba5423f7 100644 ---- a/drivers/ide/ide-generic.c -+++ b/drivers/ide/ide-generic.c -@@ -45,6 +45,9 @@ static const int legacy_irqs[] = { PLD_IRQ_CFIREQ, PLD_IRQ_IDEIREQ }; - #elif defined(CONFIG_ALPHA) - static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 }; - static const int legacy_irqs[] = { 14, 15, 11, 10 }; -+#elif defined(CONFIG_PPC_QEMU) -+static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 }; -+static const int legacy_irqs[] = { 13, 13, 11, 10 }; - #else - static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 }; - static const int legacy_irqs[] = { 14, 15, 11, 10, 8, 12 }; --- -1.8.1.2 - diff --git a/bsp/qemu-ppc32/qemu_ppc32-support-multiple-ethernet-interfaces.patch b/bsp/qemu-ppc32/qemu_ppc32-support-multiple-ethernet-interfaces.patch deleted file mode 100644 index 80b016b8..00000000 --- a/bsp/qemu-ppc32/qemu_ppc32-support-multiple-ethernet-interfaces.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 105af9c859bc4230ff68f876b63c1f36a80b0b64 Mon Sep 17 00:00:00 2001 -From: Tony Liu <Bo.Liu@windriver.com> -Date: Thu, 11 Mar 2010 14:38:49 +0800 -Subject: [PATCH] qemu_ppc32: support multiple ethernet interfaces - -Enable QEMU ppc32 to support at most 3 ethernet interfaces. - -Signed-off-by: Wessel Jason <jason.wessel@windriver.com> -Signed-off-by: Chunbo Luo <chunbo.luo@windriver.com> -diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c -index 1063093..eb63fb9 100644 ---- a/drivers/net/ethernet/8390/ne.c -+++ b/drivers/net/ethernet/8390/ne.c -@@ -482,8 +482,19 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) - } else if (dev->irq == 2) - /* Fixup for users that don't know that IRQ 2 is really IRQ 9, - or don't know which one to set. */ -+ if (ioaddr == 0x300) - dev->irq = 9; -- -+ else if (ioaddr == 0x320) -+ dev->irq = 10; -+ else if (ioaddr == 0x340) -+ dev->irq = 11; -+ else { -+ printk(KERN_ERR "failed to probe %s, QEMU supports at most 3 interfaces.\n", -+ dev->name); -+ ret = -ENODEV; -+ goto err_out; -+ } -+#endif - if (! dev->irq) { - printk(" failed to detect IRQ line.\n"); - ret = -EAGAIN; diff --git a/bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch b/bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch deleted file mode 100644 index a8b5e05f..00000000 --- a/bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 11d9dbd47954597b215e75af246bcfeb4c0ca62e Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Wed, 15 Jun 2011 16:12:17 -0400 -Subject: [PATCH] qemuppc: irq disable fixups - -Mapping the qemuppc interupt handling to the new interrupt -routines means that we call irq_state_clr_disabled -to enable irqs, not disable them. So we should modify function -"irq_state_set_disabled" with our custom qemppc mods. - -Signed-off-by: Liming Wang <liming.wang@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - kernel/irq/chip.c | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c -index a813b57..c997226 100644 ---- a/kernel/irq/chip.c -+++ b/kernel/irq/chip.c -@@ -141,19 +141,17 @@ EXPORT_SYMBOL_GPL(irq_get_irq_data); - - static void irq_state_clr_disabled(struct irq_desc *desc) - { --#ifdef CONFIG_PPC_QEMU -- struct irq_desc *desc = irq_data_to_desc(irq); -- -- if (!(desc->status & IRQ_DELAYED_DISABLE)) -- desc->chip->mask(irq); --#else - irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED); --#endif /* CONFIG_PPC_QEMU */ - } - - static void irq_state_set_disabled(struct irq_desc *desc) - { -+#ifdef CONFIG_PPC_QEMU -+ if (!(desc->status_use_accessors & IRQ_DELAYED_DISABLE)) -+ desc->irq_data.chip->irq_mask(&desc->irq_data); -+#else - irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); -+#endif /* CONFIG_PPC_QEMU */ - } - - static void irq_state_clr_masked(struct irq_desc *desc) --- -1.7.4.1 - diff --git a/bsp/qemu-ppc64/qemu-ppc64-standard.scc b/bsp/qemu-ppc64/qemu-ppc64-standard.scc index 440af149..2c663cda 100644 --- a/bsp/qemu-ppc64/qemu-ppc64-standard.scc +++ b/bsp/qemu-ppc64/qemu-ppc64-standard.scc @@ -16,6 +16,3 @@ include features/scsi/cdrom.scc include cfg/virtio.scc include qemu-ppc64.scc - -# default policy for standard kernels -include features/latencytop/latencytop.scc diff --git a/bsp/qemu-ppc64/qemu-ppc64.cfg b/bsp/qemu-ppc64/qemu-ppc64.cfg index d2f9f040..b2a5194d 100644 --- a/bsp/qemu-ppc64/qemu-ppc64.cfg +++ b/bsp/qemu-ppc64/qemu-ppc64.cfg @@ -2,13 +2,10 @@ CONFIG_PPC64=y CONFIG_PPC_BOOK3S_64=y CONFIG_GENERIC_CPU=y -CONFIG_POWER4=y CONFIG_SMP=y CONFIG_NR_CPUS=2 -CONFIG_CPU_BIG_ENDIAN=y CONFIG_NR_IRQS=512 CONFIG_PPC=y -CONFIG_SYSVIPC_COMPAT=y CONFIG_GENERIC_BUG=y CONFIG_EPAPR_BOOT=y CONFIG_PPC_PSERIES=y @@ -28,12 +25,10 @@ CONFIG_NET_VENDOR_IBM=y CONFIG_IBMVETH=y CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y -CONFIG_VMXNET3=y CONFIG_TTY=y CONFIG_VT=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_FB=y -CONFIG_FB_DDC=y CONFIG_FB_OF=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -46,3 +41,38 @@ CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_OID_REGISTRY=y + +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_CPU_BIG_ENDIAN=n +CONFIG_HVC_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y + +CONFIG_ALTIVEC=y +CONFIG_VSX=y + +CONFIG_IRQ_ALL_CPUS=y +CONFIG_PPC_64K_PAGES=y +CONFIG_SCHED_SMT=y +CONFIG_VIRTUALIZATION=y + +CONFIG_INPUT_KEYBOARD=y +CONFIG_INPUT_MOUSE=y +CONFIG_INPUT_MOUSEDEV=y + +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y + +CONFIG_HVCS=y +CONFIG_HVC_RTAS=y + +CONFIG_INPUT_MISC=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_XHCI_PLATFORM=y + +CONFIG_DRM_BOCHS=n + +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GENERIC=y diff --git a/bsp/qemuarm64/qemuarm64-gfx.cfg b/bsp/qemuarm64/qemuarm64-gfx.cfg index 039bfae5..ceae36c5 100644 --- a/bsp/qemuarm64/qemuarm64-gfx.cfg +++ b/bsp/qemuarm64/qemuarm64-gfx.cfg @@ -1,8 +1,4 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y -CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y - -CONFIG_DRM=y -CONFIG_DRM_BOCHS=y +CONFIG_INPUT=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarm64/qemuarm64-preempt-rt.scc b/bsp/qemuarm64/qemuarm64-preempt-rt.scc index f2004be0..87054501 100644 --- a/bsp/qemuarm64/qemuarm64-preempt-rt.scc +++ b/bsp/qemuarm64/qemuarm64-preempt-rt.scc @@ -6,7 +6,6 @@ define KARCH arm64 # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-standard.scc b/bsp/qemuarm64/qemuarm64-standard.scc index 361f4a20..e3d75080 100644 --- a/bsp/qemuarm64/qemuarm64-standard.scc +++ b/bsp/qemuarm64/qemuarm64-standard.scc @@ -6,7 +6,6 @@ define KARCH arm64 include ktypes/standard/standard.scc branch qemuarm64 -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-tiny.scc b/bsp/qemuarm64/qemuarm64-tiny.scc new file mode 100644 index 00000000..5fdb3416 --- /dev/null +++ b/bsp/qemuarm64/qemuarm64-tiny.scc @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: MIT +define KMACHINE qemuarm64 +define KTYPE tiny +define KARCH arm64 + +include ktypes/tiny/tiny.scc + +include qemuarm64.scc + +include features/hid/hid.scc + +# enable the ability to run 32 bit apps +include arch/arm/32bit-compat.scc diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg index ef8d3ed0..759ab8e6 100644 --- a/bsp/qemuarm64/qemuarm64.cfg +++ b/bsp/qemuarm64/qemuarm64.cfg @@ -14,6 +14,7 @@ CONFIG_ARM_AMBA=y # # Non-8250 serial port support # +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -32,3 +33,4 @@ CONFIG_RTC_DRV_PL031=y # PCI configs, needed for virtio-rng (and others) CONFIG_PCI=y CONFIG_PCI_HOST_GENERIC=y + diff --git a/bsp/qemuarm64/qemuarm64.scc b/bsp/qemuarm64/qemuarm64.scc index dee5741e..f97995da 100644 --- a/bsp/qemuarm64/qemuarm64.scc +++ b/bsp/qemuarm64/qemuarm64.scc @@ -1,3 +1,9 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarm64.cfg kconf hardware qemuarm64-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/virtio.scc +include cfg/net/mdio.scc diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg b/bsp/qemuarma15/qemuarma15-gfx.cfg index 039bfae5..c3e36f0d 100644 --- a/bsp/qemuarma15/qemuarma15-gfx.cfg +++ b/bsp/qemuarma15/qemuarma15-gfx.cfg @@ -1,8 +1,6 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y +CONFIG_INPUT=y CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y -CONFIG_DRM=y -CONFIG_DRM_BOCHS=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.scc b/bsp/qemuarma15/qemuarma15-preempt-rt.scc index 216757bb..f6a2a400 100644 --- a/bsp/qemuarma15/qemuarma15-preempt-rt.scc +++ b/bsp/qemuarma15/qemuarma15-preempt-rt.scc @@ -3,11 +3,10 @@ define KMACHINE qemuarma15 define KTYPE preempt-rt define KARCH arm -# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +include features/pci/pci.scc +# for emulated pci support +include features/pci/pci-of-generic.scc diff --git a/bsp/qemuarma15/qemuarma15-standard.scc b/bsp/qemuarma15/qemuarma15-standard.scc index cdee6332..804e89d3 100644 --- a/bsp/qemuarma15/qemuarma15-standard.scc +++ b/bsp/qemuarma15/qemuarma15-standard.scc @@ -4,12 +4,9 @@ define KTYPE standard define KARCH arm include ktypes/standard/standard.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +include features/pci/pci.scc +# for emulated pci support +include features/pci/pci-of-generic.scc diff --git a/bsp/qemuarma15/qemuarma15-tiny.cfg b/bsp/qemuarma15/qemuarma15-tiny.cfg deleted file mode 100644 index ed47939f..00000000 --- a/bsp/qemuarma15/qemuarma15-tiny.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: MIT -CONFIG_MMU=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_V7=y - -CONFIG_ARM_AMBA=y - -CONFIG_ARM_THUMB=y -CONFIG_KUSER_HELPERS=y -CONFIG_OABI_COMPAT=y -CONFIG_EXT4_FS=y - -# to keep things small, you really don't want these on. But to -# keep qemuarm's hvc0 console happy, we have them on for now -CONFIG_TTY=y -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_HVC_DRIVER=y diff --git a/bsp/qemuarma15/qemuarma15-tiny.scc b/bsp/qemuarma15/qemuarma15-tiny.scc index 406f8111..058f2ddc 100644 --- a/bsp/qemuarma15/qemuarma15-tiny.scc +++ b/bsp/qemuarma15/qemuarma15-tiny.scc @@ -4,14 +4,7 @@ define KTYPE tiny define KARCH arm include ktypes/tiny/tiny.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 - -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc -include qemuarma15.scc +include features/hid/hid.scc -kconf hardware qemuarma15-tiny.cfg +include qemuarma15.scc diff --git a/bsp/qemuarma15/qemuarma15.cfg b/bsp/qemuarma15/qemuarma15.cfg index 32187155..3c40bd0a 100644 --- a/bsp/qemuarma15/qemuarma15.cfg +++ b/bsp/qemuarma15/qemuarma15.cfg @@ -1,13 +1,18 @@ # SPDX-License-Identifier: MIT +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_VIRT=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_HW_RANDOM=y @@ -16,7 +21,6 @@ CONFIG_SPI_PL022=y CONFIG_ARM_SP805_WATCHDOG=y CONFIG_RTC_DRV_PL031=y CONFIG_PL330_DMA=y -CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM_NEON=y CONFIG_CRYPTO_SHA1_ARM_CE=y CONFIG_CRYPTO_SHA2_ARM_CE=y @@ -28,6 +32,8 @@ CONFIG_CRYPTO_GHASH_ARM_CE=y CONFIG_CRYPTO_CRC32_ARM_CE=y CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_ARM_LPAE=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y CONFIG_HIGHMEM=y +CONFIG_ARM_AMBA=y +CONFIG_ARM_THUMB=y + +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/bsp/qemuarma15/qemuarma15.scc b/bsp/qemuarma15/qemuarma15.scc index 68d9e710..db49ee54 100644 --- a/bsp/qemuarma15/qemuarma15.scc +++ b/bsp/qemuarma15/qemuarma15.scc @@ -1,3 +1,11 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarma15.cfg kconf hardware qemuarma15-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc + +include cfg/virtio.scc +include cfg/dmaengine.scc +include cfg/timer/rtc.scc +include cfg/net/mdio.scc diff --git a/bsp/qemuarma9/qemuarma9-gfx.cfg b/bsp/qemuarma9/qemuarma9-gfx.cfg index 5e7519e0..193ff985 100644 --- a/bsp/qemuarma9/qemuarma9-gfx.cfg +++ b/bsp/qemuarma9/qemuarma9-gfx.cfg @@ -1,8 +1,11 @@ # SPDX-License-Identifier: MIT -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y - CONFIG_INPUT_TABLET=y -CONFIG_HID_WACOM=y +CONFIG_USB=y +CONFIG_USB_HID=y +CONFIG_USB_XHCI_HCD=y + +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y + CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc b/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc index 8cfad860..824a4e5d 100644 --- a/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc +++ b/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc @@ -12,5 +12,4 @@ include bsp/xilinx/soc/drivers-softip.scc include bsp/xilinx/board-common.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/qemumicroblaze/qemumicroblazeel-standard.scc b/bsp/qemumicroblaze/qemumicroblazeel-standard.scc index 7ac1eab8..69b7bdc2 100644 --- a/bsp/qemumicroblaze/qemumicroblazeel-standard.scc +++ b/bsp/qemumicroblaze/qemumicroblazeel-standard.scc @@ -12,5 +12,4 @@ include bsp/xilinx/soc/drivers-softip.scc include bsp/xilinx/board-common.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/qemuriscv32/qemuriscv32.cfg b/bsp/qemuriscv32/qemuriscv32.cfg index e944f964..ae1dd6f3 100644 --- a/bsp/qemuriscv32/qemuriscv32.cfg +++ b/bsp/qemuriscv32/qemuriscv32.cfg @@ -4,11 +4,11 @@ # CONFIG_ARCH_RV32I=y CONFIG_32BIT=y +CONFIG_NONPORTABLE=y # # Platform type # -CONFIG_MAXPHYSMEM_2GB=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PGTABLE_LEVELS=2 CONFIG_GENERIC_ATOMIC64=y @@ -41,3 +41,9 @@ CONFIG_VIRTIO_CONSOLE=y # IRQ chip support # CONFIG_SIFIVE_PLIC=y + +# +# Enable Goldfish RTC +# +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GOLDFISH=y diff --git a/bsp/qemuriscv32/qemuriscv32.scc b/bsp/qemuriscv32/qemuriscv32.scc index 7d368aad..2a1e3292 100644 --- a/bsp/qemuriscv32/qemuriscv32.scc +++ b/bsp/qemuriscv32/qemuriscv32.scc @@ -3,3 +3,9 @@ kconf hardware qemuriscv32.cfg # Graphics support include features/drm-bochs/drm-bochs.scc + +# XHCI USB +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/net/mdio.scc diff --git a/bsp/qemuriscv64/qemuriscv64.cfg b/bsp/qemuriscv64/qemuriscv64.cfg index 5e28e46e..5dcfbe63 100644 --- a/bsp/qemuriscv64/qemuriscv64.cfg +++ b/bsp/qemuriscv64/qemuriscv64.cfg @@ -8,7 +8,6 @@ CONFIG_64BIT=y # # Platform type # -CONFIG_MAXPHYSMEM_128GB=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_TUNE_GENERIC=y @@ -38,3 +37,9 @@ CONFIG_VIRTIO_CONSOLE=y # IRQ chip support # CONFIG_SIFIVE_PLIC=y + +# +# Enable Goldfish RTC +# +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GOLDFISH=y diff --git a/bsp/qemuriscv64/qemuriscv64.scc b/bsp/qemuriscv64/qemuriscv64.scc index 2f012c53..f7d834f5 100644 --- a/bsp/qemuriscv64/qemuriscv64.scc +++ b/bsp/qemuriscv64/qemuriscv64.scc @@ -3,3 +3,9 @@ kconf hardware qemuriscv64.cfg # Graphics support include features/drm-bochs/drm-bochs.scc + +# XHCI USB +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/net/mdio.scc diff --git a/bsp/renesas-rcar/renesas-rcar.cfg b/bsp/renesas-rcar/renesas-rcar.cfg index 32c08355..f0325826 100644 --- a/bsp/renesas-rcar/renesas-rcar.cfg +++ b/bsp/renesas-rcar/renesas-rcar.cfg @@ -18,8 +18,9 @@ CONFIG_SMP=y # Platform selection CONFIG_ARCH_RENESAS=y -CONFIG_ARCH_R8A7795=y -CONFIG_ARCH_R8A7796=y +CONFIG_ARCH_R8A77950=y +CONFIG_ARCH_R8A77951=y +CONFIG_ARCH_R8A77960=y CONFIG_ARM64_4K_PAGES=y CONFIG_ARM64_VA_BITS_48=y CONFIG_ARM64_VA_BITS=48 @@ -116,6 +117,7 @@ CONFIG_USB_RENESAS_USBHS=y CONFIG_USB_RENESAS_USBHS_UDC=y CONFIG_USB_RENESAS_USB3=m CONFIG_USB_DWC3=y +CONFIG_USB_ROLE_SWITCH=y CONFIG_GENERIC_PHY=y CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_RCAR_GEN3_USB3=y @@ -153,7 +155,6 @@ CONFIG_VIDEO_ADV7604_CEC=y # GPIO configuration CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y @@ -171,9 +172,10 @@ CONFIG_CAN_RCAR_CANFD=y # Multi-Media configuration CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEOBUF2_DMA_CONTIG=y @@ -185,7 +187,7 @@ CONFIG_VIDEO_RENESAS_VSP1=y CONFIG_VIDEO_RCAR_VIN=y CONFIG_VIDEO_RCAR_CSI2=y CONFIG_VIDEO_OV5647=y -# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set +CONFIG_MEDIA_SUBDRV_AUTOSELECT=n # DMA configuration CONFIG_DMA_SHARED_BUFFER=y diff --git a/bsp/ti-am335x/ti-am335x.cfg b/bsp/ti-am335x/ti-am335x.cfg index d091279c..bdf54c5d 100644 --- a/bsp/ti-am335x/ti-am335x.cfg +++ b/bsp/ti-am335x/ti-am335x.cfg @@ -135,7 +135,6 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_OMAP=y CONFIG_GPIO_PCA953X=m @@ -177,9 +176,6 @@ CONFIG_SND_SOC=m CONFIG_SND_SIMPLE_CARD=m -#CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -#CONFIG_USB_MON=m - # # USB Host Controller Drivers # @@ -201,7 +197,6 @@ CONFIG_AM335X_PHY_USB=m # Platform Glue Layer CONFIG_USB_MUSB_DSPS=m -CONFIG_USB_MUSB_AM335X_CHILD=m # MUSB DMA mode CONFIG_USB_TI_CPPI41_DMA=y @@ -217,6 +212,10 @@ CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OMAP=y + # # I2C RTC drivers # diff --git a/bsp/ti-am65x/ti-am65x.cfg b/bsp/ti-am65x/ti-am65x.cfg index 008d388b..4d628d36 100644 --- a/bsp/ti-am65x/ti-am65x.cfg +++ b/bsp/ti-am65x/ti-am65x.cfg @@ -158,6 +158,8 @@ CONFIG_SPI_CADENCE_QUADSPI=y CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y +CONFIG_TI_K3_UDMA=y +CONFIG_TI_K3_UDMA_GLUE_LAYER=y # # Common Clock Framework @@ -165,6 +167,7 @@ CONFIG_DMA_OF=y CONFIG_TI_SCI_CLK=y CONFIG_TI_SCI_PROTOCOL=y CONFIG_TI_SCI_CLK_PROBE_FROM_FW=y +CONFIG_PTP_1588_CLOCK=y # # Qualcomm SoC drivers @@ -194,3 +197,11 @@ CONFIG_PHY_AM654_SERDES=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_DP83867_PHY=y + +# +# NET Support +# +CONFIG_TI_K3_RINGACC=y +CONFIG_TI_K3_AM65_CPSW_NUSS=y +CONFIG_TI_CPSW_PHY_SEL=y +CONFIG_TI_K3_AM65_CPTS=y diff --git a/bsp/xilinx-zynq/xilinx-zynq.cfg b/bsp/xilinx-zynq/xilinx-zynq.cfg index b4f66b99..c4589de2 100644 --- a/bsp/xilinx-zynq/xilinx-zynq.cfg +++ b/bsp/xilinx-zynq/xilinx-zynq.cfg @@ -22,7 +22,6 @@ CONFIG_VFP=y CONFIG_NEON=y # DMA -CONFIG_XILINX_DMA_ENGINES=y CONFIG_AXI_DMAC=y CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y @@ -40,7 +39,7 @@ CONFIG_CADENCE_WATCHDOG=y # GPIO CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_CDEV=y CONFIG_GPIO_XILINX=y CONFIG_GPIO_ZYNQ=y CONFIG_GPIO_PCA953X=y @@ -173,6 +172,7 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_USB_SUPPORT=y diff --git a/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg b/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg index 361c1e33..21a7e297 100644 --- a/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg +++ b/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg @@ -22,8 +22,8 @@ CONFIG_MTD_OF_PARTS=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_SPI_NOR=y -# CONFIG_JFFS2_FS_WRITEBUFFER is not set -# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_JFFS2_FS_WRITEBUFFER=n +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=n CONFIG_BLK_DEV_SD=y CONFIG_ATA=y @@ -68,13 +68,16 @@ CONFIG_SPI_CADENCE=y CONFIG_SPI_XILINX=y CONFIG_SPI_ZYNQMP_GQSPI=y +CONFIG_PINCTRL=y + CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_CDEV=y CONFIG_GPIO_XILINX=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_ZYNQ=y +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_POWER_RESET=y CONFIG_SENSORS_INA2XX=y @@ -91,12 +94,17 @@ CONFIG_USB_OTG_FSM=m CONFIG_USB_GADGET=y CONFIG_USB_GADGET_XILINX=y +CONFIG_INPUT=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_EVDEV=y + CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ARASAN=y +CONFIG_RAS=y CONFIG_EDAC=y CONFIG_EDAC_SYNOPSYS=y CONFIG_EDAC_ZYNQMP_OCM=y @@ -108,7 +116,6 @@ CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_DRV_ZYNQMP=y CONFIG_DMADEVICES=y -CONFIG_XILINX_DMA_ENGINES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_CMA=y @@ -123,6 +130,7 @@ CONFIG_UIO_XILINX_APM=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_SI570=y CONFIG_COMMON_CLK_SI5324=y +CONFIG_COMMON_CLK_SI5341=y CONFIG_COMMON_CLK_ZYNQMP=y CONFIG_COMMON_CLK_XLNX_CLKWZRD=y CONFIG_IOMMU_API=y @@ -166,7 +174,7 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_XILINX=y CONFIG_VIDEO_XILINX_CFA=y @@ -186,7 +194,6 @@ CONFIG_VIDEO_XILINX_MULTISCALER=y CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y @@ -205,7 +212,7 @@ CONFIG_DRM_XLNX_SDI=y CONFIG_DRM_XLNX_BRIDGE_CSC=y CONFIG_DRM_XLNX_BRIDGE_SCALER=y CONFIG_XILINX_FRMBUF=y -CONFIG_XILINX_DPDMA=y +CONFIG_XILINX_ZYNQMP_DPDMA=y CONFIG_DRM_XILINX_SDI=y CONFIG_SOUND=y CONFIG_SND=y @@ -239,3 +246,9 @@ CONFIG_OF_CONFIGFS=y CONFIG_FPGA_MGR_DEBUG_FS=y CONFIG_ARM_PSCI_CPUIDLE=y + +CONFIG_ZYNQMP_FIRMWARE_DEBUG=y + +CONFIG_CRYPTO_DEV_ZYNQMP_SHA3=y +CONFIG_CRYPTO_DEV_XILINX_RSA=y +CONFIG_CRYPTO_DEV_ZYNQMP_AES=y diff --git a/bsp/xilinx/board-common.cfg b/bsp/xilinx/board-common.cfg index 6ba80905..0efca4cd 100644 --- a/bsp/xilinx/board-common.cfg +++ b/bsp/xilinx/board-common.cfg @@ -39,7 +39,7 @@ CONFIG_EEPROM_AT25=y # MTD CONFIG_MTD=y CONFIG_MTD_SPI_NOR=y -# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=n CONFIG_MTD_M25P80=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y diff --git a/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.cfg b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.cfg new file mode 100644 index 00000000..22eb8301 --- /dev/null +++ b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.cfg @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: MIT +CONFIG_XILINX_MICROBLAZE0_FAMILY="kintex7" + +# CPU ISA Config +CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 +CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 +CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 +CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 +CONFIG_XILINX_MICROBLAZE0_HW_VER="11.0" + +# Memory Base Address +CONFIG_KERNEL_BASE_ADDR=0x80000000 + +CONFIG_XILINX_AXI_EMAC=y +CONFIG_XILINX_PHY=y +CONFIG_BLK_DEV_INITRD=y diff --git a/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc new file mode 100644 index 00000000..2f9c2fbc --- /dev/null +++ b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for kc705-microblazeel specific setup" +define KFEATURE_COMPATIBILITY board + +kconf hardware kc705-microblazeel-features.cfg diff --git a/bsp/xilinx/soc/drivers-softip.cfg b/bsp/xilinx/soc/drivers-softip.cfg index 3d3e067c..01c29ba1 100644 --- a/bsp/xilinx/soc/drivers-softip.cfg +++ b/bsp/xilinx/soc/drivers-softip.cfg @@ -23,7 +23,6 @@ CONFIG_XILINX_AXI_EMAC=y # GPIO CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_XILINX=y # I2C diff --git a/bsp/xilinx/soc/drivers-zynq.cfg b/bsp/xilinx/soc/drivers-zynq.cfg index 560e0cb8..deee2b1c 100644 --- a/bsp/xilinx/soc/drivers-zynq.cfg +++ b/bsp/xilinx/soc/drivers-zynq.cfg @@ -29,11 +29,10 @@ CONFIG_WATCHDOG=y CONFIG_CADENCE_WATCHDOG=y # Ethernet -CONFIG_NET_CADENCE=y +CONFIG_NET_VENDOR_CADENCE=y CONFIG_MACB=y # GPIO -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ZYNQ=y # I2C diff --git a/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.cfg b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.cfg new file mode 100644 index 00000000..d7f65e7f --- /dev/null +++ b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.cfg @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: MIT +CONFIG_VIDEO_ADV_DEBUG=y +CONFIG_VIDEO_OV5640=y +CONFIG_VIDEO_OV5645=y +CONFIG_XILINX_APF=y +CONFIG_XILINX_DMA_APF=y +CONFIG_COMMON_CLK_IDT8T49N24X=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA9541=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_ALGOPCA=y +CONFIG_I2C_PCA_PLATFORM=y +CONFIG_I2C_DEBUG_CORE=y +CONFIG_I2C_DEBUG_BUS=y diff --git a/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc new file mode 100644 index 00000000..c326568b --- /dev/null +++ b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for Ultra96 for MIPI" +define KFEATURE_COMPATIBILITY board + +kconf hardware mipi-config-ultra96.cfg + diff --git a/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg new file mode 100644 index 00000000..6c03a9d5 --- /dev/null +++ b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: MIT +# Keyboard GPIO support +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_GPIO_POLLED=y + +# Sound support for Zybo linux_bd project +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_ADI=y +CONFIG_SND_SOC_ADI_AXI_I2S=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_SND_SOC_SSM2602_I2C=y + +# Drivers for Digilent DRM encoder +# DRM encoder +CONFIG_DRM_DIGILENT_ENCODER=y +# Common Clock Framework +CONFIG_COMMON_CLK_DGLNT_DYNCLK=y + diff --git a/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc new file mode 100644 index 00000000..35df82a2 --- /dev/null +++ b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for ZYBO Linux-BD Design" +define KFEATURE_COMPATIBILITY board + +kconf hardware zybo-linux-bd-zynq7.cfg + +include bsp/xilinx/soc/drivers-drm.scc + diff --git a/bsp/xilinx/zynq-standard.scc b/bsp/xilinx/zynq-standard.scc index 889ba997..bad94870 100644 --- a/bsp/xilinx/zynq-standard.scc +++ b/bsp/xilinx/zynq-standard.scc @@ -12,5 +12,4 @@ include features/input/input.scc include cfg/usb-mass-storage.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/cfg/8250.cfg b/cfg/8250.cfg index fe2d270c..403c736e 100644 --- a/cfg/8250.cfg +++ b/cfg/8250.cfg @@ -7,3 +7,4 @@ CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y diff --git a/cfg/amd.cfg b/cfg/amd.cfg index 2189810a..18213328 100644 --- a/cfg/amd.cfg +++ b/cfg/amd.cfg @@ -3,7 +3,6 @@ CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_MICROCODE=y -CONFIG_MICROCODE_AMD=y CONFIG_CPU_SUP_AMD=y diff --git a/cfg/boot-live.cfg b/cfg/boot-live.cfg index 03705e76..e13d04b5 100644 --- a/cfg/boot-live.cfg +++ b/cfg/boot-live.cfg @@ -2,7 +2,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_RD_GZIP=y # Needed for booting (and using) CD images -CONFIG_BLK_DEV_IDECD=y CONFIG_ISO9660_FS=y CONFIG_BLK_DEV_SR=y CONFIG_ZISOFS=y diff --git a/cfg/cgroup-hugetlb.cfg b/cfg/cgroup-hugetlb.cfg new file mode 100644 index 00000000..417ca249 --- /dev/null +++ b/cfg/cgroup-hugetlb.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# +# This requires CONFIG_HUGETLBFS + +CONFIG_CGROUP_HUGETLB=y diff --git a/cfg/cgroup-hugetlb.scc b/cfg/cgroup-hugetlb.scc new file mode 100644 index 00000000..7d1f9997 --- /dev/null +++ b/cfg/cgroup-hugetlb.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable hugetlb cgroup" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware cgroup-hugetlb.cfg diff --git a/cfg/criu.cfg b/cfg/criu.cfg new file mode 100644 index 00000000..dc9502a6 --- /dev/null +++ b/cfg/criu.cfg @@ -0,0 +1,8 @@ +#Networking options options for sock-diag subsystem +CONFIG_UNIX_DIAG=y +CONFIG_INET_DIAG=y +CONFIG_INET_UDP_DIAG=y +CONFIG_PACKET_DIAG=y +CONFIG_NETLINK_DIAG=y +CONFIG_NETFILTER_XT_MARK=y +CONFIG_TUN=m diff --git a/cfg/criu.scc b/cfg/criu.scc new file mode 100644 index 00000000..87a88113 --- /dev/null +++ b/cfg/criu.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable Networking Features needed by criu." +define KFEATURE_COMPATIBILITY board + +kconf non-hardware criu.cfg diff --git a/cfg/crypto-obsolete-disable.cfg b/cfg/crypto-obsolete-disable.cfg new file mode 100644 index 00000000..85128c87 --- /dev/null +++ b/cfg/crypto-obsolete-disable.cfg @@ -0,0 +1 @@ +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=n diff --git a/cfg/crypto-obsolete-disable.scc b/cfg/crypto-obsolete-disable.scc new file mode 100644 index 00000000..e7ead6a8 --- /dev/null +++ b/cfg/crypto-obsolete-disable.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Disable obselete crypto options" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware crypto-obsolete-disable.cfg + diff --git a/cfg/debug/debug-info/debug-info.cfg b/cfg/debug/debug-info/debug-info.cfg index 0514cea3..1d75b16b 100644 --- a/cfg/debug/debug-info/debug-info.cfg +++ b/cfg/debug/debug-info/debug-info.cfg @@ -1,3 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_TEST is not set CONFIG_DEBUG_INFO=y diff --git a/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg b/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg new file mode 100644 index 00000000..7e5b692a --- /dev/null +++ b/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +# dependencies +CONFIG_SYSFS=y +CONFIG_DEBUG_FS=y + +CONFIG_FAULT_INJECTION_DEBUG_FS=y diff --git a/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc b/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc new file mode 100644 index 00000000..d12af702 --- /dev/null +++ b/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable fault injection debugfs capabilities" +define KFEATURE_COMPATIBILITY all + +include debug-fault-injection.scc + +kconf non-hardware debug-fault-injection-debugfs.cfg diff --git a/cfg/debug/kcov/debug-kcov.cfg b/cfg/debug/kcov/debug-kcov.cfg new file mode 100644 index 00000000..9cdd37ce --- /dev/null +++ b/cfg/debug/kcov/debug-kcov.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +CONFIG_KCOV=y +CONFIG_KCOV_ENABLE_COMPARISONS=y +CONFIG_KCOV_INSTRUMENT_ALL=y diff --git a/cfg/debug/kcov/debug-kcov.scc b/cfg/debug/kcov/debug-kcov.scc new file mode 100644 index 00000000..325c6f99 --- /dev/null +++ b/cfg/debug/kcov/debug-kcov.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable kernel code coverage support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware debug-kcov.cfg diff --git a/cfg/debug/kcsan/debug-kcsan.cfg b/cfg/debug/kcsan/debug-kcsan.cfg new file mode 100644 index 00000000..57c4352e --- /dev/null +++ b/cfg/debug/kcsan/debug-kcsan.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_KCSAN=y diff --git a/cfg/debug/kcsan/debug-kcsan.scc b/cfg/debug/kcsan/debug-kcsan.scc new file mode 100644 index 00000000..b726d6b0 --- /dev/null +++ b/cfg/debug/kcsan/debug-kcsan.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable kernel concurrency sanitizer support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware debug-kcsan.cfg diff --git a/cfg/debug/mem/debug-pagealloc.cfg b/cfg/debug/mem/debug-pagealloc.cfg index c4f1ade0..218f0756 100644 --- a/cfg/debug/mem/debug-pagealloc.cfg +++ b/cfg/debug/mem/debug-pagealloc.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_HIBERNATION is not set +CONFIG_HIBERNATION=n CONFIG_DEBUG_PAGEALLOC=y CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y diff --git a/cfg/debug/misc/debug-credentials.cfg b/cfg/debug/misc/debug-credentials.cfg index e0d09198..548d2d44 100644 --- a/cfg/debug/misc/debug-credentials.cfg +++ b/cfg/debug/misc/debug-credentials.cfg @@ -1,2 +1 @@ # SPDX-License-Identifier: MIT -CONFIG_DEBUG_CREDENTIALS=y diff --git a/cfg/debug/misc/debug-optimize-inlining.scc b/cfg/debug/misc/debug-optimize-inlining.scc deleted file mode 100644 index 7e732402..00000000 --- a/cfg/debug/misc/debug-optimize-inlining.scc +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: MIT -if [ "$KARCH" = "x86_64" ] || [ "$KARCH" = "i386" ]; then - kconf non-hareware debug-optimize-inlining.cfg -fi diff --git a/cfg/debug/syzkaller/debug-syzkaller.scc b/cfg/debug/syzkaller/debug-syzkaller.scc new file mode 100644 index 00000000..ff99b281 --- /dev/null +++ b/cfg/debug/syzkaller/debug-syzkaller.scc @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable debug and emulation features needed for syzkaller fuzzing" +define KFEATURE_COMPATIBILITY all + +include cfg/debug/kcov/debug-kcov.scc +include cfg/debug/mem/debug-memleak.scc +include cfg/debug/kcsan/debug-kcsan.scc +include cfg/debug/fault-inject/debug-failslab-slab.scc +include cfg/debug/fault-inject/debug-fault-injection-debugfs.scc + +include features/tun/tun.scc +include features/usb/usb-dummy-hcd.scc +include features/usb/usb-raw-gadget.scc +include features/mac80211/mac80211-hwsim.scc +include features/bluetooth/bluetooth-vhci.scc +include features/ieee802154/ieee802154-hwsim.scc diff --git a/cfg/docker.cfg b/cfg/docker.cfg new file mode 100644 index 00000000..4d8d7e04 --- /dev/null +++ b/cfg/docker.cfg @@ -0,0 +1,15 @@ +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_NF_NAT=m +CONFIG_NF_CONNTRACK=y + +CONFIG_DM_THIN_PROVISIONING=m + + +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m + +CONFIG_OVERLAY_FS=y + +CONFIG_CGROUP_BPF=y diff --git a/cfg/docker.scc b/cfg/docker.scc new file mode 100644 index 00000000..e317456c --- /dev/null +++ b/cfg/docker.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable Features needed by docker in addition to LXC features" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware docker.cfg diff --git a/cfg/drm-cdvpvr.cfg b/cfg/drm-cdvpvr.cfg index 2ba41584..c51904cf 100644 --- a/cfg/drm-cdvpvr.cfg +++ b/cfg/drm-cdvpvr.cfg @@ -7,5 +7,5 @@ CONFIG_SND_HDA_CODEC_HDMI=y CONFIG_DRM_INTEL_CDV=y CONFIG_DRM_CDV_RELEASE=y -# CONFIG_DRM_CDV_DEBUG is not set -# CONFIG_DRM_PVR_PDUMP is not set +CONFIG_DRM_CDV_DEBUG=n +CONFIG_DRM_PVR_PDUMP=n diff --git a/cfg/ebtables.cfg b/cfg/ebtables.cfg new file mode 100644 index 00000000..a3c514e1 --- /dev/null +++ b/cfg/ebtables.cfg @@ -0,0 +1,2 @@ +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_NAT=m diff --git a/cfg/ebtables.scc b/cfg/ebtables.scc new file mode 100644 index 00000000..b3895e58 --- /dev/null +++ b/cfg/ebtables.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable ebtables support" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware ebtables.cfg diff --git a/cfg/efi-ext.cfg b/cfg/efi-ext.cfg index 55478ad9..b8fa0426 100644 --- a/cfg/efi-ext.cfg +++ b/cfg/efi-ext.cfg @@ -11,5 +11,4 @@ CONFIG_PARTITION_ADVANCED=y # Add support for optional EFI features CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FB_EFI=y -CONFIG_EFI_VARS=m CONFIG_EFI_PARTITION=y diff --git a/cfg/efi.cfg b/cfg/efi.cfg index d3dfd603..d729cbe9 100644 --- a/cfg/efi.cfg +++ b/cfg/efi.cfg @@ -3,7 +3,6 @@ # Dependencies CONFIG_PCI=y -CONFIG_ACPI=y # Enable basic EFI support CONFIG_EFI=y diff --git a/cfg/fs/ext2.cfg b/cfg/fs/ext2.cfg index 6a3efdf1..8bb8986c 100644 --- a/cfg/fs/ext2.cfg +++ b/cfg/fs/ext2.cfg @@ -2,4 +2,4 @@ CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y -# CONFIG_EXT2_FS_SECURITY is not set +CONFIG_EXT2_FS_SECURITY=n diff --git a/cfg/fs/squashfs.cfg b/cfg/fs/squashfs.cfg new file mode 100644 index 00000000..27906251 --- /dev/null +++ b/cfg/fs/squashfs.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_SQUASHFS=y diff --git a/cfg/fs/squashfs.scc b/cfg/fs/squashfs.scc new file mode 100644 index 00000000..bb82fe60 --- /dev/null +++ b/cfg/fs/squashfs.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable squashfs filesystem support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware squashfs.cfg diff --git a/cfg/intel.cfg b/cfg/intel.cfg index 3096df33..01e865df 100644 --- a/cfg/intel.cfg +++ b/cfg/intel.cfg @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT # Config settings specific to intel processors CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y CONFIG_CPU_SUP_INTEL=y diff --git a/cfg/kubernetes.cfg b/cfg/kubernetes.cfg new file mode 100644 index 00000000..84fa8c57 --- /dev/null +++ b/cfg/kubernetes.cfg @@ -0,0 +1,39 @@ +CONFIG_BLK_CGROUP=y +CONFIG_BLK_DEV_THROTTLING=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_NET_CLS_CGROUP=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_SET=m +CONFIG_IP_VS=y +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_RR=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NAMESPACES=y +CONFIG_NET_NS=y +CONFIG_PID_NS=y +CONFIG_IPC_NS=y +CONFIG_UTS_NS=y +CONFIG_CGROUPS=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_SCHED=y +CONFIG_SMP=y +CONFIG_CPUSETS=y +CONFIG_MEMCG=y +CONFIG_INET=y +CONFIG_EXT4_FS=y +CONFIG_PROC_FS=y diff --git a/cfg/kubernetes.scc b/cfg/kubernetes.scc new file mode 100644 index 00000000..9ec5d13a --- /dev/null +++ b/cfg/kubernetes.scc @@ -0,0 +1,5 @@ +include docker.scc +include cgl/cfg/net/ip_vs.scc +include features/hugetlb/hugetlb.scc + +kconf non-hardware kubernetes.cfg diff --git a/cfg/lxc.cfg b/cfg/lxc.cfg new file mode 100644 index 00000000..09093319 --- /dev/null +++ b/cfg/lxc.cfg @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: MIT +# Misc configs +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_MEMCG=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y + +CONFIG_NET_CLS_CGROUP=m +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_NET_PRIO=y + +# Base support for live boot +CONFIG_BLK_DEV_LOOP=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_VFAT_FS=y +CONFIG_RD_GZIP=y + +# Support for virtual ethernet and LXC +CONFIG_VETH=y +CONFIG_MACVLAN=y +CONFIG_VXLAN=m diff --git a/cfg/lxc.scc b/cfg/lxc.scc new file mode 100644 index 00000000..ee518835 --- /dev/null +++ b/cfg/lxc.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable Features needed by LxC, namespaces, cgroups et.c." +define KFEATURE_COMPATIBILITY board + +kconf non-hardware lxc.cfg diff --git a/cfg/mips64.cfg b/cfg/mips64.cfg index 77857ef7..1098090f 100644 --- a/cfg/mips64.cfg +++ b/cfg/mips64.cfg @@ -15,4 +15,4 @@ CONFIG_MIPS32_N32=y # The kernel panics on boot with an unhandled page fault if we # configure the VGA_CONSOLE in. # -# CONFIG_VGA_CONSOLE is not set +CONFIG_VGA_CONSOLE=n diff --git a/cfg/mips64le.cfg b/cfg/mips64le.cfg index 8eaf305a..9ea3fa43 100644 --- a/cfg/mips64le.cfg +++ b/cfg/mips64le.cfg @@ -15,4 +15,4 @@ CONFIG_MIPS32_N32=y # The kernel panics on boot with an unhandled page fault if we # configure the VGA_CONSOLE in. # -# CONFIG_VGA_CONSOLE is not set +CONFIG_VGA_CONSOLE=n diff --git a/cfg/net/bridge.cfg b/cfg/net/bridge.cfg index 629a2892..8d522441 100644 --- a/cfg/net/bridge.cfg +++ b/cfg/net/bridge.cfg @@ -2,6 +2,12 @@ # # Bridge: Netfilter Configuration # + +# note: standard.cfg sets CONFIG_BRIDGE=m, so this can't be +# =y as the final value. We can either change it, or +# we have to set CONFIG_BRIDGE here, trying CONFIG_BRIDGE=y +# here for now +CONFIG_BRIDGE=y CONFIG_BRIDGE_NETFILTER=y CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m diff --git a/cfg/net/ip6_nf.cfg b/cfg/net/ip6_nf.cfg index cb1db470..3458f9c4 100644 --- a/cfg/net/ip6_nf.cfg +++ b/cfg/net/ip6_nf.cfg @@ -12,3 +12,4 @@ CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_NAT=m diff --git a/cfg/net/ip_nf.cfg b/cfg/net/ip_nf.cfg index 406be5bc..14f7cfad 100644 --- a/cfg/net/ip_nf.cfg +++ b/cfg/net/ip_nf.cfg @@ -12,8 +12,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m +CONFIG_IP_NF_NAT=m diff --git a/cfg/net/ipsec6.cfg b/cfg/net/ipsec6.cfg index dd51c557..9cb7ec38 100644 --- a/cfg/net/ipsec6.cfg +++ b/cfg/net/ipsec6.cfg @@ -9,7 +9,7 @@ CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=m # crypto needed by ipsec-self of IPv6 Conformance Test -CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_CAMELLIA=m diff --git a/cfg/net/mdio.cfg b/cfg/net/mdio.cfg new file mode 100644 index 00000000..98a0f3e6 --- /dev/null +++ b/cfg/net/mdio.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y diff --git a/cfg/net/mdio.scc b/cfg/net/mdio.scc new file mode 100644 index 00000000..4e99fa7d --- /dev/null +++ b/cfg/net/mdio.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable MDIO bus device options" +define KFEATURE_COMPATIBILITY all + +kconf hardware mdio.cfg diff --git a/cfg/net/y_or_m_enabled.cfg b/cfg/net/y_or_m_enabled.cfg new file mode 100644 index 00000000..2be97522 --- /dev/null +++ b/cfg/net/y_or_m_enabled.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_MDIO_BUS diff --git a/cfg/non-hardware.cfg b/cfg/non-hardware.cfg new file mode 100644 index 00000000..6528c0ae --- /dev/null +++ b/cfg/non-hardware.cfg @@ -0,0 +1,2 @@ +CONFIG_SCSI_VIRTIO +CONFIG_SERIAL_OF_PLATFORM diff --git a/cfg/remoteproc.cfg b/cfg/remoteproc.cfg index b4f13fd7..dacb8505 100644 --- a/cfg/remoteproc.cfg +++ b/cfg/remoteproc.cfg @@ -1,3 +1,3 @@ # SPDX-License-Identifier: MIT -CONFIG_REMOTEPROC=m +CONFIG_REMOTEPROC=y CONFIG_WKUP_M3_RPROC=m diff --git a/cfg/sound.cfg b/cfg/sound.cfg index 7c1fb758..3e11e940 100644 --- a/cfg/sound.cfg +++ b/cfg/sound.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_SOUND=m -# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SOUND_OSS_CORE=n CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_HRTIMER=m @@ -11,10 +11,10 @@ CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_MIDI=m CONFIG_SND_SEQ_MIDI_EVENT=m -# CONFIG_SND_MIXER_OSS is not set -# CONFIG_SND_PCM_OSS is not set -# CONFIG_SND_SEQUENCER_OSS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_MIXER_OSS=n +CONFIG_SND_PCM_OSS=n +CONFIG_SND_SEQUENCER_OSS=n +CONFIG_SND_SUPPORT_OLD_API=n CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_MPU401_UART=m @@ -45,9 +45,6 @@ CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m -CONFIG_SND_SST_IPC=m -CONFIG_SND_SST_IPC_ACPI=m -CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m diff --git a/cfg/timer/hz_100.cfg b/cfg/timer/hz_100.cfg index fffd96f2..452784d8 100644 --- a/cfg/timer/hz_100.cfg +++ b/cfg/timer/hz_100.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_HZ_100=y -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set +CONFIG_HZ_250=n +CONFIG_HZ_300=n +CONFIG_HZ_1000=n CONFIG_HZ=100 diff --git a/cfg/timer/hz_1000.cfg b/cfg/timer/hz_1000.cfg index 13351152..c6024f73 100644 --- a/cfg/timer/hz_1000.cfg +++ b/cfg/timer/hz_1000.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_HZ_1000=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_100=n +CONFIG_HZ_250=n +CONFIG_HZ_300=n CONFIG_HZ=1000 diff --git a/cfg/timer/hz_250.cfg b/cfg/timer/hz_250.cfg index f9251bbe..42f2a1b7 100644 --- a/cfg/timer/hz_250.cfg +++ b/cfg/timer/hz_250.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_HZ_250=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set +CONFIG_HZ_100=n +CONFIG_HZ_300=n +CONFIG_HZ_1000=n CONFIG_HZ=250 diff --git a/cfg/timer/no_hz.cfg b/cfg/timer/no_hz.cfg index a2275795..e17bec01 100644 --- a/cfg/timer/no_hz.cfg +++ b/cfg/timer/no_hz.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_NO_HZ=y +CONFIG_NO_HZ_IDLE=y diff --git a/cfg/vesafb.cfg b/cfg/vesafb.cfg index 203ba039..f39eefa7 100644 --- a/cfg/vesafb.cfg +++ b/cfg/vesafb.cfg @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT CONFIG_FB=y CONFIG_FB_VESA=y -CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_BOOT_VESA_SUPPORT=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y diff --git a/cfg/virtio.cfg b/cfg/virtio.cfg index 3b3ccbc8..0ef99c6b 100644 --- a/cfg/virtio.cfg +++ b/cfg/virtio.cfg @@ -1,14 +1,25 @@ # SPDX-License-Identifier: MIT CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y +CONFIG_NET=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y +CONFIG_BLK_MQ_VIRTIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_INPUT=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_SCSI=y +CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_VIRTIO=y +CONFIG_CRYPTO=y CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_VSOCKETS=y +CONFIG_VSOCKETS_DIAG=y +CONFIG_VIRTIO_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS_COMMON=y diff --git a/cfg/vmware-guest.cfg b/cfg/vmware-guest.cfg index 00b1131d..499a02b9 100644 --- a/cfg/vmware-guest.cfg +++ b/cfg/vmware-guest.cfg @@ -15,9 +15,9 @@ CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=y CONFIG_FUSION_LAN=y CONFIG_FUSION_LOGGING=y +CONFIG_NET_FC=y +CONFIG_SCSI_FC_ATTRS=y CONFIG_SCSI_MPT2SAS=y CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_MPT3SAS=y CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_LOGGING=y diff --git a/cfg/vswitch.cfg b/cfg/vswitch.cfg new file mode 100644 index 00000000..b1fefc0c --- /dev/null +++ b/cfg/vswitch.cfg @@ -0,0 +1,3 @@ +CONFIG_OPENVSWITCH=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_ACT_POLICE=m diff --git a/cfg/vswitch.scc b/cfg/vswitch.scc new file mode 100644 index 00000000..2790b4fe --- /dev/null +++ b/cfg/vswitch.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware vswitch.cfg diff --git a/cfg/x32.cfg b/cfg/x32.cfg index 98fd8b2d..307695dd 100644 --- a/cfg/x32.cfg +++ b/cfg/x32.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -CONFIG_X86_X32=y +CONFIG_X86_X32_ABI=y # Support running 32 bit binaries CONFIG_COMPAT=y diff --git a/cfg/x86_64.cfg b/cfg/x86_64.cfg index 1f6a2a81..c2c3193c 100644 --- a/cfg/x86_64.cfg +++ b/cfg/x86_64.cfg @@ -6,5 +6,5 @@ CONFIG_64BIT=y CONFIG_IA32_EMULATION=y CONFIG_COMPAT=y -# CONFIG_UNWINDER_ORC is not set +CONFIG_UNWINDER_ORC=n CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/cfg/x86_base.cfg b/cfg/x86_base.cfg index 9dedfd09..b3cd09cd 100644 --- a/cfg/x86_base.cfg +++ b/cfg/x86_base.cfg @@ -4,5 +4,7 @@ CONFIG_X86_MSR=y CONFIG_X86_CPUID=y CONFIG_MTRR=y +CONFIG_ACPI=y + CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y diff --git a/cfg/xen.cfg b/cfg/xen.cfg new file mode 100644 index 00000000..af821d2f --- /dev/null +++ b/cfg/xen.cfg @@ -0,0 +1,49 @@ +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_MMU_NOTIFIER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_PCI_XEN=y +CONFIG_XEN_PCIDEV_FRONTEND=y +CONFIG_SYS_HYPERVISOR=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_XEN_WDT=m +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=y +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=y +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=y +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_EFI=y +CONFIG_XEN_AUTO_XLATE=y +CONFIG_XEN_ACPI=y diff --git a/cfg/xen.scc b/cfg/xen.scc new file mode 100644 index 00000000..b588e5df --- /dev/null +++ b/cfg/xen.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Xen Kernel Support" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware xen.cfg diff --git a/cfg/xt-checksum.cfg b/cfg/xt-checksum.cfg new file mode 100644 index 00000000..58afbff6 --- /dev/null +++ b/cfg/xt-checksum.cfg @@ -0,0 +1 @@ +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m diff --git a/cfg/xt-checksum.scc b/cfg/xt-checksum.scc new file mode 100644 index 00000000..d3804f0c --- /dev/null +++ b/cfg/xt-checksum.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Add extra iptables modules" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware xt-checksum.cfg diff --git a/cgl/cfg/net/l2tp.cfg b/cgl/cfg/net/l2tp.cfg index daeb044b..cbdb2e36 100644 --- a/cgl/cfg/net/l2tp.cfg +++ b/cgl/cfg/net/l2tp.cfg @@ -13,4 +13,4 @@ #......................................................................... CONFIG_L2TP=y -CONFIG_PPPOL2TP=y +CONFIG_PPPOL2TP=m diff --git a/cgl/features/audit/audit.cfg b/cgl/features/audit/audit.cfg index e9db3a50..ec3678c5 100644 --- a/cgl/features/audit/audit.cfg +++ b/cgl/features/audit/audit.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y -# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_NETFILTER_XT_TARGET_AUDIT=n CONFIG_AUDIT_GENERIC=y diff --git a/cgl/features/selinux/selinux.cfg b/cgl/features/selinux/selinux.cfg index 91efe977..a73ad995 100644 --- a/cgl/features/selinux/selinux.cfg +++ b/cgl/features/selinux/selinux.cfg @@ -7,6 +7,4 @@ CONFIG_JFS_SECURITY=y CONFIG_JFFS2_FS_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 diff --git a/features/apparmor/apparmor.cfg b/features/apparmor/apparmor.cfg index 1a656fb0..0fe87377 100644 --- a/features/apparmor/apparmor.cfg +++ b/features/apparmor/apparmor.cfg @@ -5,4 +5,3 @@ CONFIG_SECURITY_PATH=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -CONFIG_DEFAULT_SECURITY_APPARMOR=y diff --git a/features/apparmor/apparmor.scc b/features/apparmor/apparmor.scc index 235551ce..39548733 100644 --- a/features/apparmor/apparmor.scc +++ b/features/apparmor/apparmor.scc @@ -3,4 +3,3 @@ define KFEATURE_DESCRIPTION "Enable/disable configurations for apparmor security define KFEATURE_COMPATIBILITY all kconf non-hardware apparmor.cfg -kconf non-hardware apparmor_on_boot.cfg diff --git a/features/apparmor/apparmor_on_boot.cfg b/features/apparmor/apparmor_on_boot.cfg deleted file mode 100644 index 1b496516..00000000 --- a/features/apparmor/apparmor_on_boot.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: MIT -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 diff --git a/features/aufs/aufs-adjust-for-v6.9.patch b/features/aufs/aufs-adjust-for-v6.9.patch new file mode 100644 index 00000000..82e5bfd0 --- /dev/null +++ b/features/aufs/aufs-adjust-for-v6.9.patch @@ -0,0 +1,48 @@ +From 252dbed4c82524c20b3564f560422633aa6cb369 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 3 Apr 2024 10:15:47 -0400 +Subject: [PATCH] aufs: adjust for v6.9+ + +The following commit drops SLAB_MEM_SPREAD, so we remove it +from aufs. + +commit cdeeaaba174886aa6c1ff4c0c5449c5066dbe82f +Author: Vlastimil Babka <vbabka@suse.cz> +Date: Fri Feb 23 19:27:17 2024 +0100 + + mm, slab: deprecate SLAB_MEM_SPREAD flag + + The SLAB_MEM_SPREAD flag used to be implemented in SLAB, which was + removed. SLUB instead relies on the page allocator's NUMA policies. + Change the flag's value to 0 to free up the value it had, and mark it + for full removal once all users are gone. + + Reported-by: Steven Rostedt <rostedt@goodmis.org> + Closes: https://lore.kernel.org/all/20240131172027.10f64405@gandalf.local.home/ + Reviewed-and-tested-by: Xiongwei Song <xiongwei.song@windriver.com> + Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev> + Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev> + Acked-by: David Rientjes <rientjes@google.com> + Signed-off-by: Vlastimil Babka <vbabka@suse.cz> + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/module.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/aufs/module.h b/fs/aufs/module.h +index a9d21d3e5414..784c830d084d 100644 +--- a/fs/aufs/module.h ++++ b/fs/aufs/module.h +@@ -129,7 +129,7 @@ enum { + + extern struct kmem_cache *au_cache[AuCache_Last]; + +-#define AuCacheFlags (SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD) ++#define AuCacheFlags (SLAB_RECLAIM_ACCOUNT) + #define AuCache(type) KMEM_CACHE(type, AuCacheFlags) + #define AuCacheCtor(type, ctor) \ + kmem_cache_create(#type, sizeof(struct type), \ +-- +2.39.2 + diff --git a/features/aufs/aufs-disable.cfg b/features/aufs/aufs-disable.cfg index e276863f..b58d21a8 100644 --- a/features/aufs/aufs-disable.cfg +++ b/features/aufs/aufs-disable.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -# CONFIG_AUFS_FS is not set -# CONFIG_AUFS_BRANCH_MAX_127 is not set -# CONFIG_AUFS_SBILIST is not set -# CONFIG_AUFS_BDEV_LOOP is not set +CONFIG_AUFS_FS=n +CONFIG_AUFS_BRANCH_MAX_127=n +CONFIG_AUFS_SBILIST=n +CONFIG_AUFS_BDEV_LOOP=n diff --git a/features/aufs/aufs-fix-v6.7-kernel-build-compilation.patch b/features/aufs/aufs-fix-v6.7-kernel-build-compilation.patch new file mode 100644 index 00000000..0ab046db --- /dev/null +++ b/features/aufs/aufs-fix-v6.7-kernel-build-compilation.patch @@ -0,0 +1,144 @@ +From 35340163fed594434a42002cc041bd29941fb985 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 22 Nov 2023 12:06:29 -0500 +Subject: [PATCH] aufs: fix v6.7 kernel build compilation + +Adapting aufs to the following upstream commits: + + commit 12cd44023651666bd44baa36a5c999698890debb + Author: Jeff Layton <jlayton@kernel.org> + Date: Fri Sep 29 09:05:52 2023 -0400 + + fs: rename inode i_atime and i_mtime fields + + Rename these two fields to discourage direct access (and to help ensure + that we mop up any leftover direct accesses). + + Signed-off-by: Jeff Layton <jlayton@kernel.org> + Signed-off-by: Christian Brauner <brauner@kernel.org> + + commit 3e15dcf77b23b8e9b9b7f3c0d4def8fe9c12c534 + Author: Amir Goldstein <amir73il@gmail.com> + Date: Fri Sep 8 16:28:59 2023 +0300 + + fs: rename __mnt_{want,drop}_write*() helpers + + Before exporting these helpers to modules, make their names more + meaningful. + + The names mnt_{get,put)_write_access*() were chosen, because they rhyme + with the inode {get,put)_write_access() helpers, which have a very close + meaning for the inode object. + + Suggested-by: Christian Brauner <brauner@kernel.org> + Link: https://lore.kernel.org/r/20230817-anfechtbar-ruhelosigkeit-8c6cca8443fc@brauner/ + Signed-off-by: Amir Goldstein <amir73il@gmail.com> + Message-Id: <20230908132900.2983519-2-amir73il@gmail.com> + Signed-off-by: Christian Brauner <brauner@kernel.org> + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/branch.c | 2 +- + fs/aufs/cpup.c | 8 ++++---- + fs/aufs/dir.c | 2 +- + fs/aufs/i_op.c | 4 ++-- + fs/aufs/vfsub.h | 2 +- + fs/namespace.c | 2 +- + 6 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/fs/aufs/branch.c b/fs/aufs/branch.c +index 2a85d744d2b5..3ecc05573cc0 100644 +--- a/fs/aufs/branch.c ++++ b/fs/aufs/branch.c +@@ -1293,7 +1293,7 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex) + if (hf->f_mode & FMODE_READ) + i_readcount_inc(h_inode); + put_write_access(h_inode); +- __mnt_drop_write(hf->f_path.mnt); ++ mnt_put_write_access(hf->f_path.mnt); + } + } + +diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c +index 8c8bd5f7b28d..3f09876a3bd5 100644 +--- a/fs/aufs/cpup.c ++++ b/fs/aufs/cpup.c +@@ -133,8 +133,8 @@ void au_dtime_store(struct au_dtime *dt, struct dentry *dentry, + dt->dt_dentry = dentry; + dt->dt_h_path = *h_path; + h_inode = d_inode(h_path->dentry); +- dt->dt_atime = h_inode->i_atime; +- dt->dt_mtime = h_inode->i_mtime; ++ dt->dt_atime = h_inode->__i_atime; ++ dt->dt_mtime = h_inode->__i_mtime; + /* smp_mb(); */ + } + +@@ -200,8 +200,8 @@ int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct path *h_src, + } else { + ia.ia_uid = h_isrc->i_uid; + ia.ia_gid = h_isrc->i_gid; +- ia.ia_atime = h_isrc->i_atime; +- ia.ia_mtime = h_isrc->i_mtime; ++ ia.ia_atime = h_isrc->__i_atime; ++ ia.ia_mtime = h_isrc->__i_mtime; + if (h_idst->i_mode != h_isrc->i_mode + && !S_ISLNK(h_idst->i_mode)) { + ia.ia_valid |= ATTR_MODE; +diff --git a/fs/aufs/dir.c b/fs/aufs/dir.c +index ee900ea3264b..e986deffef5e 100644 +--- a/fs/aufs/dir.c ++++ b/fs/aufs/dir.c +@@ -145,7 +145,7 @@ static void au_do_dir_ts(void *arg) + au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); + h_dir = au_h_iptr(dir, btop); + if (h_dir->i_nlink +- && timespec64_compare(&h_dir->i_mtime, &dt.dt_mtime) < 0) { ++ && timespec64_compare(&h_dir->__i_mtime, &dt.dt_mtime) < 0) { + dt.dt_h_path = h_path; + au_dtime_revert(&dt); + } +diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c +index 993d57633393..8700b9e46b44 100644 +--- a/fs/aufs/i_op.c ++++ b/fs/aufs/i_op.c +@@ -1167,8 +1167,8 @@ static void au_refresh_iattr(struct inode *inode, struct kstat *st, + /* don't i_[ug]id_write() here */ + inode->i_uid = st->uid; + inode->i_gid = st->gid; +- inode->i_atime = st->atime; +- inode->i_mtime = st->mtime; ++ inode->__i_atime = st->atime; ++ inode->__i_mtime = st->mtime; + inode_set_ctime_to_ts( inode, st->ctime ); + + au_cpup_attr_nlink(inode, /*force*/0); +diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h +index ed218d95770d..b45603c2d651 100644 +--- a/fs/aufs/vfsub.h ++++ b/fs/aufs/vfsub.h +@@ -33,7 +33,7 @@ + + /* copied from linux/fs/internal.h */ + /* todo: BAD approach!! */ +-extern void __mnt_drop_write(struct vfsmount *); ++extern void mnt_put_write_access(struct vfsmount *); + extern struct file *alloc_empty_file(int, const struct cred *); + + /* ---------------------------------------------------------------------- */ +diff --git a/fs/namespace.c b/fs/namespace.c +index 1b942a6b72fa..e5d02ed749c4 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -489,7 +489,7 @@ void mnt_put_write_access_file(struct file *file) + if (!(file->f_mode & FMODE_WRITER)) + mnt_put_write_access(file->f_path.mnt); + } +-EXPORT_SYMBOL_GPL(__mnt_drop_write); ++EXPORT_SYMBOL_GPL(mnt_put_write_access_file); + + void mnt_drop_write_file(struct file *file) + { +-- +2.34.1 + diff --git a/features/aufs/aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch b/features/aufs/aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch new file mode 100644 index 00000000..3cd55ace --- /dev/null +++ b/features/aufs/aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch @@ -0,0 +1,39 @@ +From 10db7ee919edbf7b6f65124e475d89864de7bb1b Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Fri, 5 Jan 2024 18:57:18 +0800 +Subject: [PATCH] aufs: i_op: Add handling for au_pin_hdir_set_owner with RT + kernel + +In RT kernel rw_semaphore uses rt_mutex whose owner should be set to the +task. Add a condition to handle both cases to avoid the following build error +for PREEMPT_RT kernel. + +fs/aufs/i_op.c: In function 'au_pin_hdir_set_owner': +fs/aufs/i_op.c:639:52: error: 'struct rw_semaphore' has no member named 'owner' +639 | atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task); + +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/i_op.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c +index 993d57633393..a1e0d0c54d23 100644 +--- a/fs/aufs/i_op.c ++++ b/fs/aufs/i_op.c +@@ -638,7 +638,11 @@ int au_pin_hdir_relock(struct au_pin *p) + + static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task) + { ++#if IS_ENABLED(CONFIG_PREEMPT_RT) ++ p->hdir->hi_inode->i_rwsem.rwbase.rtmutex.owner = task; ++#else + atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task); ++#endif + } + + void au_pin_hdir_acquire_nest(struct au_pin *p) +-- +2.39.2 + diff --git a/features/aufs/aufs-update-remove_page-to-remove_folio.patch b/features/aufs/aufs-update-remove_page-to-remove_folio.patch new file mode 100644 index 00000000..d874e550 --- /dev/null +++ b/features/aufs/aufs-update-remove_page-to-remove_folio.patch @@ -0,0 +1,56 @@ +From e9e335352a0815018d7db98c165d3669c3d8804f Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Tue, 23 Jan 2024 09:56:24 -0500 +Subject: [PATCH] aufs: update remove_page to remove_folio + +Commit af7628d6ec19 [fs: convert error_remove_page to +error_remove_folio] +switches remove_page to the folio equivalent. We switch +the aufs definitions to match. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/dynop.c | 2 +- + fs/aufs/file.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c +index 54fd16ecb6d3..f62b3b56291d 100644 +--- a/fs/aufs/dynop.c ++++ b/fs/aufs/dynop.c +@@ -192,7 +192,7 @@ static void dy_aop(struct au_dykey *key, const void *h_op, + DySetAop(launder_folio); + DySetAop(is_partially_uptodate); + DySetAop(is_dirty_writeback); +- DySetAop(error_remove_page); ++ DySetAop(error_remove_folio); + DySetAop(swap_activate); + DySetAop(swap_deactivate); + DySetAop(swap_rw); +diff --git a/fs/aufs/file.c b/fs/aufs/file.c +index 76ad444328db..2e3bdac4699a 100644 +--- a/fs/aufs/file.c ++++ b/fs/aufs/file.c +@@ -827,8 +827,8 @@ static bool aufs_is_partially_uptodate(struct folio *folio, size_t from, + static void aufs_is_dirty_writeback(struct folio *folio, bool *dirty, + bool *writeback) + { AuUnsupport(); } +-static int aufs_error_remove_page(struct address_space *mapping, +- struct page *page) ++static int aufs_error_remove_folio(struct address_space *mapping, ++ struct folio *folio) + { AuUnsupport(); return 0; } + static int aufs_swap_activate(struct swap_info_struct *sis, struct file *file, + sector_t *span) +@@ -857,7 +857,7 @@ const struct address_space_operations aufs_aop = { + .launder_folio = aufs_launder_folio, + .is_partially_uptodate = aufs_is_partially_uptodate, + .is_dirty_writeback = aufs_is_dirty_writeback, +- .error_remove_page = aufs_error_remove_page, ++ .error_remove_folio = aufs_error_remove_folio, + .swap_activate = aufs_swap_activate, + .swap_deactivate = aufs_swap_deactivate, + .swap_rw = aufs_swap_rw +-- +2.39.2 + diff --git a/features/aufs/aufs.scc b/features/aufs/aufs.scc index 495d6b2d..ebb980f4 100644 --- a/features/aufs/aufs.scc +++ b/features/aufs/aufs.scc @@ -1,8 +1,16 @@ # SPDX-License-Identifier: MIT # -patch aufs5-kbuild.patch -patch ausfs5-base.patch -patch aufs5-mmap.patch -patch aufs5-standalone.patch -patch aufs5-core.patch -patch aufs5-fix-avoid-to-access-rw_sem.owner-in-RT-kernel.patch + +patch aufs6-kbuild.patch +patch aufs6-base.patch +patch aufs6-mmap.patch +patch aufs6-standalone.patch +patch aufs6-core.patch +patch aufs6-adapt-to-v6.6.patch +patch aufs6-fix-magic.mk-include-path.patch +patch aufs6-adapt-to-v6.6-i_op-ctime-changes.patch +patch aufs-fix-v6.7-kernel-build-compilation.patch +patch aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch +patch aufs-update-remove_page-to-remove_folio.patch +patch aufs6-correct-do_splice_from-prototype.patch +patch aufs-adjust-for-v6.9.patch diff --git a/features/aufs/aufs5-fix-avoid-to-access-rw_sem.owner-in-RT-kernel.patch b/features/aufs/aufs5-fix-avoid-to-access-rw_sem.owner-in-RT-kernel.patch deleted file mode 100644 index 28710f82..00000000 --- a/features/aufs/aufs5-fix-avoid-to-access-rw_sem.owner-in-RT-kernel.patch +++ /dev/null @@ -1,60 +0,0 @@ -From df7b874159bde83689d4ac2df9e1be4a12b81118 Mon Sep 17 00:00:00 2001 -From: Yanfei Xu <yanfei.xu@windriver.com> -Date: Thu, 12 Mar 2020 00:57:37 +0800 -Subject: [PATCH 6/6] aufs5:fix:avoid to access rw_sem.owner in RT kernel - -Fix build failure. - -owner member is now made a permanent member of the rw_semaphore in -v5.6 kernel(commitid:c71fd893f). But the rw_semaphore in RT kernel -had been implemented with rt_mutex in rwsem-rt.h. Add if statment -to distinguish the two cases. - ----------------------Error messages--------------------- -| -/buildarea1/nightly/WRLINUX_MASTER_WR/build_dir/OVP/GIT_202003/lxbuilds/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build_linux/tmp-glibc/work-shared/intel-x86-64/kernel-source/fs/aufs/i_op.c: -In function 'au_pin_hdir_set_owner': -| -/buildarea1/nightly/WRLINUX_MASTER_WR/build_dir/OVP/GIT_202003/lxbuilds/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build_linux/tmp-glibc/work-shared/intel-x86-64/kernel-source/fs/aufs/i_op.c:643:45: -error: 'struct rw_semaphore' has no member named 'owner' -| 643 | atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, -(long)task); -| | ^ -| CC fs/btrfs/zstd.o -| AR fs/kernfs/built-in.a -| CC arch/x86/kernel/io_delay.o -| CC net/ipv6/udplite.o -| make[3]: *** -[/buildarea1/nightly/WRLINUX_MASTER_WR/build_dir/OVP/GIT_202003/lxbuilds/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build_linux/tmp-glibc/work-shared/intel-x86-64/kernel-source/scripts/Makefile.build:265: -fs/aufs/i_op.o] Error 1 -| make[3]: *** Waiting for unfinished jobs.... ------------------------------------------------------- - -Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - fs/aufs/i_op.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c -index e982bbbc4196..1ebbaac22014 100644 ---- a/fs/aufs/i_op.c -+++ b/fs/aufs/i_op.c -@@ -633,7 +633,11 @@ int au_pin_hdir_relock(struct au_pin *p) - - static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task) - { -+#if !defined(CONFIG_PREEMPT_RT) - atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task); -+#else -+ p->hdir->hi_inode->i_rwsem.rtmutex.owner = task; -+#endif - } - - void au_pin_hdir_acquire_nest(struct au_pin *p) --- -2.19.1 - diff --git a/features/aufs/aufs6-adapt-to-v6.6-i_op-ctime-changes.patch b/features/aufs/aufs6-adapt-to-v6.6-i_op-ctime-changes.patch new file mode 100644 index 00000000..cb727220 --- /dev/null +++ b/features/aufs/aufs6-adapt-to-v6.6-i_op-ctime-changes.patch @@ -0,0 +1,146 @@ +From 8eeb547a388fee17c1c168bbb33d95e0c19e2cb4 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 22:18:30 -0400 +Subject: [PATCH 8/8] aufs6: adapt to v6.6 i_op->ctime changes + +The following commits in 6.6+ change the way i_nodes and ctime are +handled. We adapt the code to match: + + 541d4c798a598854fcce7326d947cbcbd35701d6 [fs: drop the timespec64 arg from generic_update_time] + 3e3271549670783be20e233a2b78a87a0b04c715 [vfs: get rid of old '->iterate' directory operation] + 0d72b92883c651a11059d93335f33d65c6eb653b [fs: pass the request_mask to generic_fillattr] + 913e99287b98fd051ac1976140a2764a8ef9dfbf [fs: drop the timespec64 argument from update_time] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/i_op.c | 9 ++++----- + fs/aufs/i_op_add.c | 2 +- + fs/aufs/i_op_del.c | 9 ++++++--- + fs/aufs/i_op_ren.c | 6 ++++-- + fs/aufs/vfsub.h | 5 ++--- + 5 files changed, 17 insertions(+), 14 deletions(-) + +diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c +index 141620c2e0bd..993d57633393 100644 +--- a/fs/aufs/i_op.c ++++ b/fs/aufs/i_op.c +@@ -1169,7 +1169,7 @@ static void au_refresh_iattr(struct inode *inode, struct kstat *st, + inode->i_gid = st->gid; + inode->i_atime = st->atime; + inode->i_mtime = st->mtime; +- inode->i_ctime = st->ctime; ++ inode_set_ctime_to_ts( inode, st->ctime ); + + au_cpup_attr_nlink(inode, /*force*/0); + if (S_ISDIR(inode->i_mode)) { +@@ -1306,7 +1306,7 @@ static int aufs_getattr(struct mnt_idmap *idmap, const struct path *path, + goto out_di; + + out_fill: +- generic_fillattr(idmap, inode, st); ++ generic_fillattr(idmap, request, inode, st); + out_di: + di_read_unlock(dentry, AuLock_IR); + out_si: +@@ -1388,8 +1388,7 @@ static int au_is_special(struct inode *inode) + return (inode->i_mode & (S_IFBLK | S_IFCHR | S_IFIFO | S_IFSOCK)); + } + +-static int aufs_update_time(struct inode *inode, struct timespec64 *ts, +- int flags) ++static int aufs_update_time(struct inode *inode, int flags) + { + int err; + aufs_bindex_t bindex; +@@ -1413,7 +1412,7 @@ static int aufs_update_time(struct inode *inode, struct timespec64 *ts, + h_mnt = au_sbr_mnt(sb, bindex); + err = vfsub_mnt_want_write(h_mnt); + if (!err) { +- err = vfsub_update_time(h_inode, ts, flags); ++ err = vfsub_update_time(h_inode, flags); + vfsub_mnt_drop_write(h_mnt); + } + } else if (au_is_special(h_inode)) { +diff --git a/fs/aufs/i_op_add.c b/fs/aufs/i_op_add.c +index 2adf97d4488d..1ce4d45c8f7b 100644 +--- a/fs/aufs/i_op_add.c ++++ b/fs/aufs/i_op_add.c +@@ -824,7 +824,7 @@ int aufs_link(struct dentry *src_dentry, struct inode *dir, + au_dir_ts(dir, a->bdst); + inode_inc_iversion(dir); + inc_nlink(inode); +- inode->i_ctime = dir->i_ctime; ++ inode_set_ctime_to_ts( inode, inode_get_ctime(dir)); + d_instantiate(dentry, au_igrab(inode)); + if (d_unhashed(a->h_path.dentry)) + /* some filesystem calls d_drop() */ +diff --git a/fs/aufs/i_op_del.c b/fs/aufs/i_op_del.c +index d85f47cef29f..fbbda9626f6f 100644 +--- a/fs/aufs/i_op_del.c ++++ b/fs/aufs/i_op_del.c +@@ -277,7 +277,8 @@ static void epilog(struct inode *dir, struct dentry *dentry, + + inode = d_inode(dentry); + d_drop(dentry); +- inode->i_ctime = dir->i_ctime; ++ //inode->i_ctime = dir->i_ctime; ++ inode_set_ctime_to_ts(inode, inode_get_ctime(dir)); + + au_dir_ts(dir, bindex); + inode_inc_iversion(dir); +@@ -379,10 +380,12 @@ int aufs_unlink(struct inode *dir, struct dentry *dentry) + if (bindex == btop) { + vfsub_update_h_iattr(&a->h_path, /*did*/NULL); + /*ignore*/ +- inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ //inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ inode_set_ctime_to_ts(inode, inode_get_ctime(d_inode(a->h_path.dentry)) ); + } else + /* todo: this timestamp may be reverted later */ +- inode->i_ctime = h_dir->i_ctime; ++ //inode->i_ctime = h_dir->i_ctime; ++ inode_set_ctime_to_ts(inode,inode_get_ctime(h_dir) ); + goto out_unpin; /* success */ + } + +diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c +index ab69a6ac9a42..f3f9d9efe6fa 100644 +--- a/fs/aufs/i_op_ren.c ++++ b/fs/aufs/i_op_ren.c +@@ -443,12 +443,14 @@ static int do_rename(struct au_ren_args *a) + AuDebugOn(au_dbtop(a->dst_dentry) != a->btgt); + a->h_path.dentry = au_h_dptr(a->dst_dentry, a->btgt); + vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/ +- a->dst_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ //a->dst_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ inode_set_ctime_to_ts( a->dst_inode, inode_get_ctime(d_inode(a->h_path.dentry)) ); + } + AuDebugOn(au_dbtop(a->src_dentry) != a->btgt); + a->h_path.dentry = au_h_dptr(a->src_dentry, a->btgt); + vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/ +- a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ //a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ inode_set_ctime_to_ts( a->src_inode, inode_get_ctime(d_inode(a->h_path.dentry)) ); + + if (!a->exchange) { + /* remove whiteout for dentry */ +diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h +index 928c463620c1..ed218d95770d 100644 +--- a/fs/aufs/vfsub.h ++++ b/fs/aufs/vfsub.h +@@ -240,10 +240,9 @@ static inline void vfsub_touch_atime(struct vfsmount *h_mnt, + } + #endif + +-static inline int vfsub_update_time(struct inode *h_inode, +- struct timespec64 *ts, int flags) ++static inline int vfsub_update_time(struct inode *h_inode, int flags) + { +- return inode_update_time(h_inode, ts, flags); ++ return inode_update_time(h_inode, flags); + /* no vfsub_update_h_iattr() since we don't have struct path */ + } + +-- +2.34.1 + diff --git a/features/aufs/aufs6-adapt-to-v6.6.patch b/features/aufs/aufs6-adapt-to-v6.6.patch new file mode 100644 index 00000000..e91fec7a --- /dev/null +++ b/features/aufs/aufs6-adapt-to-v6.6.patch @@ -0,0 +1,40 @@ +From 5d75cb88038136d82ae6bb62da3fa8f70785e662 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 18:20:40 -0400 +Subject: [PATCH 6/8] aufs6: adapt to v6.6 + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/fcntl.c | 2 +- + mm/mmap.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/fcntl.c b/fs/fcntl.c +index fdd334fc02fb..ec0562996478 100644 +--- a/fs/fcntl.c ++++ b/fs/fcntl.c +@@ -34,7 +34,7 @@ + + #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) + +-int setfl(int fd, struct file *filp, unsigned int arg) ++int setfl(int fd, struct file *filp, long unsigned int arg) + { + struct inode * inode = file_inode(filp); + int error = 0; +diff --git a/mm/mmap.c b/mm/mmap.c +index 0a0f3d5f558d..0bb0c5a0ad0e 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -3004,7 +3004,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, + file = vma->vm_file; + prfile = vma->vm_prfile; + ret = do_mmap(vma->vm_file, start, size, +- prot, flags, pgoff, &populate, NULL); ++ prot, flags, 0, pgoff, &populate, NULL); + if (!IS_ERR_VALUE(ret) && file && prfile) { + struct vm_area_struct *new_vma; + +-- +2.34.1 + diff --git a/features/aufs/aufs6-base.patch b/features/aufs/aufs6-base.patch new file mode 100644 index 00000000..186a7cee --- /dev/null +++ b/features/aufs/aufs6-base.patch @@ -0,0 +1,230 @@ +From 884f46eed2730a238e0bf9c9a885f777a612e3ab Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:48:58 -0400 +Subject: [PATCH] aufs6: base + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + MAINTAINERS | 13 +++++++++++++ + drivers/block/loop.c | 18 ++++++++++++++++++ + fs/dcache.c | 2 +- + fs/fcntl.c | 4 +++- + fs/namespace.c | 6 ++++++ + fs/splice.c | 2 +- + include/linux/fs.h | 2 ++ + include/linux/lockdep.h | 2 ++ + include/linux/mnt_namespace.h | 3 +++ + include/linux/splice.h | 6 ++++++ + kernel/locking/lockdep.c | 3 ++- + 11 files changed, 57 insertions(+), 4 deletions(-) + +diff --git a/MAINTAINERS b/MAINTAINERS +index 8d1052fa6a69..39ec86cca0ff 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -3365,6 +3365,19 @@ F: kernel/audit* + F: lib/*audit.c + K: \baudit_[a-z_0-9]\+\b + ++AUFS (advanced multi layered unification filesystem) FILESYSTEM ++M: "J. R. Okajima" <hooanon05g@gmail.com> ++L: aufs-users@lists.sourceforge.net (members only) ++L: linux-unionfs@vger.kernel.org ++S: Supported ++W: http://aufs.sourceforge.net ++T: git://github.com/sfjro/aufs4-linux.git ++F: Documentation/ABI/testing/debugfs-aufs ++F: Documentation/ABI/testing/sysfs-aufs ++F: Documentation/filesystems/aufs/ ++F: fs/aufs/ ++F: include/uapi/linux/aufs_type.h ++ + AUXILIARY BUS DRIVER + M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + R: Dave Ertman <david.m.ertman@intel.com> +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index f8145499da38..333b3915fe86 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -641,6 +641,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, + goto done; + } + ++/* ++ * for AUFS ++ * no get/put for file. ++ */ ++struct file *loop_backing_file(struct super_block *sb) ++{ ++ struct file *ret; ++ struct loop_device *l; ++ ++ ret = NULL; ++ if (MAJOR(sb->s_dev) == LOOP_MAJOR) { ++ l = sb->s_bdev->bd_disk->private_data; ++ ret = l->lo_backing_file; ++ } ++ return ret; ++} ++EXPORT_SYMBOL_GPL(loop_backing_file); ++ + /* loop sysfs attributes */ + + static ssize_t loop_attr_show(struct device *dev, char *page, +diff --git a/fs/dcache.c b/fs/dcache.c +index b813528fb147..78e322b59b8d 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -1219,7 +1219,7 @@ enum d_walk_ret { + * + * The @enter() callbacks are called with d_lock held. + */ +-static void d_walk(struct dentry *parent, void *data, ++void d_walk(struct dentry *parent, void *data, + enum d_walk_ret (*enter)(void *, struct dentry *)) + { + struct dentry *this_parent, *dentry; +diff --git a/fs/fcntl.c b/fs/fcntl.c +index c80a6acad742..d64817808e40 100644 +--- a/fs/fcntl.c ++++ b/fs/fcntl.c +@@ -34,7 +34,7 @@ + + #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) + +-static int setfl(int fd, struct file * filp, unsigned int arg) ++int setfl(int fd, struct file *filp, unsigned int arg) + { + struct inode * inode = file_inode(filp); + int error = 0; +@@ -64,6 +64,8 @@ static int setfl(int fd, struct file * filp, unsigned int arg) + + if (filp->f_op->check_flags) + error = filp->f_op->check_flags(arg); ++ if (!error && filp->f_op->setfl) ++ error = filp->f_op->setfl(filp, arg); + if (error) + return error; + +diff --git a/fs/namespace.c b/fs/namespace.c +index 437f60e96d40..4c5eb92d2bef 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -860,6 +860,12 @@ static inline int check_mnt(struct mount *mnt) + return mnt->mnt_ns == current->nsproxy->mnt_ns; + } + ++/* for aufs, CONFIG_AUFS_BR_FUSE */ ++int is_current_mnt_ns(struct vfsmount *mnt) ++{ ++ return check_mnt(real_mount(mnt)); ++} ++ + /* + * vfsmount lock must be held for write + */ +diff --git a/fs/splice.c b/fs/splice.c +index 218e24b1ac40..7210ddc5aa81 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -933,7 +933,7 @@ static int warn_unsupported(struct file *file, const char *op) + /* + * Attempt to initiate a splice from pipe to file. + */ +-static ssize_t do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ssize_t do_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags) + { + if (unlikely(!out->f_op->splice_write)) +diff --git a/include/linux/fs.h b/include/linux/fs.h +index ed5966a70495..2f2919192af6 100644 +--- a/include/linux/fs.h ++++ b/include/linux/fs.h +@@ -1104,6 +1104,7 @@ extern void fasync_free(struct fasync_struct *); + /* can be called from interrupts */ + extern void kill_fasync(struct fasync_struct **, int, int); + ++extern int setfl(int fd, struct file *filp, unsigned long arg); + extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); + extern int f_setown(struct file *filp, int who, int force); + extern void f_delown(struct file *filp); +@@ -2001,6 +2002,7 @@ struct file_operations { + int (*lock) (struct file *, int, struct file_lock *); + unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); + int (*check_flags)(int); ++ int (*setfl)(struct file *, unsigned long); + int (*flock) (struct file *, int, struct file_lock *); + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); + ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); +diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h +index 08b0d1d9d78b..009f69c4e09d 100644 +--- a/include/linux/lockdep.h ++++ b/include/linux/lockdep.h +@@ -192,6 +192,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, + return lock->key == key; + } + ++struct lock_class *lockdep_hlock_class(struct held_lock *hlock); ++ + /* + * Acquire a lock. + * +diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h +index 8f882f5881e8..6b9808f09843 100644 +--- a/include/linux/mnt_namespace.h ++++ b/include/linux/mnt_namespace.h +@@ -7,12 +7,15 @@ struct mnt_namespace; + struct fs_struct; + struct user_namespace; + struct ns_common; ++struct vfsmount; + + extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, + struct user_namespace *, struct fs_struct *); + extern void put_mnt_ns(struct mnt_namespace *ns); + extern struct ns_common *from_mnt_ns(struct mnt_namespace *); + ++extern int is_current_mnt_ns(struct vfsmount *mnt); ++ + extern const struct file_operations proc_mounts_operations; + extern const struct file_operations proc_mountinfo_operations; + extern const struct file_operations proc_mountstats_operations; +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 9dec4861d09f..8024911403e9 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -108,4 +108,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); + + extern const struct pipe_buf_operations page_cache_pipe_buf_ops; + extern const struct pipe_buf_operations default_pipe_buf_ops; ++ ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++extern long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); + #endif +diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c +index 151bd3de5936..2223ee909c10 100644 +--- a/kernel/locking/lockdep.c ++++ b/kernel/locking/lockdep.c +@@ -218,7 +218,7 @@ unsigned long max_lock_class_idx; + struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; + DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS); + +-static inline struct lock_class *hlock_class(struct held_lock *hlock) ++inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) + { + unsigned int class_idx = hlock->class_idx; + +@@ -239,6 +239,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) + */ + return lock_classes + class_idx; + } ++#define hlock_class(hlock) lockdep_hlock_class(hlock) + + #ifdef CONFIG_LOCK_STAT + static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats); +-- +2.39.2 + diff --git a/features/aufs/aufs5-core.patch b/features/aufs/aufs6-core.patch index 4ab312ac..d9585572 100644 --- a/features/aufs/aufs5-core.patch +++ b/features/aufs/aufs6-core.patch @@ -1,103 +1,104 @@ -From eedbd716b59eaedd46b2c38381a61c3f98bc7f92 Mon Sep 17 00:00:00 2001 +From 88604e3862245a999b3cdc6d96e888a3edf0b0c7 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Mon, 16 Mar 2020 23:46:39 -0400 -Subject: [PATCH 5/6] aufs5: core +Date: Thu, 21 Sep 2023 17:51:24 -0400 +Subject: [PATCH 5/8] aufs6: core Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- Documentation/ABI/testing/debugfs-aufs | 55 + Documentation/ABI/testing/sysfs-aufs | 31 + - Documentation/filesystems/aufs/README | 401 ++++ + Documentation/filesystems/aufs/README | 409 ++++ .../filesystems/aufs/design/01intro.txt | 171 ++ .../filesystems/aufs/design/02struct.txt | 258 +++ .../filesystems/aufs/design/03atomic_open.txt | 85 + .../filesystems/aufs/design/03lookup.txt | 113 + .../filesystems/aufs/design/04branch.txt | 74 + .../filesystems/aufs/design/05wbr_policy.txt | 64 + - .../filesystems/aufs/design/06dirren.dot | 31 + + .../filesystems/aufs/design/06dirren.dot | 44 + .../filesystems/aufs/design/06dirren.txt | 102 + - .../filesystems/aufs/design/06fhsm.txt | 120 + + .../filesystems/aufs/design/06fhsm.txt | 118 + .../filesystems/aufs/design/06mmap.txt | 72 + - .../filesystems/aufs/design/06xattr.txt | 96 + + .../filesystems/aufs/design/06xattr.txt | 94 + .../filesystems/aufs/design/07export.txt | 58 + .../filesystems/aufs/design/08shwh.txt | 52 + .../filesystems/aufs/design/10dynop.txt | 47 + fs/aufs/Kconfig | 199 ++ fs/aufs/Makefile | 46 + fs/aufs/aufs.h | 62 + - fs/aufs/branch.c | 1428 ++++++++++++ - fs/aufs/branch.h | 366 +++ + fs/aufs/branch.c | 1427 ++++++++++++ + fs/aufs/branch.h | 375 ++++ fs/aufs/conf.mk | 40 + - fs/aufs/cpup.c | 1458 ++++++++++++ + fs/aufs/cpup.c | 1459 +++++++++++++ fs/aufs/cpup.h | 100 + fs/aufs/dbgaufs.c | 526 +++++ fs/aufs/dbgaufs.h | 53 + fs/aufs/dcsub.c | 225 ++ fs/aufs/dcsub.h | 137 ++ - fs/aufs/debug.c | 441 ++++ + fs/aufs/debug.c | 446 ++++ fs/aufs/debug.h | 226 ++ - fs/aufs/dentry.c | 1154 ++++++++++ - fs/aufs/dentry.h | 268 +++ - fs/aufs/dinfo.c | 554 +++++ - fs/aufs/dir.c | 763 +++++++ + fs/aufs/dentry.c | 1168 ++++++++++ + fs/aufs/dentry.h | 270 +++ + fs/aufs/dinfo.c | 555 +++++ + fs/aufs/dir.c | 765 +++++++ fs/aufs/dir.h | 134 ++ - fs/aufs/dirren.c | 1316 +++++++++++ + fs/aufs/dirren.c | 1315 +++++++++++ fs/aufs/dirren.h | 140 ++ - fs/aufs/dynop.c | 367 +++ + fs/aufs/dynop.c | 366 ++++ fs/aufs/dynop.h | 77 + - fs/aufs/export.c | 838 +++++++ - fs/aufs/f_op.c | 819 +++++++ - fs/aufs/fhsm.c | 427 ++++ - fs/aufs/file.c | 863 ++++++++ + fs/aufs/export.c | 830 +++++++ + fs/aufs/f_op.c | 771 +++++++ + fs/aufs/fhsm.c | 426 ++++ + fs/aufs/file.c | 865 ++++++++ fs/aufs/file.h | 342 +++ fs/aufs/finfo.c | 149 ++ + fs/aufs/fsctx.c | 1242 +++++++++++ fs/aufs/fstype.h | 401 ++++ fs/aufs/hbl.h | 65 + - fs/aufs/hfsnotify.c | 288 +++ + fs/aufs/hfsnotify.c | 290 +++ fs/aufs/hfsplus.c | 60 + fs/aufs/hnotify.c | 715 ++++++ - fs/aufs/i_op.c | 1498 +++++++++++++ - fs/aufs/i_op_add.c | 936 ++++++++ - fs/aufs/i_op_del.c | 513 +++++ - fs/aufs/i_op_ren.c | 1250 +++++++++++ + fs/aufs/i_op.c | 1517 +++++++++++++ + fs/aufs/i_op_add.c | 972 +++++++++ + fs/aufs/i_op_del.c | 522 +++++ + fs/aufs/i_op_ren.c | 1257 +++++++++++ fs/aufs/iinfo.c | 286 +++ - fs/aufs/inode.c | 529 +++++ - fs/aufs/inode.h | 698 ++++++ + fs/aufs/inode.c | 531 +++++ + fs/aufs/inode.h | 707 ++++++ fs/aufs/ioctl.c | 220 ++ fs/aufs/lcnt.h | 186 ++ fs/aufs/loop.c | 148 ++ fs/aufs/loop.h | 55 + fs/aufs/magic.mk | 31 + fs/aufs/module.c | 273 +++ - fs/aufs/module.h | 166 ++ + fs/aufs/module.h | 180 ++ fs/aufs/mvdown.c | 706 ++++++ - fs/aufs/opts.c | 1880 ++++++++++++++++ - fs/aufs/opts.h | 225 ++ + fs/aufs/opts.c | 1032 +++++++++ + fs/aufs/opts.h | 263 +++ fs/aufs/plink.c | 516 +++++ fs/aufs/poll.c | 51 + - fs/aufs/posix_acl.c | 105 + + fs/aufs/posix_acl.c | 108 + fs/aufs/procfs.c | 170 ++ fs/aufs/rdu.c | 384 ++++ - fs/aufs/rwsem.h | 73 + - fs/aufs/sbinfo.c | 314 +++ - fs/aufs/super.c | 1047 +++++++++ - fs/aufs/super.h | 589 +++++ - fs/aufs/sysaufs.c | 93 + + fs/aufs/rwsem.h | 85 + + fs/aufs/sbinfo.c | 316 +++ + fs/aufs/super.c | 871 ++++++++ + fs/aufs/super.h | 592 +++++ + fs/aufs/sysaufs.c | 94 + fs/aufs/sysaufs.h | 102 + fs/aufs/sysfs.c | 374 ++++ fs/aufs/sysrq.c | 149 ++ fs/aufs/vdir.c | 896 ++++++++ - fs/aufs/vfsub.c | 902 ++++++++ - fs/aufs/vfsub.h | 354 +++ + fs/aufs/vfsub.c | 918 ++++++++ + fs/aufs/vfsub.h | 404 ++++ fs/aufs/wbr_policy.c | 830 +++++++ - fs/aufs/whout.c | 1062 +++++++++ - fs/aufs/whout.h | 86 + + fs/aufs/whout.c | 1072 +++++++++ + fs/aufs/whout.h | 87 + fs/aufs/wkq.c | 372 ++++ fs/aufs/wkq.h | 89 + - fs/aufs/xattr.c | 356 +++ - fs/aufs/xino.c | 1966 +++++++++++++++++ + fs/aufs/xattr.c | 360 +++ + fs/aufs/xino.c | 1926 +++++++++++++++++ include/uapi/linux/aufs_type.h | 452 ++++ - 92 files changed, 37809 insertions(+) + 93 files changed, 38218 insertions(+) create mode 100644 Documentation/ABI/testing/debugfs-aufs create mode 100644 Documentation/ABI/testing/sysfs-aufs create mode 100644 Documentation/filesystems/aufs/README @@ -144,6 +145,7 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> create mode 100644 fs/aufs/file.c create mode 100644 fs/aufs/file.h create mode 100644 fs/aufs/finfo.c + create mode 100644 fs/aufs/fsctx.c create mode 100644 fs/aufs/fstype.h create mode 100644 fs/aufs/hbl.h create mode 100644 fs/aufs/hfsnotify.c @@ -193,7 +195,7 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> diff --git a/Documentation/ABI/testing/debugfs-aufs b/Documentation/ABI/testing/debugfs-aufs new file mode 100644 -index 000000000000..4a6694194ba6 +index 000000000000..45b739879d76 --- /dev/null +++ b/Documentation/ABI/testing/debugfs-aufs @@ -0,0 +1,55 @@ @@ -227,7 +229,7 @@ index 000000000000..4a6694194ba6 + When the aufs mount option 'noxino' is specified, it + will be empty. About XINO files, see the aufs manual. + -+What: /debug/aufs/si_<id>/xi0, xi1 ... xiN and xiN-N ++What: /debug/aufs/si_<id>/xi<branch-index> +Date: March 2009 +Contact: J. R. Okajima <hooanon05g@gmail.com> +Description: @@ -254,7 +256,7 @@ index 000000000000..4a6694194ba6 + will be empty. About XINO files, see the aufs manual. diff --git a/Documentation/ABI/testing/sysfs-aufs b/Documentation/ABI/testing/sysfs-aufs new file mode 100644 -index 000000000000..82f9518495ea +index 000000000000..48500c0569e6 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-aufs @@ -0,0 +1,31 @@ @@ -266,14 +268,14 @@ index 000000000000..82f9518495ea + per aufs mount, where <id> is a unique id generated + internally. + -+What: /sys/fs/aufs/si_<id>/br0, br1 ... brN ++What: /sys/fs/aufs/si_<id>/br<idx> +Date: March 2009 +Contact: J. R. Okajima <hooanon05g@gmail.com> +Description: + It shows the abolute path of a member directory (which + is called branch) in aufs, and its permission. + -+What: /sys/fs/aufs/si_<id>/brid0, brid1 ... bridN ++What: /sys/fs/aufs/si_<id>/brid<idx> +Date: July 2013 +Contact: J. R. Okajima <hooanon05g@gmail.com> +Description: @@ -291,12 +293,12 @@ index 000000000000..82f9518495ea + will be empty. About XINO files, see the aufs manual. diff --git a/Documentation/filesystems/aufs/README b/Documentation/filesystems/aufs/README new file mode 100644 -index 000000000000..3e655d357134 +index 000000000000..04a4d069bb52 --- /dev/null +++ b/Documentation/filesystems/aufs/README -@@ -0,0 +1,401 @@ +@@ -0,0 +1,409 @@ + -+Aufs5 -- advanced multi layered unification filesystem version 5.x ++Aufs6 -- advanced multi layered unification filesystem version 6.x +http://aufs.sf.net +Junjiro R. Okajima + @@ -312,13 +314,19 @@ index 000000000000..3e655d357134 +Unionfs was being developed by Professor Erez Zadok at Stony Brook +University and his team. + -+Aufs5 supports linux-v5.0 and later, If you want older kernel version -+support, ++Aufs6 supports linux-v6.0 and later, try aufs6.0 branch in ++aufs-linux.git or aufs-standalone.git. ++If you want older kernel version support, ++- for linux-v5.x series, try aufs-linux.git or aufs-standalone.git +- for linux-v4.x series, try aufs4-linux.git or aufs4-standalone.git +- for linux-v3.x series, try aufs3-linux.git or aufs3-standalone.git +- for linux-v2.6.16 and later, try aufs2-2.6.git, aufs2-standalone.git + or aufs1 from CVS on SourceForge. + ++Note: the name of aufs5-linux.git and aufs5-standalone.git on github ++ were changed. Now they are aufs-linux.git and ++ aufs-standalone.git and they contain aufs5 and later branches. ++ +Note: it becomes clear that "Aufs was rejected. Let's give it up." + According to Christoph Hellwig, linux rejects all union-type + filesystems but UnionMount. @@ -377,7 +385,7 @@ index 000000000000..3e655d357134 +- userspace wrapper for pathconf(3)/fpathconf(3) with _PC_LINK_MAX. +- and more... + -+Currently these features are dropped temporary from aufs5. ++Currently these features are dropped temporary from aufs6. +See design/08plan.txt in detail. +- nested mount, i.e. aufs as readonly no-whiteout branch of another aufs + (robr) @@ -395,64 +403,63 @@ index 000000000000..3e655d357134 + +2. Download +---------------------------------------- -+There are three GIT trees for aufs5, aufs5-linux.git, -+aufs5-standalone.git, and aufs-util.git. Note that there is no "5" in -+"aufs-util.git." -+While the aufs-util is always necessary, you need either of aufs5-linux -+or aufs5-standalone. ++There are three GIT trees for aufs6, aufs-linux.git, ++aufs-standalone.git, and aufs-util.git. ++While the aufs-util is always necessary, you need either of aufs-linux ++or aufs-standalone. + -+The aufs5-linux tree includes the whole linux mainline GIT tree, ++The aufs-linux tree includes the whole linux mainline GIT tree, +git://git.kernel.org/.../torvalds/linux.git. +And you cannot select CONFIG_AUFS_FS=m for this version, eg. you cannot -+build aufs5 as an external kernel module. ++build aufs6 as an external kernel module. +Several extra patches are not included in this tree. Only -+aufs5-standalone tree contains them. They are described in the later ++aufs-standalone tree contains them. They are described in the later +section "Configuration and Compilation." + -+On the other hand, the aufs5-standalone tree has only aufs source files ++On the other hand, the aufs-standalone tree has only aufs source files +and necessary patches, and you can select CONFIG_AUFS_FS=m. +But you need to apply all aufs patches manually. + -+You will find GIT branches whose name is in form of "aufs5.x" where "x" -+represents the linux kernel version, "linux-5.x". For instance, -+"aufs5.0" is for linux-5.0. For latest "linux-5.x-rcN", use -+"aufs5.x-rcN" branch. ++You will find GIT branches whose name is in form of "aufs6.x" where "x" ++represents the linux kernel version, "linux-6.x". For instance, ++"aufs6.0" is for linux-6.0. For latest "linux-6.x-rcN", use ++"aufs6.x-rcN" branch. + -+o aufs5-linux tree ++o aufs-linux tree +$ git clone --reference /your/linux/git/tree \ -+ git://github.com/sfjro/aufs5-linux.git aufs5-linux.git ++ git://github.com/sfjro/aufs-linux.git aufs-linux.git +- if you don't have linux GIT tree, then remove "--reference ..." -+$ cd aufs5-linux.git -+$ git checkout origin/aufs5.0 ++$ cd aufs-linux.git ++$ git checkout origin/aufs6.0 + +Or You may want to directly git-pull aufs into your linux GIT tree, and +leave the patch-work to GIT. +$ cd /your/linux/git/tree -+$ git remote add aufs5 git://github.com/sfjro/aufs5-linux.git -+$ git fetch aufs5 -+$ git checkout -b my5.0 v5.0 ++$ git remote add aufs git://github.com/sfjro/aufs-linux.git ++$ git fetch aufs ++$ git checkout -b my6.0 v6.0 +$ (add your local change...) -+$ git pull aufs5 aufs5.0 -+- now you have v5.0 + your_changes + aufs5.0 in you my5.0 branch. ++$ git pull aufs aufs6.0 ++- now you have v6.0 + your_changes + aufs6.0 in you my6.0 branch. +- you may need to solve some conflicts between your_changes and -+ aufs5.0. in this case, git-rerere is recommended so that you can -+ solve the similar conflicts automatically when you upgrade to 5.1 or ++ aufs6.0. in this case, git-rerere is recommended so that you can ++ solve the similar conflicts automatically when you upgrade to 6.1 or + later in the future. + -+o aufs5-standalone tree -+$ git clone git://github.com/sfjro/aufs5-standalone.git aufs5-standalone.git -+$ cd aufs5-standalone.git -+$ git checkout origin/aufs5.0 ++o aufs-standalone tree ++$ git clone git://github.com/sfjro/aufs-standalone.git aufs-standalone.git ++$ cd aufs-standalone.git ++$ git checkout origin/aufs6.0 + +o aufs-util tree +$ git clone git://git.code.sf.net/p/aufs/aufs-util aufs-util.git +- note that the public aufs-util.git is on SourceForge instead of + GitHUB. +$ cd aufs-util.git -+$ git checkout origin/aufs5.0 ++$ git checkout origin/aufs6.0 + -+Note: The 5.x-rcN branch is to be used with `rc' kernel versions ONLY. -+The minor version number, 'x' in '5.x', of aufs may not always ++Note: The 6.x-rcN branch is to be used with `rc' kernel versions ONLY. ++The minor version number, 'x' in '6.x', of aufs may not always +follow the minor version number of the kernel. +Because changes in the kernel that cause the use of a new +minor version number do not always require changes to aufs-util. @@ -464,8 +471,8 @@ index 000000000000..3e655d357134 +nearest lower number. + +For (an unreleased) example: -+If you are using "linux-5.10" and the "aufs5.10" branch -+does not exist in aufs-util repository, then "aufs5.9", "aufs5.8" ++If you are using "linux-6.10" and the "aufs6.10" branch ++does not exist in aufs-util repository, then "aufs6.9", "aufs6.8" +or something numerically smaller is the branch for your kernel. + +Also you can view all branches by @@ -476,19 +483,31 @@ index 000000000000..3e655d357134 +---------------------------------------- +Make sure you have git-checkout'ed the correct branch. + -+For aufs5-linux tree, ++For aufs-linux tree, +- enable CONFIG_AUFS_FS. +- set other aufs configurations if necessary. -+ -+For aufs5-standalone tree, ++- for aufs5.13 and later ++ Because aufs is not only an ordinary filesystem (callee of VFS), but ++ also a caller of VFS functions for branch filesystems, subclassing of ++ the internal locks for LOCKDEP is necessary. LOCKDEP is a debugging ++ feature of linux kernel. If you enable CONFIG_LOCKDEP, then you will ++ need to customize some LOCKDEP numbers. Here are what I use on my ++ test environment. ++ CONFIG_LOCKDEP_BITS=21 ++ CONFIG_LOCKDEP_CHAINS_BITS=21 ++ CONFIG_LOCKDEP_STACK_TRACE_BITS=24 ++ Also you will need to expand some constant values in LOCKDEP. Refer ++ to lockdep-debug.patch in aufs-standalone.git. ++ ++For aufs-standalone tree, +There are several ways to build. + +1. -+- apply ./aufs5-kbuild.patch to your kernel source files. -+- apply ./aufs5-base.patch too. -+- apply ./aufs5-mmap.patch too. -+- apply ./aufs5-standalone.patch too, if you have a plan to set -+ CONFIG_AUFS_FS=m. otherwise you don't need ./aufs5-standalone.patch. ++- apply ./aufs6-kbuild.patch to your kernel source files. ++- apply ./aufs6-base.patch too. ++- apply ./aufs6-mmap.patch too. ++- apply ./aufs6-standalone.patch too, if you have a plan to set ++ CONFIG_AUFS_FS=m. otherwise you don't need ./aufs-standalone.patch. +- copy ./{Documentation,fs,include/uapi/linux/aufs_type.h} files to your + kernel source tree. Never copy $PWD/include/uapi/linux/Kbuild. +- enable CONFIG_AUFS_FS, you can select either @@ -502,9 +521,9 @@ index 000000000000..3e655d357134 + +2. +- module only (CONFIG_AUFS_FS=m). -+- apply ./aufs5-base.patch to your kernel source files. -+- apply ./aufs5-mmap.patch too. -+- apply ./aufs5-standalone.patch too. ++- apply ./aufs6-base.patch to your kernel source files. ++- apply ./aufs6-mmap.patch too. ++- apply ./aufs6-standalone.patch too. +- build your kernel, don't forget "make headers_install", and reboot. +- edit ./config.mk and set other aufs configurations if necessary. + Note: You should read $PWD/fs/aufs/Kconfig carefully which describes @@ -520,7 +539,7 @@ index 000000000000..3e655d357134 + available in aufs standalone version's Makefile only), or copy + $PWD/usr/include/linux/aufs_type.h to /usr/include/linux or wherever + you like manually. By default, the target directory is $PWD/usr. -+- no need to apply aufs5-kbuild.patch, nor copying source files to your ++- no need to apply aufs6-kbuild.patch, nor copying source files to your + kernel source tree. + +Note: The header file aufs_type.h is necessary to build aufs-util @@ -540,19 +559,12 @@ index 000000000000..3e655d357134 + then run "make install_ulib" too. And refer to the aufs manual in + detail. + -+There several other patches in aufs5-standalone.git. They are all ++There several other patches in aufs-standalone.git. They are all +optional. When you meet some problems, they will help you. -+- aufs5-loopback.patch ++- aufs6-loopback.patch + Supports a nested loopback mount in a branch-fs. This patch is + unnecessary until aufs produces a message like "you may want to try + another patch for loopback file". -+- proc_mounts.patch -+ When there are many mountpoints and many mount(2)/umount(2) are -+ running, then /proc/mounts may not show the all mountpoints. This -+ patch makes /proc/mounts always show the full mountpoints list. -+ If you don't want to apply this patch and meet such problem, then you -+ need to increase the value of 'ProcMounts_Times' make-variable in -+ aufs-util.git as a second best solution. +- vfs-ino.patch + Modifies a system global kernel internal function get_next_ino() in + order to stop assigning 0 for an inode-number. Not directly related to @@ -564,13 +576,9 @@ index 000000000000..3e655d357134 + other utilities. When you find aufs XINO files for tmpfs branch + growing too much, try this patch. +- lockdep-debug.patch -+ Because aufs is not only an ordinary filesystem (callee of VFS), but -+ also a caller of VFS functions for branch filesystems, subclassing of -+ the internal locks for LOCKDEP is necessary. LOCKDEP is a debugging -+ feature of linux kernel. If you enable CONFIG_LOCKDEP, then you will -+ need to apply this debug patch to expand several constant values. -+ If you don't know what LOCKDEP is, then you don't have apply this -+ patch. ++ Similar to some kernel configurations for LOCKDEP (see the top of ++ this section), you will need expand some constants in LOCKDEP for ++ aufs if you enable CONFIG_LOCKDEP. + + +4. Usage @@ -671,7 +679,7 @@ index 000000000000..3e655d357134 +The Parted Magic Project made a donation (2013/9 and 11). +Pavel Barta made a donation (2013/10). +Nikolay Pertsev made a donation (2014/5). -+James B made a donation (2014/7 and 2015/7). ++James B made a donation (2014/7, 2015/7, and 2021/12). +Stefano Di Biase made a donation (2014/8). +Daniel Epellei made a donation (2015/1). +OmegaPhil made a donation (2016/1, 2018/4). @@ -679,6 +687,8 @@ index 000000000000..3e655d357134 +James Burry made a donation (2016/12). +Carsten Rose made a donation (2018/9). +Porteus Kiosk made a donation (2018/10). ++huronOS team: Enya Quetzalli made donations (2022/5, 2023/5 and 8). ++Vasily Mikhaylichenko made a donation (2023/5). + +Thank you very much. +Donations are always, including future donations, very important and @@ -698,23 +708,23 @@ index 000000000000..3e655d357134 +# End: ; diff --git a/Documentation/filesystems/aufs/design/01intro.txt b/Documentation/filesystems/aufs/design/01intro.txt new file mode 100644 -index 000000000000..47e0a01a8af2 +index 000000000000..4c468b3264b5 --- /dev/null +++ b/Documentation/filesystems/aufs/design/01intro.txt @@ -0,0 +1,171 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -875,23 +885,23 @@ index 000000000000..47e0a01a8af2 +about it. But currently I have implemented it in kernel space. diff --git a/Documentation/filesystems/aufs/design/02struct.txt b/Documentation/filesystems/aufs/design/02struct.txt new file mode 100644 -index 000000000000..0092b3dcfbe0 +index 000000000000..83be46121ae2 --- /dev/null +++ b/Documentation/filesystems/aufs/design/02struct.txt @@ -0,0 +1,258 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -1139,23 +1149,23 @@ index 000000000000..0092b3dcfbe0 +For this purpose, use "aumvdown" command in aufs-util.git. diff --git a/Documentation/filesystems/aufs/design/03atomic_open.txt b/Documentation/filesystems/aufs/design/03atomic_open.txt new file mode 100644 -index 000000000000..fb8cf0bc8c72 +index 000000000000..4811f2432465 --- /dev/null +++ b/Documentation/filesystems/aufs/design/03atomic_open.txt @@ -0,0 +1,85 @@ + -+# Copyright (C) 2015-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2015-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -1230,23 +1240,23 @@ index 000000000000..fb8cf0bc8c72 + be implemented in aufs, but not all I am afraid. diff --git a/Documentation/filesystems/aufs/design/03lookup.txt b/Documentation/filesystems/aufs/design/03lookup.txt new file mode 100644 -index 000000000000..5c3c97f11c57 +index 000000000000..766a28be0263 --- /dev/null +++ b/Documentation/filesystems/aufs/design/03lookup.txt @@ -0,0 +1,113 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -1349,23 +1359,23 @@ index 000000000000..5c3c97f11c57 + by over-mounting something (or another method). diff --git a/Documentation/filesystems/aufs/design/04branch.txt b/Documentation/filesystems/aufs/design/04branch.txt new file mode 100644 -index 000000000000..da5200be41a9 +index 000000000000..ffeb97dcaff3 --- /dev/null +++ b/Documentation/filesystems/aufs/design/04branch.txt @@ -0,0 +1,74 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -1429,23 +1439,23 @@ index 000000000000..da5200be41a9 + same named entry on the upper branch. diff --git a/Documentation/filesystems/aufs/design/05wbr_policy.txt b/Documentation/filesystems/aufs/design/05wbr_policy.txt new file mode 100644 -index 000000000000..0262084bf634 +index 000000000000..a2143bfe6efc --- /dev/null +++ b/Documentation/filesystems/aufs/design/05wbr_policy.txt @@ -0,0 +1,64 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -1499,12 +1509,25 @@ index 000000000000..0262084bf634 + copyup policy. diff --git a/Documentation/filesystems/aufs/design/06dirren.dot b/Documentation/filesystems/aufs/design/06dirren.dot new file mode 100644 -index 000000000000..2d62bb6dd55f +index 000000000000..4e6c7e7c20ef --- /dev/null +++ b/Documentation/filesystems/aufs/design/06dirren.dot -@@ -0,0 +1,31 @@ +@@ -0,0 +1,44 @@ + +// to view this graph, run dot(1) command in GRAPHVIZ. ++// ++// This program is free software; you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation; either version 2 of the License, or ++// (at your option) any later version. ++// ++// This program is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with this program. If not, see <http://www.gnu.org/licenses/>. + +digraph G { +node [shape=box]; @@ -1536,12 +1559,12 @@ index 000000000000..2d62bb6dd55f +} diff --git a/Documentation/filesystems/aufs/design/06dirren.txt b/Documentation/filesystems/aufs/design/06dirren.txt new file mode 100644 -index 000000000000..38ae77b2c842 +index 000000000000..58ec5e22fe3d --- /dev/null +++ b/Documentation/filesystems/aufs/design/06dirren.txt @@ -0,0 +1,102 @@ + -+# Copyright (C) 2017-2020 Junjiro R. Okajima ++# Copyright (C) 2017-2022 Junjiro R. Okajima +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -1619,7 +1642,7 @@ index 000000000000..38ae77b2c842 +simply the inode-numbers on the branch. The file is created or updated +in removing the branch, and loaded in adding the branch. Its lifetime is +equal to the branch. -+The list is refered in lookup, and when the current target inode is ++The list is referred in lookup, and when the current target inode is +found in the list, the aufs tries loading the "detailed info per +directory" and get the changed and valid name of the dir. + @@ -1644,27 +1667,25 @@ index 000000000000..38ae77b2c842 +equivalen to udba=reval case. diff --git a/Documentation/filesystems/aufs/design/06fhsm.txt b/Documentation/filesystems/aufs/design/06fhsm.txt new file mode 100644 -index 000000000000..df985662befb +index 000000000000..d3b56325ff87 --- /dev/null +++ b/Documentation/filesystems/aufs/design/06fhsm.txt -@@ -0,0 +1,120 @@ +@@ -0,0 +1,118 @@ + -+# Copyright (C) 2011-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2011-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ ++# along with this program. If not, see <http://www.gnu.org/licenses/>. + +File-based Hierarchical Storage Management (FHSM) +---------------------------------------------------------------------- @@ -1770,23 +1791,23 @@ index 000000000000..df985662befb +should restore the original file state after an error happens. diff --git a/Documentation/filesystems/aufs/design/06mmap.txt b/Documentation/filesystems/aufs/design/06mmap.txt new file mode 100644 -index 000000000000..9184f6710437 +index 000000000000..ddc65ce97fa3 --- /dev/null +++ b/Documentation/filesystems/aufs/design/06mmap.txt @@ -0,0 +1,72 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -1848,12 +1869,12 @@ index 000000000000..9184f6710437 +I have to give up this "looks-smater" approach. diff --git a/Documentation/filesystems/aufs/design/06xattr.txt b/Documentation/filesystems/aufs/design/06xattr.txt new file mode 100644 -index 000000000000..d0f6aedfe2d0 +index 000000000000..4e5ead3ad741 --- /dev/null +++ b/Documentation/filesystems/aufs/design/06xattr.txt -@@ -0,0 +1,96 @@ +@@ -0,0 +1,94 @@ + -+# Copyright (C) 2014-2020 Junjiro R. Okajima ++# Copyright (C) 2014-2022 Junjiro R. Okajima +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -1866,9 +1887,7 @@ index 000000000000..d0f6aedfe2d0 +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ ++# along with this program. If not, see <http://www.gnu.org/licenses/>. + +Listing XATTR/EA and getting the value +---------------------------------------------------------------------- @@ -1950,23 +1969,23 @@ index 000000000000..d0f6aedfe2d0 +now, aufs implements the branch attributes to ignore the error. diff --git a/Documentation/filesystems/aufs/design/07export.txt b/Documentation/filesystems/aufs/design/07export.txt new file mode 100644 -index 000000000000..6fcb00d7dbdb +index 000000000000..40b2f1f12049 --- /dev/null +++ b/Documentation/filesystems/aufs/design/07export.txt @@ -0,0 +1,58 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -2014,23 +2033,23 @@ index 000000000000..6fcb00d7dbdb + lookup_one_len(), vfs_getattr(), encode_fh() and others. diff --git a/Documentation/filesystems/aufs/design/08shwh.txt b/Documentation/filesystems/aufs/design/08shwh.txt new file mode 100644 -index 000000000000..d7e58319086b +index 000000000000..67245e98e6b4 --- /dev/null +++ b/Documentation/filesystems/aufs/design/08shwh.txt @@ -0,0 +1,52 @@ + -+# Copyright (C) 2005-2020 Junjiro R. Okajima -+# ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. -+# ++# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -+# ++# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -2072,12 +2091,12 @@ index 000000000000..d7e58319086b +initramfs will use it to replace the old one at the next boot. diff --git a/Documentation/filesystems/aufs/design/10dynop.txt b/Documentation/filesystems/aufs/design/10dynop.txt new file mode 100644 -index 000000000000..d55cae285dff +index 000000000000..da382ec2dc05 --- /dev/null +++ b/Documentation/filesystems/aufs/design/10dynop.txt @@ -0,0 +1,47 @@ + -+# Copyright (C) 2010-2020 Junjiro R. Okajima ++# Copyright (C) 2010-2022 Junjiro R. Okajima +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -2125,7 +2144,7 @@ index 000000000000..d55cae285dff +regular files only. diff --git a/fs/aufs/Kconfig b/fs/aufs/Kconfig new file mode 100644 -index 000000000000..9f436425716a +index 000000000000..a5008b87a55f --- /dev/null +++ b/fs/aufs/Kconfig @@ -0,0 +1,199 @@ @@ -2255,7 +2274,7 @@ index 000000000000..9f436425716a + his child on the lower branch, since it is a bad idea to issue + rename(2) internally for every lower branch. But user may not + accept this behaviour. So here is a workaround to allow such -+ rename(2) and store some extra infromation on the writable ++ rename(2) and store some extra information on the writable + branch. Obviously this costs high (and I don't like it). + To use this feature, you need to enable this configuration AND + to specify the mount option `dirren.' @@ -2330,7 +2349,7 @@ index 000000000000..9f436425716a +endif diff --git a/fs/aufs/Makefile b/fs/aufs/Makefile new file mode 100644 -index 000000000000..2c819a64935e +index 000000000000..4af8ecde3e3f --- /dev/null +++ b/fs/aufs/Makefile @@ -0,0 +1,46 @@ @@ -2353,7 +2372,7 @@ index 000000000000..2c819a64935e +endif + +obj-$(CONFIG_AUFS_FS) += aufs.o -+aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \ ++aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o fsctx.o \ + wkq.o vfsub.o dcsub.o \ + cpup.o whout.o wbr_policy.o \ + dinfo.o dentry.o \ @@ -2382,15 +2401,15 @@ index 000000000000..2c819a64935e +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o diff --git a/fs/aufs/aufs.h b/fs/aufs/aufs.h new file mode 100644 -index 000000000000..9a573445876f +index 000000000000..20430cf79042 --- /dev/null +++ b/fs/aufs/aufs.h @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -2450,15 +2469,15 @@ index 000000000000..9a573445876f +#endif /* __AUFS_H__ */ diff --git a/fs/aufs/branch.c b/fs/aufs/branch.c new file mode 100644 -index 000000000000..1f141fc8ffed +index 000000000000..2a85d744d2b5 --- /dev/null +++ b/fs/aufs/branch.c -@@ -0,0 +1,1428 @@ +@@ -0,0 +1,1427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -3735,7 +3754,7 @@ index 000000000000..1f141fc8ffed + * file_release_write() for each file, because the branch + * attribute in aufs world is totally different from the native + * fs rw/ro mode. -+ */ ++ */ + /* fi_read_lock(file); */ + hfile = &au_fi(file)->fi_htop; + hf = hfile->hf_file; @@ -3746,11 +3765,10 @@ index 000000000000..1f141fc8ffed + spin_unlock(&hf->f_lock); + if (writer) { + h_inode = file_inode(hf); ++ if (hf->f_mode & FMODE_READ) ++ i_readcount_inc(h_inode); + put_write_access(h_inode); + __mnt_drop_write(hf->f_path.mnt); -+ if ((hf->f_mode & (FMODE_READ | FMODE_WRITE)) -+ == FMODE_READ) -+ i_readcount_inc(h_inode); + } + } + @@ -3884,15 +3902,15 @@ index 000000000000..1f141fc8ffed +} diff --git a/fs/aufs/branch.h b/fs/aufs/branch.h new file mode 100644 -index 000000000000..594c8bd674b2 +index 000000000000..6818ba8df8a2 --- /dev/null +++ b/fs/aufs/branch.h -@@ -0,0 +1,366 @@ +@@ -0,0 +1,375 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -4036,6 +4054,11 @@ index 000000000000..594c8bd674b2 + return br->br_path.dentry; +} + ++static inline struct mnt_idmap *au_br_idmap(struct au_branch *br) ++{ ++ return mnt_idmap(br->br_path.mnt); ++} ++ +static inline struct super_block *au_br_sb(struct au_branch *br) +{ + return au_br_mnt(br)->mnt_sb; @@ -4131,10 +4154,8 @@ index 000000000000..594c8bd674b2 + ino_t *ino); +int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, + ino_t ino); -+ssize_t xino_fread(vfs_readf_t func, struct file *file, void *buf, size_t size, -+ loff_t *pos); -+ssize_t xino_fwrite(vfs_writef_t func, struct file *file, void *buf, -+ size_t size, loff_t *pos); ++ssize_t xino_fread(struct file *file, void *buf, size_t size, loff_t *pos); ++ssize_t xino_fwrite(struct file *file, void *buf, size_t size, loff_t *pos); + +int au_xib_trunc(struct super_block *sb); +int au_xino_trunc(struct super_block *sb, aufs_bindex_t bindex, int idx_begin); @@ -4197,6 +4218,12 @@ index 000000000000..594c8bd674b2 +} + +static inline ++struct mnt_idmap *au_sbr_idmap(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ return au_br_idmap(au_sbr(sb, bindex)); ++} ++ ++static inline +struct super_block *au_sbr_sb(struct super_block *sb, aufs_bindex_t bindex) +{ + return au_br_sb(au_sbr(sb, bindex)); @@ -4302,15 +4329,15 @@ index 000000000000..12782f8e0f38 +-include ${srctree}/${src}/conf_priv.mk diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c new file mode 100644 -index 000000000000..492442339b6c +index 000000000000..8c8bd5f7b28d --- /dev/null +++ b/fs/aufs/cpup.c -@@ -0,0 +1,1458 @@ +@@ -0,0 +1,1459 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -4472,7 +4499,7 @@ index 000000000000..492442339b6c +}; + +static noinline_for_stack -+int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct dentry *h_src, ++int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct path *h_src, + struct au_cpup_reg_attr *h_src_attr) +{ + int err, sbits, icex; @@ -4484,11 +4511,11 @@ index 000000000000..492442339b6c + struct kstat *h_st; + struct au_branch *br; + -+ h_path.dentry = au_h_dptr(dst, bindex); -+ h_idst = d_inode(h_path.dentry); + br = au_sbr(dst->d_sb, bindex); + h_path.mnt = au_br_mnt(br); -+ h_isrc = d_inode(h_src); ++ h_path.dentry = au_h_dptr(dst, bindex); ++ h_idst = d_inode(h_path.dentry); ++ h_isrc = d_inode(h_src->dentry); + ia.ia_valid = ATTR_FORCE | ATTR_UID | ATTR_GID + | ATTR_ATIME | ATTR_MTIME + | ATTR_ATIME_SET | ATTR_MTIME_SET; @@ -4532,7 +4559,7 @@ index 000000000000..492442339b6c + if (!err) { + mnt_flags = au_mntflags(dst->d_sb); + verbose = !!au_opt_test(mnt_flags, VERBOSE); -+ err = au_cpup_xattr(h_path.dentry, h_src, icex, verbose); ++ err = au_cpup_xattr(&h_path, h_src, icex, verbose); + } + + return err; @@ -4877,32 +4904,19 @@ index 000000000000..492442339b6c +static int au_do_cpup_symlink(struct path *h_path, struct dentry *h_src, + struct inode *h_dir) +{ -+ int err, symlen; -+ mm_segment_t old_fs; -+ union { -+ char *k; -+ char __user *u; -+ } sym; ++ int err; ++ DEFINE_DELAYED_CALL(done); ++ const char *sym; + -+ err = -ENOMEM; -+ sym.k = (void *)__get_free_page(GFP_NOFS); -+ if (unlikely(!sym.k)) ++ sym = vfs_get_link(h_src, &done); ++ err = PTR_ERR(sym); ++ if (IS_ERR(sym)) + goto out; + -+ /* unnecessary to support mmap_sem since symlink is not mmap-able */ -+ old_fs = get_fs(); -+ set_fs(KERNEL_DS); -+ symlen = vfs_readlink(h_src, sym.u, PATH_MAX); -+ err = symlen; -+ set_fs(old_fs); -+ -+ if (symlen > 0) { -+ sym.k[symlen] = 0; -+ err = vfsub_symlink(h_dir, h_path, sym.k); -+ } -+ free_page((unsigned long)sym.k); ++ err = vfsub_symlink(h_dir, h_path, sym); + +out: ++ do_delayed_call(&done); + return err; +} + @@ -4910,21 +4924,23 @@ index 000000000000..492442339b6c + * regardless 'acl' option, reset all ACL. + * All ACL will be copied up later from the original entry on the lower branch. + */ -+static int au_reset_acl(struct inode *h_dir, struct path *h_path, umode_t mode) ++static int au_reset_acl(struct path *h_path, umode_t mode) +{ + int err; + struct dentry *h_dentry; -+ struct inode *h_inode; ++ /* struct inode *h_inode; */ ++ struct mnt_idmap *h_idmap; + ++ h_idmap = mnt_idmap(h_path->mnt); + h_dentry = h_path->dentry; -+ h_inode = d_inode(h_dentry); ++ /* h_inode = d_inode(h_dentry); */ + /* forget_all_cached_acls(h_inode)); */ -+ err = vfsub_removexattr(h_dentry, XATTR_NAME_POSIX_ACL_ACCESS); ++ err = vfsub_remove_acl(h_idmap, h_dentry, XATTR_NAME_POSIX_ACL_ACCESS); + AuTraceErr(err); + if (err == -EOPNOTSUPP) + err = 0; + if (!err) -+ err = vfsub_acl_chmod(h_inode, mode); ++ err = vfsub_acl_chmod(h_idmap, h_dentry, mode); + + AuTraceErr(err); + return err; @@ -4935,8 +4951,11 @@ index 000000000000..492442339b6c +{ + int err; + struct inode *dir, *inode; ++ struct mnt_idmap *h_idmap; + -+ err = vfsub_removexattr(h_path->dentry, XATTR_NAME_POSIX_ACL_DEFAULT); ++ h_idmap = mnt_idmap(h_path->mnt); ++ err = vfsub_remove_acl(h_idmap, h_path->dentry, ++ XATTR_NAME_POSIX_ACL_DEFAULT); + AuTraceErr(err); + if (err == -EOPNOTSUPP) + err = 0; @@ -5017,7 +5036,7 @@ index 000000000000..492442339b6c + case S_IFCHR: + case S_IFBLK: + AuDebugOn(!capable(CAP_MKNOD)); -+ /*FALLTHROUGH*/ ++ fallthrough; + case S_IFIFO: + case S_IFSOCK: + err = vfsub_mknod(h_dir, &h_path, mode, h_inode->i_rdev); @@ -5027,7 +5046,7 @@ index 000000000000..492442339b6c + err = -EIO; + } + if (!err) -+ err = au_reset_acl(h_dir, &h_path, mode); ++ err = au_reset_acl(&h_path, mode); + + mnt_flags = au_mntflags(sb); + if (!au_opt_test(mnt_flags, UDBA_NONE) @@ -5061,11 +5080,13 @@ index 000000000000..492442339b6c +{ + int err; + struct dentry *dentry, *h_dentry, *h_parent, *parent; ++ struct path h_ppath; + struct inode *h_dir; + aufs_bindex_t bdst; + + dentry = cpg->dentry; + bdst = cpg->bdst; ++ h_ppath.mnt = au_sbr_mnt(dentry->d_sb, bdst); + h_dentry = au_h_dptr(dentry, bdst); + if (!au_ftest_cpup(cpg->flags, OVERWRITE)) { + dget(h_dentry); @@ -5077,9 +5098,9 @@ index 000000000000..492442339b6c + } else { + err = 0; + parent = dget_parent(dentry); -+ h_parent = au_h_dptr(parent, bdst); ++ h_ppath.dentry = au_h_dptr(parent, bdst); + dput(parent); -+ h_path->dentry = vfsub_lkup_one(&dentry->d_name, h_parent); ++ h_path->dentry = vfsub_lkup_one(&dentry->d_name, &h_ppath); + if (IS_ERR(h_path->dentry)) + err = PTR_ERR(h_path->dentry); + } @@ -5117,6 +5138,7 @@ index 000000000000..492442339b6c + struct inode *dst_inode, *h_dir, *inode, *delegated, *src_inode; + struct super_block *sb; + struct au_branch *br; ++ struct path h_src_path; + /* to reduce stack size */ + struct { + struct au_dtime dt; @@ -5208,7 +5230,9 @@ index 000000000000..492442339b6c + /* todo: necessary? */ + /* au_pin_hdir_unlock(cpg->pin); */ + -+ err = cpup_iattr(cpg->dentry, cpg->bdst, h_src, &a->h_src_attr); ++ h_src_path.dentry = h_src; ++ h_src_path.mnt = au_sbr_mnt(sb, cpg->bsrc); ++ err = cpup_iattr(cpg->dentry, cpg->bdst, &h_src_path, &a->h_src_attr); + if (unlikely(err)) { + /* todo: necessary? */ + /* au_pin_hdir_relock(cpg->pin); */ /* ignore an error */ @@ -5410,6 +5434,7 @@ index 000000000000..492442339b6c + struct dentry *dentry, *parent; + struct file *h_file; + struct inode *h_dir; ++ struct mnt_idmap *h_idmap; + + dentry = cpg->dentry; + h_file = NULL; @@ -5423,7 +5448,8 @@ index 000000000000..492442339b6c + + parent = dget_parent(dentry); + h_dir = au_h_iptr(d_inode(parent), cpg->bdst); -+ if (!au_test_h_perm_sio(h_dir, MAY_EXEC | MAY_WRITE) ++ h_idmap = au_sbr_idmap(dentry->d_sb, cpg->bdst); ++ if (!au_test_h_perm_sio(h_idmap, h_dir, MAY_EXEC | MAY_WRITE) + && !au_cpup_sio_test(cpg->pin, d_inode(dentry)->i_mode)) + err = au_cpup_simple(cpg); + else { @@ -5593,6 +5619,7 @@ index 000000000000..492442339b6c + struct inode *dir, *h_dir, *h_tmpdir; + struct au_wbr *wbr; + struct au_pin wh_pin, *pin_orig; ++ struct mnt_idmap *h_idmap; + + dentry = cpg->dentry; + bdst = cpg->bdst; @@ -5621,7 +5648,8 @@ index 000000000000..492442339b6c + cpg->pin = &wh_pin; + } + -+ if (!au_test_h_perm_sio(h_tmpdir, MAY_EXEC | MAY_WRITE) ++ h_idmap = au_sbr_idmap(dentry->d_sb, bdst); ++ if (!au_test_h_perm_sio(h_idmap, h_tmpdir, MAY_EXEC | MAY_WRITE) + && !au_cpup_sio_test(cpg->pin, d_inode(dentry)->i_mode)) + err = au_cpup_wh(cpg, file); + else { @@ -5766,15 +5794,15 @@ index 000000000000..492442339b6c +} diff --git a/fs/aufs/cpup.h b/fs/aufs/cpup.h new file mode 100644 -index 000000000000..d02f8150fa05 +index 000000000000..decd8f01425a --- /dev/null +++ b/fs/aufs/cpup.h @@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -5872,15 +5900,15 @@ index 000000000000..d02f8150fa05 +#endif /* __AUFS_CPUP_H__ */ diff --git a/fs/aufs/dbgaufs.c b/fs/aufs/dbgaufs.c new file mode 100644 -index 000000000000..80266f4fcf7d +index 000000000000..d5811df890b5 --- /dev/null +++ b/fs/aufs/dbgaufs.c @@ -0,0 +1,526 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -6042,7 +6070,7 @@ index 000000000000..80266f4fcf7d + } else { +#define str "1\n0\n0\n" + p->n = sizeof(str) - 1; -+ strcpy(p->a, str); ++ strscpy(p->a, str, sizeof(str)); +#undef str + } + si_read_unlock(sb); @@ -6404,15 +6432,15 @@ index 000000000000..80266f4fcf7d +} diff --git a/fs/aufs/dbgaufs.h b/fs/aufs/dbgaufs.h new file mode 100644 -index 000000000000..7b4ccdebb678 +index 000000000000..30f1694224e0 --- /dev/null +++ b/fs/aufs/dbgaufs.h @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -6463,15 +6491,15 @@ index 000000000000..7b4ccdebb678 +#endif /* __DBGAUFS_H__ */ diff --git a/fs/aufs/dcsub.c b/fs/aufs/dcsub.c new file mode 100644 -index 000000000000..0b9b1862b563 +index 000000000000..fa2a9ad2b49b --- /dev/null +++ b/fs/aufs/dcsub.c @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -6694,15 +6722,15 @@ index 000000000000..0b9b1862b563 +} diff --git a/fs/aufs/dcsub.h b/fs/aufs/dcsub.h new file mode 100644 -index 000000000000..36f7fcdd7f23 +index 000000000000..7e4f4eba0343 --- /dev/null +++ b/fs/aufs/dcsub.h @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -6837,15 +6865,15 @@ index 000000000000..36f7fcdd7f23 +#endif /* __AUFS_DCSUB_H__ */ diff --git a/fs/aufs/debug.c b/fs/aufs/debug.c new file mode 100644 -index 000000000000..f0c076c61252 +index 000000000000..e14075c4bccc --- /dev/null +++ b/fs/aufs/debug.c -@@ -0,0 +1,441 @@ +@@ -0,0 +1,446 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -6890,7 +6918,7 @@ index 000000000000..f0c076c61252 + return sprintf(buffer, "%d", atomic_read(a)); +} + -+static struct kernel_param_ops param_ops_atomic_t = { ++static const struct kernel_param_ops param_ops_atomic_t = { + .set = param_atomic_t_set, + .get = param_atomic_t_get + /* void (*free)(void *arg) */ @@ -6970,11 +6998,13 @@ index 000000000000..f0c076c61252 + } + + dpri("i%d: %p, i%lu, %s, cnt %d, nl %u, 0%o, sz %llu, blk %llu," ++ " acl %p, def_acl %p," + " hn %d, ct %lld, np %lu, st 0x%lx, f 0x%x, v %llu, g %x%s%.*s\n", + bindex, inode, + inode->i_ino, inode->i_sb ? au_sbtype(inode->i_sb) : "??", + atomic_read(&inode->i_count), inode->i_nlink, inode->i_mode, + i_size_read(inode), (unsigned long long)inode->i_blocks, ++ inode->i_acl, inode->i_default_acl, + hn, (long long)timespec64_to_ns(&inode->i_ctime) & 0x0ffff, + inode->i_mapping ? inode->i_mapping->nrpages : 0, + inode->i_state, inode->i_flags, inode_peek_iversion(inode), @@ -7226,7 +7256,10 @@ index 000000000000..f0c076c61252 + AuDbgDentry(dentry); + AuDbgInode(inode); + au_debug_off(); -+ BUG(); ++ if (au_test_fuse(h_inode->i_sb)) ++ WARN_ON_ONCE(1); ++ else ++ BUG(); + } + } +} @@ -7284,15 +7317,15 @@ index 000000000000..f0c076c61252 +} diff --git a/fs/aufs/debug.h b/fs/aufs/debug.h new file mode 100644 -index 000000000000..7e46953513f2 +index 000000000000..f757588e5000 --- /dev/null +++ b/fs/aufs/debug.h @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -7516,15 +7549,15 @@ index 000000000000..7e46953513f2 +#endif /* __AUFS_DEBUG_H__ */ diff --git a/fs/aufs/dentry.c b/fs/aufs/dentry.c new file mode 100644 -index 000000000000..50aaaa21d089 +index 000000000000..ed7ce8f6d1a1 --- /dev/null +++ b/fs/aufs/dentry.c -@@ -0,0 +1,1154 @@ +@@ -0,0 +1,1168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -7543,7 +7576,6 @@ index 000000000000..50aaaa21d089 + */ + +#include <linux/iversion.h> -+#include <linux/namei.h> +#include "aufs.h" + +/* @@ -7557,6 +7589,8 @@ index 000000000000..50aaaa21d089 + struct dentry *h_dentry; + struct inode *h_inode; + struct au_branch *br; ++ struct mnt_idmap *h_idmap; ++ struct path h_path; + int wh_found, opq; + unsigned char wh_able; + const unsigned char allow_neg = !!au_ftest_lkup(args->flags, ALLOW_NEG); @@ -7565,9 +7599,13 @@ index 000000000000..50aaaa21d089 + + wh_found = 0; + br = au_sbr(dentry->d_sb, bindex); ++ h_path.dentry = h_parent; ++ h_path.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); + wh_able = !!au_br_whable(br->br_perm); + if (wh_able) -+ wh_found = au_wh_test(h_parent, &args->whname, ignore_perm); ++ wh_found = au_wh_test(h_idmap, &h_path, &args->whname, ++ ignore_perm); + h_dentry = ERR_PTR(wh_found); + if (!wh_found) + goto real_lookup; @@ -7582,9 +7620,9 @@ index 000000000000..50aaaa21d089 + +real_lookup: + if (!ignore_perm) -+ h_dentry = vfsub_lkup_one(args->name, h_parent); ++ h_dentry = vfsub_lkup_one(args->name, &h_path); + else -+ h_dentry = au_sio_lkup_one(args->name, h_parent); ++ h_dentry = au_sio_lkup_one(h_idmap, args->name, &h_path); + if (IS_ERR(h_dentry)) { + if (PTR_ERR(h_dentry) == -ENAMETOOLONG + && !allow_neg) @@ -7618,8 +7656,9 @@ index 000000000000..50aaaa21d089 + || (d_really_is_positive(dentry) && !d_is_dir(dentry))) + goto out; /* success */ + ++ h_path.dentry = h_dentry; + inode_lock_shared_nested(h_inode, AuLsc_I_CHILD); -+ opq = au_diropq_test(h_dentry); ++ opq = au_diropq_test(h_idmap, &h_path); + inode_unlock_shared(h_inode); + if (opq > 0) + au_set_dbdiropq(dentry, bindex); @@ -7764,18 +7803,19 @@ index 000000000000..50aaaa21d089 + return err; +} + -+struct dentry *au_sio_lkup_one(struct qstr *name, struct dentry *parent) ++struct dentry *au_sio_lkup_one(struct mnt_idmap *idmap, struct qstr *name, ++ struct path *ppath) +{ + struct dentry *dentry; + int wkq_err; + -+ if (!au_test_h_perm_sio(d_inode(parent), MAY_EXEC)) -+ dentry = vfsub_lkup_one(name, parent); ++ if (!au_test_h_perm_sio(idmap, d_inode(ppath->dentry), MAY_EXEC)) ++ dentry = vfsub_lkup_one(name, ppath); + else { + struct vfsub_lkup_one_args args = { + .errp = &dentry, + .name = name, -+ .parent = parent ++ .ppath = ppath + }; + + wkq_err = au_wkq_wait(vfsub_call_lkup_one, &args); @@ -7792,16 +7832,20 @@ index 000000000000..50aaaa21d089 +int au_lkup_neg(struct dentry *dentry, aufs_bindex_t bindex, int wh) +{ + int err; -+ struct dentry *parent, *h_parent, *h_dentry; ++ struct dentry *parent, *h_dentry; + struct au_branch *br; ++ struct mnt_idmap *h_idmap; ++ struct path h_ppath; + + parent = dget_parent(dentry); -+ h_parent = au_h_dptr(parent, bindex); + br = au_sbr(dentry->d_sb, bindex); ++ h_ppath.dentry = au_h_dptr(parent, bindex); ++ h_ppath.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); + if (wh) -+ h_dentry = au_whtmp_lkup(h_parent, br, &dentry->d_name); ++ h_dentry = au_whtmp_lkup(h_ppath.dentry, br, &dentry->d_name); + else -+ h_dentry = au_sio_lkup_one(&dentry->d_name, h_parent); ++ h_dentry = au_sio_lkup_one(h_idmap, &dentry->d_name, &h_ppath); + err = PTR_ERR(h_dentry); + if (IS_ERR(h_dentry)) + goto out; @@ -7876,6 +7920,7 @@ index 000000000000..50aaaa21d089 + struct inode *h_inode; + struct dentry *h_d; + struct super_block *h_sb; ++ struct path h_ppath; + + err = 0; + memset(&ia, -1, sizeof(ia)); @@ -7890,7 +7935,9 @@ index 000000000000..50aaaa21d089 + goto out; + + /* main purpose is namei.c:cached_lookup() and d_revalidate */ -+ h_d = vfsub_lkup_one(&h_dentry->d_name, h_parent); ++ h_ppath.dentry = h_parent; ++ h_ppath.mnt = au_br_mnt(br); ++ h_d = vfsub_lkup_one(&h_dentry->d_name, &h_ppath); + err = PTR_ERR(h_d); + if (IS_ERR(h_d)) + goto out; @@ -8676,15 +8723,15 @@ index 000000000000..50aaaa21d089 +}; diff --git a/fs/aufs/dentry.h b/fs/aufs/dentry.h new file mode 100644 -index 000000000000..c9f9c704da0a +index 000000000000..da4c9063d7e1 --- /dev/null +++ b/fs/aufs/dentry.h -@@ -0,0 +1,268 @@ +@@ -0,0 +1,270 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -8723,6 +8770,7 @@ index 000000000000..c9f9c704da0a + aufs_bindex_t di_btop, di_bbot, di_bwh, di_bdiropq; + unsigned char di_tmpfile; /* to allow the different name */ + struct au_hdentry *di_hdentry; ++ struct file *di_htmpfile; + struct rcu_head rcu; +} ____cacheline_aligned_in_smp; + @@ -8755,7 +8803,8 @@ index 000000000000..c9f9c704da0a +/* dentry.c */ +extern const struct dentry_operations aufs_dop, aufs_dop_noreval; +struct au_branch; -+struct dentry *au_sio_lkup_one(struct qstr *name, struct dentry *parent); ++struct dentry *au_sio_lkup_one(struct mnt_idmap *idmap, struct qstr *name, ++ struct path *ppath); +int au_h_verify(struct dentry *h_dentry, unsigned int udba, struct inode *h_dir, + struct dentry *h_parent, struct au_branch *br); + @@ -8950,15 +8999,15 @@ index 000000000000..c9f9c704da0a +#endif /* __AUFS_DENTRY_H__ */ diff --git a/fs/aufs/dinfo.c b/fs/aufs/dinfo.c new file mode 100644 -index 000000000000..be959106d980 +index 000000000000..bf4a94414309 --- /dev/null +++ b/fs/aufs/dinfo.c -@@ -0,0 +1,554 @@ +@@ -0,0 +1,555 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -9007,6 +9056,7 @@ index 000000000000..be959106d980 + dinfo->di_tmpfile = 0; + for (i = 0; i < nbr; i++) + dinfo->di_hdentry[i].hd_id = -1; ++ dinfo->di_htmpfile = NULL; + goto out; + } + @@ -9510,15 +9560,15 @@ index 000000000000..be959106d980 +} diff --git a/fs/aufs/dir.c b/fs/aufs/dir.c new file mode 100644 -index 000000000000..0bcb39ee7255 +index 000000000000..ee900ea3264b --- /dev/null +++ b/fs/aufs/dir.c -@@ -0,0 +1,763 @@ +@@ -0,0 +1,765 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -10065,9 +10115,9 @@ index 000000000000..0bcb39ee7255 + aufs_bindex_t bindex; +}; + -+static int test_empty_cb(struct dir_context *ctx, const char *__name, -+ int namelen, loff_t offset __maybe_unused, u64 ino, -+ unsigned int d_type) ++static bool test_empty_cb(struct dir_context *ctx, const char *__name, ++ int namelen, loff_t offset __maybe_unused, u64 ino, ++ unsigned int d_type) +{ + struct test_empty_arg *arg = container_of(ctx, struct test_empty_arg, + ctx); @@ -10098,7 +10148,7 @@ index 000000000000..0bcb39ee7255 +out: + /* smp_mb(); */ + AuTraceErr(arg->err); -+ return arg->err; ++ return !arg->err; +} + +static int do_test_empty(struct dentry *dentry, struct test_empty_arg *arg) @@ -10153,12 +10203,14 @@ index 000000000000..0bcb39ee7255 + int err, wkq_err; + struct dentry *h_dentry; + struct inode *h_inode; ++ struct mnt_idmap *h_idmap; + ++ h_idmap = au_sbr_idmap(dentry->d_sb, arg->bindex); + h_dentry = au_h_dptr(dentry, arg->bindex); + h_inode = d_inode(h_dentry); + /* todo: i_mode changes anytime? */ + inode_lock_shared_nested(h_inode, AuLsc_I_CHILD); -+ err = au_test_h_perm_sio(h_inode, MAY_EXEC | MAY_READ); ++ err = au_test_h_perm_sio(h_idmap, h_inode, MAY_EXEC | MAY_READ); + inode_unlock_shared(h_inode); + if (!err) + err = do_test_empty(dentry, arg); @@ -10279,15 +10331,15 @@ index 000000000000..0bcb39ee7255 +}; diff --git a/fs/aufs/dir.h b/fs/aufs/dir.h new file mode 100644 -index 000000000000..ef4d1addf168 +index 000000000000..382342bd6ecf --- /dev/null +++ b/fs/aufs/dir.h @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -10323,7 +10375,7 @@ index 000000000000..ef4d1addf168 + +struct au_vdir_destr { + unsigned char len; -+ unsigned char name[0]; ++ unsigned char name[]; +} __packed; + +struct au_vdir_dehstr { @@ -10419,15 +10471,15 @@ index 000000000000..ef4d1addf168 +#endif /* __AUFS_DIR_H__ */ diff --git a/fs/aufs/dirren.c b/fs/aufs/dirren.c new file mode 100644 -index 000000000000..354997f3e9f7 +index 000000000000..2a6295ab6576 --- /dev/null +++ b/fs/aufs/dirren.c -@@ -0,0 +1,1316 @@ +@@ -0,0 +1,1315 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2017-2020 Junjiro R. Okajima ++ * Copyright (C) 2017-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -10688,7 +10740,8 @@ index 000000000000..354997f3e9f7 + dir = d_inode(path->dentry); + inode_lock_nested(dir, AuLsc_I_CHILD); + } -+ hinopath.dentry = vfsub_lkup_one(&hinoname, path->dentry); ++ hinopath.mnt = path->mnt; ++ hinopath.dentry = vfsub_lkup_one(&hinoname, (struct path *)path); + err = PTR_ERR(hinopath.dentry); + if (IS_ERR(hinopath.dentry)) + goto out_unlock; @@ -10722,7 +10775,6 @@ index 000000000000..354997f3e9f7 + } + flags = O_WRONLY; + } -+ hinopath.mnt = path->mnt; + hinofile = vfsub_dentry_open(&hinopath, flags); + if (suspend) + au_hn_inode_unlock(hdir); @@ -11009,7 +11061,7 @@ index 000000000000..354997f3e9f7 +struct au_drinfo_rev { + unsigned char already; + aufs_bindex_t nelm; -+ struct au_drinfo_rev_elm elm[0]; ++ struct au_drinfo_rev_elm elm[]; +}; + +/* todo: isn't it too large? */ @@ -11044,7 +11096,7 @@ index 000000000000..354997f3e9f7 + AuDebugOn(elm + && memcmp(elm, page_address(ZERO_PAGE(0)), sizeof(*elm))); + -+ infopath.dentry = vfsub_lookup_one_len(w->whname, w->h_ppath.dentry, ++ infopath.dentry = vfsub_lookup_one_len(w->whname, &w->h_ppath, + w->whnamelen); + AuTraceErrPtr(infopath.dentry); + if (IS_ERR(infopath.dentry)) { @@ -11160,7 +11212,7 @@ index 000000000000..354997f3e9f7 + + memset(w, 0, sizeof(*w)); + w->allocated = roundup_pow_of_two(sizeof(*w->fdata) + 40); -+ strcpy(w->whname, AUFS_WH_DR_INFO_PFX); ++ strscpy(w->whname, AUFS_WH_DR_INFO_PFX, sizeof(AUFS_WH_DR_INFO_PFX)); + w->infoname = w->whname + sizeof(AUFS_WH_DR_INFO_PFX) - 1; + w->infonamelen = sizeof(w->whname) - sizeof(AUFS_WH_DR_INFO_PFX); + w->btgt = btgt; @@ -11428,8 +11480,7 @@ index 000000000000..354997f3e9f7 + unlocked = 0; + h_dir = d_inode(h_ppath->dentry); + inode_lock_shared_nested(h_dir, AuLsc_I_PARENT); -+ infopath.dentry = vfsub_lookup_one_len(whname, h_ppath->dentry, -+ whnamelen); ++ infopath.dentry = vfsub_lookup_one_len(whname, h_ppath, whnamelen); + if (IS_ERR(infopath.dentry)) { + drinfo = (void *)infopath.dentry; + goto out; @@ -11741,15 +11792,15 @@ index 000000000000..354997f3e9f7 +} diff --git a/fs/aufs/dirren.h b/fs/aufs/dirren.h new file mode 100644 -index 000000000000..1fbc8fb20def +index 000000000000..d2d57d95a77e --- /dev/null +++ b/fs/aufs/dirren.h @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2017-2020 Junjiro R. Okajima ++ * Copyright (C) 2017-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -11887,15 +11938,15 @@ index 000000000000..1fbc8fb20def +#endif /* __AUFS_DIRREN_H__ */ diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c new file mode 100644 -index 000000000000..837f94d49f74 +index 000000000000..54fd16ecb6d3 --- /dev/null +++ b/fs/aufs/dynop.c -@@ -0,0 +1,367 @@ +@@ -0,0 +1,366 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2010-2020 Junjiro R. Okajima ++ * Copyright (C) 2010-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -12069,27 +12120,26 @@ index 000000000000..837f94d49f74 + AuDbg("%s\n", au_sbtype(h_sb)); + + DySetAop(writepage); -+ DySetAopForce(readpage); /* force */ ++ DySetAopForce(read_folio); /* force */ + DySetAop(writepages); -+ DySetAop(set_page_dirty); -+ DySetAop(readpages); ++ DySetAop(dirty_folio); ++ DySetAop(invalidate_folio); ++ DySetAop(readahead); + DySetAop(write_begin); + DySetAop(write_end); + DySetAop(bmap); -+ DySetAop(invalidatepage); -+ DySetAop(releasepage); -+ DySetAop(freepage); ++ DySetAop(release_folio); ++ DySetAop(free_folio); + /* this one will be changed according to an aufs mount option */ + DySetAop(direct_IO); -+ DySetAop(migratepage); -+ DySetAop(isolate_page); -+ DySetAop(putback_page); -+ DySetAop(launder_page); ++ DySetAop(migrate_folio); ++ DySetAop(launder_folio); + DySetAop(is_partially_uptodate); + DySetAop(is_dirty_writeback); + DySetAop(error_remove_page); + DySetAop(swap_activate); + DySetAop(swap_deactivate); ++ DySetAop(swap_rw); + + DyDbgSize(cnt, *h_aop); +} @@ -12260,15 +12310,15 @@ index 000000000000..837f94d49f74 +} diff --git a/fs/aufs/dynop.h b/fs/aufs/dynop.h new file mode 100644 -index 000000000000..c0c7a5485ad7 +index 000000000000..60d89364b676 --- /dev/null +++ b/fs/aufs/dynop.h @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2010-2020 Junjiro R. Okajima ++ * Copyright (C) 2010-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -12343,15 +12393,15 @@ index 000000000000..c0c7a5485ad7 +#endif /* __AUFS_DYNOP_H__ */ diff --git a/fs/aufs/export.c b/fs/aufs/export.c new file mode 100644 -index 000000000000..842df6f05517 +index 000000000000..4c639e5d40f6 --- /dev/null +++ b/fs/aufs/export.c -@@ -0,0 +1,838 @@ +@@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -12371,7 +12421,6 @@ index 000000000000..842df6f05517 + +#include <linux/exportfs.h> +#include <linux/fs_struct.h> -+#include <linux/namei.h> +#include <linux/nsproxy.h> +#include <linux/random.h> +#include <linux/writeback.h> @@ -12470,8 +12519,7 @@ index 000000000000..842df6f05517 + pos = inode->i_ino; + pos *= sizeof(igen); + igen = inode->i_generation + 1; -+ sz = xino_fwrite(sbinfo->si_xwrite, sbinfo->si_xigen, &igen, -+ sizeof(igen), &pos); ++ sz = xino_fwrite(sbinfo->si_xigen, &igen, sizeof(igen), &pos); + if (sz == sizeof(igen)) + return; /* success */ + @@ -12513,10 +12561,10 @@ index 000000000000..842df6f05517 + if (vfsub_f_size_read(file) + < pos + sizeof(inode->i_generation)) { + inode->i_generation = atomic_inc_return(&sbinfo->si_xigen_next); -+ sz = xino_fwrite(sbinfo->si_xwrite, file, &inode->i_generation, ++ sz = xino_fwrite(file, &inode->i_generation, + sizeof(inode->i_generation), &pos); + } else -+ sz = xino_fread(sbinfo->si_xread, file, &inode->i_generation, ++ sz = xino_fread(file, &inode->i_generation, + sizeof(inode->i_generation), &pos); + if (sz == sizeof(inode->i_generation)) + goto out; /* success */ @@ -12697,7 +12745,7 @@ index 000000000000..842df6f05517 + int namelen; +}; + -+static int ++static bool +find_name_by_ino(struct dir_context *ctx, const char *name, int namelen, + loff_t offset, u64 ino, unsigned int d_type) +{ @@ -12706,12 +12754,12 @@ index 000000000000..842df6f05517 + + a->called++; + if (a->ino != ino) -+ return 0; ++ return true; + + memcpy(a->name, name, namelen); + a->namelen = namelen; + a->found = 1; -+ return 1; ++ return false; +} + +static struct dentry *au_lkup_by_ino(struct path *path, ino_t ino, @@ -12756,7 +12804,7 @@ index 000000000000..842df6f05517 + + /* do not call vfsub_lkup_one() */ + dir = d_inode(parent); -+ dentry = vfsub_lookup_one_len_unlocked(arg.name, parent, arg.namelen); ++ dentry = vfsub_lookup_one_len_unlocked(arg.name, path, arg.namelen); + AuTraceErrPtr(dentry); + if (IS_ERR(dentry)) + goto out_name; @@ -13144,14 +13192,8 @@ index 000000000000..842df6f05517 + f = h_inode->i_sb->s_export_op->commit_metadata; + if (f) + err = f(h_inode); -+ else { -+ struct writeback_control wbc = { -+ .sync_mode = WB_SYNC_ALL, -+ .nr_to_write = 0 /* metadata only */ -+ }; -+ -+ err = sync_inode(h_inode, &wbc); -+ } ++ else ++ err = sync_inode_metadata(h_inode, /*wait*/1); + + au_cpup_attr_timesizes(inode); + ii_write_unlock(inode); @@ -13187,15 +13229,15 @@ index 000000000000..842df6f05517 +} diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c new file mode 100644 -index 000000000000..9894e2124bd5 +index 000000000000..320ad8a9334d --- /dev/null +++ b/fs/aufs/f_op.c -@@ -0,0 +1,819 @@ +@@ -0,0 +1,771 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -13254,12 +13296,17 @@ index 000000000000..9894e2124bd5 + /* br ref is already inc-ed */ + } + -+ if ((flags & __O_TMPFILE) -+ && !(flags & O_EXCL)) { -+ h_inode = file_inode(h_file); -+ spin_lock(&h_inode->i_lock); -+ h_inode->i_state |= I_LINKABLE; -+ spin_unlock(&h_inode->i_lock); ++ if (flags & __O_TMPFILE) { ++ AuDebugOn(!h_file); ++ AuDebugOn(h_file != au_di(dentry)->di_htmpfile); ++ au_di(dentry)->di_htmpfile = NULL; ++ ++ if (!(flags & O_EXCL)) { ++ h_inode = file_inode(h_file); ++ spin_lock(&h_inode->i_lock); ++ h_inode->i_state |= I_LINKABLE; ++ spin_unlock(&h_inode->i_lock); ++ } + } + au_set_fbtop(file, bindex); + au_set_h_fptr(file, bindex, h_file); @@ -13411,6 +13458,7 @@ index 000000000000..9894e2124bd5 + if (do_ready) + au_unpin(&pin); + di_read_unlock(dentry, /*flags*/0); ++ vfsub_file_start_write(h_file); + +out_fi: + fi_write_unlock(file); @@ -13423,6 +13471,7 @@ index 000000000000..9894e2124bd5 +{ + struct inode *h_inode; + ++ vfsub_file_end_write(h_file); + au_cpup_attr_timesizes(inode); + AuDebugOn(au_ibtop(inode) != wpre->btop); + h_inode = file_inode(h_file); @@ -13435,34 +13484,6 @@ index 000000000000..9894e2124bd5 + fput(h_file); +} + -+static ssize_t aufs_read(struct file *file, char __user *buf, size_t count, -+ loff_t *ppos) -+{ -+ ssize_t err; -+ struct inode *inode; -+ struct file *h_file; -+ struct super_block *sb; -+ -+ inode = file_inode(file); -+ sb = inode->i_sb; -+ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW); -+ -+ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0); -+ err = PTR_ERR(h_file); -+ if (IS_ERR(h_file)) -+ goto out; -+ -+ /* filedata may be obsoleted by concurrent copyup, but no problem */ -+ err = vfsub_read_u(h_file, buf, count, ppos); -+ /* todo: necessary? */ -+ /* file->f_ra = h_file->f_ra; */ -+ au_read_post(inode, h_file); -+ -+out: -+ si_read_unlock(sb); -+ return err; -+} -+ +/* + * todo: very ugly + * it locks both of i_mutex and si_rwsem for read in safe. @@ -13485,33 +13506,6 @@ index 000000000000..9894e2124bd5 + } +} + -+static ssize_t aufs_write(struct file *file, const char __user *ubuf, -+ size_t count, loff_t *ppos) -+{ -+ ssize_t err; -+ struct au_write_pre wpre; -+ struct inode *inode; -+ struct file *h_file; -+ char __user *buf = (char __user *)ubuf; -+ -+ inode = file_inode(file); -+ au_mtx_and_read_lock(inode); -+ -+ wpre.lsc = 0; -+ h_file = au_write_pre(file, /*do_ready*/1, &wpre); -+ err = PTR_ERR(h_file); -+ if (IS_ERR(h_file)) -+ goto out; -+ -+ err = vfsub_write_u(h_file, buf, count, ppos); -+ au_write_post(inode, h_file, &wpre, err); -+ -+out: -+ si_read_unlock(inode->i_sb); -+ inode_unlock(inode); -+ return err; -+} -+ +static ssize_t au_do_iter(struct file *h_file, int rw, struct kiocb *kio, + struct iov_iter *iov_iter) +{ @@ -13607,6 +13601,15 @@ index 000000000000..9894e2124bd5 + return err; +} + ++/* ++ * We may be able to remove aufs_splice_{read,write}() since almost all FSes ++ * don't have their own .splice_{read,write} implimentations, and they use ++ * generic_file_splice_read() and iter_file_splice_write() who can act like the ++ * simple converters to f_op->iter_read() and ->iter_write(). ++ * But we keep our own implementations because some non-mainlined FSes may have ++ * their own .splice_{read,write} implimentations and aufs doesn't want to take ++ * away an opportunity to co-work with aufs from them. ++ */ +static ssize_t aufs_splice_read(struct file *file, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) @@ -13625,7 +13628,7 @@ index 000000000000..9894e2124bd5 + if (IS_ERR(h_file)) + goto out; + -+ err = vfsub_splice_to(h_file, ppos, pipe, len, flags); ++ err = vfsub_splice_read(h_file, ppos, pipe, len, flags); + /* todo: necessary? */ + /* file->f_ra = h_file->f_ra; */ + au_read_post(inode, h_file); @@ -13682,6 +13685,10 @@ index 000000000000..9894e2124bd5 + lockdep_off(); + err = vfs_fallocate(h_file, mode, offset, len); + lockdep_on(); ++ /* ++ * we don't need to call file_modifed() here since au_write_post() ++ * is equivalent and copies-up all timestamps and permission bits. ++ */ + au_write_post(inode, h_file, &wpre, /*written*/1); + +out: @@ -13966,23 +13973,11 @@ index 000000000000..9894e2124bd5 + +/* ---------------------------------------------------------------------- */ + -+/* no one supports this operation, currently */ -+#if 0 /* reserved for future use */ -+static ssize_t aufs_sendpage(struct file *file, struct page *page, int offset, -+ size_t len, loff_t *pos, int more) -+{ -+} -+#endif -+ -+/* ---------------------------------------------------------------------- */ -+ +const struct file_operations aufs_file_fop = { + .owner = THIS_MODULE, + + .llseek = default_llseek, + -+ .read = aufs_read, -+ .write = aufs_write, + .read_iter = aufs_read_iter, + .write_iter = aufs_write_iter, + @@ -13999,7 +13994,6 @@ index 000000000000..9894e2124bd5 + .release = aufs_release_nondir, + .fsync = aufs_fsync_nondir, + .fasync = aufs_fasync, -+ /* .sendpage = aufs_sendpage, */ + .setfl = aufs_setfl, + .splice_write = aufs_splice_write, + .splice_read = aufs_splice_read, @@ -14012,15 +14006,15 @@ index 000000000000..9894e2124bd5 +}; diff --git a/fs/aufs/fhsm.c b/fs/aufs/fhsm.c new file mode 100644 -index 000000000000..9cef93b42993 +index 000000000000..91262fbbbfae --- /dev/null +++ b/fs/aufs/fhsm.c -@@ -0,0 +1,427 @@ +@@ -0,0 +1,426 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2011-2020 Junjiro R. Okajima ++ * Copyright (C) 2011-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -14031,8 +14025,7 @@ index 000000000000..9cef93b42993 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/* @@ -14445,15 +14438,15 @@ index 000000000000..9cef93b42993 +} diff --git a/fs/aufs/file.c b/fs/aufs/file.c new file mode 100644 -index 000000000000..b0075b57d8bc +index 000000000000..76ad444328db --- /dev/null +++ b/fs/aufs/file.c -@@ -0,0 +1,863 @@ +@@ -0,0 +1,865 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -14537,6 +14530,11 @@ index 000000000000..b0075b57d8bc + au_lcnt_inc(&br->br_nfiles); + h_path.dentry = h_dentry; + h_path.mnt = au_br_mnt(br); ++ /* ++ * vfs::backing_file_open() looks promising since it can get rid of ++ * mm::vm_prfile approach from my mind. ++ * but I keep current approach for a while. ++ */ + h_file = vfsub_dentry_open(&h_path, flags); + if (IS_ERR(h_file)) + goto out_br; @@ -14695,18 +14693,20 @@ index 000000000000..b0075b57d8bc + AuDebugOn(IS_ERR_OR_NULL(dentry)); + di_write_lock_child(dentry); + err = au_cmoo(dentry); -+ di_downgrade_lock(dentry, AuLock_IR); + if (!err) { -+ if (!aopen) -+ err = args->open(file, vfsub_file_flags(file), NULL); -+ else { ++ if (!aopen) { ++ err = args->open(file, vfsub_file_flags(file), ++ au_di(dentry)->di_htmpfile); ++ di_write_unlock(dentry); ++ } else { ++ di_downgrade_lock(dentry, AuLock_IR); + lockdep_off(); + err = args->open(file, vfsub_file_flags(file), + args->h_file); + lockdep_on(); ++ di_read_unlock(dentry, AuLock_IR); + } + } -+ di_read_unlock(dentry, AuLock_IR); + + finfo = au_fi(file); + if (!err) { @@ -15229,9 +15229,9 @@ index 000000000000..b0075b57d8bc + +/* cf. aufs_nopage() */ +/* for madvise(2) */ -+static int aufs_readpage(struct file *file __maybe_unused, struct page *page) ++static int aufs_read_folio(struct file *file __maybe_unused, struct folio *folio) +{ -+ unlock_page(page); ++ folio_unlock(folio); + return 0; +} + @@ -15242,7 +15242,7 @@ index 000000000000..b0075b57d8bc +/* they will never be called. */ +#ifdef CONFIG_AUFS_DEBUG +static int aufs_write_begin(struct file *file, struct address_space *mapping, -+ loff_t pos, unsigned len, unsigned flags, ++ loff_t pos, unsigned len, + struct page **pagep, void **fsdata) +{ AuUnsupport(); return 0; } +static int aufs_write_end(struct file *file, struct address_space *mapping, @@ -15252,29 +15252,23 @@ index 000000000000..b0075b57d8bc +static int aufs_writepage(struct page *page, struct writeback_control *wbc) +{ AuUnsupport(); return 0; } + -+static int aufs_set_page_dirty(struct page *page) -+{ AuUnsupport(); return 0; } -+static void aufs_invalidatepage(struct page *page, unsigned int offset, -+ unsigned int length) ++static bool aufs_dirty_folio(struct address_space *mapping, struct folio *folio) ++{ AuUnsupport(); return true; } ++static void aufs_invalidate_folio(struct folio *folio, size_t offset, size_t len) +{ AuUnsupport(); } -+static int aufs_releasepage(struct page *page, gfp_t gfp) -+{ AuUnsupport(); return 0; } ++static bool aufs_release_folio(struct folio *folio, gfp_t gfp) ++{ AuUnsupport(); return true; } +#if 0 /* called by memory compaction regardless file */ -+static int aufs_migratepage(struct address_space *mapping, struct page *newpage, -+ struct page *page, enum migrate_mode mode) ++static int aufs_migrate_folio(struct address_space *mapping, struct folio *dst, ++ struct folio *src, enum migrate_mode mode) +{ AuUnsupport(); return 0; } +#endif -+static bool aufs_isolate_page(struct page *page, isolate_mode_t mode) -+{ AuUnsupport(); return true; } -+static void aufs_putback_page(struct page *page) -+{ AuUnsupport(); } -+static int aufs_launder_page(struct page *page) -+{ AuUnsupport(); return 0; } -+static int aufs_is_partially_uptodate(struct page *page, -+ unsigned long from, -+ unsigned long count) ++static int aufs_launder_folio(struct folio *folio) +{ AuUnsupport(); return 0; } -+static void aufs_is_dirty_writeback(struct page *page, bool *dirty, ++static bool aufs_is_partially_uptodate(struct folio *folio, size_t from, ++ size_t count) ++{ AuUnsupport(); return true; } ++static void aufs_is_dirty_writeback(struct folio *folio, bool *dirty, + bool *writeback) +{ AuUnsupport(); } +static int aufs_error_remove_page(struct address_space *mapping, @@ -15285,44 +15279,45 @@ index 000000000000..b0075b57d8bc +{ AuUnsupport(); return 0; } +static void aufs_swap_deactivate(struct file *file) +{ AuUnsupport(); } ++static int aufs_swap_rw(struct kiocb *iocb, struct iov_iter *iter) ++{ AuUnsupport(); return 0; } +#endif /* CONFIG_AUFS_DEBUG */ + +const struct address_space_operations aufs_aop = { -+ .readpage = aufs_readpage, ++ .read_folio = aufs_read_folio, + .direct_IO = aufs_direct_IO, +#ifdef CONFIG_AUFS_DEBUG + .writepage = aufs_writepage, + /* no writepages, because of writepage */ -+ .set_page_dirty = aufs_set_page_dirty, ++ .dirty_folio = aufs_dirty_folio, + /* no readpages, because of readpage */ + .write_begin = aufs_write_begin, + .write_end = aufs_write_end, + /* no bmap, no block device */ -+ .invalidatepage = aufs_invalidatepage, -+ .releasepage = aufs_releasepage, ++ .invalidate_folio = aufs_invalidate_folio, ++ .release_folio = aufs_release_folio, + /* is fallback_migrate_page ok? */ -+ /* .migratepage = aufs_migratepage, */ -+ .isolate_page = aufs_isolate_page, -+ .putback_page = aufs_putback_page, -+ .launder_page = aufs_launder_page, ++ /* .migrate_folio = aufs_migrate_folio, */ ++ .launder_folio = aufs_launder_folio, + .is_partially_uptodate = aufs_is_partially_uptodate, + .is_dirty_writeback = aufs_is_dirty_writeback, + .error_remove_page = aufs_error_remove_page, + .swap_activate = aufs_swap_activate, -+ .swap_deactivate = aufs_swap_deactivate ++ .swap_deactivate = aufs_swap_deactivate, ++ .swap_rw = aufs_swap_rw +#endif /* CONFIG_AUFS_DEBUG */ +}; diff --git a/fs/aufs/file.h b/fs/aufs/file.h new file mode 100644 -index 000000000000..d124d9c8216d +index 000000000000..b16f31e364a8 --- /dev/null +++ b/fs/aufs/file.h @@ -0,0 +1,342 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -15662,15 +15657,15 @@ index 000000000000..d124d9c8216d +#endif /* __AUFS_FILE_H__ */ diff --git a/fs/aufs/finfo.c b/fs/aufs/finfo.c new file mode 100644 -index 000000000000..25077670a507 +index 000000000000..7da7b286c006 --- /dev/null +++ b/fs/aufs/finfo.c @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -15815,17 +15810,1265 @@ index 000000000000..25077670a507 +out: + return err; +} +diff --git a/fs/aufs/fsctx.c b/fs/aufs/fsctx.c +new file mode 100644 +index 000000000000..e14fe4d381c5 +--- /dev/null ++++ b/fs/aufs/fsctx.c +@@ -0,0 +1,1242 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * fs context, aka new mount api ++ */ ++ ++#include <linux/fs_context.h> ++#include "aufs.h" ++ ++struct au_fsctx_opts { ++ aufs_bindex_t bindex; ++ unsigned char skipped; ++ struct au_opt *opt, *opt_tail; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ struct au_opts opts; ++}; ++ ++/* stop extra interpretation of errno in mount(8), and strange error messages */ ++static int cvt_err(int err) ++{ ++ AuTraceErr(err); ++ ++ switch (err) { ++ case -ENOENT: ++ case -ENOTDIR: ++ case -EEXIST: ++ case -EIO: ++ err = -EINVAL; ++ } ++ return err; ++} ++ ++static int au_fsctx_reconfigure(struct fs_context *fc) ++{ ++ int err, do_dx; ++ unsigned int mntflags; ++ struct dentry *root; ++ struct super_block *sb; ++ struct inode *inode; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ AuDbg("fc %p\n", fc); ++ ++ root = fc->root; ++ sb = root->d_sb; ++ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (!err) { ++ di_write_lock_child(root); ++ err = au_opts_verify(sb, fc->sb_flags, /*pending*/0); ++ aufs_write_unlock(root); ++ } ++ ++ inode = d_inode(root); ++ inode_lock(inode); ++ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out; ++ di_write_lock_child(root); ++ ++ /* au_opts_remount() may return an error */ ++ err = au_opts_remount(sb, &a->opts); ++ ++ if (au_ftest_opts(a->opts.flags, REFRESH)) ++ au_remount_refresh(sb, au_ftest_opts(a->opts.flags, ++ REFRESH_IDOP)); ++ ++ if (au_ftest_opts(a->opts.flags, REFRESH_DYAOP)) { ++ mntflags = au_mntflags(sb); ++ do_dx = !!au_opt_test(mntflags, DIO); ++ au_dy_arefresh(do_dx); ++ } ++ ++ au_fhsm_wrote_all(sb, /*force*/1); /* ?? */ ++ aufs_write_unlock(root); ++ ++out: ++ inode_unlock(inode); ++ err = cvt_err(err); ++ AuTraceErr(err); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_fsctx_fill_super(struct super_block *sb, struct fs_context *fc) ++{ ++ int err; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_sbinfo *sbinfo = a->sbinfo; ++ struct dentry *root; ++ struct inode *inode; ++ ++ sbinfo->si_sb = sb; ++ sb->s_fs_info = sbinfo; ++ kobject_get(&sbinfo->si_kobj); ++ ++ __si_write_lock(sb); ++ si_pid_set(sb); ++ au_sbilist_add(sb); ++ ++ /* all timestamps always follow the ones on the branch */ ++ sb->s_flags |= SB_NOATIME | SB_NODIRATIME; ++ sb->s_flags |= SB_I_VERSION; /* do we really need this? */ ++ sb->s_op = &aufs_sop; ++ sb->s_d_op = &aufs_dop; ++ sb->s_magic = AUFS_SUPER_MAGIC; ++ sb->s_maxbytes = 0; ++ sb->s_stack_depth = 1; ++ au_export_init(sb); ++ au_xattr_init(sb); ++ ++ err = au_alloc_root(sb); ++ if (unlikely(err)) { ++ si_write_unlock(sb); ++ goto out; ++ } ++ root = sb->s_root; ++ inode = d_inode(root); ++ ii_write_lock_parent(inode); ++ aufs_write_unlock(root); ++ ++ /* lock vfs_inode first, then aufs. */ ++ inode_lock(inode); ++ aufs_write_lock(root); ++ err = au_opts_mount(sb, &a->opts); ++ AuTraceErr(err); ++ if (!err && au_ftest_si(sbinfo, NO_DREVAL)) { ++ sb->s_d_op = &aufs_dop_noreval; ++ /* infofc(fc, "%ps", sb->s_d_op); */ ++ pr_info("%ps\n", sb->s_d_op); ++ au_refresh_dop(root, /*force_reval*/0); ++ sbinfo->si_iop_array = aufs_iop_nogetattr; ++ au_refresh_iop(inode, /*force_getattr*/0); ++ } ++ aufs_write_unlock(root); ++ inode_unlock(inode); ++ if (!err) ++ goto out; /* success */ ++ ++ dput(root); ++ sb->s_root = NULL; ++ ++out: ++ if (unlikely(err)) ++ kobject_put(&sbinfo->si_kobj); ++ AuTraceErr(err); ++ err = cvt_err(err); ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_get_tree(struct fs_context *fc) ++{ ++ int err; ++ ++ AuDbg("fc %p\n", fc); ++ err = get_tree_nodev(fc, au_fsctx_fill_super); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_fsctx_dump(struct au_opts *opts) ++{ ++#ifdef CONFIG_AUFS_DEBUG ++ /* reduce stack space */ ++ union { ++ struct au_opt_add *add; ++ struct au_opt_del *del; ++ struct au_opt_mod *mod; ++ struct au_opt_xino *xino; ++ struct au_opt_xino_itrunc *xino_itrunc; ++ struct au_opt_wbr_create *create; ++ } u; ++ struct au_opt *opt; ++ ++ opt = opts->opt; ++ while (opt->type != Opt_tail) { ++ switch (opt->type) { ++ case Opt_add: ++ u.add = &opt->add; ++ AuDbg("add {b%d, %s, 0x%x, %p}\n", ++ u.add->bindex, u.add->pathname, u.add->perm, ++ u.add->path.dentry); ++ break; ++ case Opt_del: ++ fallthrough; ++ case Opt_idel: ++ u.del = &opt->del; ++ AuDbg("del {%s, %p}\n", ++ u.del->pathname, u.del->h_path.dentry); ++ break; ++ case Opt_mod: ++ fallthrough; ++ case Opt_imod: ++ u.mod = &opt->mod; ++ AuDbg("mod {%s, 0x%x, %p}\n", ++ u.mod->path, u.mod->perm, u.mod->h_root); ++ break; ++ case Opt_append: ++ u.add = &opt->add; ++ AuDbg("append {b%d, %s, 0x%x, %p}\n", ++ u.add->bindex, u.add->pathname, u.add->perm, ++ u.add->path.dentry); ++ break; ++ case Opt_prepend: ++ u.add = &opt->add; ++ AuDbg("prepend {b%d, %s, 0x%x, %p}\n", ++ u.add->bindex, u.add->pathname, u.add->perm, ++ u.add->path.dentry); ++ break; ++ ++ case Opt_dirwh: ++ AuDbg("dirwh %d\n", opt->dirwh); ++ break; ++ case Opt_rdcache: ++ AuDbg("rdcache %d\n", opt->rdcache); ++ break; ++ case Opt_rdblk: ++ AuDbg("rdblk %d\n", opt->rdblk); ++ break; ++ case Opt_rdhash: ++ AuDbg("rdhash %u\n", opt->rdhash); ++ break; ++ ++ case Opt_xino: ++ u.xino = &opt->xino; ++ AuDbg("xino {%s %pD}\n", u.xino->path, u.xino->file); ++ break; ++ ++#define au_fsctx_TF(name) \ ++ case Opt_##name: \ ++ if (opt->tf) \ ++ AuLabel(name); \ ++ else \ ++ AuLabel(no##name); \ ++ break; ++ ++ /* simple true/false flag */ ++ au_fsctx_TF(trunc_xino); ++ au_fsctx_TF(trunc_xib); ++ au_fsctx_TF(dirperm1); ++ au_fsctx_TF(plink); ++ au_fsctx_TF(shwh); ++ au_fsctx_TF(dio); ++ au_fsctx_TF(warn_perm); ++ au_fsctx_TF(verbose); ++ au_fsctx_TF(sum); ++ au_fsctx_TF(dirren); ++ au_fsctx_TF(acl); ++#undef au_fsctx_TF ++ ++ case Opt_trunc_xino_path: ++ fallthrough; ++ case Opt_itrunc_xino: ++ u.xino_itrunc = &opt->xino_itrunc; ++ AuDbg("trunc_xino %d\n", u.xino_itrunc->bindex); ++ break; ++ case Opt_noxino: ++ AuLabel(noxino); ++ break; ++ ++ case Opt_list_plink: ++ AuLabel(list_plink); ++ break; ++ case Opt_udba: ++ AuDbg("udba %d, %s\n", ++ opt->udba, au_optstr_udba(opt->udba)); ++ break; ++ case Opt_diropq_a: ++ AuLabel(diropq_a); ++ break; ++ case Opt_diropq_w: ++ AuLabel(diropq_w); ++ break; ++ case Opt_wsum: ++ AuLabel(wsum); ++ break; ++ case Opt_wbr_create: ++ u.create = &opt->wbr_create; ++ AuDbg("create %d, %s\n", u.create->wbr_create, ++ au_optstr_wbr_create(u.create->wbr_create)); ++ switch (u.create->wbr_create) { ++ case AuWbrCreate_MFSV: ++ fallthrough; ++ case AuWbrCreate_PMFSV: ++ AuDbg("%d sec\n", u.create->mfs_second); ++ break; ++ case AuWbrCreate_MFSRR: ++ fallthrough; ++ case AuWbrCreate_TDMFS: ++ AuDbg("%llu watermark\n", ++ u.create->mfsrr_watermark); ++ break; ++ case AuWbrCreate_MFSRRV: ++ fallthrough; ++ case AuWbrCreate_TDMFSV: ++ fallthrough; ++ case AuWbrCreate_PMFSRRV: ++ AuDbg("%llu watermark, %d sec\n", ++ u.create->mfsrr_watermark, ++ u.create->mfs_second); ++ break; ++ } ++ break; ++ case Opt_wbr_copyup: ++ AuDbg("copyup %d, %s\n", opt->wbr_copyup, ++ au_optstr_wbr_copyup(opt->wbr_copyup)); ++ break; ++ case Opt_fhsm_sec: ++ AuDbg("fhsm_sec %u\n", opt->fhsm_second); ++ break; ++ ++ default: ++ AuDbg("type %d\n", opt->type); ++ BUG(); ++ } ++ opt++; ++ } ++#endif ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * For conditionally compiled mount options. ++ * Instead of fsparam_flag_no(), use this macro to distinguish ignore_silent. ++ */ ++#define au_ignore_flag(name, action) \ ++ fsparam_flag(name, action), \ ++ fsparam_flag("no" name, Opt_ignore_silent) ++ ++const struct fs_parameter_spec aufs_fsctx_paramspec[] = { ++ fsparam_string("br", Opt_br), ++ ++ /* "add=%d:%s" or "ins=%d:%s" */ ++ fsparam_string("add", Opt_add), ++ fsparam_string("ins", Opt_add), ++ fsparam_path("append", Opt_append), ++ fsparam_path("prepend", Opt_prepend), ++ ++ fsparam_path("del", Opt_del), ++ /* fsparam_s32("idel", Opt_idel), */ ++ fsparam_path("mod", Opt_mod), ++ /* fsparam_string("imod", Opt_imod), */ ++ ++ fsparam_s32("dirwh", Opt_dirwh), ++ ++ fsparam_path("xino", Opt_xino), ++ fsparam_flag("noxino", Opt_noxino), ++ fsparam_flag_no("trunc_xino", Opt_trunc_xino), ++ /* "trunc_xino_v=%d:%d" */ ++ /* fsparam_string("trunc_xino_v", Opt_trunc_xino_v), */ ++ fsparam_path("trunc_xino", Opt_trunc_xino_path), ++ fsparam_s32("itrunc_xino", Opt_itrunc_xino), ++ /* fsparam_path("zxino", Opt_zxino), */ ++ fsparam_flag_no("trunc_xib", Opt_trunc_xib), ++ ++#ifdef CONFIG_PROC_FS ++ fsparam_flag_no("plink", Opt_plink), ++#else ++ au_ignore_flag("plink", Opt_ignore), ++#endif ++ ++#ifdef CONFIG_AUFS_DEBUG ++ fsparam_flag("list_plink", Opt_list_plink), ++#endif ++ ++ fsparam_string("udba", Opt_udba), ++ ++ fsparam_flag_no("dio", Opt_dio), ++ ++#ifdef CONFIG_AUFS_DIRREN ++ fsparam_flag_no("dirren", Opt_dirren), ++#else ++ au_ignore_flag("dirren", Opt_ignore), ++#endif ++ ++#ifdef CONFIG_AUFS_FHSM ++ fsparam_s32("fhsm_sec", Opt_fhsm_sec), ++#else ++ fsparam_s32("fhsm_sec", Opt_ignore), ++#endif ++ ++ /* always | a | whiteouted | w */ ++ fsparam_string("diropq", Opt_diropq), ++ ++ fsparam_flag_no("warn_perm", Opt_warn_perm), ++ ++#ifdef CONFIG_AUFS_SHWH ++ fsparam_flag_no("shwh", Opt_shwh), ++#else ++ au_ignore_flag("shwh", Opt_err), ++#endif ++ ++ fsparam_flag_no("dirperm1", Opt_dirperm1), ++ ++ fsparam_flag_no("verbose", Opt_verbose), ++ fsparam_flag("v", Opt_verbose), ++ fsparam_flag("quiet", Opt_noverbose), ++ fsparam_flag("q", Opt_noverbose), ++ /* user-space may handle this */ ++ fsparam_flag("silent", Opt_noverbose), ++ ++ fsparam_flag_no("sum", Opt_sum), ++ fsparam_flag("wsum", Opt_wsum), ++ ++ fsparam_s32("rdcache", Opt_rdcache), ++ /* "def" or s32 */ ++ fsparam_string("rdblk", Opt_rdblk), ++ /* "def" or s32 */ ++ fsparam_string("rdhash", Opt_rdhash), ++ ++ fsparam_string("create", Opt_wbr_create), ++ fsparam_string("create_policy", Opt_wbr_create), ++ fsparam_string("cpup", Opt_wbr_copyup), ++ fsparam_string("copyup", Opt_wbr_copyup), ++ fsparam_string("copyup_policy", Opt_wbr_copyup), ++ ++ /* generic VFS flag */ ++#ifdef CONFIG_FS_POSIX_ACL ++ fsparam_flag_no("acl", Opt_acl), ++#else ++ au_ignore_flag("acl", Opt_ignore), ++#endif ++ ++ /* internal use for the scripts */ ++ fsparam_string("si", Opt_ignore_silent), ++ ++ /* obsoleted, keep them temporary */ ++ fsparam_flag("nodlgt", Opt_ignore_silent), ++ fsparam_flag("clean_plink", Opt_ignore), ++ fsparam_string("dirs", Opt_br), ++ fsparam_u32("debug", Opt_ignore), ++ /* "whiteout" or "all" */ ++ fsparam_string("delete", Opt_ignore), ++ fsparam_string("imap", Opt_ignore), ++ ++ /* temporary workaround, due to old mount(8)? */ ++ fsparam_flag("relatime", Opt_ignore_silent), ++ ++ {} ++}; ++ ++static int au_fsctx_parse_do_add(struct fs_context *fc, struct au_opt *opt, ++ char *brspec, size_t speclen, ++ aufs_bindex_t bindex) ++{ ++ int err; ++ char *p; ++ ++ AuDbg("brspec %s\n", brspec); ++ ++ err = -ENOMEM; ++ if (!speclen) ++ speclen = strlen(brspec); ++ /* will be freed by au_fsctx_free() */ ++ p = kmemdup_nul(brspec, speclen, GFP_NOFS); ++ if (unlikely(!p)) { ++ errorfc(fc, "failed in %s", brspec); ++ goto out; ++ } ++ err = au_opt_add(opt, p, fc->sb_flags, bindex); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_br(struct fs_context *fc, char *brspec) ++{ ++ int err; ++ char *p; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_opt *opt = a->opt; ++ aufs_bindex_t bindex = a->bindex; ++ ++ AuDbg("brspec %s\n", brspec); ++ ++ err = -EINVAL; ++ while ((p = strsep(&brspec, ":")) && *p) { ++ err = au_fsctx_parse_do_add(fc, opt, p, /*len*/0, bindex); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ break; ++ bindex++; ++ opt++; ++ if (unlikely(opt > a->opt_tail)) { ++ err = -E2BIG; ++ bindex--; ++ opt--; ++ break; ++ } ++ opt->type = Opt_tail; ++ a->skipped = 1; ++ } ++ a->bindex = bindex; ++ a->opt = opt; ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_add(struct fs_context *fc, char *addspec) ++{ ++ int err, n; ++ char *p; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_opt *opt = a->opt; ++ ++ err = -EINVAL; ++ p = strchr(addspec, ':'); ++ if (unlikely(!p)) { ++ errorfc(fc, "bad arg in %s", addspec); ++ goto out; ++ } ++ *p++ = '\0'; ++ err = kstrtoint(addspec, 0, &n); ++ if (unlikely(err)) { ++ errorfc(fc, "bad integer in %s", addspec); ++ goto out; ++ } ++ AuDbg("n %d\n", n); ++ err = au_fsctx_parse_do_add(fc, opt, p, /*len*/0, n); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_del(struct fs_context *fc, struct au_opt_del *del, ++ struct fs_parameter *param) ++{ ++ int err; ++ ++ err = -ENOMEM; ++ /* will be freed by au_fsctx_free() */ ++ del->pathname = kmemdup_nul(param->string, param->size, GFP_NOFS); ++ if (unlikely(!del->pathname)) ++ goto out; ++ AuDbg("del %s\n", del->pathname); ++ err = vfsub_kern_path(del->pathname, AuOpt_LkupDirFlags, &del->h_path); ++ if (unlikely(err)) ++ errorfc(fc, "lookup failed %s (%d)", del->pathname, err); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++#if 0 /* reserved for future use */ ++static int au_fsctx_parse_idel(struct fs_context *fc, struct au_opt_del *del, ++ aufs_bindex_t bindex) ++{ ++ int err; ++ struct super_block *sb; ++ struct dentry *root; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ sb = a->sb; ++ AuDebugOn(!sb); ++ ++ err = -EINVAL; ++ root = sb->s_root; ++ aufs_read_lock(root, AuLock_FLUSH); ++ if (bindex < 0 || au_sbbot(sb) < bindex) { ++ errorfc(fc, "out of bounds, %d", bindex); ++ goto out; ++ } ++ ++ err = 0; ++ del->h_path.dentry = dget(au_h_dptr(root, bindex)); ++ del->h_path.mnt = mntget(au_sbr_mnt(sb, bindex)); ++ ++out: ++ aufs_read_unlock(root, !AuLock_IR); ++ AuTraceErr(err); ++ return err; ++} ++#endif ++ ++static int au_fsctx_parse_mod(struct fs_context *fc, struct au_opt_mod *mod, ++ struct fs_parameter *param) ++{ ++ int err; ++ struct path path; ++ char *p; ++ ++ err = -ENOMEM; ++ /* will be freed by au_fsctx_free() */ ++ mod->path = kmemdup_nul(param->string, param->size, GFP_NOFS); ++ if (unlikely(!mod->path)) ++ goto out; ++ ++ err = -EINVAL; ++ p = strchr(mod->path, '='); ++ if (unlikely(!p)) { ++ errorfc(fc, "no permission %s", mod->path); ++ goto out; ++ } ++ ++ *p++ = 0; ++ err = vfsub_kern_path(mod->path, AuOpt_LkupDirFlags, &path); ++ if (unlikely(err)) { ++ errorfc(fc, "lookup failed %s (%d)", mod->path, err); ++ goto out; ++ } ++ ++ mod->perm = au_br_perm_val(p); ++ AuDbg("mod path %s, perm 0x%x, %s", mod->path, mod->perm, p); ++ mod->h_root = dget(path.dentry); ++ path_put(&path); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++#if 0 /* reserved for future use */ ++static int au_fsctx_parse_imod(struct fs_context *fc, struct au_opt_mod *mod, ++ char *ibrspec) ++{ ++ int err, n; ++ char *p; ++ struct super_block *sb; ++ struct dentry *root; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ sb = a->sb; ++ AuDebugOn(!sb); ++ ++ err = -EINVAL; ++ p = strchr(ibrspec, ':'); ++ if (unlikely(!p)) { ++ errorfc(fc, "no index, %s", ibrspec); ++ goto out; ++ } ++ *p++ = '\0'; ++ err = kstrtoint(ibrspec, 0, &n); ++ if (unlikely(err)) { ++ errorfc(fc, "bad integer in %s", ibrspec); ++ goto out; ++ } ++ AuDbg("n %d\n", n); ++ ++ root = sb->s_root; ++ aufs_read_lock(root, AuLock_FLUSH); ++ if (n < 0 || au_sbbot(sb) < n) { ++ errorfc(fc, "out of bounds, %d", bindex); ++ goto out_root; ++ } ++ ++ err = 0; ++ mod->perm = au_br_perm_val(p); ++ AuDbg("mod path %s, perm 0x%x, %s\n", ++ mod->path, mod->perm, p); ++ mod->h_root = dget(au_h_dptr(root, bindex)); ++ ++out_root: ++ aufs_read_unlock(root, !AuLock_IR); ++out: ++ AuTraceErr(err); ++ return err; ++} ++#endif ++ ++static int au_fsctx_parse_xino(struct fs_context *fc, ++ struct au_opt_xino *xino, ++ struct fs_parameter *param) ++{ ++ int err; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ err = -ENOMEM; ++ /* will be freed by au_opts_free() */ ++ xino->path = kmemdup_nul(param->string, param->size, GFP_NOFS); ++ if (unlikely(!xino->path)) ++ goto out; ++ AuDbg("path %s\n", xino->path); ++ ++ xino->file = au_xino_create(a->sb, xino->path, /*silent*/0, ++ /*wbrtop*/0); ++ err = PTR_ERR(xino->file); ++ if (IS_ERR(xino->file)) { ++ xino->file = NULL; ++ goto out; ++ } ++ ++ err = 0; ++ if (unlikely(a->sb && xino->file->f_path.dentry->d_sb == a->sb)) { ++ err = -EINVAL; ++ errorfc(fc, "%s must be outside", xino->path); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static ++int au_fsctx_parse_xino_itrunc_path(struct fs_context *fc, ++ struct au_opt_xino_itrunc *xino_itrunc, ++ char *pathname) ++{ ++ int err; ++ aufs_bindex_t bbot, bindex; ++ struct path path; ++ struct dentry *root; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ AuDebugOn(!a->sb); ++ ++ err = vfsub_kern_path(pathname, AuOpt_LkupDirFlags, &path); ++ if (unlikely(err)) { ++ errorfc(fc, "lookup failed %s (%d)", pathname, err); ++ goto out; ++ } ++ ++ xino_itrunc->bindex = -1; ++ root = a->sb->s_root; ++ aufs_read_lock(root, AuLock_FLUSH); ++ bbot = au_sbbot(a->sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ if (au_h_dptr(root, bindex) == path.dentry) { ++ xino_itrunc->bindex = bindex; ++ break; ++ } ++ } ++ aufs_read_unlock(root, !AuLock_IR); ++ path_put(&path); ++ ++ if (unlikely(xino_itrunc->bindex < 0)) { ++ err = -EINVAL; ++ errorfc(fc, "no such branch %s", pathname); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_xino_itrunc(struct fs_context *fc, ++ struct au_opt_xino_itrunc *xino_itrunc, ++ unsigned int bindex) ++{ ++ int err; ++ aufs_bindex_t bbot; ++ struct super_block *sb; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ sb = a->sb; ++ AuDebugOn(!sb); ++ ++ err = 0; ++ si_noflush_read_lock(sb); ++ bbot = au_sbbot(sb); ++ si_read_unlock(sb); ++ if (bindex <= bbot) ++ xino_itrunc->bindex = bindex; ++ else { ++ err = -EINVAL; ++ errorfc(fc, "out of bounds, %u", bindex); ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_param(struct fs_context *fc, struct fs_parameter *param) ++{ ++ int err, token; ++ struct fs_parse_result result; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_opt *opt = a->opt; ++ ++ AuDbg("fc %p, param {key %s, string %s}\n", ++ fc, param->key, param->string); ++ err = fs_parse(fc, aufs_fsctx_paramspec, param, &result); ++ if (unlikely(err < 0)) ++ goto out; ++ token = err; ++ AuDbg("token %d, res{negated %d, uint64 %llu}\n", ++ token, result.negated, result.uint_64); ++ ++ err = -EINVAL; ++ a->skipped = 0; ++ switch (token) { ++ case Opt_br: ++ err = au_fsctx_parse_br(fc, param->string); ++ break; ++ case Opt_add: ++ err = au_fsctx_parse_add(fc, param->string); ++ break; ++ case Opt_append: ++ err = au_fsctx_parse_do_add(fc, opt, param->string, param->size, ++ /*dummy bindex*/1); ++ break; ++ case Opt_prepend: ++ err = au_fsctx_parse_do_add(fc, opt, param->string, param->size, ++ /*bindex*/0); ++ break; ++ ++ case Opt_del: ++ err = au_fsctx_parse_del(fc, &opt->del, param); ++ break; ++#if 0 /* reserved for future use */ ++ case Opt_idel: ++ if (!a->sb) { ++ err = 0; ++ a->skipped = 1; ++ break; ++ } ++ del->pathname = "(indexed)"; ++ err = au_opts_parse_idel(fc, &opt->del, result.uint_32); ++ break; ++#endif ++ ++ case Opt_mod: ++ err = au_fsctx_parse_mod(fc, &opt->mod, param); ++ break; ++#ifdef IMOD /* reserved for future use */ ++ case Opt_imod: ++ if (!a->sb) { ++ err = 0; ++ a->skipped = 1; ++ break; ++ } ++ u.mod->path = "(indexed)"; ++ err = au_opts_parse_imod(fc, &opt->mod, param->string); ++ break; ++#endif ++ ++ case Opt_xino: ++ err = au_fsctx_parse_xino(fc, &opt->xino, param); ++ break; ++ case Opt_trunc_xino_path: ++ if (!a->sb) { ++ errorfc(fc, "no such branch %s", param->string); ++ break; ++ } ++ err = au_fsctx_parse_xino_itrunc_path(fc, &opt->xino_itrunc, ++ param->string); ++ break; ++#if 0 ++ case Opt_trunc_xino_v: ++ if (!a->sb) { ++ err = 0; ++ a->skipped = 1; ++ break; ++ } ++ err = au_fsctx_parse_xino_itrunc_path(fc, &opt->xino_itrunc, ++ param->string); ++ break; ++#endif ++ case Opt_itrunc_xino: ++ if (!a->sb) { ++ errorfc(fc, "out of bounds %s", param->string); ++ break; ++ } ++ err = au_fsctx_parse_xino_itrunc(fc, &opt->xino_itrunc, ++ result.int_32); ++ break; ++ ++ case Opt_dirwh: ++ err = 0; ++ opt->dirwh = result.int_32; ++ break; ++ ++ case Opt_rdcache: ++ if (unlikely(result.int_32 > AUFS_RDCACHE_MAX)) { ++ errorfc(fc, "rdcache must be smaller than %d", ++ AUFS_RDCACHE_MAX); ++ break; ++ } ++ err = 0; ++ opt->rdcache = result.int_32; ++ break; ++ ++ case Opt_rdblk: ++ err = 0; ++ opt->rdblk = AUFS_RDBLK_DEF; ++ if (!strcmp(param->string, "def")) ++ break; ++ ++ err = kstrtoint(param->string, 0, &result.int_32); ++ if (unlikely(err)) { ++ errorfc(fc, "bad value in %s", param->key); ++ break; ++ } ++ err = -EINVAL; ++ if (unlikely(result.int_32 < 0 ++ || result.int_32 > KMALLOC_MAX_SIZE)) { ++ errorfc(fc, "bad value in %s", param->key); ++ break; ++ } ++ if (unlikely(result.int_32 && result.int_32 < NAME_MAX)) { ++ errorfc(fc, "rdblk must be larger than %d", NAME_MAX); ++ break; ++ } ++ err = 0; ++ opt->rdblk = result.int_32; ++ break; ++ ++ case Opt_rdhash: ++ err = 0; ++ opt->rdhash = AUFS_RDHASH_DEF; ++ if (!strcmp(param->string, "def")) ++ break; ++ ++ err = kstrtoint(param->string, 0, &result.int_32); ++ if (unlikely(err)) { ++ errorfc(fc, "bad value in %s", param->key); ++ break; ++ } ++ /* how about zero? */ ++ if (result.int_32 < 0 ++ || result.int_32 * sizeof(struct hlist_head) ++ > KMALLOC_MAX_SIZE) { ++ err = -EINVAL; ++ errorfc(fc, "bad integer in %s", param->key); ++ break; ++ } ++ opt->rdhash = result.int_32; ++ break; ++ ++ case Opt_diropq: ++ /* ++ * As other options, fs/aufs/opts.c can handle these strings by ++ * match_token(). But "diropq=" is deprecated now and will ++ * never have other value. So simple strcmp() is enough here. ++ */ ++ if (!strcmp(param->string, "a") || ++ !strcmp(param->string, "always")) { ++ err = 0; ++ opt->type = Opt_diropq_a; ++ } else if (!strcmp(param->string, "w") || ++ !strcmp(param->string, "whiteouted")) { ++ err = 0; ++ opt->type = Opt_diropq_w; ++ } else ++ errorfc(fc, "unknown value %s", param->string); ++ break; ++ ++ case Opt_udba: ++ opt->udba = au_udba_val(param->string); ++ if (opt->udba >= 0) ++ err = 0; ++ else ++ errorf(fc, "wrong value, %s", param->string); ++ break; ++ ++ case Opt_wbr_create: ++ opt->wbr_create.wbr_create ++ = au_wbr_create_val(param->string, &opt->wbr_create); ++ if (opt->wbr_create.wbr_create >= 0) ++ err = 0; ++ else ++ errorf(fc, "wrong value, %s", param->key); ++ break; ++ ++ case Opt_wbr_copyup: ++ opt->wbr_copyup = au_wbr_copyup_val(param->string); ++ if (opt->wbr_copyup >= 0) ++ err = 0; ++ else ++ errorfc(fc, "wrong value, %s", param->key); ++ break; ++ ++ case Opt_fhsm_sec: ++ if (unlikely(result.int_32 < 0)) { ++ errorfc(fc, "bad integer in %s\n", param->key); ++ break; ++ } ++ err = 0; ++ if (sysaufs_brs) ++ opt->fhsm_second = result.int_32; ++ else ++ warnfc(fc, "ignored %s %s", param->key, param->string); ++ break; ++ ++ /* simple true/false flag */ ++#define au_fsctx_TF(name) \ ++ case Opt_##name: \ ++ err = 0; \ ++ opt->tf = !result.negated; \ ++ break ++ au_fsctx_TF(trunc_xino); ++ au_fsctx_TF(trunc_xib); ++ au_fsctx_TF(dirperm1); ++ au_fsctx_TF(plink); ++ au_fsctx_TF(shwh); ++ au_fsctx_TF(dio); ++ au_fsctx_TF(warn_perm); ++ au_fsctx_TF(verbose); ++ au_fsctx_TF(sum); ++ au_fsctx_TF(dirren); ++ au_fsctx_TF(acl); ++#undef au_fsctx_TF ++ ++ case Opt_noverbose: ++ err = 0; ++ opt->type = Opt_verbose; ++ opt->tf = false; ++ break; ++ ++ case Opt_noxino: ++ fallthrough; ++ case Opt_list_plink: ++ fallthrough; ++ case Opt_wsum: ++ err = 0; ++ break; ++ ++ case Opt_ignore: ++ warnfc(fc, "ignored %s", param->key); ++ fallthrough; ++ case Opt_ignore_silent: ++ a->skipped = 1; ++ err = 0; ++ break; ++ default: ++ a->skipped = 1; ++ err = -ENOPARAM; ++ break; ++ } ++ if (unlikely(err)) ++ goto out; ++ if (a->skipped) ++ goto out; ++ ++ switch (token) { ++ case Opt_br: ++ fallthrough; ++ case Opt_noverbose: ++ fallthrough; ++ case Opt_diropq: ++ break; ++ default: ++ opt->type = token; ++ break; ++ } ++ opt++; ++ if (unlikely(opt > a->opt_tail)) { ++ err = -E2BIG; ++ opt--; ++ } ++ opt->type = Opt_tail; ++ a->opt = opt; ++ ++out: ++ return err; ++} ++ ++/* ++ * these options accept both 'name=val' and 'name:val' form. ++ * some accept optional '=' in its value. ++ * eg. br:/br1=rw:/br2=ro and br=/br1=rw:/br2=ro ++ */ ++static inline unsigned int is_colonopt(char *str) ++{ ++#define do_test(name) \ ++ if (!strncmp(str, name ":", sizeof(name))) \ ++ return sizeof(name) - 1 ++ do_test("br"); ++ do_test("add"); ++ do_test("ins"); ++ do_test("append"); ++ do_test("prepend"); ++ do_test("del"); ++ /* do_test("idel"); */ ++ do_test("mod"); ++ /* do_test("imod"); */ ++#undef do_test ++ ++ return 0; ++} ++ ++static int au_fsctx_parse_monolithic(struct fs_context *fc, void *data) ++{ ++ int err; ++ unsigned int u; ++ char *str; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ str = data; ++ AuDbg("str %s\n", str); ++ while (str) { ++ u = is_colonopt(str); ++ if (u) ++ str[u] = '='; ++ str = strchr(str, ','); ++ if (!str) ++ break; ++ str++; ++ } ++ str = data; ++ AuDbg("str %s\n", str); ++ ++ err = generic_parse_monolithic(fc, str); ++ AuTraceErr(err); ++ au_fsctx_dump(&a->opts); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_fsctx_opts_free(struct au_opts *opts) ++{ ++ struct au_opt *opt; ++ ++ opt = opts->opt; ++ while (opt->type != Opt_tail) { ++ switch (opt->type) { ++ case Opt_add: ++ fallthrough; ++ case Opt_append: ++ fallthrough; ++ case Opt_prepend: ++ kfree(opt->add.pathname); ++ path_put(&opt->add.path); ++ break; ++ case Opt_del: ++ kfree(opt->del.pathname); ++ fallthrough; ++ case Opt_idel: ++ path_put(&opt->del.h_path); ++ break; ++ case Opt_mod: ++ kfree(opt->mod.path); ++ fallthrough; ++ case Opt_imod: ++ dput(opt->mod.h_root); ++ break; ++ case Opt_xino: ++ kfree(opt->xino.path); ++ fput(opt->xino.file); ++ break; ++ } ++ opt++; ++ } ++} ++ ++static void au_fsctx_free(struct fs_context *fc) ++{ ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ /* fs_type=%p, root=%pD */ ++ AuDbg("fc %p{sb_flags 0x%x, sb_flags_mask 0x%x, purpose %u\n", ++ fc, fc->sb_flags, fc->sb_flags_mask, fc->purpose); ++ ++ kobject_put(&a->sbinfo->si_kobj); ++ au_fsctx_opts_free(&a->opts); ++ free_page((unsigned long)a->opts.opt); ++ au_kfree_rcu(a); ++} ++ ++static const struct fs_context_operations au_fsctx_ops = { ++ .free = au_fsctx_free, ++ .parse_param = au_fsctx_parse_param, ++ .parse_monolithic = au_fsctx_parse_monolithic, ++ .get_tree = au_fsctx_get_tree, ++ .reconfigure = au_fsctx_reconfigure ++ /* ++ * nfs4 requires ->dup()? No. ++ * I don't know what is this ->dup() for. ++ */ ++}; ++ ++int aufs_fsctx_init(struct fs_context *fc) ++{ ++ int err; ++ struct au_fsctx_opts *a; ++ ++ /* fs_type=%p, root=%pD */ ++ AuDbg("fc %p{sb_flags 0x%x, sb_flags_mask 0x%x, purpose %u\n", ++ fc, fc->sb_flags, fc->sb_flags_mask, fc->purpose); ++ ++ /* they will be freed by au_fsctx_free() */ ++ err = -ENOMEM; ++ a = kzalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ a->bindex = 0; ++ a->opts.opt = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!a->opts.opt)) ++ goto out_a; ++ a->opt = a->opts.opt; ++ a->opt->type = Opt_tail; ++ a->opts.max_opt = PAGE_SIZE / sizeof(*a->opts.opt); ++ a->opt_tail = a->opt + a->opts.max_opt - 1; ++ a->opts.sb_flags = fc->sb_flags; ++ ++ a->sb = NULL; ++ if (fc->root) { ++ AuDebugOn(fc->purpose != FS_CONTEXT_FOR_RECONFIGURE); ++ a->opts.flags = AuOpts_REMOUNT; ++ a->sb = fc->root->d_sb; ++ a->sbinfo = au_sbi(a->sb); ++ kobject_get(&a->sbinfo->si_kobj); ++ } else { ++ a->sbinfo = au_si_alloc(a->sb); ++ AuDebugOn(!a->sbinfo); ++ err = PTR_ERR(a->sbinfo); ++ if (IS_ERR(a->sbinfo)) ++ goto out_opt; ++ au_rw_write_unlock(&a->sbinfo->si_rwsem); ++ } ++ ++ err = 0; ++ fc->fs_private = a; ++ fc->ops = &au_fsctx_ops; ++ goto out; /* success */ ++ ++out_opt: ++ free_page((unsigned long)a->opts.opt); ++out_a: ++ au_kfree_rcu(a); ++out: ++ AuTraceErr(err); ++ return err; ++} diff --git a/fs/aufs/fstype.h b/fs/aufs/fstype.h new file mode 100644 -index 000000000000..af4bc6c0dd42 +index 000000000000..24ff0d64c219 --- /dev/null +++ b/fs/aufs/fstype.h @@ -0,0 +1,401 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -16224,15 +17467,15 @@ index 000000000000..af4bc6c0dd42 +#endif /* __AUFS_FSTYPE_H__ */ diff --git a/fs/aufs/hbl.h b/fs/aufs/hbl.h new file mode 100644 -index 000000000000..4d5016bccc51 +index 000000000000..7e1e66db0264 --- /dev/null +++ b/fs/aufs/hbl.h @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2017-2020 Junjiro R. Okajima ++ * Copyright (C) 2017-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -16295,15 +17538,15 @@ index 000000000000..4d5016bccc51 +#endif /* __AUFS_HBL_H__ */ diff --git a/fs/aufs/hfsnotify.c b/fs/aufs/hfsnotify.c new file mode 100644 -index 000000000000..cb4eeb1e6069 +index 000000000000..caa900cea3a0 --- /dev/null +++ b/fs/aufs/hfsnotify.c -@@ -0,0 +1,288 @@ +@@ -0,0 +1,290 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -16461,8 +17704,8 @@ index 000000000000..cb4eeb1e6069 +} + +static int au_hfsn_handle_event(struct fsnotify_group *group, -+ struct inode *inode, + u32 mask, const void *data, int data_type, ++ struct inode *dir, + const struct qstr *file_name, u32 cookie, + struct fsnotify_iter_info *iter_info) +{ @@ -16471,7 +17714,8 @@ index 000000000000..cb4eeb1e6069 + struct inode *h_dir, *h_inode; + struct fsnotify_mark *inode_mark; + -+ AuDebugOn(data_type != FSNOTIFY_EVENT_INODE); ++ AuDebugOn(!(data_type == FSNOTIFY_EVENT_INODE ++ || data_type == FSNOTIFY_EVENT_DENTRY)); + + err = 0; + /* if FS_UNMOUNT happens, there must be another bug */ @@ -16479,15 +17723,15 @@ index 000000000000..cb4eeb1e6069 + if (mask & (FS_IN_IGNORED | FS_UNMOUNT)) + goto out; + -+ h_dir = inode; ++ h_dir = dir; + h_inode = NULL; +#ifdef AuDbgHnotify + au_debug_on(); -+ if (1 || h_child_qstr.len != sizeof(AUFS_XINO_FNAME) - 1 -+ || strncmp(h_child_qstr.name, AUFS_XINO_FNAME, h_child_qstr.len)) { ++ if (1 || file_name.len != sizeof(AUFS_XINO_FNAME) - 1 ++ || strncmp(file_name.name, AUFS_XINO_FNAME, file_name.len)) { + AuDbg("i%lu, mask 0x%x %s, hcname %.*s, hi%lu\n", + h_dir->i_ino, mask, au_hfsn_name(mask), -+ AuLNPair(&h_child_qstr), h_inode ? h_inode->i_ino : 0); ++ AuLNPair(file_name), h_inode ? h_inode->i_ino : 0); + /* WARN_ON(1); */ + } + au_debug_off(); @@ -16539,7 +17783,8 @@ index 000000000000..cb4eeb1e6069 + goto out; + + err = 0; -+ group = fsnotify_alloc_group(&au_hfsn_ops); ++ group = fsnotify_alloc_group(&au_hfsn_ops, ++ /*flags - not for userspace*/0); + if (IS_ERR(group)) { + err = PTR_ERR(group); + pr_err("fsnotify_alloc_group() failed, %d\n", err); @@ -16589,15 +17834,15 @@ index 000000000000..cb4eeb1e6069 +}; diff --git a/fs/aufs/hfsplus.c b/fs/aufs/hfsplus.c new file mode 100644 -index 000000000000..d250f019bedf +index 000000000000..c626ff2128c6 --- /dev/null +++ b/fs/aufs/hfsplus.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2010-2020 Junjiro R. Okajima ++ * Copyright (C) 2010-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -16655,15 +17900,15 @@ index 000000000000..d250f019bedf +} diff --git a/fs/aufs/hnotify.c b/fs/aufs/hnotify.c new file mode 100644 -index 000000000000..231edd1b4753 +index 000000000000..8ca8c98d40a3 --- /dev/null +++ b/fs/aufs/hnotify.c @@ -0,0 +1,715 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -17245,7 +18490,7 @@ index 000000000000..231edd1b4753 + case FS_MOVED_TO: + au_fset_hnjob(flags[AuHn_CHILD], XINO0); + au_fset_hnjob(flags[AuHn_CHILD], MNTPNT); -+ /*FALLTHROUGH*/ ++ fallthrough; + case FS_CREATE: + AuDebugOn(!h_child_name); + break; @@ -17376,15 +18621,15 @@ index 000000000000..231edd1b4753 +} diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c new file mode 100644 -index 000000000000..e982bbbc4196 +index 000000000000..141620c2e0bd --- /dev/null +++ b/fs/aufs/i_op.c -@@ -0,0 +1,1498 @@ +@@ -0,0 +1,1517 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -17403,9 +18648,9 @@ index 000000000000..e982bbbc4196 + */ + +#include <linux/device_cgroup.h> ++#include <linux/filelock.h> +#include <linux/fs_stack.h> +#include <linux/iversion.h> -+#include <linux/namei.h> +#include <linux/security.h> +#include "aufs.h" + @@ -17414,6 +18659,7 @@ index 000000000000..e982bbbc4196 +{ + int err; + const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND)); ++ struct mnt_idmap *h_idmap; + + err = -EPERM; + if (write_mask && IS_IMMUTABLE(h_inode)) @@ -17433,19 +18679,22 @@ index 000000000000..e982bbbc4196 + * - nfs always sets SB_POSIXACL regardless its mount option 'noacl.' + * in this case, generic_permission() returns -EOPNOTSUPP. + */ ++ h_idmap = mnt_idmap(h_path->mnt); + if ((write_mask && !au_br_writable(brperm)) + || (au_test_nfs(h_inode->i_sb) && S_ISDIR(h_inode->i_mode) + && write_mask && !(mask & MAY_READ)) + || !h_inode->i_op->permission) { + /* AuLabel(generic_permission); */ -+ /* AuDbg("get_acl %ps\n", h_inode->i_op->get_acl); */ -+ err = generic_permission(h_inode, mask); ++ /* AuDbg("get_inode_acl %ps\n", ++ h_inode->i_op->get_inode_acl); */ ++ err = generic_permission(h_idmap, h_inode, mask); + if (err == -EOPNOTSUPP && au_test_nfs_noacl(h_inode)) -+ err = h_inode->i_op->permission(h_inode, mask); ++ err = h_inode->i_op->permission(h_idmap, h_inode, ++ mask); + AuTraceErr(err); + } else { + /* AuLabel(h_inode->permission); */ -+ err = h_inode->i_op->permission(h_inode, mask); ++ err = h_inode->i_op->permission(h_idmap, h_inode, mask); + AuTraceErr(err); + } + @@ -17458,7 +18707,8 @@ index 000000000000..e982bbbc4196 + return err; +} + -+static int aufs_permission(struct inode *inode, int mask) ++static int aufs_permission(struct mnt_idmap *idmap, struct inode *inode, ++ int mask) +{ + int err; + aufs_bindex_t bindex, bbot; @@ -18306,18 +19556,20 @@ index 000000000000..e982bbbc4196 + return err; +} + -+static int aufs_setattr(struct dentry *dentry, struct iattr *ia) ++static int aufs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, ++ struct iattr *ia) +{ + int err; + struct inode *inode, *delegated; + struct super_block *sb; + struct file *file; + struct au_icpup_args *a; ++ struct mnt_idmap *h_idmap; + + inode = d_inode(dentry); + IMustLock(inode); + -+ err = setattr_prepare(dentry, ia); ++ err = setattr_prepare(idmap, dentry, ia); + if (unlikely(err)) + goto out; + @@ -18410,8 +19662,10 @@ index 000000000000..e982bbbc4196 + * regardless aufs 'acl' option setting. + * why don't all acl-aware fs call this func from their ->setattr()? + */ -+ if (!err && (ia->ia_valid & ATTR_MODE)) -+ err = vfsub_acl_chmod(a->h_inode, ia->ia_mode); ++ if (!err && (ia->ia_valid & ATTR_MODE)) { ++ h_idmap = mnt_idmap(a->h_path.mnt); ++ err = vfsub_acl_chmod(h_idmap, a->h_path.dentry, ia->ia_mode); ++ } + if (!err) + au_cpup_attr_changeable(inode); + @@ -18473,6 +19727,7 @@ index 000000000000..e982bbbc4196 + struct super_block *sb; + struct au_icpup_args *a; + struct inode *h_inode; ++ struct mnt_idmap *h_idmap; + + IMustLock(inode); + @@ -18491,23 +19746,25 @@ index 000000000000..e982bbbc4196 + err = au_h_path_to_set_attr(dentry, a, &h_path); + if (unlikely(err)) + goto out_di; ++ h_idmap = mnt_idmap(h_path.mnt); + + inode_unlock(a->h_inode); + switch (arg->type) { + case AU_XATTR_SET: + AuDebugOn(d_is_negative(h_path.dentry)); -+ err = vfsub_setxattr(h_path.dentry, ++ err = vfsub_setxattr(h_idmap, h_path.dentry, + arg->u.set.name, arg->u.set.value, + arg->u.set.size, arg->u.set.flags); + break; + case AU_ACL_SET: + err = -EOPNOTSUPP; + h_inode = d_inode(h_path.dentry); -+ if (h_inode->i_op->set_acl) ++ if (h_inode->i_op->set_acl) { + /* this will call posix_acl_update_mode */ -+ err = h_inode->i_op->set_acl(h_inode, ++ err = h_inode->i_op->set_acl(h_idmap, h_path.dentry, + arg->u.acl_set.acl, + arg->u.acl_set.type); ++ } + break; + } + if (!err) @@ -18562,15 +19819,14 @@ index 000000000000..e982bbbc4196 + * returns zero or negative (an error). + * @dentry will be read-locked in success. + */ -+int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path, -+ int locked) ++int au_h_path_getattr(struct dentry *dentry, struct inode *inode, int force, ++ struct path *h_path, int locked) +{ + int err; + unsigned int mnt_flags, sigen; + unsigned char udba_none; + aufs_bindex_t bindex; + struct super_block *sb, *h_sb; -+ struct inode *inode; + + h_path->mnt = NULL; + h_path->dentry = NULL; @@ -18611,7 +19867,11 @@ index 000000000000..e982bbbc4196 + di_read_lock_child(dentry, AuLock_IR); + +body: -+ inode = d_inode(dentry); ++ if (!inode) { ++ inode = d_inode(dentry); ++ if (unlikely(!inode)) ++ goto out; ++ } + bindex = au_ibtop(inode); + h_path->mnt = au_sbr_mnt(sb, bindex); + h_sb = h_path->mnt->mnt_sb; @@ -18635,8 +19895,8 @@ index 000000000000..e982bbbc4196 + return err; +} + -+static int aufs_getattr(const struct path *path, struct kstat *st, -+ u32 request, unsigned int query) ++static int aufs_getattr(struct mnt_idmap *idmap, const struct path *path, ++ struct kstat *st, u32 request, unsigned int query) +{ + int err; + unsigned char positive; @@ -18651,7 +19911,8 @@ index 000000000000..e982bbbc4196 + err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); + if (unlikely(err)) + goto out; -+ err = au_h_path_getattr(dentry, /*force*/0, &h_path, /*locked*/0); ++ err = au_h_path_getattr(dentry, /*inode*/NULL, /*force*/0, &h_path, ++ /*locked*/0); + if (unlikely(err)) + goto out_si; + if (unlikely(!h_path.dentry)) @@ -18672,7 +19933,7 @@ index 000000000000..e982bbbc4196 + goto out_di; + +out_fill: -+ generic_fillattr(inode, st); ++ generic_fillattr(idmap, inode, st); +out_di: + di_read_unlock(dentry, AuLock_IR); +out_si: @@ -18818,6 +20079,7 @@ index 000000000000..e982bbbc4196 + [AuIop_SYMLINK] = { + .permission = aufs_permission, +#ifdef CONFIG_FS_POSIX_ACL ++ .get_inode_acl = aufs_get_inode_acl, + .get_acl = aufs_get_acl, + .set_acl = aufs_set_acl, /* unsupport for symlink? */ +#endif @@ -18829,7 +20091,7 @@ index 000000000000..e982bbbc4196 + .listxattr = aufs_listxattr, +#endif + -+ .get_link = aufs_get_link, ++ .get_link = aufs_get_link + + /* .update_time = aufs_update_time */ + }, @@ -18846,6 +20108,7 @@ index 000000000000..e982bbbc4196 + + .permission = aufs_permission, +#ifdef CONFIG_FS_POSIX_ACL ++ .get_inode_acl = aufs_get_inode_acl, + .get_acl = aufs_get_acl, + .set_acl = aufs_set_acl, +#endif @@ -18864,6 +20127,7 @@ index 000000000000..e982bbbc4196 + [AuIop_OTHER] = { + .permission = aufs_permission, +#ifdef CONFIG_FS_POSIX_ACL ++ .get_inode_acl = aufs_get_inode_acl, + .get_acl = aufs_get_acl, + .set_acl = aufs_set_acl, +#endif @@ -18880,15 +20144,15 @@ index 000000000000..e982bbbc4196 +}; diff --git a/fs/aufs/i_op_add.c b/fs/aufs/i_op_add.c new file mode 100644 -index 000000000000..80f2cfeeaaa0 +index 000000000000..2adf97d4488d --- /dev/null +++ b/fs/aufs/i_op_add.c -@@ -0,0 +1,936 @@ +@@ -0,0 +1,972 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -19252,8 +20516,8 @@ index 000000000000..80f2cfeeaaa0 + return err; +} + -+int aufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, -+ dev_t dev) ++int aufs_mknod(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, dev_t dev) +{ + struct simple_arg arg = { + .type = Mknod, @@ -19265,7 +20529,8 @@ index 000000000000..80f2cfeeaaa0 + return add_simple(dir, dentry, &arg); +} + -+int aufs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) ++int aufs_symlink(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, const char *symname) +{ + struct simple_arg arg = { + .type = Symlink, @@ -19274,8 +20539,8 @@ index 000000000000..80f2cfeeaaa0 + return add_simple(dir, dentry, &arg); +} + -+int aufs_create(struct inode *dir, struct dentry *dentry, umode_t mode, -+ bool want_excl) ++int aufs_create(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, bool want_excl) +{ + struct simple_arg arg = { + .type = Creat, @@ -19302,14 +20567,19 @@ index 000000000000..80f2cfeeaaa0 + return add_simple(dir, dentry, &arg); +} + -+int aufs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) ++int aufs_tmpfile(struct mnt_idmap *idmap, struct inode *dir, ++ struct file *file, umode_t mode) +{ + int err; + aufs_bindex_t bindex; ++ struct path h_ppath; + struct super_block *sb; -+ struct dentry *parent, *h_parent, *h_dentry; ++ struct au_branch *br; ++ struct dentry *dentry, *parent, *h_parent, *h_dentry; + struct inode *h_dir, *inode; + struct vfsmount *h_mnt; ++ struct mnt_idmap *h_idmap; ++ struct file *h_file; + struct au_wr_dir_args wr_dir_args = { + .force_btgt = -1, + .flags = AuWrDir_TMPFILE @@ -19318,11 +20588,13 @@ index 000000000000..80f2cfeeaaa0 + /* copy-up may happen */ + inode_lock(dir); + ++ h_file = NULL; + sb = dir->i_sb; + err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); + if (unlikely(err)) + goto out; + ++ dentry = file->f_path.dentry; + err = au_di_init(dentry); + if (unlikely(err)) + goto out_si; @@ -19351,18 +20623,25 @@ index 000000000000..80f2cfeeaaa0 + if (unlikely(!h_dir->i_op->tmpfile)) + goto out_parent; + -+ h_mnt = au_sbr_mnt(sb, bindex); ++ br = au_sbr(sb, bindex); ++ h_mnt = au_br_mnt(br); + err = vfsub_mnt_want_write(h_mnt); + if (unlikely(err)) + goto out_parent; + ++ h_idmap = mnt_idmap(h_mnt); + h_parent = au_h_dptr(parent, bindex); -+ h_dentry = vfs_tmpfile(h_parent, mode, /*open_flag*/0); -+ if (IS_ERR(h_dentry)) { -+ err = PTR_ERR(h_dentry); ++ h_ppath.mnt = h_mnt; ++ h_ppath.dentry = h_parent; ++ h_file = kernel_tmpfile_open(h_idmap, &h_ppath, mode, /*open_flag*/0, ++ current_cred()); ++ if (IS_ERR(h_file)) { ++ err = PTR_ERR(h_file); ++ h_file = NULL; + goto out_mnt; + } + ++ h_dentry = h_file->f_path.dentry; + au_set_dbtop(dentry, bindex); + au_set_dbbot(dentry, bindex); + au_set_h_dptr(dentry, bindex, dget(h_dentry)); @@ -19372,32 +20651,52 @@ index 000000000000..80f2cfeeaaa0 + au_set_h_dptr(dentry, bindex, NULL); + au_set_dbtop(dentry, -1); + au_set_dbbot(dentry, -1); -+ } else { -+ if (!inode->i_nlink) -+ set_nlink(inode, 1); -+ d_tmpfile(dentry, inode); -+ au_di(dentry)->di_tmpfile = 1; -+ -+ /* update without i_mutex */ -+ if (au_ibtop(dir) == au_dbtop(dentry)) -+ au_cpup_attr_timesizes(dir); ++ goto out_h_file; + } -+ dput(h_dentry); + ++ if (!inode->i_nlink) ++ set_nlink(inode, 1); ++ d_tmpfile(file, inode); ++ au_di(dentry)->di_tmpfile = 1; ++ get_file(h_file); ++ au_di(dentry)->di_htmpfile = h_file; ++ ++ /* update without i_mutex */ ++ if (au_ibtop(dir) == au_dbtop(dentry)) ++ au_cpup_attr_timesizes(dir); ++ ++out_h_file: ++ fput(h_file); +out_mnt: + vfsub_mnt_drop_write(h_mnt); +out_parent: + di_write_unlock(parent); + dput(parent); + di_write_unlock(dentry); -+ if (unlikely(err)) { -+ au_di_fin(dentry); -+ dentry->d_fsdata = NULL; -+ } ++ if (!err) ++ goto out_si; ++ if (h_file) ++ fput(h_file); ++ au_di(dentry)->di_htmpfile = NULL; ++ au_di_fin(dentry); ++ dentry->d_fsdata = NULL; +out_si: + si_read_unlock(sb); ++ if (!err && h_file) { ++ /* finally... */ ++ err = finish_open_simple(file, err); ++ if (!err) ++ au_lcnt_inc(&br->br_nfiles); ++ else { ++ fput(h_file); ++ au_di(dentry)->di_htmpfile = NULL; ++ au_di_fin(dentry); ++ dentry->d_fsdata = NULL; ++ } ++ } +out: + inode_unlock(dir); ++ AuTraceErr(err); + return err; +} + @@ -19713,7 +21012,8 @@ index 000000000000..80f2cfeeaaa0 + return err; +} + -+int aufs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ++int aufs_mkdir(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode) +{ + int err, rerr; + aufs_bindex_t bindex; @@ -19822,15 +21122,15 @@ index 000000000000..80f2cfeeaaa0 +} diff --git a/fs/aufs/i_op_del.c b/fs/aufs/i_op_del.c new file mode 100644 -index 000000000000..9beba2ba8db0 +index 000000000000..d85f47cef29f --- /dev/null +++ b/fs/aufs/i_op_del.c -@@ -0,0 +1,513 @@ +@@ -0,0 +1,522 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -19922,6 +21222,10 @@ index 000000000000..9beba2ba8db0 + umode_t h_mode; + struct dentry *h_dentry, *h_latest; + struct inode *h_inode; ++ struct path h_ppath; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct mnt_idmap *h_idmap; + + h_dentry = au_h_dptr(dentry, bindex); + if (d_really_is_positive(dentry)) { @@ -19959,12 +21263,17 @@ index 000000000000..9beba2ba8db0 + * let's try heavy test. + */ + err = -EACCES; -+ if (unlikely(!au_opt_test(au_mntflags(dentry->d_sb), DIRPERM1) -+ && au_test_h_perm(d_inode(h_parent), ++ sb = dentry->d_sb; ++ br = au_sbr(sb, bindex); ++ h_idmap = au_br_idmap(br); ++ if (unlikely(!au_opt_test(au_mntflags(sb), DIRPERM1) ++ && au_test_h_perm(h_idmap, d_inode(h_parent), + MAY_EXEC | MAY_WRITE))) + goto out; + -+ h_latest = au_sio_lkup_one(&dentry->d_name, h_parent); ++ h_ppath.dentry = h_parent; ++ h_ppath.mnt = au_br_mnt(br); ++ h_latest = au_sio_lkup_one(h_idmap, &dentry->d_name, &h_ppath); + err = -EIO; + if (IS_ERR(h_latest)) + goto out; @@ -20341,15 +21650,15 @@ index 000000000000..9beba2ba8db0 +} diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c new file mode 100644 -index 000000000000..435fa50811ff +index 000000000000..ab69a6ac9a42 --- /dev/null +++ b/fs/aufs/i_op_ren.c -@@ -0,0 +1,1250 @@ +@@ -0,0 +1,1257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -20497,9 +21806,12 @@ index 000000000000..435fa50811ff +{ + int rerr; + struct inode *delegated; ++ struct path h_ppath = { ++ .dentry = a->src_h_parent, ++ .mnt = a->h_path.mnt ++ }; + -+ a->h_path.dentry = vfsub_lkup_one(&a->src_dentry->d_name, -+ a->src_h_parent); ++ a->h_path.dentry = vfsub_lkup_one(&a->src_dentry->d_name, &h_ppath); + rerr = PTR_ERR(a->h_path.dentry); + if (IS_ERR(a->h_path.dentry)) { + RevertFailure("lkup one %pd", a->src_dentry); @@ -20526,9 +21838,12 @@ index 000000000000..435fa50811ff +{ + int rerr; + struct inode *delegated; ++ struct path h_ppath = { ++ .dentry = a->dst_h_parent, ++ .mnt = a->h_path.mnt ++ }; + -+ a->h_path.dentry = vfsub_lkup_one(&a->dst_dentry->d_name, -+ a->dst_h_parent); ++ a->h_path.dentry = vfsub_lkup_one(&a->dst_dentry->d_name, &h_ppath); + rerr = PTR_ERR(a->h_path.dentry); + if (IS_ERR(a->h_path.dentry)) { + RevertFailure("lkup one %pd", a->dst_dentry); @@ -21300,7 +22615,8 @@ index 000000000000..435fa50811ff + +/* ---------------------------------------------------------------------- */ + -+int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry, ++int aufs_rename(struct mnt_idmap *idmap, ++ struct inode *_src_dir, struct dentry *_src_dentry, + struct inode *_dst_dir, struct dentry *_dst_dentry, + unsigned int _flags) +{ @@ -21597,15 +22913,15 @@ index 000000000000..435fa50811ff +} diff --git a/fs/aufs/iinfo.c b/fs/aufs/iinfo.c new file mode 100644 -index 000000000000..016db39451cd +index 000000000000..0d3a2487643b --- /dev/null +++ b/fs/aufs/iinfo.c @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -21889,15 +23205,15 @@ index 000000000000..016db39451cd +} diff --git a/fs/aufs/inode.c b/fs/aufs/inode.c new file mode 100644 -index 000000000000..4de1b7507c5b +index 000000000000..7dbf6a6f2fee --- /dev/null +++ b/fs/aufs/inode.c -@@ -0,0 +1,529 @@ +@@ -0,0 +1,531 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -22169,7 +23485,7 @@ index 000000000000..4de1b7507c5b + } + au_cpup_attr_all(inode, /*force*/1); + /* -+ * to force calling aufs_get_acl() every time, ++ * to force calling aufs_get_inode_acl() every time, + * do not call cache_no_acl() for aufs inode. + */ + @@ -22407,32 +23723,34 @@ index 000000000000..4de1b7507c5b + return err; +} + -+int au_test_h_perm(struct inode *h_inode, int mask) ++int au_test_h_perm(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask) +{ + if (uid_eq(current_fsuid(), GLOBAL_ROOT_UID)) + return 0; -+ return inode_permission(h_inode, mask); ++ return inode_permission(h_idmap, h_inode, mask); +} + -+int au_test_h_perm_sio(struct inode *h_inode, int mask) ++int au_test_h_perm_sio(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask) +{ + if (au_test_nfs(h_inode->i_sb) + && (mask & MAY_WRITE) + && S_ISDIR(h_inode->i_mode)) + mask |= MAY_READ; /* force permission check */ -+ return au_test_h_perm(h_inode, mask); ++ return au_test_h_perm(h_idmap, h_inode, mask); +} diff --git a/fs/aufs/inode.h b/fs/aufs/inode.h new file mode 100644 -index 000000000000..f34ea8739427 +index 000000000000..76c3bd49674a --- /dev/null +++ b/fs/aufs/inode.h -@@ -0,0 +1,698 @@ +@@ -0,0 +1,707 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -22567,8 +23885,10 @@ index 000000000000..f34ea8739427 +struct inode *au_new_inode(struct dentry *dentry, int must_new); +int au_test_ro(struct super_block *sb, aufs_bindex_t bindex, + struct inode *inode); -+int au_test_h_perm(struct inode *h_inode, int mask); -+int au_test_h_perm_sio(struct inode *h_inode, int mask); ++int au_test_h_perm(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask); ++int au_test_h_perm_sio(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask); + +static inline int au_wh_ino(struct super_block *sb, aufs_bindex_t bindex, + ino_t h_ino, unsigned int d_type, ino_t *ino) @@ -22637,24 +23957,27 @@ index 000000000000..f34ea8739427 +int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia, + struct au_icpup_args *a); + -+int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path, -+ int locked); ++int au_h_path_getattr(struct dentry *dentry, struct inode *inode, int force, ++ struct path *h_path, int locked); + +/* i_op_add.c */ +int au_may_add(struct dentry *dentry, aufs_bindex_t bindex, + struct dentry *h_parent, int isdir); -+int aufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, -+ dev_t dev); -+int aufs_symlink(struct inode *dir, struct dentry *dentry, const char *symname); -+int aufs_create(struct inode *dir, struct dentry *dentry, umode_t mode, -+ bool want_excl); ++int aufs_mknod(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, dev_t dev); ++int aufs_symlink(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, const char *symname); ++int aufs_create(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, bool want_excl); +struct vfsub_aopen_args; +int au_aopen_or_create(struct inode *dir, struct dentry *dentry, + struct vfsub_aopen_args *args); -+int aufs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode); ++int aufs_tmpfile(struct mnt_idmap *idmap, struct inode *dir, ++ struct file *file, umode_t mode); +int aufs_link(struct dentry *src_dentry, struct inode *dir, + struct dentry *dentry); -+int aufs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode); ++int aufs_mkdir(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode); + +/* i_op_del.c */ +int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup); @@ -22665,9 +23988,10 @@ index 000000000000..f34ea8739427 + +/* i_op_ren.c */ +int au_wbr(struct dentry *dentry, aufs_bindex_t btgt); -+int aufs_rename(struct inode *src_dir, struct dentry *src_dentry, -+ struct inode *dir, struct dentry *dentry, -+ unsigned int flags); ++int aufs_rename(struct mnt_idmap *idmap, ++ struct inode *_src_dir, struct dentry *_src_dentry, ++ struct inode *_dst_dir, struct dentry *_dst_dentry, ++ unsigned int _flags); + +/* iinfo.c */ +struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex); @@ -22737,19 +24061,22 @@ index 000000000000..f34ea8739427 + +#ifdef CONFIG_AUFS_XATTR +/* xattr.c */ -+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags, ++int au_cpup_xattr(struct path *h_dst, struct path *h_src, int ignore_flags, + unsigned int verbose); +ssize_t aufs_listxattr(struct dentry *dentry, char *list, size_t size); +void au_xattr_init(struct super_block *sb); +#else -+AuStubInt0(au_cpup_xattr, struct dentry *h_dst, struct dentry *h_src, ++AuStubInt0(au_cpup_xattr, struct path *h_dst, struct path *h_src, + int ignore_flags, unsigned int verbose); +AuStubVoid(au_xattr_init, struct super_block *sb); +#endif + +#ifdef CONFIG_FS_POSIX_ACL -+struct posix_acl *aufs_get_acl(struct inode *inode, int type); -+int aufs_set_acl(struct inode *inode, struct posix_acl *acl, int type); ++struct posix_acl *aufs_get_inode_acl(struct inode *inode, int type, bool rcu); ++struct posix_acl *aufs_get_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, int type); ++int aufs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, ++ struct posix_acl *acl, int type); +#endif + +#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL) @@ -23023,7 +24350,7 @@ index 000000000000..f34ea8739427 + int (*alloc)(struct au_hinode *hinode); + + /* -+ * if it returns true, the the caller should free hinode->hi_notify, ++ * if it returns true, the caller should free hinode->hi_notify, + * otherwise ->free() frees it. + */ + int (*free)(struct au_hinode *hinode, @@ -23128,15 +24455,15 @@ index 000000000000..f34ea8739427 +#endif /* __AUFS_INODE_H__ */ diff --git a/fs/aufs/ioctl.c b/fs/aufs/ioctl.c new file mode 100644 -index 000000000000..ae4f73386b90 +index 000000000000..2d8d91084099 --- /dev/null +++ b/fs/aufs/ioctl.c @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -23354,15 +24681,15 @@ index 000000000000..ae4f73386b90 +#endif diff --git a/fs/aufs/lcnt.h b/fs/aufs/lcnt.h new file mode 100644 -index 000000000000..8afcabe55826 +index 000000000000..6dc37108565f --- /dev/null +++ b/fs/aufs/lcnt.h @@ -0,0 +1,186 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2018-2020 Junjiro R. Okajima ++ * Copyright (C) 2018-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -23546,15 +24873,15 @@ index 000000000000..8afcabe55826 +#endif /* __AUFS_LCNT_H__ */ diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c new file mode 100644 -index 000000000000..63732e938684 +index 000000000000..383190588595 --- /dev/null +++ b/fs/aufs/loop.c @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -23700,15 +25027,15 @@ index 000000000000..63732e938684 +} diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h new file mode 100644 -index 000000000000..65c38bbb5d56 +index 000000000000..9726b8354e00 --- /dev/null +++ b/fs/aufs/loop.h @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -23798,15 +25125,15 @@ index 000000000000..7bc9eef3ffec +endif diff --git a/fs/aufs/module.c b/fs/aufs/module.c new file mode 100644 -index 000000000000..7245197a6cbf +index 000000000000..c2815fffb5c6 --- /dev/null +++ b/fs/aufs/module.c @@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -24077,15 +25404,15 @@ index 000000000000..7245197a6cbf +module_exit(aufs_exit); diff --git a/fs/aufs/module.h b/fs/aufs/module.h new file mode 100644 -index 000000000000..d6a76788d2ff +index 000000000000..a9d21d3e5414 --- /dev/null +++ b/fs/aufs/module.h -@@ -0,0 +1,166 @@ +@@ -0,0 +1,180 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -24180,7 +25507,7 @@ index 000000000000..d6a76788d2ff +static inline int au_kmidx_sub(size_t sz, size_t new_sz) +{ +#ifndef CONFIG_SLOB -+ return kmalloc_index(sz) - kmalloc_index(new_sz); ++ return __kmalloc_index(sz, false) - __kmalloc_index(new_sz, false); +#else + return -1; /* SLOB is untested */ +#endif @@ -24218,9 +25545,11 @@ index 000000000000..d6a76788d2ff + kmem_cache_create(#type, sizeof(struct type), \ + __alignof__(struct type), AuCacheFlags, ctor) + -+#define AuCacheFuncs(name, index) \ ++#define AuCacheFuncAlloc(name, index) \ + static inline struct au_##name *au_cache_alloc_##name(void) \ -+ { return kmem_cache_alloc(au_cache[AuCache_##index], GFP_NOFS); } \ ++ { return kmem_cache_alloc(au_cache[AuCache_##index], GFP_NOFS); } ++ ++#define AuCacheFuncs(name, index) \ + static inline void au_cache_free_##name##_norcu(struct au_##name *p) \ + { kmem_cache_free(au_cache[AuCache_##index], p); } \ + \ @@ -24237,27 +25566,39 @@ index 000000000000..d6a76788d2ff + au_cache_free_##name##_rcu(p); } + +AuCacheFuncs(dinfo, DINFO); ++AuCacheFuncAlloc(dinfo, DINFO); ++ +AuCacheFuncs(icntnr, ICNTNR); ++static inline struct au_icntnr *au_cache_alloc_icntnr(struct super_block *sb) ++{ return alloc_inode_sb(sb, au_cache[AuCache_ICNTNR], GFP_NOFS); } ++ +AuCacheFuncs(finfo, FINFO); ++AuCacheFuncAlloc(finfo, FINFO); ++ +AuCacheFuncs(vdir, VDIR); ++AuCacheFuncAlloc(vdir, VDIR); ++ +AuCacheFuncs(vdir_dehstr, DEHSTR); ++AuCacheFuncAlloc(vdir_dehstr, DEHSTR); ++ +#ifdef CONFIG_AUFS_HNOTIFY +AuCacheFuncs(hnotify, HNOTIFY); ++AuCacheFuncAlloc(hnotify, HNOTIFY); +#endif + +#endif /* __KERNEL__ */ +#endif /* __AUFS_MODULE_H__ */ diff --git a/fs/aufs/mvdown.c b/fs/aufs/mvdown.c new file mode 100644 -index 000000000000..c39a39e52ebc +index 000000000000..daafc27e64b0 --- /dev/null +++ b/fs/aufs/mvdown.c @@ -0,0 +1,706 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2011-2020 Junjiro R. Okajima ++ * Copyright (C) 2011-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -24961,15 +26302,15 @@ index 000000000000..c39a39e52ebc +} diff --git a/fs/aufs/opts.c b/fs/aufs/opts.c new file mode 100644 -index 000000000000..16e785facf9b +index 000000000000..20421440c004 --- /dev/null +++ b/fs/aufs/opts.c -@@ -0,0 +1,1880 @@ +@@ -0,0 +1,1032 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -24987,172 +26328,12 @@ index 000000000000..16e785facf9b + * mount options/flags + */ + -+#include <linux/namei.h> +#include <linux/types.h> /* a distribution requires */ +#include <linux/parser.h> +#include "aufs.h" + +/* ---------------------------------------------------------------------- */ + -+enum { -+ Opt_br, -+ Opt_add, Opt_del, Opt_mod, Opt_append, Opt_prepend, -+ Opt_idel, Opt_imod, -+ Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash, -+ Opt_rdblk_def, Opt_rdhash_def, -+ Opt_xino, Opt_noxino, -+ Opt_trunc_xino, Opt_trunc_xino_v, Opt_notrunc_xino, -+ Opt_trunc_xino_path, Opt_itrunc_xino, -+ Opt_trunc_xib, Opt_notrunc_xib, -+ Opt_shwh, Opt_noshwh, -+ Opt_plink, Opt_noplink, Opt_list_plink, -+ Opt_udba, -+ Opt_dio, Opt_nodio, -+ Opt_diropq_a, Opt_diropq_w, -+ Opt_warn_perm, Opt_nowarn_perm, -+ Opt_wbr_copyup, Opt_wbr_create, -+ Opt_fhsm_sec, -+ Opt_verbose, Opt_noverbose, -+ Opt_sum, Opt_nosum, Opt_wsum, -+ Opt_dirperm1, Opt_nodirperm1, -+ Opt_dirren, Opt_nodirren, -+ Opt_acl, Opt_noacl, -+ Opt_tail, Opt_ignore, Opt_ignore_silent, Opt_err -+}; -+ -+static match_table_t options = { -+ {Opt_br, "br=%s"}, -+ {Opt_br, "br:%s"}, -+ -+ {Opt_add, "add=%d:%s"}, -+ {Opt_add, "add:%d:%s"}, -+ {Opt_add, "ins=%d:%s"}, -+ {Opt_add, "ins:%d:%s"}, -+ {Opt_append, "append=%s"}, -+ {Opt_append, "append:%s"}, -+ {Opt_prepend, "prepend=%s"}, -+ {Opt_prepend, "prepend:%s"}, -+ -+ {Opt_del, "del=%s"}, -+ {Opt_del, "del:%s"}, -+ /* {Opt_idel, "idel:%d"}, */ -+ {Opt_mod, "mod=%s"}, -+ {Opt_mod, "mod:%s"}, -+ /* {Opt_imod, "imod:%d:%s"}, */ -+ -+ {Opt_dirwh, "dirwh=%d"}, -+ -+ {Opt_xino, "xino=%s"}, -+ {Opt_noxino, "noxino"}, -+ {Opt_trunc_xino, "trunc_xino"}, -+ {Opt_trunc_xino_v, "trunc_xino_v=%d:%d"}, -+ {Opt_notrunc_xino, "notrunc_xino"}, -+ {Opt_trunc_xino_path, "trunc_xino=%s"}, -+ {Opt_itrunc_xino, "itrunc_xino=%d"}, -+ /* {Opt_zxino, "zxino=%s"}, */ -+ {Opt_trunc_xib, "trunc_xib"}, -+ {Opt_notrunc_xib, "notrunc_xib"}, -+ -+#ifdef CONFIG_PROC_FS -+ {Opt_plink, "plink"}, -+#else -+ {Opt_ignore_silent, "plink"}, -+#endif -+ -+ {Opt_noplink, "noplink"}, -+ -+#ifdef CONFIG_AUFS_DEBUG -+ {Opt_list_plink, "list_plink"}, -+#endif -+ -+ {Opt_udba, "udba=%s"}, -+ -+ {Opt_dio, "dio"}, -+ {Opt_nodio, "nodio"}, -+ -+#ifdef CONFIG_AUFS_DIRREN -+ {Opt_dirren, "dirren"}, -+ {Opt_nodirren, "nodirren"}, -+#else -+ {Opt_ignore, "dirren"}, -+ {Opt_ignore_silent, "nodirren"}, -+#endif -+ -+#ifdef CONFIG_AUFS_FHSM -+ {Opt_fhsm_sec, "fhsm_sec=%d"}, -+#else -+ {Opt_ignore, "fhsm_sec=%d"}, -+#endif -+ -+ {Opt_diropq_a, "diropq=always"}, -+ {Opt_diropq_a, "diropq=a"}, -+ {Opt_diropq_w, "diropq=whiteouted"}, -+ {Opt_diropq_w, "diropq=w"}, -+ -+ {Opt_warn_perm, "warn_perm"}, -+ {Opt_nowarn_perm, "nowarn_perm"}, -+ -+ /* keep them temporary */ -+ {Opt_ignore_silent, "nodlgt"}, -+ {Opt_ignore, "clean_plink"}, -+ -+#ifdef CONFIG_AUFS_SHWH -+ {Opt_shwh, "shwh"}, -+#endif -+ {Opt_noshwh, "noshwh"}, -+ -+ {Opt_dirperm1, "dirperm1"}, -+ {Opt_nodirperm1, "nodirperm1"}, -+ -+ {Opt_verbose, "verbose"}, -+ {Opt_verbose, "v"}, -+ {Opt_noverbose, "noverbose"}, -+ {Opt_noverbose, "quiet"}, -+ {Opt_noverbose, "q"}, -+ {Opt_noverbose, "silent"}, -+ -+ {Opt_sum, "sum"}, -+ {Opt_nosum, "nosum"}, -+ {Opt_wsum, "wsum"}, -+ -+ {Opt_rdcache, "rdcache=%d"}, -+ {Opt_rdblk, "rdblk=%d"}, -+ {Opt_rdblk_def, "rdblk=def"}, -+ {Opt_rdhash, "rdhash=%d"}, -+ {Opt_rdhash_def, "rdhash=def"}, -+ -+ {Opt_wbr_create, "create=%s"}, -+ {Opt_wbr_create, "create_policy=%s"}, -+ {Opt_wbr_copyup, "cpup=%s"}, -+ {Opt_wbr_copyup, "copyup=%s"}, -+ {Opt_wbr_copyup, "copyup_policy=%s"}, -+ -+ /* generic VFS flag */ -+#ifdef CONFIG_FS_POSIX_ACL -+ {Opt_acl, "acl"}, -+ {Opt_noacl, "noacl"}, -+#else -+ {Opt_ignore, "acl"}, -+ {Opt_ignore_silent, "noacl"}, -+#endif -+ -+ /* internal use for the scripts */ -+ {Opt_ignore_silent, "si=%s"}, -+ -+ {Opt_br, "dirs=%s"}, -+ {Opt_ignore, "debug=%d"}, -+ {Opt_ignore, "delete=whiteout"}, -+ {Opt_ignore, "delete=all"}, -+ {Opt_ignore, "imap=%s"}, -+ -+ /* temporary workaround, due to old mount(8)? */ -+ {Opt_ignore_silent, "relatime"}, -+ -+ {Opt_err, NULL} -+}; -+ -+/* ---------------------------------------------------------------------- */ -+ +static const char *au_parser_pattern(int val, match_table_t tbl) +{ + struct match_token *p; @@ -25284,7 +26465,7 @@ index 000000000000..16e785facf9b + return q - str->a; +} + -+static int noinline_for_stack br_perm_val(char *perm) ++int au_br_perm_val(char *perm) +{ + int val, bad, sz; + char *p; @@ -25377,7 +26558,7 @@ index 000000000000..16e785facf9b + {-1, NULL} +}; + -+static int noinline_for_stack udba_val(char *str) ++int au_udba_val(char *str) +{ + substring_t args[MAX_OPT_ARGS]; + @@ -25448,8 +26629,7 @@ index 000000000000..16e785facf9b + return err; +} + -+static int noinline_for_stack -+au_wbr_create_val(char *str, struct au_opt_wbr_create *create) ++int au_wbr_create_val(char *str, struct au_opt_wbr_create *create) +{ + int err, e; + substring_t args[MAX_OPT_ARGS]; @@ -25474,7 +26654,7 @@ index 000000000000..16e785facf9b + err = e; + break; + } -+ /*FALLTHROUGH*/ ++ fallthrough; + case AuWbrCreate_MFS: + case AuWbrCreate_PMFS: + create->mfs_second = AUFS_MFS_DEF_SEC; @@ -25505,7 +26685,7 @@ index 000000000000..16e785facf9b + {-1, NULL} +}; + -+static int noinline_for_stack au_wbr_copyup_val(char *str) ++int au_wbr_copyup_val(char *str) +{ + substring_t args[MAX_OPT_ARGS]; + @@ -25519,235 +26699,8 @@ index 000000000000..16e785facf9b + +/* ---------------------------------------------------------------------- */ + -+static const int lkup_dirflags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY; -+ -+static void dump_opts(struct au_opts *opts) -+{ -+#ifdef CONFIG_AUFS_DEBUG -+ /* reduce stack space */ -+ union { -+ struct au_opt_add *add; -+ struct au_opt_del *del; -+ struct au_opt_mod *mod; -+ struct au_opt_xino *xino; -+ struct au_opt_xino_itrunc *xino_itrunc; -+ struct au_opt_wbr_create *create; -+ } u; -+ struct au_opt *opt; -+ -+ opt = opts->opt; -+ while (opt->type != Opt_tail) { -+ switch (opt->type) { -+ case Opt_add: -+ u.add = &opt->add; -+ AuDbg("add {b%d, %s, 0x%x, %p}\n", -+ u.add->bindex, u.add->pathname, u.add->perm, -+ u.add->path.dentry); -+ break; -+ case Opt_del: -+ case Opt_idel: -+ u.del = &opt->del; -+ AuDbg("del {%s, %p}\n", -+ u.del->pathname, u.del->h_path.dentry); -+ break; -+ case Opt_mod: -+ case Opt_imod: -+ u.mod = &opt->mod; -+ AuDbg("mod {%s, 0x%x, %p}\n", -+ u.mod->path, u.mod->perm, u.mod->h_root); -+ break; -+ case Opt_append: -+ u.add = &opt->add; -+ AuDbg("append {b%d, %s, 0x%x, %p}\n", -+ u.add->bindex, u.add->pathname, u.add->perm, -+ u.add->path.dentry); -+ break; -+ case Opt_prepend: -+ u.add = &opt->add; -+ AuDbg("prepend {b%d, %s, 0x%x, %p}\n", -+ u.add->bindex, u.add->pathname, u.add->perm, -+ u.add->path.dentry); -+ break; -+ case Opt_dirwh: -+ AuDbg("dirwh %d\n", opt->dirwh); -+ break; -+ case Opt_rdcache: -+ AuDbg("rdcache %d\n", opt->rdcache); -+ break; -+ case Opt_rdblk: -+ AuDbg("rdblk %u\n", opt->rdblk); -+ break; -+ case Opt_rdblk_def: -+ AuDbg("rdblk_def\n"); -+ break; -+ case Opt_rdhash: -+ AuDbg("rdhash %u\n", opt->rdhash); -+ break; -+ case Opt_rdhash_def: -+ AuDbg("rdhash_def\n"); -+ break; -+ case Opt_xino: -+ u.xino = &opt->xino; -+ AuDbg("xino {%s %pD}\n", u.xino->path, u.xino->file); -+ break; -+ case Opt_trunc_xino: -+ AuLabel(trunc_xino); -+ break; -+ case Opt_notrunc_xino: -+ AuLabel(notrunc_xino); -+ break; -+ case Opt_trunc_xino_path: -+ case Opt_itrunc_xino: -+ u.xino_itrunc = &opt->xino_itrunc; -+ AuDbg("trunc_xino %d\n", u.xino_itrunc->bindex); -+ break; -+ case Opt_noxino: -+ AuLabel(noxino); -+ break; -+ case Opt_trunc_xib: -+ AuLabel(trunc_xib); -+ break; -+ case Opt_notrunc_xib: -+ AuLabel(notrunc_xib); -+ break; -+ case Opt_shwh: -+ AuLabel(shwh); -+ break; -+ case Opt_noshwh: -+ AuLabel(noshwh); -+ break; -+ case Opt_dirperm1: -+ AuLabel(dirperm1); -+ break; -+ case Opt_nodirperm1: -+ AuLabel(nodirperm1); -+ break; -+ case Opt_plink: -+ AuLabel(plink); -+ break; -+ case Opt_noplink: -+ AuLabel(noplink); -+ break; -+ case Opt_list_plink: -+ AuLabel(list_plink); -+ break; -+ case Opt_udba: -+ AuDbg("udba %d, %s\n", -+ opt->udba, au_optstr_udba(opt->udba)); -+ break; -+ case Opt_dio: -+ AuLabel(dio); -+ break; -+ case Opt_nodio: -+ AuLabel(nodio); -+ break; -+ case Opt_diropq_a: -+ AuLabel(diropq_a); -+ break; -+ case Opt_diropq_w: -+ AuLabel(diropq_w); -+ break; -+ case Opt_warn_perm: -+ AuLabel(warn_perm); -+ break; -+ case Opt_nowarn_perm: -+ AuLabel(nowarn_perm); -+ break; -+ case Opt_verbose: -+ AuLabel(verbose); -+ break; -+ case Opt_noverbose: -+ AuLabel(noverbose); -+ break; -+ case Opt_sum: -+ AuLabel(sum); -+ break; -+ case Opt_nosum: -+ AuLabel(nosum); -+ break; -+ case Opt_wsum: -+ AuLabel(wsum); -+ break; -+ case Opt_wbr_create: -+ u.create = &opt->wbr_create; -+ AuDbg("create %d, %s\n", u.create->wbr_create, -+ au_optstr_wbr_create(u.create->wbr_create)); -+ switch (u.create->wbr_create) { -+ case AuWbrCreate_MFSV: -+ case AuWbrCreate_PMFSV: -+ AuDbg("%d sec\n", u.create->mfs_second); -+ break; -+ case AuWbrCreate_MFSRR: -+ case AuWbrCreate_TDMFS: -+ AuDbg("%llu watermark\n", -+ u.create->mfsrr_watermark); -+ break; -+ case AuWbrCreate_MFSRRV: -+ case AuWbrCreate_TDMFSV: -+ case AuWbrCreate_PMFSRRV: -+ AuDbg("%llu watermark, %d sec\n", -+ u.create->mfsrr_watermark, -+ u.create->mfs_second); -+ break; -+ } -+ break; -+ case Opt_wbr_copyup: -+ AuDbg("copyup %d, %s\n", opt->wbr_copyup, -+ au_optstr_wbr_copyup(opt->wbr_copyup)); -+ break; -+ case Opt_fhsm_sec: -+ AuDbg("fhsm_sec %u\n", opt->fhsm_second); -+ break; -+ case Opt_dirren: -+ AuLabel(dirren); -+ break; -+ case Opt_nodirren: -+ AuLabel(nodirren); -+ break; -+ case Opt_acl: -+ AuLabel(acl); -+ break; -+ case Opt_noacl: -+ AuLabel(noacl); -+ break; -+ default: -+ BUG(); -+ } -+ opt++; -+ } -+#endif -+} -+ -+void au_opts_free(struct au_opts *opts) -+{ -+ struct au_opt *opt; -+ -+ opt = opts->opt; -+ while (opt->type != Opt_tail) { -+ switch (opt->type) { -+ case Opt_add: -+ case Opt_append: -+ case Opt_prepend: -+ path_put(&opt->add.path); -+ break; -+ case Opt_del: -+ case Opt_idel: -+ path_put(&opt->del.h_path); -+ break; -+ case Opt_mod: -+ case Opt_imod: -+ dput(opt->mod.h_root); -+ break; -+ case Opt_xino: -+ fput(opt->xino.file); -+ break; -+ } -+ opt++; -+ } -+} -+ -+static int opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags, -+ aufs_bindex_t bindex) ++int au_opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags, ++ aufs_bindex_t bindex) +{ + int err; + struct au_opt_add *add = &opt->add; @@ -25760,10 +26713,10 @@ index 000000000000..16e785facf9b + if (p) { + *p++ = 0; + if (*p) -+ add->perm = br_perm_val(p); ++ add->perm = au_br_perm_val(p); + } + -+ err = vfsub_kern_path(add->pathname, lkup_dirflags, &add->path); ++ err = vfsub_kern_path(add->pathname, AuOpt_LkupDirFlags, &add->path); + if (!err) { + if (!p) { + add->perm = AuBrPerm_RO; @@ -25782,460 +26735,6 @@ index 000000000000..16e785facf9b + return err; +} + -+static int au_opts_parse_del(struct au_opt_del *del, substring_t args[]) -+{ -+ int err; -+ -+ del->pathname = args[0].from; -+ AuDbg("del path %s\n", del->pathname); -+ -+ err = vfsub_kern_path(del->pathname, lkup_dirflags, &del->h_path); -+ if (unlikely(err)) -+ pr_err("lookup failed %s (%d)\n", del->pathname, err); -+ -+ return err; -+} -+ -+#if 0 /* reserved for future use */ -+static int au_opts_parse_idel(struct super_block *sb, aufs_bindex_t bindex, -+ struct au_opt_del *del, substring_t args[]) -+{ -+ int err; -+ struct dentry *root; -+ -+ err = -EINVAL; -+ root = sb->s_root; -+ aufs_read_lock(root, AuLock_FLUSH); -+ if (bindex < 0 || au_sbbot(sb) < bindex) { -+ pr_err("out of bounds, %d\n", bindex); -+ goto out; -+ } -+ -+ err = 0; -+ del->h_path.dentry = dget(au_h_dptr(root, bindex)); -+ del->h_path.mnt = mntget(au_sbr_mnt(sb, bindex)); -+ -+out: -+ aufs_read_unlock(root, !AuLock_IR); -+ return err; -+} -+#endif -+ -+static int noinline_for_stack -+au_opts_parse_mod(struct au_opt_mod *mod, substring_t args[]) -+{ -+ int err; -+ struct path path; -+ char *p; -+ -+ err = -EINVAL; -+ mod->path = args[0].from; -+ p = strchr(mod->path, '='); -+ if (unlikely(!p)) { -+ pr_err("no permission %s\n", args[0].from); -+ goto out; -+ } -+ -+ *p++ = 0; -+ err = vfsub_kern_path(mod->path, lkup_dirflags, &path); -+ if (unlikely(err)) { -+ pr_err("lookup failed %s (%d)\n", mod->path, err); -+ goto out; -+ } -+ -+ mod->perm = br_perm_val(p); -+ AuDbg("mod path %s, perm 0x%x, %s\n", mod->path, mod->perm, p); -+ mod->h_root = dget(path.dentry); -+ path_put(&path); -+ -+out: -+ return err; -+} -+ -+#if 0 /* reserved for future use */ -+static int au_opts_parse_imod(struct super_block *sb, aufs_bindex_t bindex, -+ struct au_opt_mod *mod, substring_t args[]) -+{ -+ int err; -+ struct dentry *root; -+ -+ err = -EINVAL; -+ root = sb->s_root; -+ aufs_read_lock(root, AuLock_FLUSH); -+ if (bindex < 0 || au_sbbot(sb) < bindex) { -+ pr_err("out of bounds, %d\n", bindex); -+ goto out; -+ } -+ -+ err = 0; -+ mod->perm = br_perm_val(args[1].from); -+ AuDbg("mod path %s, perm 0x%x, %s\n", -+ mod->path, mod->perm, args[1].from); -+ mod->h_root = dget(au_h_dptr(root, bindex)); -+ -+out: -+ aufs_read_unlock(root, !AuLock_IR); -+ return err; -+} -+#endif -+ -+static int au_opts_parse_xino(struct super_block *sb, struct au_opt_xino *xino, -+ substring_t args[]) -+{ -+ int err; -+ struct file *file; -+ -+ file = au_xino_create(sb, args[0].from, /*silent*/0, /*wbrtop*/0); -+ err = PTR_ERR(file); -+ if (IS_ERR(file)) -+ goto out; -+ -+ err = -EINVAL; -+ if (unlikely(file->f_path.dentry->d_sb == sb)) { -+ fput(file); -+ pr_err("%s must be outside\n", args[0].from); -+ goto out; -+ } -+ -+ err = 0; -+ xino->file = file; -+ xino->path = args[0].from; -+ -+out: -+ return err; -+} -+ -+static int noinline_for_stack -+au_opts_parse_xino_itrunc_path(struct super_block *sb, -+ struct au_opt_xino_itrunc *xino_itrunc, -+ substring_t args[]) -+{ -+ int err; -+ aufs_bindex_t bbot, bindex; -+ struct path path; -+ struct dentry *root; -+ -+ err = vfsub_kern_path(args[0].from, lkup_dirflags, &path); -+ if (unlikely(err)) { -+ pr_err("lookup failed %s (%d)\n", args[0].from, err); -+ goto out; -+ } -+ -+ xino_itrunc->bindex = -1; -+ root = sb->s_root; -+ aufs_read_lock(root, AuLock_FLUSH); -+ bbot = au_sbbot(sb); -+ for (bindex = 0; bindex <= bbot; bindex++) { -+ if (au_h_dptr(root, bindex) == path.dentry) { -+ xino_itrunc->bindex = bindex; -+ break; -+ } -+ } -+ aufs_read_unlock(root, !AuLock_IR); -+ path_put(&path); -+ -+ if (unlikely(xino_itrunc->bindex < 0)) { -+ pr_err("no such branch %s\n", args[0].from); -+ err = -EINVAL; -+ } -+ -+out: -+ return err; -+} -+ -+/* called without aufs lock */ -+int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts) -+{ -+ int err, n, token; -+ aufs_bindex_t bindex; -+ unsigned char skipped; -+ struct dentry *root; -+ struct au_opt *opt, *opt_tail; -+ char *opt_str; -+ /* reduce the stack space */ -+ union { -+ struct au_opt_xino_itrunc *xino_itrunc; -+ struct au_opt_wbr_create *create; -+ } u; -+ struct { -+ substring_t args[MAX_OPT_ARGS]; -+ } *a; -+ -+ err = -ENOMEM; -+ a = kmalloc(sizeof(*a), GFP_NOFS); -+ if (unlikely(!a)) -+ goto out; -+ -+ root = sb->s_root; -+ err = 0; -+ bindex = 0; -+ opt = opts->opt; -+ opt_tail = opt + opts->max_opt - 1; -+ opt->type = Opt_tail; -+ while (!err && (opt_str = strsep(&str, ",")) && *opt_str) { -+ err = -EINVAL; -+ skipped = 0; -+ token = match_token(opt_str, options, a->args); -+ switch (token) { -+ case Opt_br: -+ err = 0; -+ while (!err && (opt_str = strsep(&a->args[0].from, ":")) -+ && *opt_str) { -+ err = opt_add(opt, opt_str, opts->sb_flags, -+ bindex++); -+ if (unlikely(!err && ++opt > opt_tail)) { -+ err = -E2BIG; -+ break; -+ } -+ opt->type = Opt_tail; -+ skipped = 1; -+ } -+ break; -+ case Opt_add: -+ if (unlikely(match_int(&a->args[0], &n))) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ bindex = n; -+ err = opt_add(opt, a->args[1].from, opts->sb_flags, -+ bindex); -+ if (!err) -+ opt->type = token; -+ break; -+ case Opt_append: -+ err = opt_add(opt, a->args[0].from, opts->sb_flags, -+ /*dummy bindex*/1); -+ if (!err) -+ opt->type = token; -+ break; -+ case Opt_prepend: -+ err = opt_add(opt, a->args[0].from, opts->sb_flags, -+ /*bindex*/0); -+ if (!err) -+ opt->type = token; -+ break; -+ case Opt_del: -+ err = au_opts_parse_del(&opt->del, a->args); -+ if (!err) -+ opt->type = token; -+ break; -+#if 0 /* reserved for future use */ -+ case Opt_idel: -+ del->pathname = "(indexed)"; -+ if (unlikely(match_int(&args[0], &n))) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ err = au_opts_parse_idel(sb, n, &opt->del, a->args); -+ if (!err) -+ opt->type = token; -+ break; -+#endif -+ case Opt_mod: -+ err = au_opts_parse_mod(&opt->mod, a->args); -+ if (!err) -+ opt->type = token; -+ break; -+#ifdef IMOD /* reserved for future use */ -+ case Opt_imod: -+ u.mod->path = "(indexed)"; -+ if (unlikely(match_int(&a->args[0], &n))) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ err = au_opts_parse_imod(sb, n, &opt->mod, a->args); -+ if (!err) -+ opt->type = token; -+ break; -+#endif -+ case Opt_xino: -+ err = au_opts_parse_xino(sb, &opt->xino, a->args); -+ if (!err) -+ opt->type = token; -+ break; -+ -+ case Opt_trunc_xino_path: -+ err = au_opts_parse_xino_itrunc_path -+ (sb, &opt->xino_itrunc, a->args); -+ if (!err) -+ opt->type = token; -+ break; -+ -+ case Opt_itrunc_xino: -+ u.xino_itrunc = &opt->xino_itrunc; -+ if (unlikely(match_int(&a->args[0], &n))) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ u.xino_itrunc->bindex = n; -+ aufs_read_lock(root, AuLock_FLUSH); -+ if (n < 0 || au_sbbot(sb) < n) { -+ pr_err("out of bounds, %d\n", n); -+ aufs_read_unlock(root, !AuLock_IR); -+ break; -+ } -+ aufs_read_unlock(root, !AuLock_IR); -+ err = 0; -+ opt->type = token; -+ break; -+ -+ case Opt_dirwh: -+ if (unlikely(match_int(&a->args[0], &opt->dirwh))) -+ break; -+ err = 0; -+ opt->type = token; -+ break; -+ -+ case Opt_rdcache: -+ if (unlikely(match_int(&a->args[0], &n))) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ if (unlikely(n > AUFS_RDCACHE_MAX)) { -+ pr_err("rdcache must be smaller than %d\n", -+ AUFS_RDCACHE_MAX); -+ break; -+ } -+ opt->rdcache = n; -+ err = 0; -+ opt->type = token; -+ break; -+ case Opt_rdblk: -+ if (unlikely(match_int(&a->args[0], &n) -+ || n < 0 -+ || n > KMALLOC_MAX_SIZE)) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ if (unlikely(n && n < NAME_MAX)) { -+ pr_err("rdblk must be larger than %d\n", -+ NAME_MAX); -+ break; -+ } -+ opt->rdblk = n; -+ err = 0; -+ opt->type = token; -+ break; -+ case Opt_rdhash: -+ if (unlikely(match_int(&a->args[0], &n) -+ || n < 0 -+ || n * sizeof(struct hlist_head) -+ > KMALLOC_MAX_SIZE)) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ opt->rdhash = n; -+ err = 0; -+ opt->type = token; -+ break; -+ -+ case Opt_trunc_xino: -+ case Opt_notrunc_xino: -+ case Opt_noxino: -+ case Opt_trunc_xib: -+ case Opt_notrunc_xib: -+ case Opt_shwh: -+ case Opt_noshwh: -+ case Opt_dirperm1: -+ case Opt_nodirperm1: -+ case Opt_plink: -+ case Opt_noplink: -+ case Opt_list_plink: -+ case Opt_dio: -+ case Opt_nodio: -+ case Opt_diropq_a: -+ case Opt_diropq_w: -+ case Opt_warn_perm: -+ case Opt_nowarn_perm: -+ case Opt_verbose: -+ case Opt_noverbose: -+ case Opt_sum: -+ case Opt_nosum: -+ case Opt_wsum: -+ case Opt_rdblk_def: -+ case Opt_rdhash_def: -+ case Opt_dirren: -+ case Opt_nodirren: -+ case Opt_acl: -+ case Opt_noacl: -+ err = 0; -+ opt->type = token; -+ break; -+ -+ case Opt_udba: -+ opt->udba = udba_val(a->args[0].from); -+ if (opt->udba >= 0) { -+ err = 0; -+ opt->type = token; -+ } else -+ pr_err("wrong value, %s\n", opt_str); -+ break; -+ -+ case Opt_wbr_create: -+ u.create = &opt->wbr_create; -+ u.create->wbr_create -+ = au_wbr_create_val(a->args[0].from, u.create); -+ if (u.create->wbr_create >= 0) { -+ err = 0; -+ opt->type = token; -+ } else -+ pr_err("wrong value, %s\n", opt_str); -+ break; -+ case Opt_wbr_copyup: -+ opt->wbr_copyup = au_wbr_copyup_val(a->args[0].from); -+ if (opt->wbr_copyup >= 0) { -+ err = 0; -+ opt->type = token; -+ } else -+ pr_err("wrong value, %s\n", opt_str); -+ break; -+ -+ case Opt_fhsm_sec: -+ if (unlikely(match_int(&a->args[0], &n) -+ || n < 0)) { -+ pr_err("bad integer in %s\n", opt_str); -+ break; -+ } -+ if (sysaufs_brs) { -+ opt->fhsm_second = n; -+ opt->type = token; -+ } else -+ pr_warn("ignored %s\n", opt_str); -+ err = 0; -+ break; -+ -+ case Opt_ignore: -+ pr_warn("ignored %s\n", opt_str); -+ /*FALLTHROUGH*/ -+ case Opt_ignore_silent: -+ skipped = 1; -+ err = 0; -+ break; -+ case Opt_err: -+ pr_err("unknown option %s\n", opt_str); -+ break; -+ } -+ -+ if (!err && !skipped) { -+ if (unlikely(++opt > opt_tail)) { -+ err = -E2BIG; -+ opt--; -+ opt->type = Opt_tail; -+ break; -+ } -+ opt->type = Opt_tail; -+ } -+ } -+ -+ au_kfree_rcu(a); -+ dump_opts(opts); -+ if (unlikely(err)) -+ au_opts_free(opts); -+ -+out: -+ return err; -+} -+ +static int au_opt_wbr_create(struct super_block *sb, + struct au_opt_wbr_create *create) +{ @@ -26262,7 +26761,7 @@ index 000000000000..16e785facf9b + case AuWbrCreate_PMFSRR: + case AuWbrCreate_PMFSRRV: + sbinfo->si_wbr_mfs.mfsrr_watermark = create->mfsrr_watermark; -+ /*FALLTHROUGH*/ ++ fallthrough; + case AuWbrCreate_MFS: + case AuWbrCreate_MFSV: + case AuWbrCreate_PMFS: @@ -26301,12 +26800,13 @@ index 000000000000..16e785facf9b + break; + + case Opt_plink: -+ au_opt_set(sbinfo->si_mntflags, PLINK); -+ break; -+ case Opt_noplink: -+ if (au_opt_test(sbinfo->si_mntflags, PLINK)) -+ au_plink_put(sb, /*verbose*/1); -+ au_opt_clr(sbinfo->si_mntflags, PLINK); ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, PLINK); ++ else { ++ if (au_opt_test(sbinfo->si_mntflags, PLINK)) ++ au_plink_put(sb, /*verbose*/1); ++ au_opt_clr(sbinfo->si_mntflags, PLINK); ++ } + break; + case Opt_list_plink: + if (au_opt_test(sbinfo->si_mntflags, PLINK)) @@ -26314,12 +26814,13 @@ index 000000000000..16e785facf9b + break; + + case Opt_dio: -+ au_opt_set(sbinfo->si_mntflags, DIO); -+ au_fset_opts(opts->flags, REFRESH_DYAOP); -+ break; -+ case Opt_nodio: -+ au_opt_clr(sbinfo->si_mntflags, DIO); -+ au_fset_opts(opts->flags, REFRESH_DYAOP); ++ if (opt->tf) { ++ au_opt_set(sbinfo->si_mntflags, DIO); ++ au_fset_opts(opts->flags, REFRESH_DYAOP); ++ } else { ++ au_opt_clr(sbinfo->si_mntflags, DIO); ++ au_fset_opts(opts->flags, REFRESH_DYAOP); ++ } + break; + + case Opt_fhsm_sec: @@ -26334,30 +26835,31 @@ index 000000000000..16e785facf9b + break; + + case Opt_warn_perm: -+ au_opt_set(sbinfo->si_mntflags, WARN_PERM); -+ break; -+ case Opt_nowarn_perm: -+ au_opt_clr(sbinfo->si_mntflags, WARN_PERM); ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, WARN_PERM); ++ else ++ au_opt_clr(sbinfo->si_mntflags, WARN_PERM); + break; + + case Opt_verbose: -+ au_opt_set(sbinfo->si_mntflags, VERBOSE); -+ break; -+ case Opt_noverbose: -+ au_opt_clr(sbinfo->si_mntflags, VERBOSE); ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, VERBOSE); ++ else ++ au_opt_clr(sbinfo->si_mntflags, VERBOSE); + break; + + case Opt_sum: -+ au_opt_set(sbinfo->si_mntflags, SUM); ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, SUM); ++ else { ++ au_opt_clr(sbinfo->si_mntflags, SUM); ++ au_opt_clr(sbinfo->si_mntflags, SUM_W); ++ } + break; + case Opt_wsum: + au_opt_clr(sbinfo->si_mntflags, SUM); + au_opt_set(sbinfo->si_mntflags, SUM_W); + break; -+ case Opt_nosum: -+ au_opt_clr(sbinfo->si_mntflags, SUM); -+ au_opt_clr(sbinfo->si_mntflags, SUM_W); -+ break; + + case Opt_wbr_create: + err = au_opt_wbr_create(sb, &opt->wbr_create); @@ -26378,35 +26880,29 @@ index 000000000000..16e785facf9b + case Opt_rdblk: + sbinfo->si_rdblk = opt->rdblk; + break; -+ case Opt_rdblk_def: -+ sbinfo->si_rdblk = AUFS_RDBLK_DEF; -+ break; + case Opt_rdhash: + sbinfo->si_rdhash = opt->rdhash; + break; -+ case Opt_rdhash_def: -+ sbinfo->si_rdhash = AUFS_RDHASH_DEF; -+ break; + + case Opt_shwh: -+ au_opt_set(sbinfo->si_mntflags, SHWH); -+ break; -+ case Opt_noshwh: -+ au_opt_clr(sbinfo->si_mntflags, SHWH); ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, SHWH); ++ else ++ au_opt_clr(sbinfo->si_mntflags, SHWH); + break; + + case Opt_dirperm1: -+ au_opt_set(sbinfo->si_mntflags, DIRPERM1); -+ break; -+ case Opt_nodirperm1: -+ au_opt_clr(sbinfo->si_mntflags, DIRPERM1); ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, DIRPERM1); ++ else ++ au_opt_clr(sbinfo->si_mntflags, DIRPERM1); + break; + + case Opt_trunc_xino: -+ au_opt_set(sbinfo->si_mntflags, TRUNC_XINO); -+ break; -+ case Opt_notrunc_xino: -+ au_opt_clr(sbinfo->si_mntflags, TRUNC_XINO); ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, TRUNC_XINO); ++ else ++ au_opt_clr(sbinfo->si_mntflags, TRUNC_XINO); + break; + + case Opt_trunc_xino_path: @@ -26418,39 +26914,39 @@ index 000000000000..16e785facf9b + break; + + case Opt_trunc_xib: -+ au_fset_opts(opts->flags, TRUNC_XIB); -+ break; -+ case Opt_notrunc_xib: -+ au_fclr_opts(opts->flags, TRUNC_XIB); ++ if (opt->tf) ++ au_fset_opts(opts->flags, TRUNC_XIB); ++ else ++ au_fclr_opts(opts->flags, TRUNC_XIB); + break; + + case Opt_dirren: + err = 1; -+ if (!au_opt_test(sbinfo->si_mntflags, DIRREN)) { -+ err = au_dr_opt_set(sb); -+ if (!err) -+ err = 1; -+ } -+ if (err == 1) -+ au_opt_set(sbinfo->si_mntflags, DIRREN); -+ break; -+ case Opt_nodirren: -+ err = 1; -+ if (au_opt_test(sbinfo->si_mntflags, DIRREN)) { -+ err = au_dr_opt_clr(sb, au_ftest_opts(opts->flags, -+ DR_FLUSHED)); -+ if (!err) -+ err = 1; ++ if (opt->tf) { ++ if (!au_opt_test(sbinfo->si_mntflags, DIRREN)) { ++ err = au_dr_opt_set(sb); ++ if (!err) ++ err = 1; ++ } ++ if (err == 1) ++ au_opt_set(sbinfo->si_mntflags, DIRREN); ++ } else { ++ if (au_opt_test(sbinfo->si_mntflags, DIRREN)) { ++ err = au_dr_opt_clr(sb, au_ftest_opts(opts->flags, ++ DR_FLUSHED)); ++ if (!err) ++ err = 1; ++ } ++ if (err == 1) ++ au_opt_clr(sbinfo->si_mntflags, DIRREN); + } -+ if (err == 1) -+ au_opt_clr(sbinfo->si_mntflags, DIRREN); + break; + + case Opt_acl: -+ sb->s_flags |= SB_POSIXACL; -+ break; -+ case Opt_noacl: -+ sb->s_flags &= ~SB_POSIXACL; ++ if (opt->tf) ++ sb->s_flags |= SB_POSIXACL; ++ else ++ sb->s_flags &= ~SB_POSIXACL; + break; + + default: @@ -26482,7 +26978,7 @@ index 000000000000..16e785facf9b + /* Always goto add, not fallthrough */ + case Opt_prepend: + opt->add.bindex = 0; -+ /* fallthrough */ ++ fallthrough; + add: /* indented label */ + case Opt_add: + err = au_br_add(sb, &opt->add, @@ -26530,12 +27026,9 @@ index 000000000000..16e785facf9b + case Opt_xino: + err = au_xino_set(sb, &opt->xino, + !!au_ftest_opts(opts->flags, REMOUNT)); -+ if (unlikely(err)) -+ break; -+ -+ *opt_xino = &opt->xino; ++ if (!err) ++ *opt_xino = &opt->xino; + break; -+ + case Opt_noxino: + au_xino_clr(sb); + *opt_xino = (void *)-1; @@ -26847,15 +27340,15 @@ index 000000000000..16e785facf9b +} diff --git a/fs/aufs/opts.h b/fs/aufs/opts.h new file mode 100644 -index 000000000000..79f3ea56f8bb +index 000000000000..d8bbdbf0560a --- /dev/null +++ b/fs/aufs/opts.h -@@ -0,0 +1,225 @@ +@@ -0,0 +1,263 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -26878,9 +27371,34 @@ index 000000000000..79f3ea56f8bb + +#ifdef __KERNEL__ + ++#include <linux/fs_parser.h> ++#include <linux/namei.h> +#include <linux/path.h> + -+struct file; ++enum { ++ Opt_br, ++ Opt_add, Opt_del, Opt_mod, Opt_append, Opt_prepend, ++ Opt_idel, Opt_imod, ++ Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash, ++ Opt_xino, Opt_noxino, ++ Opt_trunc_xino, Opt_trunc_xino_v, ++ Opt_trunc_xino_path, Opt_itrunc_xino, ++ Opt_trunc_xib, ++ Opt_shwh, ++ Opt_plink, Opt_list_plink, ++ Opt_udba, ++ Opt_dio, ++ Opt_diropq, Opt_diropq_a, Opt_diropq_w, ++ Opt_warn_perm, ++ Opt_wbr_copyup, Opt_wbr_create, ++ Opt_fhsm_sec, ++ Opt_verbose, Opt_noverbose, ++ Opt_sum, Opt_wsum, ++ Opt_dirperm1, ++ Opt_dirren, ++ Opt_acl, ++ Opt_tail, Opt_ignore, Opt_ignore_silent, Opt_err ++}; + +/* ---------------------------------------------------------------------- */ + @@ -26925,6 +27443,8 @@ index 000000000000..79f3ea56f8bb + | AuOpt_UDBA_REVAL \ + | AuOpt_UDBA_HNOTIFY) + ++#define AuOpt_LkupDirFlags (LOOKUP_FOLLOW | LOOKUP_DIRECTORY) ++ +#define au_opt_test(flags, name) (flags & AuOpt_##name) +#define au_opt_set(flags, name) do { \ + BUILD_BUG_ON(AuOpt_##name & AuOptMask_UDBA); \ @@ -26977,6 +27497,8 @@ index 000000000000..79f3ea56f8bb + +/* ---------------------------------------------------------------------- */ + ++struct file; ++ +struct au_opt_add { + aufs_bindex_t bindex; + char *pathname; @@ -27026,6 +27548,7 @@ index 000000000000..79f3ea56f8bb + struct au_opt_wbr_create wbr_create; + int wbr_copyup; + unsigned int fhsm_second; ++ bool tf; /* generic flag, true or false */ + }; +}; + @@ -27059,14 +27582,18 @@ index 000000000000..79f3ea56f8bb +/* ---------------------------------------------------------------------- */ + +/* opts.c */ ++int au_br_perm_val(char *perm); +void au_optstr_br_perm(au_br_perm_str_t *str, int perm); ++int au_udba_val(char *str); +const char *au_optstr_udba(int udba); -+const char *au_optstr_wbr_copyup(int wbr_copyup); ++int au_wbr_create_val(char *str, struct au_opt_wbr_create *create); +const char *au_optstr_wbr_create(int wbr_create); ++int au_wbr_copyup_val(char *str); ++const char *au_optstr_wbr_copyup(int wbr_copyup); + -+void au_opts_free(struct au_opts *opts); ++int au_opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags, ++ aufs_bindex_t bindex); +struct super_block; -+int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts); +int au_opts_verify(struct super_block *sb, unsigned long sb_flags, + unsigned int pending); +int au_opts_mount(struct super_block *sb, struct au_opts *opts); @@ -27074,19 +27601,23 @@ index 000000000000..79f3ea56f8bb + +unsigned int au_opt_udba(struct super_block *sb); + ++/* fsctx.c */ ++int aufs_fsctx_init(struct fs_context *fc); ++extern const struct fs_parameter_spec aufs_fsctx_paramspec[]; ++ +#endif /* __KERNEL__ */ +#endif /* __AUFS_OPTS_H__ */ diff --git a/fs/aufs/plink.c b/fs/aufs/plink.c new file mode 100644 -index 000000000000..850829b21888 +index 000000000000..5f9a5b50dcc6 --- /dev/null +++ b/fs/aufs/plink.c @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -27290,35 +27821,35 @@ index 000000000000..850829b21888 +struct au_do_plink_lkup_args { + struct dentry **errp; + struct qstr *tgtname; -+ struct dentry *h_parent; -+ struct au_branch *br; ++ struct path *h_ppath; +}; + +static struct dentry *au_do_plink_lkup(struct qstr *tgtname, -+ struct dentry *h_parent, -+ struct au_branch *br) ++ struct path *h_ppath) +{ + struct dentry *h_dentry; + struct inode *h_inode; + -+ h_inode = d_inode(h_parent); ++ h_inode = d_inode(h_ppath->dentry); + inode_lock_shared_nested(h_inode, AuLsc_I_CHILD2); -+ h_dentry = vfsub_lkup_one(tgtname, h_parent); ++ h_dentry = vfsub_lkup_one(tgtname, h_ppath); + inode_unlock_shared(h_inode); ++ + return h_dentry; +} + +static void au_call_do_plink_lkup(void *args) +{ + struct au_do_plink_lkup_args *a = args; -+ *a->errp = au_do_plink_lkup(a->tgtname, a->h_parent, a->br); ++ *a->errp = au_do_plink_lkup(a->tgtname, a->h_ppath); +} + +/* lookup the plink-ed @inode under the branch at @bindex */ +struct dentry *au_plink_lkup(struct inode *inode, aufs_bindex_t bindex) +{ -+ struct dentry *h_dentry, *h_parent; ++ struct dentry *h_dentry; + struct au_branch *br; ++ struct path h_ppath; + int wkq_err; + char a[PLINK_NAME_LEN]; + struct qstr tgtname = QSTR_INIT(a, 0); @@ -27326,40 +27857,39 @@ index 000000000000..850829b21888 + AuDebugOn(au_plink_maint(inode->i_sb, AuLock_NOPLM)); + + br = au_sbr(inode->i_sb, bindex); -+ h_parent = br->br_wbr->wbr_plink; ++ h_ppath.dentry = br->br_wbr->wbr_plink; ++ h_ppath.mnt = au_br_mnt(br); + tgtname.len = plink_name(a, sizeof(a), inode, bindex); + + if (!uid_eq(current_fsuid(), GLOBAL_ROOT_UID)) { + struct au_do_plink_lkup_args args = { + .errp = &h_dentry, + .tgtname = &tgtname, -+ .h_parent = h_parent, -+ .br = br ++ .h_ppath = &h_ppath + }; + + wkq_err = au_wkq_wait(au_call_do_plink_lkup, &args); + if (unlikely(wkq_err)) + h_dentry = ERR_PTR(wkq_err); + } else -+ h_dentry = au_do_plink_lkup(&tgtname, h_parent, br); ++ h_dentry = au_do_plink_lkup(&tgtname, &h_ppath); + + return h_dentry; +} + +/* create a pseudo-link */ -+static int do_whplink(struct qstr *tgt, struct dentry *h_parent, -+ struct dentry *h_dentry, struct au_branch *br) ++static int do_whplink(struct qstr *tgt, struct path *h_ppath, ++ struct dentry *h_dentry) +{ + int err; -+ struct path h_path = { -+ .mnt = au_br_mnt(br) -+ }; ++ struct path h_path; + struct inode *h_dir, *delegated; + -+ h_dir = d_inode(h_parent); ++ h_dir = d_inode(h_ppath->dentry); + inode_lock_nested(h_dir, AuLsc_I_CHILD2); ++ h_path.mnt = h_ppath->mnt; +again: -+ h_path.dentry = vfsub_lkup_one(tgt, h_parent); ++ h_path.dentry = vfsub_lkup_one(tgt, h_ppath); + err = PTR_ERR(h_path.dentry); + if (IS_ERR(h_path.dentry)) + goto out; @@ -27400,28 +27930,30 @@ index 000000000000..850829b21888 +struct do_whplink_args { + int *errp; + struct qstr *tgt; -+ struct dentry *h_parent; ++ struct path *h_ppath; + struct dentry *h_dentry; -+ struct au_branch *br; +}; + +static void call_do_whplink(void *args) +{ + struct do_whplink_args *a = args; -+ *a->errp = do_whplink(a->tgt, a->h_parent, a->h_dentry, a->br); ++ *a->errp = do_whplink(a->tgt, a->h_ppath, a->h_dentry); +} + +static int whplink(struct dentry *h_dentry, struct inode *inode, -+ aufs_bindex_t bindex, struct au_branch *br) ++ aufs_bindex_t bindex) +{ + int err, wkq_err; ++ struct au_branch *br; + struct au_wbr *wbr; -+ struct dentry *h_parent; ++ struct path h_ppath; + char a[PLINK_NAME_LEN]; + struct qstr tgtname = QSTR_INIT(a, 0); + -+ wbr = au_sbr(inode->i_sb, bindex)->br_wbr; -+ h_parent = wbr->wbr_plink; ++ br = au_sbr(inode->i_sb, bindex); ++ wbr = br->br_wbr; ++ h_ppath.dentry = wbr->wbr_plink; ++ h_ppath.mnt = au_br_mnt(br); + tgtname.len = plink_name(a, sizeof(a), inode, bindex); + + /* always superio. */ @@ -27429,15 +27961,14 @@ index 000000000000..850829b21888 + struct do_whplink_args args = { + .errp = &err, + .tgt = &tgtname, -+ .h_parent = h_parent, -+ .h_dentry = h_dentry, -+ .br = br ++ .h_ppath = &h_ppath, ++ .h_dentry = h_dentry + }; + wkq_err = au_wkq_wait(call_do_whplink, &args); + if (unlikely(wkq_err)) + err = wkq_err; + } else -+ err = do_whplink(&tgtname, h_parent, h_dentry, br); ++ err = do_whplink(&tgtname, &h_ppath, h_dentry); + + return err; +} @@ -27487,7 +28018,7 @@ index 000000000000..850829b21888 + if (cnt > AUFS_PLINK_WARN) + AuWarn1(msg ", %d\n", cnt); +#undef msg -+ err = whplink(h_dentry, inode, bindex, au_sbr(sb, bindex)); ++ err = whplink(h_dentry, inode, bindex); + if (unlikely(err)) { + pr_warn("err %d, damaged pseudo link.\n", err); + au_hbl_del(&icntnr->plink, hbl); @@ -27600,15 +28131,15 @@ index 000000000000..850829b21888 +} diff --git a/fs/aufs/poll.c b/fs/aufs/poll.c new file mode 100644 -index 000000000000..6975d3ab2d29 +index 000000000000..83defa454c8e --- /dev/null +++ b/fs/aufs/poll.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -27657,15 +28188,15 @@ index 000000000000..6975d3ab2d29 +} diff --git a/fs/aufs/posix_acl.c b/fs/aufs/posix_acl.c new file mode 100644 -index 000000000000..0789335650de +index 000000000000..03742bcc6603 --- /dev/null +++ b/fs/aufs/posix_acl.c -@@ -0,0 +1,105 @@ +@@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2014-2020 Junjiro R. Okajima ++ * Copyright (C) 2014-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -27686,7 +28217,7 @@ index 000000000000..0789335650de +#include <linux/fs.h> +#include "aufs.h" + -+struct posix_acl *aufs_get_acl(struct inode *inode, int type) ++struct posix_acl *aufs_get_inode_acl(struct inode *inode, int type, bool rcu) +{ + struct posix_acl *acl; + int err; @@ -27694,12 +28225,16 @@ index 000000000000..0789335650de + struct inode *h_inode; + struct super_block *sb; + ++ acl = ERR_PTR(-ECHILD); ++ if (rcu) ++ goto out; ++ + acl = NULL; + sb = inode->i_sb; + si_read_lock(sb, AuLock_FLUSH); + ii_read_lock_child(inode); + if (!(sb->s_flags & SB_POSIXACL)) -+ goto out; ++ goto unlock; + + bindex = au_ibtop(inode); + h_inode = au_h_iptr(inode, bindex); @@ -27708,29 +28243,43 @@ index 000000000000..0789335650de + != (inode->i_mode & S_IFMT)))) { + err = au_busy_or_stale(); + acl = ERR_PTR(err); -+ goto out; ++ goto unlock; + } + + /* always topmost only */ -+ acl = get_acl(h_inode, type); ++ acl = get_inode_acl(h_inode, type); + if (IS_ERR(acl)) + forget_cached_acl(inode, type); + else + set_cached_acl(inode, type, acl); + -+out: ++unlock: + ii_read_unlock(inode); + si_read_unlock(sb); + ++out: + AuTraceErrPtr(acl); + return acl; +} + -+int aufs_set_acl(struct inode *inode, struct posix_acl *acl, int type) ++struct posix_acl *aufs_get_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, int type) ++{ ++ struct posix_acl *acl; ++ struct inode *inode; ++ ++ inode = d_inode(dentry); ++ acl = aufs_get_inode_acl(inode, type, /*rcu*/false); ++ ++ return acl; ++} ++ ++int aufs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, ++ struct posix_acl *acl, int type) +{ + int err; + ssize_t ssz; -+ struct dentry *dentry; ++ struct inode *inode; + struct au_sxattr arg = { + .type = AU_ACL_SET, + .u.acl_set = { @@ -27739,44 +28288,29 @@ index 000000000000..0789335650de + }, + }; + ++ inode = d_inode(dentry); + IMustLock(inode); + -+ if (inode->i_ino == AUFS_ROOT_INO) -+ dentry = dget(inode->i_sb->s_root); -+ else { -+ dentry = d_find_alias(inode); -+ if (!dentry) -+ dentry = d_find_any_alias(inode); -+ if (!dentry) { -+ pr_warn("cannot handle this inode, " -+ "please report to aufs-users ML\n"); -+ err = -ENOENT; -+ goto out; -+ } -+ } -+ + ssz = au_sxattr(dentry, inode, &arg); + /* forget even it if succeeds since the branch might set differently */ + forget_cached_acl(inode, type); -+ dput(dentry); + err = ssz; + if (ssz >= 0) + err = 0; + -+out: + return err; +} diff --git a/fs/aufs/procfs.c b/fs/aufs/procfs.c new file mode 100644 -index 000000000000..50ee0a9c1bcb +index 000000000000..0fca104ac554 --- /dev/null +++ b/fs/aufs/procfs.c @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2010-2020 Junjiro R. Okajima ++ * Copyright (C) 2010-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -27944,15 +28478,15 @@ index 000000000000..50ee0a9c1bcb +} diff --git a/fs/aufs/rdu.c b/fs/aufs/rdu.c new file mode 100644 -index 000000000000..afd77564f3dc +index 000000000000..144251c02c3f --- /dev/null +++ b/fs/aufs/rdu.c @@ -0,0 +1,384 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -27995,8 +28529,8 @@ index 000000000000..afd77564f3dc + int err; +}; + -+static int au_rdu_fill(struct dir_context *ctx, const char *name, int nlen, -+ loff_t offset, u64 h_ino, unsigned int d_type) ++static bool au_rdu_fill(struct dir_context *ctx, const char *name, int nlen, ++ loff_t offset, u64 h_ino, unsigned int d_type) +{ + int err, len; + struct au_rdu_arg *arg = container_of(ctx, struct au_rdu_arg, ctx); @@ -28037,7 +28571,7 @@ index 000000000000..afd77564f3dc + +out: + /* AuTraceErr(err); */ -+ return err; ++ return !err; +} + +static int au_rdu_do(struct file *h_file, struct au_rdu_arg *arg) @@ -28100,7 +28634,7 @@ index 000000000000..afd77564f3dc + arg.end += rdu->sz; + + err = -ENOTDIR; -+ if (unlikely(!file->f_op->iterate && !file->f_op->iterate_shared)) ++ if (unlikely(!file->f_op->iterate_shared)) + goto out; + + err = security_file_permission(file, MAY_READ); @@ -28334,15 +28868,15 @@ index 000000000000..afd77564f3dc +#endif diff --git a/fs/aufs/rwsem.h b/fs/aufs/rwsem.h new file mode 100644 -index 000000000000..370eae159348 +index 000000000000..9d9cd50ef155 --- /dev/null +++ b/fs/aufs/rwsem.h -@@ -0,0 +1,73 @@ +@@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -28372,19 +28906,31 @@ index 000000000000..370eae159348 + +/* to debug easier, do not make them inlined functions */ +#define AuRwMustNoWaiters(rw) AuDebugOn(rwsem_is_contended(rw)) ++ ++#ifdef CONFIG_LOCKDEP +/* rwsem_is_locked() is unusable */ -+#define AuRwMustReadLock(rw) AuDebugOn(!lockdep_recursing(current) \ -+ && debug_locks \ ++#define AuRwMustReadLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ + && !lockdep_is_held_type(rw, 1)) -+#define AuRwMustWriteLock(rw) AuDebugOn(!lockdep_recursing(current) \ -+ && debug_locks \ ++#define AuRwMustWriteLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ + && !lockdep_is_held_type(rw, 0)) -+#define AuRwMustAnyLock(rw) AuDebugOn(!lockdep_recursing(current) \ -+ && debug_locks \ ++#define AuRwMustAnyLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ + && !lockdep_is_held(rw)) -+#define AuRwDestroy(rw) AuDebugOn(!lockdep_recursing(current) \ -+ && debug_locks \ ++#define AuRwDestroy(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ + && lockdep_is_held(rw)) ++#else ++#define AuRwMustReadLock(rw) do {} while (0) ++#define AuRwMustWriteLock(rw) do {} while (0) ++#define AuRwMustAnyLock(rw) do {} while (0) ++#define AuRwDestroy(rw) do {} while (0) ++#endif + +#define au_rw_init(rw) init_rwsem(rw) + @@ -28413,15 +28959,15 @@ index 000000000000..370eae159348 +#endif /* __AUFS_RWSEM_H__ */ diff --git a/fs/aufs/sbinfo.c b/fs/aufs/sbinfo.c new file mode 100644 -index 000000000000..3835be61d978 +index 000000000000..dde9f9c17b18 --- /dev/null +++ b/fs/aufs/sbinfo.c -@@ -0,0 +1,314 @@ +@@ -0,0 +1,316 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -28475,10 +29021,10 @@ index 000000000000..3835be61d978 + au_kfree_rcu(sbinfo); +} + -+int au_si_alloc(struct super_block *sb) ++struct au_sbinfo *au_si_alloc(struct super_block *sb) +{ -+ int err, i; + struct au_sbinfo *sbinfo; ++ int err, i; + + err = -ENOMEM; + sbinfo = kzalloc(sizeof(*sbinfo), GFP_NOFS); @@ -28543,16 +29089,18 @@ index 000000000000..3835be61d978 + + /* leave other members for sysaufs and si_mnt. */ + sbinfo->si_sb = sb; -+ sb->s_fs_info = sbinfo; -+ si_pid_set(sb); -+ return 0; /* success */ ++ if (sb) { ++ sb->s_fs_info = sbinfo; ++ si_pid_set(sb); ++ } ++ return sbinfo; /* success */ + +out_br: + au_kfree_try_rcu(sbinfo->si_branch); +out_sbinfo: + au_kfree_rcu(sbinfo); +out: -+ return err; ++ return ERR_PTR(err); +} + +int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink) @@ -28733,15 +29281,15 @@ index 000000000000..3835be61d978 +} diff --git a/fs/aufs/super.c b/fs/aufs/super.c new file mode 100644 -index 000000000000..aa7f210e5493 +index 000000000000..77c6d90808bb --- /dev/null +++ b/fs/aufs/super.c -@@ -0,0 +1,1047 @@ +@@ -0,0 +1,871 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -28773,7 +29321,7 @@ index 000000000000..aa7f210e5493 +{ + struct au_icntnr *c; + -+ c = au_cache_alloc_icntnr(); ++ c = au_cache_alloc_icntnr(sb); + if (c) { + au_icntnr_init(c); + inode_set_iversion(&c->vfs_inode, 1); /* sigen(sb); */ @@ -28856,7 +29404,7 @@ index 000000000000..aa7f210e5493 + return err; +} + -+static void au_gen_fmt(char *fmt, int len __maybe_unused, const char *pat, ++static void au_gen_fmt(char *fmt, int len, const char *pat, + const char *append) +{ + char *p; @@ -28865,7 +29413,7 @@ index 000000000000..aa7f210e5493 + while (*pat != ':') + *p++ = *pat++; + *p++ = *pat++; -+ strcpy(p, append); ++ strscpy(p, append, len - (p - fmt)); + AuDebugOn(strlen(fmt) >= len); +} + @@ -29192,7 +29740,7 @@ index 000000000000..aa7f210e5493 + continue; + + h_sb = au_sbr_sb(sb, bindex); -+ e = vfsub_sync_filesystem(h_sb, wait); ++ e = vfsub_sync_filesystem(h_sb); + if (unlikely(e && !err)) + err = e; + /* go on even if an error happens */ @@ -29440,7 +29988,7 @@ index 000000000000..aa7f210e5493 + return err; +} + -+static void au_remount_refresh(struct super_block *sb, unsigned int do_idop) ++void au_remount_refresh(struct super_block *sb, unsigned int do_idop) +{ + int err, e; + unsigned int udba; @@ -29501,92 +30049,7 @@ index 000000000000..aa7f210e5493 + AuIOErr("refresh failed, ignored, %d\n", err); +} + -+/* stop extra interpretation of errno in mount(8), and strange error messages */ -+static int cvt_err(int err) -+{ -+ AuTraceErr(err); -+ -+ switch (err) { -+ case -ENOENT: -+ case -ENOTDIR: -+ case -EEXIST: -+ case -EIO: -+ err = -EINVAL; -+ } -+ return err; -+} -+ -+static int aufs_remount_fs(struct super_block *sb, int *flags, char *data) -+{ -+ int err, do_dx; -+ unsigned int mntflags; -+ struct au_opts opts = { -+ .opt = NULL -+ }; -+ struct dentry *root; -+ struct inode *inode; -+ struct au_sbinfo *sbinfo; -+ -+ err = 0; -+ root = sb->s_root; -+ if (!data || !*data) { -+ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM); -+ if (!err) { -+ di_write_lock_child(root); -+ err = au_opts_verify(sb, *flags, /*pending*/0); -+ aufs_write_unlock(root); -+ } -+ goto out; -+ } -+ -+ err = -ENOMEM; -+ opts.opt = (void *)__get_free_page(GFP_NOFS); -+ if (unlikely(!opts.opt)) -+ goto out; -+ opts.max_opt = PAGE_SIZE / sizeof(*opts.opt); -+ opts.flags = AuOpts_REMOUNT; -+ opts.sb_flags = *flags; -+ -+ /* parse it before aufs lock */ -+ err = au_opts_parse(sb, data, &opts); -+ if (unlikely(err)) -+ goto out_opts; -+ -+ sbinfo = au_sbi(sb); -+ inode = d_inode(root); -+ inode_lock(inode); -+ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM); -+ if (unlikely(err)) -+ goto out_mtx; -+ di_write_lock_child(root); -+ -+ /* au_opts_remount() may return an error */ -+ err = au_opts_remount(sb, &opts); -+ au_opts_free(&opts); -+ -+ if (au_ftest_opts(opts.flags, REFRESH)) -+ au_remount_refresh(sb, au_ftest_opts(opts.flags, REFRESH_IDOP)); -+ -+ if (au_ftest_opts(opts.flags, REFRESH_DYAOP)) { -+ mntflags = au_mntflags(sb); -+ do_dx = !!au_opt_test(mntflags, DIO); -+ au_dy_arefresh(do_dx); -+ } -+ -+ au_fhsm_wrote_all(sb, /*force*/1); /* ?? */ -+ aufs_write_unlock(root); -+ -+out_mtx: -+ inode_unlock(inode); -+out_opts: -+ free_page((unsigned long)opts.opt); -+out: -+ err = cvt_err(err); -+ AuTraceErr(err); -+ return err; -+} -+ -+static const struct super_operations aufs_sop = { ++const struct super_operations aufs_sop = { + .alloc_inode = aufs_alloc_inode, + .destroy_inode = aufs_destroy_inode, + .free_inode = aufs_free_inode, @@ -29595,13 +30058,12 @@ index 000000000000..aa7f210e5493 + .show_options = aufs_show_options, + .statfs = aufs_statfs, + .put_super = aufs_put_super, -+ .sync_fs = aufs_sync_fs, -+ .remount_fs = aufs_remount_fs ++ .sync_fs = aufs_sync_fs +}; + +/* ---------------------------------------------------------------------- */ + -+static int alloc_root(struct super_block *sb) ++int au_alloc_root(struct super_block *sb) +{ + int err; + struct inode *inode; @@ -29637,164 +30099,74 @@ index 000000000000..aa7f210e5493 + return err; +} + -+static int aufs_fill_super(struct super_block *sb, void *raw_data, -+ int silent __maybe_unused) ++/* ---------------------------------------------------------------------- */ ++ ++static void aufs_kill_sb(struct super_block *sb) +{ -+ int err; -+ struct au_opts opts = { -+ .opt = NULL -+ }; + struct au_sbinfo *sbinfo; + struct dentry *root; -+ struct inode *inode; -+ char *arg = raw_data; -+ -+ if (unlikely(!arg || !*arg)) { -+ err = -EINVAL; -+ pr_err("no arg\n"); -+ goto out; -+ } + -+ err = -ENOMEM; -+ opts.opt = (void *)__get_free_page(GFP_NOFS); -+ if (unlikely(!opts.opt)) -+ goto out; -+ opts.max_opt = PAGE_SIZE / sizeof(*opts.opt); -+ opts.sb_flags = sb->s_flags; -+ -+ err = au_si_alloc(sb); -+ if (unlikely(err)) -+ goto out_opts; + sbinfo = au_sbi(sb); ++ if (!sbinfo) ++ goto out; + -+ /* all timestamps always follow the ones on the branch */ -+ sb->s_flags |= SB_NOATIME | SB_NODIRATIME; -+ sb->s_flags |= SB_I_VERSION; /* do we really need this? */ -+ sb->s_op = &aufs_sop; -+ sb->s_d_op = &aufs_dop; -+ sb->s_magic = AUFS_SUPER_MAGIC; -+ sb->s_maxbytes = 0; -+ sb->s_stack_depth = 1; -+ au_export_init(sb); -+ au_xattr_init(sb); ++ au_sbilist_del(sb); + -+ err = alloc_root(sb); -+ if (unlikely(err)) { -+ si_write_unlock(sb); -+ goto out_info; -+ } + root = sb->s_root; -+ inode = d_inode(root); -+ -+ /* -+ * actually we can parse options regardless aufs lock here. -+ * but at remount time, parsing must be done before aufs lock. -+ * so we follow the same rule. -+ */ -+ ii_write_lock_parent(inode); -+ aufs_write_unlock(root); -+ err = au_opts_parse(sb, arg, &opts); -+ if (unlikely(err)) -+ goto out_root; ++ if (root) ++ aufs_write_lock(root); ++ else ++ __si_write_lock(sb); + -+ /* lock vfs_inode first, then aufs. */ -+ inode_lock(inode); -+ aufs_write_lock(root); -+ err = au_opts_mount(sb, &opts); -+ au_opts_free(&opts); -+ if (!err && au_ftest_si(sbinfo, NO_DREVAL)) { -+ sb->s_d_op = &aufs_dop_noreval; -+ pr_info("%ps\n", sb->s_d_op); -+ au_refresh_dop(root, /*force_reval*/0); -+ sbinfo->si_iop_array = aufs_iop_nogetattr; -+ au_refresh_iop(inode, /*force_getattr*/0); ++ au_fhsm_fin(sb); ++ if (sbinfo->si_wbr_create_ops->fin) ++ sbinfo->si_wbr_create_ops->fin(sb); ++ if (au_opt_test(sbinfo->si_mntflags, UDBA_HNOTIFY)) { ++ au_opt_set_udba(sbinfo->si_mntflags, UDBA_NONE); ++ au_remount_refresh(sb, /*do_idop*/0); + } -+ aufs_write_unlock(root); -+ inode_unlock(inode); -+ if (!err) -+ goto out_opts; /* success */ -+ -+out_root: -+ dput(root); -+ sb->s_root = NULL; -+out_info: -+ kobject_put(&sbinfo->si_kobj); -+ sb->s_fs_info = NULL; -+out_opts: -+ free_page((unsigned long)opts.opt); -+out: -+ AuTraceErr(err); -+ err = cvt_err(err); -+ AuTraceErr(err); -+ return err; -+} -+ -+/* ---------------------------------------------------------------------- */ -+ -+static struct dentry *aufs_mount(struct file_system_type *fs_type, int flags, -+ const char *dev_name __maybe_unused, -+ void *raw_data) -+{ -+ struct dentry *root; ++ if (au_opt_test(sbinfo->si_mntflags, PLINK)) ++ au_plink_put(sb, /*verbose*/1); ++ au_xino_clr(sb); ++ if (root) ++ au_dr_opt_flush(sb); + -+ /* all timestamps always follow the ones on the branch */ -+ /* mnt->mnt_flags |= MNT_NOATIME | MNT_NODIRATIME; */ -+ root = mount_nodev(fs_type, flags, raw_data, aufs_fill_super); -+ if (IS_ERR(root)) -+ goto out; ++ if (root) ++ aufs_write_unlock(root); ++ else ++ __si_write_unlock(sb); + -+ au_sbilist_add(root->d_sb); ++ sbinfo->si_sb = NULL; ++ au_nwt_flush(&sbinfo->si_nowait); + +out: -+ return root; -+} -+ -+static void aufs_kill_sb(struct super_block *sb) -+{ -+ struct au_sbinfo *sbinfo; -+ -+ sbinfo = au_sbi(sb); -+ if (sbinfo) { -+ au_sbilist_del(sb); -+ aufs_write_lock(sb->s_root); -+ au_fhsm_fin(sb); -+ if (sbinfo->si_wbr_create_ops->fin) -+ sbinfo->si_wbr_create_ops->fin(sb); -+ if (au_opt_test(sbinfo->si_mntflags, UDBA_HNOTIFY)) { -+ au_opt_set_udba(sbinfo->si_mntflags, UDBA_NONE); -+ au_remount_refresh(sb, /*do_idop*/0); -+ } -+ if (au_opt_test(sbinfo->si_mntflags, PLINK)) -+ au_plink_put(sb, /*verbose*/1); -+ au_xino_clr(sb); -+ au_dr_opt_flush(sb); -+ sbinfo->si_sb = NULL; -+ aufs_write_unlock(sb->s_root); -+ au_nwt_flush(&sbinfo->si_nowait); -+ } + kill_anon_super(sb); +} + +struct file_system_type aufs_fs_type = { + .name = AUFS_FSTYPE, + /* a race between rename and others */ -+ .fs_flags = FS_RENAME_DOES_D_MOVE, -+ .mount = aufs_mount, ++ .fs_flags = FS_RENAME_DOES_D_MOVE ++ /* untested */ ++ /*| FS_ALLOW_IDMAP*/ ++ , ++ .init_fs_context = aufs_fsctx_init, ++ .parameters = aufs_fsctx_paramspec, + .kill_sb = aufs_kill_sb, + /* no need to __module_get() and module_put(). */ + .owner = THIS_MODULE, +}; diff --git a/fs/aufs/super.h b/fs/aufs/super.h new file mode 100644 -index 000000000000..c0cb0051242c +index 000000000000..f1d9aedcbca4 --- /dev/null +++ b/fs/aufs/super.h -@@ -0,0 +1,589 @@ +@@ -0,0 +1,592 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -29923,8 +30295,6 @@ index 000000000000..c0cb0051242c + unsigned int si_mntflags; + + /* external inode number (bitmap and translation table) */ -+ vfs_readf_t si_xread; -+ vfs_writef_t si_xwrite; + loff_t si_ximaxent; /* max entries in a xino */ + + struct file *si_xib; @@ -30055,8 +30425,8 @@ index 000000000000..c0cb0051242c +/* ---------------------------------------------------------------------- */ + +/* super.c */ -+extern struct file_system_type aufs_fs_type; +struct inode *au_iget_locked(struct super_block *sb, ino_t ino); ++ +typedef unsigned long long (*au_arraycb_t)(struct super_block *sb, void *array, + unsigned long long max, void *arg); +void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb, @@ -30064,9 +30434,14 @@ index 000000000000..c0cb0051242c +struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max); +void au_iarray_free(struct inode **a, unsigned long long max); + ++void au_remount_refresh(struct super_block *sb, unsigned int do_idop); ++extern const struct super_operations aufs_sop; ++int au_alloc_root(struct super_block *sb); ++extern struct file_system_type aufs_fs_type; ++ +/* sbinfo.c */ +void au_si_free(struct kobject *kobj); -+int au_si_alloc(struct super_block *sb); ++struct au_sbinfo *au_si_alloc(struct super_block *sb); +int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink); + +unsigned int au_sigen_inc(struct super_block *sb); @@ -30381,15 +30756,15 @@ index 000000000000..c0cb0051242c +#endif /* __AUFS_SUPER_H__ */ diff --git a/fs/aufs/sysaufs.c b/fs/aufs/sysaufs.c new file mode 100644 -index 000000000000..f615471231b5 +index 000000000000..e3f3489c7570 --- /dev/null +++ b/fs/aufs/sysaufs.c -@@ -0,0 +1,93 @@ +@@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -30424,6 +30799,7 @@ index 000000000000..f615471231b5 + &sysaufs_si_attr_xi_path.attr, + NULL, +}; ++ATTRIBUTE_GROUPS(sysaufs_si); + +static const struct sysfs_ops au_sbi_ops = { + .show = sysaufs_si_show @@ -30432,7 +30808,7 @@ index 000000000000..f615471231b5 +static struct kobj_type au_sbi_ktype = { + .release = au_si_free, + .sysfs_ops = &au_sbi_ops, -+ .default_attrs = sysaufs_si_attrs ++ .default_groups = sysaufs_si_groups +}; + +/* ---------------------------------------------------------------------- */ @@ -30480,15 +30856,15 @@ index 000000000000..f615471231b5 +} diff --git a/fs/aufs/sysaufs.h b/fs/aufs/sysaufs.h new file mode 100644 -index 000000000000..55c5c9868f3b +index 000000000000..3f7efd4510be --- /dev/null +++ b/fs/aufs/sysaufs.h @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -30588,15 +30964,15 @@ index 000000000000..55c5c9868f3b +#endif /* __SYSAUFS_H__ */ diff --git a/fs/aufs/sysfs.c b/fs/aufs/sysfs.c new file mode 100644 -index 000000000000..46638d88ef21 +index 000000000000..4e8a4cfa9faa --- /dev/null +++ b/fs/aufs/sysfs.c @@ -0,0 +1,374 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -30968,15 +31344,15 @@ index 000000000000..46638d88ef21 +} diff --git a/fs/aufs/sysrq.c b/fs/aufs/sysrq.c new file mode 100644 -index 000000000000..fc8aa4a2839f +index 000000000000..d4bdeafe2fe3 --- /dev/null +++ b/fs/aufs/sysrq.c @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -31123,15 +31499,15 @@ index 000000000000..fc8aa4a2839f +} diff --git a/fs/aufs/vdir.c b/fs/aufs/vdir.c new file mode 100644 -index 000000000000..5ba006b80724 +index 000000000000..fdf7644049c5 --- /dev/null +++ b/fs/aufs/vdir.c @@ -0,0 +1,896 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -31581,7 +31957,7 @@ index 000000000000..5ba006b80724 + int err; +}; + -+static int fillvdir(struct dir_context *ctx, const char *__name, int nlen, ++static bool fillvdir(struct dir_context *ctx, const char *__name, int nlen, + loff_t offset __maybe_unused, u64 h_ino, + unsigned int d_type) +{ @@ -31632,7 +32008,7 @@ index 000000000000..5ba006b80724 + arg->vdir->vd_jiffy = jiffies; + /* smp_mb(); */ + AuTraceErr(arg->err); -+ return arg->err; ++ return !arg->err; +} + +static int au_handle_shwh(struct super_block *sb, struct au_vdir *vdir, @@ -32025,15 +32401,15 @@ index 000000000000..5ba006b80724 +} diff --git a/fs/aufs/vfsub.c b/fs/aufs/vfsub.c new file mode 100644 -index 000000000000..e954cd7d0110 +index 000000000000..2fb5f1ac0b31 --- /dev/null +++ b/fs/aufs/vfsub.c -@@ -0,0 +1,902 @@ +@@ -0,0 +1,918 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -32052,7 +32428,6 @@ index 000000000000..e954cd7d0110 + */ + +#include <linux/mnt_namespace.h> -+#include <linux/namei.h> +#include <linux/nsproxy.h> +#include <linux/security.h> +#include <linux/splice.h> @@ -32068,13 +32443,13 @@ index 000000000000..e954cd7d0110 +} +#endif + -+int vfsub_sync_filesystem(struct super_block *h_sb, int wait) ++int vfsub_sync_filesystem(struct super_block *h_sb) +{ + int err; + + lockdep_off(); + down_read(&h_sb->s_umount); -+ err = __sync_filesystem(h_sb, wait); ++ err = sync_filesystem(h_sb); + up_read(&h_sb->s_umount); + lockdep_on(); + @@ -32089,6 +32464,11 @@ index 000000000000..e954cd7d0110 + struct kstat st; + struct super_block *h_sb; + ++ /* ++ * Always needs h_path->mnt for LSM or FUSE branch. ++ */ ++ AuDebugOn(!h_path->mnt); ++ + /* for remote fs, leave work for its getattr or d_revalidate */ + /* for bad i_attr fs, handle them in aufs_getattr() */ + /* still some fs may acquire i_mutex. we need to skip them */ @@ -32107,15 +32487,8 @@ index 000000000000..e954cd7d0110 + +struct file *vfsub_dentry_open(struct path *path, int flags) +{ -+ struct file *file; -+ -+ file = dentry_open(path, flags /* | __FMODE_NONOTIFY */, ++ return dentry_open(path, flags /* | __FMODE_NONOTIFY */, + current_cred()); -+ if (!IS_ERR_OR_NULL(file) -+ && (file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) -+ i_readcount_inc(d_inode(path->dentry)); -+ -+ return file; +} + +struct file *vfsub_filp_open(const char *path, int oflags, int mode) @@ -32204,38 +32577,38 @@ index 000000000000..e954cd7d0110 +} + +struct dentry *vfsub_lookup_one_len_unlocked(const char *name, -+ struct dentry *parent, int len) ++ struct path *ppath, int len) +{ -+ struct path path = { -+ .mnt = NULL -+ }; ++ struct path path; + -+ path.dentry = lookup_one_len_unlocked(name, parent, len); ++ path.dentry = lookup_one_len_unlocked(name, ppath->dentry, len); + if (IS_ERR(path.dentry)) + goto out; -+ if (d_is_positive(path.dentry)) ++ if (d_is_positive(path.dentry)) { ++ path.mnt = ppath->mnt; + vfsub_update_h_iattr(&path, /*did*/NULL); /*ignore*/ ++ } + +out: + AuTraceErrPtr(path.dentry); + return path.dentry; +} + -+struct dentry *vfsub_lookup_one_len(const char *name, struct dentry *parent, ++struct dentry *vfsub_lookup_one_len(const char *name, struct path *ppath, + int len) +{ -+ struct path path = { -+ .mnt = NULL -+ }; ++ struct path path; + + /* VFS checks it too, but by WARN_ON_ONCE() */ -+ IMustLock(d_inode(parent)); ++ IMustLock(d_inode(ppath->dentry)); + -+ path.dentry = lookup_one_len(name, parent, len); ++ path.dentry = lookup_one_len(name, ppath->dentry, len); + if (IS_ERR(path.dentry)) + goto out; -+ if (d_is_positive(path.dentry)) ++ if (d_is_positive(path.dentry)) { ++ path.mnt = ppath->mnt; + vfsub_update_h_iattr(&path, /*did*/NULL); /*ignore*/ ++ } + +out: + AuTraceErrPtr(path.dentry); @@ -32245,7 +32618,7 @@ index 000000000000..e954cd7d0110 +void vfsub_call_lkup_one(void *args) +{ + struct vfsub_lkup_one_args *a = args; -+ *a->errp = vfsub_lkup_one(a->name, a->parent); ++ *a->errp = vfsub_lkup_one(a->name, a->ppath); +} + +/* ---------------------------------------------------------------------- */ @@ -32282,6 +32655,7 @@ index 000000000000..e954cd7d0110 +{ + int err; + struct dentry *d; ++ struct mnt_idmap *idmap; + + IMustLock(dir); + @@ -32291,9 +32665,10 @@ index 000000000000..e954cd7d0110 + path->dentry = d; + if (unlikely(err)) + goto out; ++ idmap = mnt_idmap(path->mnt); + + lockdep_off(); -+ err = vfs_create(dir, path->dentry, mode, want_excl); ++ err = vfs_create(idmap, dir, path->dentry, mode, want_excl); + lockdep_on(); + if (!err) { + struct path tmp = *path; @@ -32315,6 +32690,7 @@ index 000000000000..e954cd7d0110 +{ + int err; + struct dentry *d; ++ struct mnt_idmap *idmap; + + IMustLock(dir); + @@ -32324,9 +32700,10 @@ index 000000000000..e954cd7d0110 + path->dentry = d; + if (unlikely(err)) + goto out; ++ idmap = mnt_idmap(path->mnt); + + lockdep_off(); -+ err = vfs_symlink(dir, path->dentry, symname); ++ err = vfs_symlink(idmap, dir, path->dentry, symname); + lockdep_on(); + if (!err) { + struct path tmp = *path; @@ -32348,6 +32725,7 @@ index 000000000000..e954cd7d0110 +{ + int err; + struct dentry *d; ++ struct mnt_idmap *idmap; + + IMustLock(dir); + @@ -32357,9 +32735,10 @@ index 000000000000..e954cd7d0110 + path->dentry = d; + if (unlikely(err)) + goto out; ++ idmap = mnt_idmap(path->mnt); + + lockdep_off(); -+ err = vfs_mknod(dir, path->dentry, mode, dev); ++ err = vfs_mknod(idmap, dir, path->dentry, mode, dev); + lockdep_on(); + if (!err) { + struct path tmp = *path; @@ -32392,6 +32771,7 @@ index 000000000000..e954cd7d0110 +{ + int err; + struct dentry *d; ++ struct mnt_idmap *idmap; + + IMustLock(dir); + @@ -32406,9 +32786,10 @@ index 000000000000..e954cd7d0110 + path->dentry = d; + if (unlikely(err)) + goto out; ++ idmap = mnt_idmap(path->mnt); + + lockdep_off(); -+ err = vfs_link(src_dentry, dir, path->dentry, delegated_inode); ++ err = vfs_link(src_dentry, idmap, dir, path->dentry, delegated_inode); + lockdep_on(); + if (!err) { + struct path tmp = *path; @@ -32434,6 +32815,7 @@ index 000000000000..e954cd7d0110 + struct inode **delegated_inode, unsigned int flags) +{ + int err; ++ struct renamedata rd; + struct path tmp = { + .mnt = path->mnt + }; @@ -32450,9 +32832,16 @@ index 000000000000..e954cd7d0110 + if (unlikely(err)) + goto out; + ++ rd.old_mnt_idmap = mnt_idmap(path->mnt); ++ rd.old_dir = src_dir; ++ rd.old_dentry = src_dentry; ++ rd.new_mnt_idmap = rd.old_mnt_idmap; ++ rd.new_dir = dir; ++ rd.new_dentry = path->dentry; ++ rd.delegated_inode = delegated_inode; ++ rd.flags = flags; + lockdep_off(); -+ err = vfs_rename(src_dir, src_dentry, dir, path->dentry, -+ delegated_inode, flags); ++ err = vfs_rename(&rd); + lockdep_on(); + if (!err) { + int did; @@ -32476,6 +32865,7 @@ index 000000000000..e954cd7d0110 +{ + int err; + struct dentry *d; ++ struct mnt_idmap *idmap; + + IMustLock(dir); + @@ -32485,9 +32875,10 @@ index 000000000000..e954cd7d0110 + path->dentry = d; + if (unlikely(err)) + goto out; ++ idmap = mnt_idmap(path->mnt); + + lockdep_off(); -+ err = vfs_mkdir(dir, path->dentry, mode); ++ err = vfs_mkdir(idmap, dir, path->dentry, mode); + lockdep_on(); + if (!err) { + struct path tmp = *path; @@ -32509,6 +32900,7 @@ index 000000000000..e954cd7d0110 +{ + int err; + struct dentry *d; ++ struct mnt_idmap *idmap; + + IMustLock(dir); + @@ -32518,9 +32910,10 @@ index 000000000000..e954cd7d0110 + path->dentry = d; + if (unlikely(err)) + goto out; ++ idmap = mnt_idmap(path->mnt); + + lockdep_off(); -+ err = vfs_rmdir(dir, path->dentry); ++ err = vfs_rmdir(idmap, dir, path->dentry); + lockdep_on(); + if (!err) { + struct path tmp = { @@ -32551,22 +32944,17 @@ index 000000000000..e954cd7d0110 + return err; +} + -+/* todo: kernel_read()? */ +ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count, + loff_t *ppos) +{ + ssize_t err; -+ mm_segment_t oldfs; -+ union { -+ void *k; -+ char __user *u; -+ } buf; + -+ buf.k = kbuf; -+ oldfs = get_fs(); -+ set_fs(KERNEL_DS); -+ err = vfsub_read_u(file, buf.u, count, ppos); -+ set_fs(oldfs); ++ lockdep_off(); ++ err = kernel_read(file, kbuf, count, ppos); ++ lockdep_on(); ++ AuTraceErr(err); ++ if (err >= 0) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ + return err; +} + @@ -32586,17 +32974,12 @@ index 000000000000..e954cd7d0110 +ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count, loff_t *ppos) +{ + ssize_t err; -+ mm_segment_t oldfs; -+ union { -+ void *k; -+ const char __user *u; -+ } buf; + -+ buf.k = kbuf; -+ oldfs = get_fs(); -+ set_fs(KERNEL_DS); -+ err = vfsub_write_u(file, buf.u, count, ppos); -+ set_fs(oldfs); ++ lockdep_off(); ++ err = kernel_write(file, kbuf, count, ppos); ++ lockdep_on(); ++ if (err >= 0) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ + return err; +} + @@ -32635,14 +33018,14 @@ index 000000000000..e954cd7d0110 + return err; +} + -+long vfsub_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) ++long vfsub_splice_read(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) +{ + long err; + + lockdep_off(); -+ err = do_splice_to(in, ppos, pipe, len, flags); ++ err = vfs_splice_read(in, ppos, pipe, len, flags); + lockdep_on(); + file_accessed(in); + if (err >= 0) @@ -32688,6 +33071,7 @@ index 000000000000..e954cd7d0110 + int err; + struct inode *h_inode; + struct super_block *h_sb; ++ struct mnt_idmap *h_idmap; + + if (!h_file) { + err = vfsub_truncate(h_path, length); @@ -32699,12 +33083,12 @@ index 000000000000..e954cd7d0110 + lockdep_off(); + sb_start_write(h_sb); + lockdep_on(); -+ err = locks_verify_truncate(h_inode, h_file, length); -+ if (!err) -+ err = security_path_truncate(h_path); ++ err = security_file_truncate(h_file); + if (!err) { ++ h_idmap = mnt_idmap(h_path->mnt); + lockdep_off(); -+ err = do_truncate(h_path->dentry, length, attr, h_file); ++ err = do_truncate(h_idmap, h_path->dentry, length, attr, ++ h_file); + lockdep_on(); + } + lockdep_off(); @@ -32733,8 +33117,10 @@ index 000000000000..e954cd7d0110 +int vfsub_sio_mkdir(struct inode *dir, struct path *path, int mode) +{ + int err, do_sio, wkq_err; ++ struct mnt_idmap *idmap; + -+ do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE); ++ idmap = mnt_idmap(path->mnt); ++ do_sio = au_test_h_perm_sio(idmap, dir, MAY_EXEC | MAY_WRITE); + if (!do_sio) { + lockdep_off(); + err = vfsub_mkdir(dir, path, mode); @@ -32769,8 +33155,10 @@ index 000000000000..e954cd7d0110 +int vfsub_sio_rmdir(struct inode *dir, struct path *path) +{ + int err, do_sio, wkq_err; ++ struct mnt_idmap *idmap; + -+ do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE); ++ idmap = mnt_idmap(path->mnt); ++ do_sio = au_test_h_perm_sio(idmap, dir, MAY_EXEC | MAY_WRITE); + if (!do_sio) { + lockdep_off(); + err = vfsub_rmdir(dir, path); @@ -32802,14 +33190,16 @@ index 000000000000..e954cd7d0110 +{ + struct notify_change_args *a = args; + struct inode *h_inode; ++ struct mnt_idmap *idmap; + + h_inode = d_inode(a->path->dentry); + IMustLock(h_inode); + + *a->errp = -EPERM; + if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) { ++ idmap = mnt_idmap(a->path->mnt); + lockdep_off(); -+ *a->errp = notify_change(a->path->dentry, a->ia, ++ *a->errp = notify_change(idmap, a->path->dentry, a->ia, + a->delegated_inode); + lockdep_on(); + if (!*a->errp) @@ -32866,6 +33256,7 @@ index 000000000000..e954cd7d0110 + struct unlink_args *a = args; + struct dentry *d = a->path->dentry; + struct inode *h_inode; ++ struct mnt_idmap *idmap; + const int stop_sillyrename = (au_test_nfs(d->d_sb) + && au_dcount(d) == 1); + @@ -32885,8 +33276,9 @@ index 000000000000..e954cd7d0110 + ihold(h_inode); + } + ++ idmap = mnt_idmap(a->path->mnt); + lockdep_off(); -+ *a->errp = vfs_unlink(a->dir, d, a->delegated_inode); ++ *a->errp = vfs_unlink(idmap, a->dir, d, a->delegated_inode); + lockdep_on(); + if (!*a->errp) { + struct path tmp = { @@ -32933,15 +33325,15 @@ index 000000000000..e954cd7d0110 +} diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h new file mode 100644 -index 000000000000..705f033ba2c3 +index 000000000000..928c463620c1 --- /dev/null +++ b/fs/aufs/vfsub.h -@@ -0,0 +1,354 @@ +@@ -0,0 +1,404 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -33023,7 +33415,7 @@ index 000000000000..705f033ba2c3 +AuStubInt0(vfsub_test_mntns, struct vfsmount *mnt, struct super_block *h_sb); +#endif + -+int vfsub_sync_filesystem(struct super_block *h_sb, int wait); ++int vfsub_sync_filesystem(struct super_block *h_sb); + +/* ---------------------------------------------------------------------- */ + @@ -33042,20 +33434,20 @@ index 000000000000..705f033ba2c3 +int vfsub_kern_path(const char *name, unsigned int flags, struct path *path); + +struct dentry *vfsub_lookup_one_len_unlocked(const char *name, -+ struct dentry *parent, int len); -+struct dentry *vfsub_lookup_one_len(const char *name, struct dentry *parent, ++ struct path *ppath, int len); ++struct dentry *vfsub_lookup_one_len(const char *name, struct path *ppath, + int len); + +struct vfsub_lkup_one_args { + struct dentry **errp; + struct qstr *name; -+ struct dentry *parent; ++ struct path *ppath; +}; + +static inline struct dentry *vfsub_lkup_one(struct qstr *name, -+ struct dentry *parent) ++ struct path *ppath) +{ -+ return vfsub_lookup_one_len(name->name, parent, name->len); ++ return vfsub_lookup_one_len(name->name, ppath, name->len); +} + +void vfsub_call_lkup_one(void *args); @@ -33088,6 +33480,20 @@ index 000000000000..705f033ba2c3 +} +#endif + ++static inline void vfsub_file_start_write(struct file *file) ++{ ++ lockdep_off(); ++ file_start_write(file); ++ lockdep_on(); ++} ++ ++static inline void vfsub_file_end_write(struct file *file) ++{ ++ lockdep_off(); ++ file_end_write(file); ++ lockdep_on(); ++} ++ +/* ---------------------------------------------------------------------- */ + +struct au_hinode; @@ -33168,27 +33574,29 @@ index 000000000000..705f033ba2c3 +static inline int vfsub_update_time(struct inode *h_inode, + struct timespec64 *ts, int flags) +{ -+ return update_time(h_inode, ts, flags); ++ return inode_update_time(h_inode, ts, flags); + /* no vfsub_update_h_iattr() since we don't have struct path */ +} + +#ifdef CONFIG_FS_POSIX_ACL -+static inline int vfsub_acl_chmod(struct inode *h_inode, umode_t h_mode) ++static inline int vfsub_acl_chmod(struct mnt_idmap *h_idmap, ++ struct dentry *h_dentry, umode_t h_mode) +{ + int err; + -+ err = posix_acl_chmod(h_inode, h_mode); ++ err = posix_acl_chmod(h_idmap, h_dentry, h_mode); + if (err == -EOPNOTSUPP) + err = 0; + return err; +} +#else -+AuStubInt0(vfsub_acl_chmod, struct inode *h_inode, umode_t h_mode); ++AuStubInt0(vfsub_acl_chmod, struct mnt_idmap *h_idmap, ++ struct dentry *h_dentry, umode_t h_mode); +#endif + -+long vfsub_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); ++long vfsub_splice_read(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); +long vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags); + @@ -33266,42 +33674,76 @@ index 000000000000..705f033ba2c3 + +/* ---------------------------------------------------------------------- */ + -+static inline int vfsub_setxattr(struct dentry *dentry, const char *name, ++static inline int vfsub_setxattr(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name, + const void *value, size_t size, int flags) +{ + int err; + + lockdep_off(); -+ err = vfs_setxattr(dentry, name, value, size, flags); ++ err = vfs_setxattr(idmap, dentry, name, value, size, flags); ++ lockdep_on(); ++ ++ return err; ++} ++ ++static inline int vfsub_removexattr(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name) ++{ ++ int err; ++ ++ lockdep_off(); ++ err = vfs_removexattr(idmap, dentry, name); ++ lockdep_on(); ++ ++ return err; ++} ++ ++#ifdef CONFIG_FS_POSIX_ACL ++static inline int vfsub_set_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name, ++ struct posix_acl *acl) ++{ ++ int err; ++ ++ lockdep_off(); ++ err = vfs_set_acl(idmap, dentry, name, acl); + lockdep_on(); + + return err; +} + -+static inline int vfsub_removexattr(struct dentry *dentry, const char *name) ++static inline int vfsub_remove_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name) +{ + int err; + + lockdep_off(); -+ err = vfs_removexattr(dentry, name); ++ err = vfs_remove_acl(idmap, dentry, name); + lockdep_on(); + + return err; +} ++#else ++AuStubInt0(vfsub_set_acl, struct mnt_idmap *idmap, struct dentry *dentry, ++ const char *name, struct posix_acl *acl); ++AuStubInt0(vfsub_remove_acl, struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name); ++#endif + +#endif /* __KERNEL__ */ +#endif /* __AUFS_VFSUB_H__ */ diff --git a/fs/aufs/wbr_policy.c b/fs/aufs/wbr_policy.c new file mode 100644 -index 000000000000..a7cc1109f69d +index 000000000000..c726f96b7bd5 --- /dev/null +++ b/fs/aufs/wbr_policy.c @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -34129,15 +34571,15 @@ index 000000000000..a7cc1109f69d +}; diff --git a/fs/aufs/whout.c b/fs/aufs/whout.c new file mode 100644 -index 000000000000..efe0c16508db +index 000000000000..7bd0392eeb87 --- /dev/null +++ b/fs/aufs/whout.c -@@ -0,0 +1,1062 @@ +@@ -0,0 +1,1072 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -34196,18 +34638,19 @@ index 000000000000..efe0c16508db +/* ---------------------------------------------------------------------- */ + +/* -+ * test if the @wh_name exists under @h_parent. ++ * test if the @wh_name exists under @h_ppath. + * @try_sio specifies the necessary of super-io. + */ -+int au_wh_test(struct dentry *h_parent, struct qstr *wh_name, int try_sio) ++int au_wh_test(struct mnt_idmap *h_idmap, struct path *h_ppath, ++ struct qstr *wh_name, int try_sio) +{ + int err; + struct dentry *wh_dentry; + + if (!try_sio) -+ wh_dentry = vfsub_lkup_one(wh_name, h_parent); ++ wh_dentry = vfsub_lkup_one(wh_name, h_ppath); + else -+ wh_dentry = au_sio_lkup_one(wh_name, h_parent); ++ wh_dentry = au_sio_lkup_one(h_idmap, wh_name, h_ppath); + err = PTR_ERR(wh_dentry); + if (IS_ERR(wh_dentry)) { + if (err == -ENAMETOOLONG) @@ -34234,16 +34677,16 @@ index 000000000000..efe0c16508db +} + +/* -+ * test if the @h_dentry sets opaque or not. ++ * test if the @h_path->dentry sets opaque or not. + */ -+int au_diropq_test(struct dentry *h_dentry) ++int au_diropq_test(struct mnt_idmap *h_idmap, struct path *h_path) +{ + int err; + struct inode *h_dir; + -+ h_dir = d_inode(h_dentry); -+ err = au_wh_test(h_dentry, &diropq_name, -+ au_test_h_perm_sio(h_dir, MAY_EXEC)); ++ h_dir = d_inode(h_path->dentry); ++ err = au_wh_test(h_idmap, h_path, &diropq_name, ++ au_test_h_perm_sio(h_idmap, h_dir, MAY_EXEC)); + return err; +} + @@ -34260,6 +34703,8 @@ index 000000000000..efe0c16508db + /* strict atomic_t is unnecessary here */ + static unsigned short cnt; + struct qstr qs; ++ struct path h_ppath; ++ struct mnt_idmap *h_idmap; + + BUILD_BUG_ON(sizeof(cnt) * 2 > AUFS_WH_TMP_LEN); + @@ -34283,10 +34728,13 @@ index 000000000000..efe0c16508db + *p++ = '.'; + AuDebugOn(name + qs.len + 1 - p <= AUFS_WH_TMP_LEN); + ++ h_ppath.dentry = h_parent; ++ h_ppath.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); + qs.name = name; + for (i = 0; i < 3; i++) { + sprintf(p, "%.*x", AUFS_WH_TMP_LEN, cnt++); -+ dentry = au_sio_lkup_one(&qs, h_parent); ++ dentry = au_sio_lkup_one(h_idmap, &qs, &h_ppath); + if (IS_ERR(dentry) || d_is_negative(dentry)) + goto out_name; + dput(dentry); @@ -34380,21 +34828,20 @@ index 000000000000..efe0c16508db + return err; +} + -+static int unlink_wh_name(struct dentry *h_parent, struct qstr *wh, -+ struct au_branch *br) ++static int unlink_wh_name(struct path *h_ppath, struct qstr *wh) +{ + int err; -+ struct path h_path = { -+ .mnt = au_br_mnt(br) -+ }; ++ struct path h_path; + + err = 0; -+ h_path.dentry = vfsub_lkup_one(wh, h_parent); ++ h_path.dentry = vfsub_lkup_one(wh, h_ppath); + if (IS_ERR(h_path.dentry)) + err = PTR_ERR(h_path.dentry); + else { -+ if (d_is_reg(h_path.dentry)) -+ err = do_unlink_wh(d_inode(h_parent), &h_path); ++ if (d_is_reg(h_path.dentry)) { ++ h_path.mnt = h_ppath->mnt; ++ err = do_unlink_wh(d_inode(h_ppath->dentry), &h_path); ++ } + dput(h_path.dentry); + } + @@ -34834,15 +35281,17 @@ index 000000000000..efe0c16508db +static struct dentry *do_diropq(struct dentry *dentry, aufs_bindex_t bindex, + unsigned int flags) +{ -+ struct dentry *opq_dentry, *h_dentry; ++ struct dentry *opq_dentry; + struct super_block *sb; + struct au_branch *br; ++ struct path h_path; + int err; + + sb = dentry->d_sb; + br = au_sbr(sb, bindex); -+ h_dentry = au_h_dptr(dentry, bindex); -+ opq_dentry = vfsub_lkup_one(&diropq_name, h_dentry); ++ h_path.dentry = au_h_dptr(dentry, bindex); ++ h_path.mnt = au_br_mnt(br); ++ opq_dentry = vfsub_lkup_one(&diropq_name, &h_path); + if (IS_ERR(opq_dentry)) + goto out; + @@ -34853,11 +35302,8 @@ index 000000000000..efe0c16508db + goto out; /* success */ + } + } else { -+ struct path tmp = { -+ .dentry = opq_dentry, -+ .mnt = au_br_mnt(br) -+ }; -+ err = do_unlink_wh(au_h_iptr(d_inode(dentry), bindex), &tmp); ++ h_path.dentry = opq_dentry; ++ err = do_unlink_wh(au_h_iptr(d_inode(dentry), bindex), &h_path); + if (!err) + au_set_dbdiropq(dentry, -1); + } @@ -34885,9 +35331,12 @@ index 000000000000..efe0c16508db + unsigned int flags) +{ + struct dentry *diropq, *h_dentry; ++ struct mnt_idmap *h_idmap; + ++ h_idmap = au_sbr_idmap(dentry->d_sb, bindex); + h_dentry = au_h_dptr(dentry, bindex); -+ if (!au_test_h_perm_sio(d_inode(h_dentry), MAY_EXEC | MAY_WRITE)) ++ if (!au_test_h_perm_sio(h_idmap, d_inode(h_dentry), ++ MAY_EXEC | MAY_WRITE)) + diropq = do_diropq(dentry, bindex, flags); + else { + int wkq_err; @@ -34920,11 +35369,14 @@ index 000000000000..efe0c16508db + int err; + struct qstr wh_name; + struct dentry *wh_dentry; ++ struct path h_path; + + err = au_wh_name_alloc(&wh_name, base_name); + wh_dentry = ERR_PTR(err); + if (!err) { -+ wh_dentry = vfsub_lkup_one(&wh_name, h_parent); ++ h_path.dentry = h_parent; ++ h_path.mnt = au_br_mnt(br); ++ wh_dentry = vfsub_lkup_one(&wh_name, &h_path); + au_kfree_try_rcu(wh_name.name); + } + return wh_dentry; @@ -34959,8 +35411,8 @@ index 000000000000..efe0c16508db +/* ---------------------------------------------------------------------- */ + +/* Delete all whiteouts in this directory on branch bindex. */ -+static int del_wh_children(struct dentry *h_dentry, struct au_nhash *whlist, -+ aufs_bindex_t bindex, struct au_branch *br) ++static int del_wh_children(struct path *h_path, struct au_nhash *whlist, ++ aufs_bindex_t bindex) +{ + int err; + unsigned long ul, n; @@ -34990,7 +35442,7 @@ index 000000000000..efe0c16508db + if (str->len + AUFS_WH_PFX_LEN <= PATH_MAX) { + memcpy(p, str->name, str->len); + wh_name.len = AUFS_WH_PFX_LEN + str->len; -+ err = unlink_wh_name(h_dentry, &wh_name, br); ++ err = unlink_wh_name(h_path, &wh_name); + if (!err) + continue; + break; @@ -35009,16 +35461,15 @@ index 000000000000..efe0c16508db + +struct del_wh_children_args { + int *errp; -+ struct dentry *h_dentry; ++ struct path *h_path; + struct au_nhash *whlist; + aufs_bindex_t bindex; -+ struct au_branch *br; +}; + +static void call_del_wh_children(void *args) +{ + struct del_wh_children_args *a = args; -+ *a->errp = del_wh_children(a->h_dentry, a->whlist, a->bindex, a->br); ++ *a->errp = del_wh_children(a->h_path, a->whlist, a->bindex); +} + +/* ---------------------------------------------------------------------- */ @@ -35070,14 +35521,18 @@ index 000000000000..efe0c16508db +{ + int err; + unsigned int h_nlink; -+ struct path h_tmp; ++ struct path wh_path; + struct inode *wh_inode, *h_dir; + struct au_branch *br; ++ struct mnt_idmap *h_idmap; + + h_dir = d_inode(wh_dentry->d_parent); /* dir inode is locked */ + IMustLock(h_dir); + + br = au_sbr(dir->i_sb, bindex); ++ wh_path.dentry = wh_dentry; ++ wh_path.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); + wh_inode = d_inode(wh_dentry); + inode_lock_nested(wh_inode, AuLsc_I_CHILD); + @@ -35085,16 +35540,15 @@ index 000000000000..efe0c16508db + * someone else might change some whiteouts while we were sleeping. + * it means this whlist may have an obsoleted entry. + */ -+ if (!au_test_h_perm_sio(wh_inode, MAY_EXEC | MAY_WRITE)) -+ err = del_wh_children(wh_dentry, whlist, bindex, br); ++ if (!au_test_h_perm_sio(h_idmap, wh_inode, MAY_EXEC | MAY_WRITE)) ++ err = del_wh_children(&wh_path, whlist, bindex); + else { + int wkq_err; + struct del_wh_children_args args = { + .errp = &err, -+ .h_dentry = wh_dentry, ++ .h_path = &wh_path, + .whlist = whlist, -+ .bindex = bindex, -+ .br = br ++ .bindex = bindex + }; + + wkq_err = au_wkq_wait(call_del_wh_children, &args); @@ -35104,10 +35558,8 @@ index 000000000000..efe0c16508db + inode_unlock(wh_inode); + + if (!err) { -+ h_tmp.dentry = wh_dentry; -+ h_tmp.mnt = au_br_mnt(br); + h_nlink = h_dir->i_nlink; -+ err = vfsub_rmdir(h_dir, &h_tmp); ++ err = vfsub_rmdir(h_dir, &wh_path); + /* some fs doesn't change the parent nlink in some cases */ + h_nlink -= h_dir->i_nlink; + } @@ -35197,15 +35649,15 @@ index 000000000000..efe0c16508db +} diff --git a/fs/aufs/whout.h b/fs/aufs/whout.h new file mode 100644 -index 000000000000..65459ba0e790 +index 000000000000..a7ae8702e7a5 --- /dev/null +++ b/fs/aufs/whout.h -@@ -0,0 +1,86 @@ +@@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -35232,8 +35684,9 @@ index 000000000000..65459ba0e790 + +/* whout.c */ +int au_wh_name_alloc(struct qstr *wh, const struct qstr *name); -+int au_wh_test(struct dentry *h_parent, struct qstr *wh_name, int try_sio); -+int au_diropq_test(struct dentry *h_dentry); ++int au_wh_test(struct mnt_idmap *h_idmap, struct path *h_ppath, ++ struct qstr *wh_name, int try_sio); ++int au_diropq_test(struct mnt_idmap *h_idmap, struct path *h_path); +struct au_branch; +struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br, + struct qstr *prefix); @@ -35289,15 +35742,15 @@ index 000000000000..65459ba0e790 +#endif /* __AUFS_WHOUT_H__ */ diff --git a/fs/aufs/wkq.c b/fs/aufs/wkq.c new file mode 100644 -index 000000000000..4d66bb2dc657 +index 000000000000..cb71ca3bf51b --- /dev/null +++ b/fs/aufs/wkq.c @@ -0,0 +1,372 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -35667,15 +36120,15 @@ index 000000000000..4d66bb2dc657 +} diff --git a/fs/aufs/wkq.h b/fs/aufs/wkq.h new file mode 100644 -index 000000000000..5be76b69d8ff +index 000000000000..f8bb8e12395e --- /dev/null +++ b/fs/aufs/wkq.h @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -35762,15 +36215,15 @@ index 000000000000..5be76b69d8ff +#endif /* __AUFS_WKQ_H__ */ diff --git a/fs/aufs/xattr.c b/fs/aufs/xattr.c new file mode 100644 -index 000000000000..b5ba7e32c574 +index 000000000000..9e08665728ae --- /dev/null +++ b/fs/aufs/xattr.c -@@ -0,0 +1,356 @@ +@@ -0,0 +1,360 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2014-2020 Junjiro R. Okajima ++ * Copyright (C) 2014-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -35789,7 +36242,6 @@ index 000000000000..b5ba7e32c574 + */ + +#include <linux/fs.h> -+#include <linux/posix_acl_xattr.h> +#include <linux/xattr.h> +#include "aufs.h" + @@ -35832,35 +36284,61 @@ index 000000000000..b5ba7e32c574 + +static const int au_xattr_out_of_list = AuBrAttr_ICEX_OTH << 1; + -+static int au_do_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, ++static int au_do_cpup_xattr(struct path *h_dst, struct path *h_src, + char *name, char **buf, unsigned int ignore_flags, + unsigned int verbose) +{ -+ int err; ++ int err, is_acl; + ssize_t ssz; + struct inode *h_idst; ++ struct dentry *h_dst_dentry, *h_src_dentry; ++ struct mnt_idmap *h_dst_idmap, *h_src_idmap; ++ struct posix_acl *acl; + -+ ssz = vfs_getxattr_alloc(h_src, name, buf, 0, GFP_NOFS); -+ err = ssz; -+ if (unlikely(err <= 0)) { -+ if (err == -ENODATA -+ || (err == -EOPNOTSUPP -+ && ((ignore_flags & au_xattr_out_of_list) -+ || (au_test_nfs_noacl(d_inode(h_src)) -+ && (!strcmp(name, XATTR_NAME_POSIX_ACL_ACCESS) -+ || !strcmp(name, -+ XATTR_NAME_POSIX_ACL_DEFAULT)))) -+ )) -+ err = 0; -+ if (err && (verbose || au_debug_test())) -+ pr_err("%s, err %d\n", name, err); -+ goto out; ++ is_acl = !!is_posix_acl_xattr(name); ++ h_src_idmap = mnt_idmap(h_src->mnt); ++ h_src_dentry = h_src->dentry; ++ if (is_acl) { ++ acl = vfs_get_acl(h_src_idmap, h_src_dentry, name); ++ AuDebugOn(!acl); ++ if (unlikely(IS_ERR(acl))) { ++ err = PTR_ERR(acl); ++ if (err == -ENODATA) ++ err = 0; ++ else if (err == -EOPNOTSUPP ++ && au_test_nfs_noacl(d_inode(h_src_dentry))) ++ err = 0; ++ else if (verbose || au_debug_test()) ++ pr_err("%s, err %d\n", name, err); ++ goto out; ++ } ++ } else { ++ ssz = vfs_getxattr_alloc(h_src_idmap, h_src_dentry, name, buf, ++ 0, GFP_NOFS); ++ if (unlikely(ssz <= 0)) { ++ err = ssz; ++ if (err == -ENODATA) ++ err = 0; ++ else if (err == -EOPNOTSUPP ++ && (ignore_flags & au_xattr_out_of_list)) ++ err = 0; ++ else if (err && (verbose || au_debug_test())) ++ pr_err("%s, err %d\n", name, err); ++ goto out; ++ } + } + + /* unlock it temporary */ -+ h_idst = d_inode(h_dst); ++ h_dst_idmap = mnt_idmap(h_dst->mnt); ++ h_dst_dentry = h_dst->dentry; ++ h_idst = d_inode(h_dst_dentry); + inode_unlock(h_idst); -+ err = vfsub_setxattr(h_dst, name, *buf, ssz, /*flags*/0); ++ if (is_acl) { ++ err = vfsub_set_acl(h_dst_idmap, h_dst_dentry, name, acl); ++ posix_acl_release(acl); ++ } else ++ err = vfsub_setxattr(h_dst_idmap, h_dst_dentry, name, *buf, ++ ssz, /*flags*/0); + inode_lock_nested(h_idst, AuLsc_I_CHILD2); + if (unlikely(err)) { + if (verbose || au_debug_test()) @@ -35872,25 +36350,28 @@ index 000000000000..b5ba7e32c574 + return err; +} + -+int au_cpup_xattr(struct dentry *h_dst, struct dentry *h_src, int ignore_flags, ++int au_cpup_xattr(struct path *h_dst, struct path *h_src, int ignore_flags, + unsigned int verbose) +{ -+ int err, unlocked, acl_access, acl_default; ++ int err, unlocked; + ssize_t ssz; ++ struct dentry *h_dst_dentry, *h_src_dentry; + struct inode *h_isrc, *h_idst; + char *value, *p, *o, *e; + + /* try stopping to update the source inode while we are referencing */ + /* there should not be the parent-child relationship between them */ -+ h_isrc = d_inode(h_src); -+ h_idst = d_inode(h_dst); ++ h_dst_dentry = h_dst->dentry; ++ h_idst = d_inode(h_dst_dentry); ++ h_src_dentry = h_src->dentry; ++ h_isrc = d_inode(h_src_dentry); + inode_unlock(h_idst); + inode_lock_shared_nested(h_isrc, AuLsc_I_CHILD); + inode_lock_nested(h_idst, AuLsc_I_CHILD2); + unlocked = 0; + + /* some filesystems don't list POSIX ACL, for example tmpfs */ -+ ssz = vfs_listxattr(h_src, NULL, 0); ++ ssz = vfs_listxattr(h_src_dentry, NULL, 0); + err = ssz; + if (unlikely(err < 0)) { + AuTraceErr(err); @@ -35909,7 +36390,7 @@ index 000000000000..b5ba7e32c574 + o = p; + if (unlikely(!p)) + goto out; -+ err = vfs_listxattr(h_src, p, ssz); ++ err = vfs_listxattr(h_src_dentry, p, ssz); + } + inode_unlock_shared(h_isrc); + unlocked = 1; @@ -35920,33 +36401,12 @@ index 000000000000..b5ba7e32c574 + err = 0; + e = p + ssz; + value = NULL; -+ acl_access = 0; -+ acl_default = 0; ++ ignore_flags |= au_xattr_out_of_list; + while (!err && p < e) { -+ acl_access |= !strncmp(p, XATTR_NAME_POSIX_ACL_ACCESS, -+ sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1); -+ acl_default |= !strncmp(p, XATTR_NAME_POSIX_ACL_DEFAULT, -+ sizeof(XATTR_NAME_POSIX_ACL_DEFAULT) -+ - 1); + err = au_do_cpup_xattr(h_dst, h_src, p, &value, ignore_flags, + verbose); + p += strlen(p) + 1; + } -+ AuTraceErr(err); -+ ignore_flags |= au_xattr_out_of_list; -+ if (!err && !acl_access) { -+ err = au_do_cpup_xattr(h_dst, h_src, -+ XATTR_NAME_POSIX_ACL_ACCESS, &value, -+ ignore_flags, verbose); -+ AuTraceErr(err); -+ } -+ if (!err && !acl_default) { -+ err = au_do_cpup_xattr(h_dst, h_src, -+ XATTR_NAME_POSIX_ACL_DEFAULT, &value, -+ ignore_flags, verbose); -+ AuTraceErr(err); -+ } -+ + au_kfree_try_rcu(value); + +out_free: @@ -35962,7 +36422,7 @@ index 000000000000..b5ba7e32c574 + +static int au_smack_reentering(struct super_block *sb) +{ -+#if IS_ENABLED(CONFIG_SECURITY_SMACK) ++#if IS_ENABLED(CONFIG_SECURITY_SMACK) || IS_ENABLED(CONFIG_SECURITY_SELINUX) + /* + * as a part of lookup, smack_d_instantiate() is called, and it calls + * i_op->getxattr(). ouch. @@ -35993,7 +36453,8 @@ index 000000000000..b5ba7e32c574 + } u; +}; + -+static ssize_t au_lgxattr(struct dentry *dentry, struct au_lgxattr *arg) ++static ssize_t au_lgxattr(struct dentry *dentry, struct inode *inode, ++ struct au_lgxattr *arg) +{ + ssize_t err; + int reenter; @@ -36007,7 +36468,7 @@ index 000000000000..b5ba7e32c574 + if (unlikely(err)) + goto out; + } -+ err = au_h_path_getattr(dentry, /*force*/1, &h_path, reenter); ++ err = au_h_path_getattr(dentry, inode, /*force*/1, &h_path, reenter); + if (unlikely(err)) + goto out_si; + if (unlikely(!h_path.dentry)) @@ -36022,7 +36483,7 @@ index 000000000000..b5ba7e32c574 + break; + case AU_XATTR_GET: + AuDebugOn(d_is_negative(h_path.dentry)); -+ err = vfs_getxattr(h_path.dentry, ++ err = vfs_getxattr(mnt_idmap(h_path.mnt), h_path.dentry, + arg->u.get.name, arg->u.get.value, + arg->u.get.size); + break; @@ -36049,11 +36510,10 @@ index 000000000000..b5ba7e32c574 + }, + }; + -+ return au_lgxattr(dentry, &arg); ++ return au_lgxattr(dentry, /*inode*/NULL, &arg); +} + -+static ssize_t au_getxattr(struct dentry *dentry, -+ struct inode *inode __maybe_unused, ++static ssize_t au_getxattr(struct dentry *dentry, struct inode *inode, + const char *name, void *value, size_t size) +{ + struct au_lgxattr arg = { @@ -36065,7 +36525,7 @@ index 000000000000..b5ba7e32c574 + }, + }; + -+ return au_lgxattr(dentry, &arg); ++ return au_lgxattr(dentry, inode, &arg); +} + +static int au_setxattr(struct dentry *dentry, struct inode *inode, @@ -36095,6 +36555,7 @@ index 000000000000..b5ba7e32c574 +} + +static int au_xattr_set(const struct xattr_handler *handler, ++ struct mnt_idmap *idmap, + struct dentry *dentry, struct inode *inode, + const char *name, const void *value, size_t size, + int flags) @@ -36110,10 +36571,6 @@ index 000000000000..b5ba7e32c574 +}; + +static const struct xattr_handler *au_xattr_handlers[] = { -+#ifdef CONFIG_FS_POSIX_ACL -+ &posix_acl_access_xattr_handler, -+ &posix_acl_default_xattr_handler, -+#endif + &au_xattr_handler, /* must be last */ + NULL +}; @@ -36124,15 +36581,15 @@ index 000000000000..b5ba7e32c574 +} diff --git a/fs/aufs/xino.c b/fs/aufs/xino.c new file mode 100644 -index 000000000000..b3152c0ce0b5 +index 000000000000..e1db09b3541d --- /dev/null +++ b/fs/aufs/xino.c -@@ -0,0 +1,1966 @@ +@@ -0,0 +1,1926 @@ +// SPDX-License-Identifier: GPL-2.0 +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -36339,7 +36796,7 @@ index 000000000000..b3152c0ce0b5 + } + + err = -EINVAL; -+ if (unlikely(sb == d->d_sb)) { ++ if (unlikely(sb && sb == d->d_sb)) { + if (!silent) + pr_err("%s must be outside\n", fpath); + goto out; @@ -36365,22 +36822,23 @@ index 000000000000..b3152c0ce0b5 + struct file *copy_src) +{ + struct file *file; -+ struct dentry *dentry, *parent; ++ struct dentry *dentry; + struct inode *dir, *delegated; + struct qstr *name; -+ struct path path; ++ struct path ppath, path; + int err, do_unlock; + struct au_xino_lock_dir ldir; + + do_unlock = 1; + au_xino_lock_dir(sb, base, &ldir); + dentry = base->dentry; -+ parent = dentry->d_parent; /* dir inode is locked */ -+ dir = d_inode(parent); ++ ppath.dentry = dentry->d_parent; /* dir inode is locked */ ++ ppath.mnt = base->mnt; ++ dir = d_inode(ppath.dentry); + IMustLock(dir); + + name = &dentry->d_name; -+ path.dentry = vfsub_lookup_one_len(name->name, parent, name->len); ++ path.dentry = vfsub_lookup_one_len(name->name, &ppath, name->len); + if (IS_ERR(path.dentry)) { + file = (void *)path.dentry; + pr_err("%pd lookup err %ld\n", dentry, PTR_ERR(path.dentry)); @@ -36388,7 +36846,7 @@ index 000000000000..b3152c0ce0b5 + } + + /* no need to mnt_want_write() since we call dentry_open() later */ -+ err = vfs_create(dir, path.dentry, 0666, NULL); ++ err = vfs_create(mnt_idmap(base->mnt), dir, path.dentry, 0666, NULL); + if (unlikely(err)) { + file = ERR_PTR(err); + pr_err("%pd create err %d\n", dentry, err); @@ -36790,8 +37248,8 @@ index 000000000000..b3152c0ce0b5 + ino_t h_ino, ino; +}; + -+static int au_xino_do_write(vfs_writef_t write, struct file *file, -+ struct au_xi_calc *calc, ino_t ino); ++static int au_xino_do_write(struct file *file, struct au_xi_calc *calc, ++ ino_t ino); + +static void au_xino_call_do_new_async(void *args) +{ @@ -36820,7 +37278,7 @@ index 000000000000..b3152c0ce0b5 + + file = au_xino_file(br->br_xino, a->calc.idx); + AuDebugOn(!file); -+ err = au_xino_do_write(sbi->si_xwrite, file, &a->calc, a->ino); ++ err = au_xino_do_write(file, &a->calc, a->ino); + if (unlikely(err)) { + AuIOErr("err %d\n", err); + goto out; @@ -36921,7 +37379,7 @@ index 000000000000..b3152c0ce0b5 + return 0; /* no xino */ + + sbinfo = au_sbi(sb); -+ sz = xino_fread(sbinfo->si_xread, file, ino, sizeof(*ino), &calc.pos); ++ sz = xino_fread(file, ino, sizeof(*ino), &calc.pos); + if (sz == sizeof(*ino)) + return 0; /* success */ + @@ -36933,12 +37391,12 @@ index 000000000000..b3152c0ce0b5 + return err; +} + -+static int au_xino_do_write(vfs_writef_t write, struct file *file, -+ struct au_xi_calc *calc, ino_t ino) ++static int au_xino_do_write(struct file *file, struct au_xi_calc *calc, ++ ino_t ino) +{ + ssize_t sz; + -+ sz = xino_fwrite(write, file, &ino, sizeof(ino), &calc->pos); ++ sz = xino_fwrite(file, &ino, sizeof(ino), &calc->pos); + if (sz == sizeof(ino)) + return 0; /* success */ + @@ -36988,7 +37446,7 @@ index 000000000000..b3152c0ce0b5 + goto out; + } + -+ err = au_xino_do_write(au_sbi(sb)->si_xwrite, file, &calc, ino); ++ err = au_xino_do_write(file, &calc, ino); + if (!err) { + br = au_sbr(sb, bindex); + if (au_opt_test(mnt_flags, TRUNC_XINO) @@ -37002,40 +37460,27 @@ index 000000000000..b3152c0ce0b5 + return -EIO; +} + -+static ssize_t xino_fread_wkq(vfs_readf_t func, struct file *file, void *buf, -+ size_t size, loff_t *pos); ++static ssize_t xino_fread_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos); + +/* todo: unnecessary to support mmap_sem since kernel-space? */ -+ssize_t xino_fread(vfs_readf_t func, struct file *file, void *kbuf, size_t size, -+ loff_t *pos) ++ssize_t xino_fread(struct file *file, void *kbuf, size_t size, loff_t *pos) +{ + ssize_t err; -+ mm_segment_t oldfs; -+ union { -+ void *k; -+ char __user *u; -+ } buf; + int i; + const int prevent_endless = 10; + + i = 0; -+ buf.k = kbuf; -+ oldfs = get_fs(); -+ set_fs(KERNEL_DS); + do { -+ err = func(file, buf.u, size, pos); ++ err = vfsub_read_k(file, kbuf, size, pos); + if (err == -EINTR + && !au_wkq_test() + && fatal_signal_pending(current)) { -+ set_fs(oldfs); -+ err = xino_fread_wkq(func, file, kbuf, size, pos); ++ err = xino_fread_wkq(file, kbuf, size, pos); + BUG_ON(err == -EINTR); -+ oldfs = get_fs(); -+ set_fs(KERNEL_DS); + } + } while (i++ < prevent_endless + && (err == -EAGAIN || err == -EINTR)); -+ set_fs(oldfs); + +#if 0 /* reserved for future use */ + if (err > 0) @@ -37047,7 +37492,6 @@ index 000000000000..b3152c0ce0b5 + +struct xino_fread_args { + ssize_t *errp; -+ vfs_readf_t func; + struct file *file; + void *buf; + size_t size; @@ -37057,17 +37501,16 @@ index 000000000000..b3152c0ce0b5 +static void call_xino_fread(void *args) +{ + struct xino_fread_args *a = args; -+ *a->errp = xino_fread(a->func, a->file, a->buf, a->size, a->pos); ++ *a->errp = xino_fread(a->file, a->buf, a->size, a->pos); +} + -+static ssize_t xino_fread_wkq(vfs_readf_t func, struct file *file, void *buf, -+ size_t size, loff_t *pos) ++static ssize_t xino_fread_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos) +{ + ssize_t err; + int wkq_err; + struct xino_fread_args args = { + .errp = &err, -+ .func = func, + .file = file, + .buf = buf, + .size = size, @@ -37081,39 +37524,27 @@ index 000000000000..b3152c0ce0b5 + return err; +} + -+static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf, -+ size_t size, loff_t *pos); ++static ssize_t xino_fwrite_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos); + -+static ssize_t do_xino_fwrite(vfs_writef_t func, struct file *file, void *kbuf, -+ size_t size, loff_t *pos) ++static ssize_t do_xino_fwrite(struct file *file, void *kbuf, size_t size, ++ loff_t *pos) +{ + ssize_t err; -+ mm_segment_t oldfs; -+ union { -+ void *k; -+ const char __user *u; -+ } buf; + int i; + const int prevent_endless = 10; + + i = 0; -+ buf.k = kbuf; -+ oldfs = get_fs(); -+ set_fs(KERNEL_DS); + do { -+ err = func(file, buf.u, size, pos); ++ err = vfsub_write_k(file, kbuf, size, pos); + if (err == -EINTR + && !au_wkq_test() + && fatal_signal_pending(current)) { -+ set_fs(oldfs); -+ err = xino_fwrite_wkq(func, file, kbuf, size, pos); ++ err = xino_fwrite_wkq(file, kbuf, size, pos); + BUG_ON(err == -EINTR); -+ oldfs = get_fs(); -+ set_fs(KERNEL_DS); + } + } while (i++ < prevent_endless + && (err == -EAGAIN || err == -EINTR)); -+ set_fs(oldfs); + +#if 0 /* reserved for future use */ + if (err > 0) @@ -37125,7 +37556,6 @@ index 000000000000..b3152c0ce0b5 + +struct do_xino_fwrite_args { + ssize_t *errp; -+ vfs_writef_t func; + struct file *file; + void *buf; + size_t size; @@ -37135,17 +37565,16 @@ index 000000000000..b3152c0ce0b5 +static void call_do_xino_fwrite(void *args) +{ + struct do_xino_fwrite_args *a = args; -+ *a->errp = do_xino_fwrite(a->func, a->file, a->buf, a->size, a->pos); ++ *a->errp = do_xino_fwrite(a->file, a->buf, a->size, a->pos); +} + -+static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf, -+ size_t size, loff_t *pos) ++static ssize_t xino_fwrite_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos) +{ + ssize_t err; + int wkq_err; + struct do_xino_fwrite_args args = { + .errp = &err, -+ .func = func, + .file = file, + .buf = buf, + .size = size, @@ -37163,18 +37592,17 @@ index 000000000000..b3152c0ce0b5 + return err; +} + -+ssize_t xino_fwrite(vfs_writef_t func, struct file *file, void *buf, -+ size_t size, loff_t *pos) ++ssize_t xino_fwrite(struct file *file, void *buf, size_t size, loff_t *pos) +{ + ssize_t err; + + if (rlimit(RLIMIT_FSIZE) == RLIM_INFINITY) { + lockdep_off(); -+ err = do_xino_fwrite(func, file, buf, size, pos); ++ err = do_xino_fwrite(file, buf, size, pos); + lockdep_on(); + } else { + lockdep_off(); -+ err = xino_fwrite_wkq(func, file, buf, size, pos); ++ err = xino_fwrite_wkq(file, buf, size, pos); + lockdep_on(); + } + @@ -37225,17 +37653,17 @@ index 000000000000..b3152c0ce0b5 + p = sbinfo->si_xib_buf; + pos = sbinfo->si_xib_last_pindex; + pos *= PAGE_SIZE; -+ sz = xino_fwrite(sbinfo->si_xwrite, xib, p, PAGE_SIZE, &pos); ++ sz = xino_fwrite(xib, p, PAGE_SIZE, &pos); + if (unlikely(sz != PAGE_SIZE)) + goto out; + + pos = pindex; + pos *= PAGE_SIZE; + if (vfsub_f_size_read(xib) >= pos + PAGE_SIZE) -+ sz = xino_fread(sbinfo->si_xread, xib, p, PAGE_SIZE, &pos); ++ sz = xino_fread(xib, p, PAGE_SIZE, &pos); + else { + memset(p, 0, PAGE_SIZE); -+ sz = xino_fwrite(sbinfo->si_xwrite, xib, p, PAGE_SIZE, &pos); ++ sz = xino_fwrite(xib, p, PAGE_SIZE, &pos); + } + if (sz == PAGE_SIZE) { + sbinfo->si_xib_last_pindex = pindex; @@ -37286,7 +37714,6 @@ index 000000000000..b3152c0ce0b5 + unsigned long pindex; + loff_t pos, pend; + struct au_sbinfo *sbinfo; -+ vfs_readf_t func; + ino_t *ino; + unsigned long *p; + @@ -37294,11 +37721,10 @@ index 000000000000..b3152c0ce0b5 + sbinfo = au_sbi(sb); + MtxMustLock(&sbinfo->si_xib_mtx); + p = sbinfo->si_xib_buf; -+ func = sbinfo->si_xread; + pend = vfsub_f_size_read(file); + pos = 0; + while (pos < pend) { -+ sz = xino_fread(func, file, page, PAGE_SIZE, &pos); ++ sz = xino_fread(file, page, PAGE_SIZE, &pos); + err = sz; + if (unlikely(sz <= 0)) + goto out; @@ -37387,7 +37813,7 @@ index 000000000000..b3152c0ce0b5 + p = sbinfo->si_xib_buf; + memset(p, 0, PAGE_SIZE); + pos = 0; -+ sz = xino_fwrite(sbinfo->si_xwrite, sbinfo->si_xib, p, PAGE_SIZE, &pos); ++ sz = xino_fwrite(sbinfo->si_xib, p, PAGE_SIZE, &pos); + if (unlikely(sz != PAGE_SIZE)) { + err = sz; + AuIOErr("err %d\n", err); @@ -37526,7 +37952,6 @@ index 000000000000..b3152c0ce0b5 + SiMustWriteLock(sb); + + sbinfo = au_sbi(sb); -+ /* unnecessary to clear sbinfo->si_xread and ->si_xwrite */ + if (sbinfo->si_xib) + fput(sbinfo->si_xib); + sbinfo->si_xib = NULL; @@ -37553,8 +37978,6 @@ index 000000000000..b3152c0ce0b5 + if (sbinfo->si_xib) + fput(sbinfo->si_xib); + sbinfo->si_xib = file; -+ sbinfo->si_xread = vfs_readf(file); -+ sbinfo->si_xwrite = vfs_writef(file); + xi_sb = file_inode(file)->i_sb; + sbinfo->si_ximaxent = xi_sb->s_maxbytes; + if (unlikely(sbinfo->si_ximaxent < PAGE_SIZE)) { @@ -37575,8 +37998,7 @@ index 000000000000..b3152c0ce0b5 + sbinfo->si_xib_next_bit = 0; + if (vfsub_f_size_read(file) < PAGE_SIZE) { + pos = 0; -+ err = xino_fwrite(sbinfo->si_xwrite, file, sbinfo->si_xib_buf, -+ PAGE_SIZE, &pos); ++ err = xino_fwrite(file, sbinfo->si_xib_buf, PAGE_SIZE, &pos); + if (unlikely(err != PAGE_SIZE)) + goto out_free; + } @@ -37627,7 +38049,6 @@ index 000000000000..b3152c0ce0b5 +} + +struct au_xino_do_set_br { -+ vfs_writef_t writef; + struct au_branch *br; + ino_t h_ino; + aufs_bindex_t bshared; @@ -37669,7 +38090,7 @@ index 000000000000..b3152c0ce0b5 + goto out; + AuDebugOn(!file); + -+ err = au_xino_do_write(args->writef, file, &calc, AUFS_ROOT_INO); ++ err = au_xino_do_write(file, &calc, AUFS_ROOT_INO); + if (unlikely(err)) + au_xino_put(br); + @@ -37689,7 +38110,6 @@ index 000000000000..b3152c0ce0b5 + + bbot = au_sbbot(sb); + inode = d_inode(sb->s_root); -+ args.writef = au_sbi(sb)->si_xwrite; + for (bindex = 0; bindex <= bbot; bindex++) { + args.h_ino = au_h_iptr(inode, bindex)->i_ino; + args.br = au_sbr(sb, bindex); @@ -37844,7 +38264,6 @@ index 000000000000..b3152c0ce0b5 + .br = br + }; + -+ args.writef = au_sbi(sb)->si_xwrite; + args.bshared = sbr_find_shared(sb, /*btop*/0, au_sbbot(sb), + au_br_sb(br)); + err = au_xino_do_set_br(sb, base, &args); @@ -37928,7 +38347,6 @@ index 000000000000..b3152c0ce0b5 + struct au_hinode *hi; + struct inode *h_inode; + struct au_branch *br; -+ vfs_writef_t xwrite; + struct au_xi_calc calc; + struct file *file; + @@ -37950,7 +38368,6 @@ index 000000000000..b3152c0ce0b5 + if (bindex < 0) + return; + -+ xwrite = au_sbi(sb)->si_xwrite; + try_trunc = !!au_opt_test(mnt_flags, TRUNC_XINO); + hi = au_hinode(iinfo, bindex); + bbot = iinfo->ii_bbot; @@ -37971,7 +38388,7 @@ index 000000000000..b3152c0ce0b5 + if (IS_ERR_OR_NULL(file)) + continue; + -+ err = au_xino_do_write(xwrite, file, &calc, /*ino*/0); ++ err = au_xino_do_write(file, &calc, /*ino*/0); + if (!err && try_trunc + && au_test_fs_trunc_xino(au_br_sb(br))) + xino_try_trunc(sb, br); @@ -38096,15 +38513,15 @@ index 000000000000..b3152c0ce0b5 +} diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h new file mode 100644 -index 000000000000..28ef4bb88f21 +index 000000000000..83d3a5132b5a --- /dev/null +++ b/include/uapi/linux/aufs_type.h @@ -0,0 +1,452 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* -+ * Copyright (C) 2005-2020 Junjiro R. Okajima ++ * Copyright (C) 2005-2022 Junjiro R. Okajima + * -+ * This program, aufs is free software; you can redistribute it and/or modify ++ * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. @@ -38142,7 +38559,7 @@ index 000000000000..28ef4bb88f21 +#include <limits.h> +#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "5.x-rcN-20200302" ++#define AUFS_VERSION "6.5-20230918" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') @@ -38389,7 +38806,7 @@ index 000000000000..28ef4bb88f21 + uint8_t type; + uint8_t nlen; + uint8_t wh; -+ char name[0]; ++ char name[]; +} __aligned(8); + +static inline int au_rdu_len(int nlen) @@ -38440,7 +38857,7 @@ index 000000000000..28ef4bb88f21 + uint8_t oldnamelen; + uint64_t _padding; + }; -+ uint8_t oldname[0]; ++ uint8_t oldname[]; +} __aligned(8); + +struct au_drinfo_fdata { @@ -38534,7 +38951,7 @@ index 000000000000..28ef4bb88f21 + struct { + int16_t id; + int perm; -+ char path[0]; ++ char path[]; + }; +} __aligned(8); + @@ -38553,5 +38970,5 @@ index 000000000000..28ef4bb88f21 + +#endif /* __AUFS_TYPE_H__ */ -- -2.19.1 +2.34.1 diff --git a/features/aufs/aufs6-correct-do_splice_from-prototype.patch b/features/aufs/aufs6-correct-do_splice_from-prototype.patch new file mode 100644 index 00000000..dd83db1e --- /dev/null +++ b/features/aufs/aufs6-correct-do_splice_from-prototype.patch @@ -0,0 +1,26 @@ +From c76e5c498001148b22148fadc86611fd1874caa9 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 25 Jan 2024 11:17:19 -0500 +Subject: [PATCH] aufs6: correct do_splice_from prototype + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + include/linux/splice.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 8024911403e9..727e61a98c49 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -109,7 +109,7 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); + extern const struct pipe_buf_operations page_cache_pipe_buf_ops; + extern const struct pipe_buf_operations default_pipe_buf_ops; + +-extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++extern ssize_t do_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags); + extern long do_splice_to(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, +-- +2.39.2 + diff --git a/features/aufs/aufs6-fix-magic.mk-include-path.patch b/features/aufs/aufs6-fix-magic.mk-include-path.patch new file mode 100644 index 00000000..9bb1cf43 --- /dev/null +++ b/features/aufs/aufs6-fix-magic.mk-include-path.patch @@ -0,0 +1,37 @@ +From 001144b1c29e0214cad19720e6e1c35a576b124c Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 6 Jul 2023 11:34:59 -0400 +Subject: [PATCH 7/8] aufs6: fix magic.mk include path + +commit 482d7131560c51da3ca [aufs stdalone: make it standalone] in the +aufs upstream changes the way that the .mk file is included. + +This doesn't work properly with all kernel build processes, so we +restore the use of srctree/src to locate the file. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/aufs/Makefile b/fs/aufs/Makefile +index 4af8ecde3e3f..72db3cae2b92 100644 +--- a/fs/aufs/Makefile ++++ b/fs/aufs/Makefile +@@ -1,10 +1,10 @@ + # SPDX-License-Identifier: GPL-2.0 + +-include ${src}/magic.mk ++include ${srctree}/${src}/magic.mk + ifeq (${CONFIG_AUFS_FS},m) +-include ${src}/conf.mk ++include ${srctree}/${src}/conf.mk + endif +--include ${src}/priv_def.mk ++-include ${srctree}/${src}/priv_def.mk + + # cf. include/linux/kernel.h + # enable pr_debug +-- +2.34.1 + diff --git a/features/aufs/aufs5-kbuild.patch b/features/aufs/aufs6-kbuild.patch index 5f180754..57532dd5 100644 --- a/features/aufs/aufs5-kbuild.patch +++ b/features/aufs/aufs6-kbuild.patch @@ -1,7 +1,7 @@ -From 601227764eeae90aef5be5ed3cb4497f246c5888 Mon Sep 17 00:00:00 2001 +From 9962a8dfbc2b485c58d9ca511ae7bdfd808f78cc Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Mon, 16 Mar 2020 23:42:06 -0400 -Subject: [PATCH 1/6] aufs5: kbuild +Date: Thu, 21 Sep 2023 17:47:14 -0400 +Subject: [PATCH 1/8] aufs6: kbuild Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- @@ -10,10 +10,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> 2 files changed, 2 insertions(+) diff --git a/fs/Kconfig b/fs/Kconfig -index fe77c48345ac..80e1346b2ded 100644 +index 3800e18ad2ea..a0b5168e1ef6 100644 --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -267,6 +267,7 @@ source "fs/sysv/Kconfig" +@@ -332,6 +332,7 @@ source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/erofs/Kconfig" source "fs/vboxsf/Kconfig" @@ -22,14 +22,14 @@ index fe77c48345ac..80e1346b2ded 100644 endif # MISC_FILESYSTEMS diff --git a/fs/Makefile b/fs/Makefile -index 4b7b6634e2ae..8d00f0f3b0df 100644 +index 23cc0a3852aa..d58a3f162e31 100644 --- a/fs/Makefile +++ b/fs/Makefile -@@ -136,3 +136,4 @@ obj-$(CONFIG_EROFS_FS) += erofs/ +@@ -130,3 +130,4 @@ obj-$(CONFIG_EROFS_FS) += erofs/ obj-$(CONFIG_VBOXSF_FS) += vboxsf/ obj-$(CONFIG_ZONEFS_FS) += zonefs/ obj-$(CONFIG_YAFFS_FS) += yaffs2/ +obj-$(CONFIG_AUFS_FS) += aufs/ -- -2.19.1 +2.34.1 diff --git a/features/aufs/aufs5-mmap.patch b/features/aufs/aufs6-mmap.patch index 9603eb0e..d1e5168f 100644 --- a/features/aufs/aufs5-mmap.patch +++ b/features/aufs/aufs6-mmap.patch @@ -1,43 +1,43 @@ -From 4e26732d3aafe49ce67e71925e5939c01bd3cbaf Mon Sep 17 00:00:00 2001 +From 550fbd6a226ed0b04b497dd4dcf5e14c7cd113f1 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Mon, 16 Mar 2020 23:44:53 -0400 -Subject: [PATCH 3/6] aufs5: mmap +Date: Thu, 21 Sep 2023 17:49:39 -0400 +Subject: [PATCH] aufs6: mmap Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- fs/proc/base.c | 2 +- fs/proc/nommu.c | 5 ++- - fs/proc/task_mmu.c | 7 +++- + fs/proc/task_mmu.c | 6 ++- fs/proc/task_nommu.c | 5 ++- - include/linux/mm.h | 22 ++++++++++ - include/linux/mm_types.h | 2 + + include/linux/mm.h | 37 +++++++++++++++++ + include/linux/mm_types.h | 6 +++ kernel/fork.c | 2 +- - mm/Makefile | 2 +- + mm/Makefile | 1 + mm/filemap.c | 2 +- - mm/mmap.c | 33 +++++++++++---- + mm/mmap.c | 41 +++++++++++++++---- mm/nommu.c | 10 ++--- mm/prfile.c | 86 ++++++++++++++++++++++++++++++++++++++++ - 12 files changed, 157 insertions(+), 21 deletions(-) + 12 files changed, 184 insertions(+), 19 deletions(-) create mode 100644 mm/prfile.c diff --git a/fs/proc/base.c b/fs/proc/base.c -index c7c64272b0fa..76d99aea5ae2 100644 +index 98a031ac2648..9cd1d25f9fc0 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c -@@ -2128,7 +2128,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) +@@ -2215,7 +2215,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) rc = -ENOENT; vma = find_exact_vma(mm, vm_start, vm_end); if (vma && vma->vm_file) { -- *path = vma->vm_file->f_path; -+ *path = vma_pr_or_file(vma)->f_path; +- *path = *file_user_path(vma->vm_file); ++ *path = *file_user_path(vma_pr_or_file(vma)); path_get(path); rc = 0; } diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c -index 14c2badb8fd9..65afe5287e43 100644 +index c6e7ebc63756..d7ccfd909764 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c -@@ -41,7 +41,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) +@@ -39,7 +39,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) file = region->vm_file; if (file) { @@ -50,35 +50,35 @@ index 14c2badb8fd9..65afe5287e43 100644 ino = inode->i_ino; } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index 3ba9ae83bff5..397c33e0acbe 100644 +index 3f78ebbb795f..32f9aaf5345e 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) +@@ -273,8 +273,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) const char *name = NULL; if (file) { -- struct inode *inode = file_inode(vma->vm_file); +- const struct inode *inode = file_user_inode(vma->vm_file); + struct inode *inode; -+ + + file = vma_pr_or_file(vma); -+ inode = file_inode(file); ++ inode = file_user_inode(vma->vm_file); dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; -@@ -1819,7 +1822,7 @@ static int show_numa_map(struct seq_file *m, void *v) +@@ -2701,7 +2703,7 @@ static int show_numa_map(struct seq_file *m, void *v) struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct vm_area_struct *vma = v; struct numa_maps *md = &numa_priv->md; - struct file *file = vma->vm_file; + struct file *file = vma_pr_or_file(vma); struct mm_struct *mm = vma->vm_mm; - struct mempolicy *pol; char buffer[64]; + struct mempolicy *pol; diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c -index 7907e6419e57..d17209cf52bc 100644 +index bce674533000..b12b5a75c799 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c -@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) +@@ -137,7 +137,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) file = vma->vm_file; if (file) { @@ -91,13 +91,14 @@ index 7907e6419e57..d17209cf52bc 100644 ino = inode->i_ino; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; diff --git a/include/linux/mm.h b/include/linux/mm.h -index c54fb96cb1e6..393304f0526d 100644 +index f5a97dec5169..dc908f541ce9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1487,6 +1487,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, - unmap_mapping_range(mapping, holebegin, holelen, 0); - } +@@ -2432,6 +2432,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, + static inline struct vm_area_struct *vma_lookup(struct mm_struct *mm, + unsigned long addr); ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ +extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int); +extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[], + int); @@ -120,101 +121,105 @@ index c54fb96cb1e6..393304f0526d 100644 +#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__) +#endif /* !CONFIG_MMU */ + ++#else ++ ++#define vma_file_update_time(vma) file_update_time((vma)->vm_file) ++#define vma_pr_or_file(vma) (vma)->vm_file ++#define vma_get_file(vma) get_file((vma)->vm_file) ++#define vma_fput(vma) fput((vma)->vm_file) ++ ++#ifndef CONFIG_MMU ++#define vmr_pr_or_file(region) (region)->vm_file ++#define vmr_fput(region) fput((region)->vm_file) ++#endif /* !CONFIG_MMU */ ++ ++#endif /* CONFIG_AUFS_FS */ ++ extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, unsigned int gup_flags); extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index c28911c3afa8..23d069c0e171 100644 +index 8b611e13153e..f5f10bfa5b63 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h -@@ -267,6 +267,7 @@ struct vm_region { +@@ -527,6 +527,9 @@ struct vm_region { unsigned long vm_top; /* region allocated to here */ unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ struct file *vm_file; /* the backing file or NULL */ ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ + struct file *vm_prfile; /* the virtual backing file or NULL */ ++#endif int vm_usage; /* region usage count (access under nommu_region_sem) */ bool vm_icache_flushed : 1; /* true if the icache has been flushed for -@@ -346,6 +347,7 @@ struct vm_area_struct { +@@ -691,6 +694,9 @@ struct vm_area_struct { unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE units */ struct file * vm_file; /* File we map to (can be NULL). */ ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ + struct file *vm_prfile; /* shadow of vm_file */ ++#endif void * vm_private_data; /* was vm_pte (shared mem) */ - #ifdef CONFIG_SWAP + #ifdef CONFIG_ANON_VMA_NAME diff --git a/kernel/fork.c b/kernel/fork.c -index 86425305cd4a..1ba5dcd161f1 100644 +index 47ff3b35352e..41a80f248514 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -565,7 +565,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, - struct inode *inode = file_inode(file); +@@ -716,7 +716,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, + if (file) { struct address_space *mapping = file->f_mapping; - get_file(file); + vma_get_file(tmp); - if (tmp->vm_flags & VM_DENYWRITE) - atomic_dec(&inode->i_writecount); i_mmap_lock_write(mapping); + if (vma_is_shared_maywrite(tmp)) + mapping_allow_writable(mapping); diff --git a/mm/Makefile b/mm/Makefile -index 272e66039e70..c8ff3d955c27 100644 +index e4b5b75aaec9..d69ba9efb769 100644 --- a/mm/Makefile +++ b/mm/Makefile -@@ -43,7 +43,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ - mm_init.o mmu_context.o percpu.o slab_common.o \ - compaction.o vmacache.o \ - interval_tree.o list_lru.o workingset.o \ -- debug.o gup.o $(mmu-y) -+ prfile.o debug.o gup.o $(mmu-y) - - # Give 'page_alloc' its own module-parameter namespace - page-alloc-y := page_alloc.o +@@ -134,3 +134,4 @@ obj-$(CONFIG_IO_MAPPING) += io-mapping.o + obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o + obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o + obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o ++obj-y += prfile.o diff --git a/mm/filemap.c b/mm/filemap.c -index 1784478270e1..fb03735cd00e 100644 +index 750e779c23db..b84a752ff676 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2653,7 +2653,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) +@@ -3587,7 +3587,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) vm_fault_t ret = VM_FAULT_LOCKED; - sb_start_pagefault(inode->i_sb); + sb_start_pagefault(mapping->host->i_sb); - file_update_time(vmf->vma->vm_file); + vma_file_update_time(vmf->vma); - lock_page(page); - if (page->mapping != inode->i_mapping) { - unlock_page(page); + folio_lock(folio); + if (folio->mapping != mapping) { + folio_unlock(folio); diff --git a/mm/mmap.c b/mm/mmap.c -index d681a20eb4ea..36c80ae89cee 100644 +index b78e83d351d2..e2ae3999a51c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -176,7 +176,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) +@@ -140,7 +140,7 @@ static void remove_vma(struct vm_area_struct *vma, bool unreachable) if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) - fput(vma->vm_file); + vma_fput(vma); mpol_put(vma_policy(vma)); - vm_area_free(vma); - return next; -@@ -907,7 +907,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, - if (remove_next) { - if (file) { - uprobe_munmap(next, next->vm_start, next->vm_end); -- fput(file); -+ vma_fput(vma); + if (unreachable) + __vm_area_free(vma); +@@ -554,7 +554,7 @@ static inline void vma_complete(struct vma_prepare *vp, + if (vp->file) { + uprobe_munmap(vp->remove, vp->remove->vm_start, + vp->remove->vm_end); +- fput(vp->file); ++ vma_fput(vp->vma); } - if (next->anon_vma) - anon_vma_merge(vma, next); -@@ -1829,8 +1829,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, - return addr; - - unmap_and_free_vma: -+ vma_fput(vma); - vma->vm_file = NULL; -- fput(file); - - /* Undo any partial mapping done by a device driver. */ - unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); -@@ -2659,7 +2659,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, + if (vp->remove->anon_vma) + anon_vma_merge(vp->vma, vp->remove); +@@ -2355,7 +2355,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, goto out_free_mpol; if (new->vm_file) @@ -223,54 +228,70 @@ index d681a20eb4ea..36c80ae89cee 100644 if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); -@@ -2678,7 +2678,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, - if (new->vm_ops && new->vm_ops->close) - new->vm_ops->close(new); - if (new->vm_file) -- fput(new->vm_file); -+ vma_fput(new); - unlink_anon_vmas(new); - out_free_mpol: - mpol_put(vma_policy(new)); -@@ -2870,7 +2870,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, - struct vm_area_struct *vma; +@@ -2853,7 +2853,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, + * and cause general protection fault + * ultimately. + */ +- fput(vma->vm_file); ++ vma_fput(vma); + vm_area_free(vma); + vma = merge; + /* Update vm_flags to pick up the change. */ +@@ -2948,7 +2948,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, + + if (file || vma->vm_file) { + unmap_and_free_vma: +- fput(vma->vm_file); ++ vma_fput(vma); + vma->vm_file = NULL; + + vma_iter_set(&vmi, vma->vm_end); +@@ -3010,6 +3010,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, unsigned long populate = 0; unsigned long ret = -EINVAL; -- struct file *file; -+ struct file *file, *prfile; + struct file *file; ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ ++ struct file *prfile; ++#endif - pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", + pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/mm/remap_file_pages.rst.\n", current->comm, current->pid); -@@ -2945,10 +2945,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, - } - } +@@ -3068,10 +3071,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, + if (vma->vm_flags & VM_LOCKED) + flags |= MAP_LOCKED; -- file = get_file(vma->vm_file); ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ + vma_get_file(vma); + file = vma->vm_file; + prfile = vma->vm_prfile; - ret = do_mmap_pgoff(vma->vm_file, start, size, - prot, flags, pgoff, &populate, NULL); ++ ret = do_mmap(vma->vm_file, start, size, ++ prot, flags, pgoff, &populate, NULL); + if (!IS_ERR_VALUE(ret) && file && prfile) { + struct vm_area_struct *new_vma; + + new_vma = find_vma(mm, ret); + if (!new_vma->vm_prfile) + new_vma->vm_prfile = prfile; -+ if (new_vma != vma) ++ if (prfile) + get_file(prfile); + } + /* + * two fput()s instead of vma_fput(vma), + * coz vma may not be available anymore. + */ - fput(file); ++ fput(file); + if (prfile) + fput(prfile); ++#else + file = get_file(vma->vm_file); + ret = do_mmap(vma->vm_file, start, size, + prot, flags, 0, pgoff, &populate, NULL); + fput(file); ++#endif /* CONFIG_AUFS_FS */ out: - up_write(&mm->mmap_sem); + mmap_write_unlock(mm); if (populate) -@@ -3239,7 +3256,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -3418,7 +3445,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, if (anon_vma_clone(new_vma, vma)) goto out_free_mempol; if (new_vma->vm_file) @@ -278,12 +299,21 @@ index d681a20eb4ea..36c80ae89cee 100644 + vma_get_file(new_vma); if (new_vma->vm_ops && new_vma->vm_ops->open) new_vma->vm_ops->open(new_vma); - vma_link(mm, new_vma, prev, rb_link, rb_parent); + if (vma_link(mm, new_vma)) +@@ -3432,7 +3459,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, + new_vma->vm_ops->close(new_vma); + + if (new_vma->vm_file) +- fput(new_vma->vm_file); ++ vma_fput(new_vma); + + unlink_anon_vmas(new_vma); + out_free_mempol: diff --git a/mm/nommu.c b/mm/nommu.c -index bd2b4e5ef144..acdab5253263 100644 +index b6dc558d3144..d96655486468 100644 --- a/mm/nommu.c +++ b/mm/nommu.c -@@ -563,7 +563,7 @@ static void __put_nommu_region(struct vm_region *region) +@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region) up_write(&nommu_region_sem); if (region->vm_file) @@ -292,7 +322,7 @@ index bd2b4e5ef144..acdab5253263 100644 /* IO memory and memory shared directly out of the pagecache * from ramfs/tmpfs mustn't be released here */ -@@ -695,7 +695,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -603,7 +603,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) @@ -301,7 +331,7 @@ index bd2b4e5ef144..acdab5253263 100644 put_nommu_region(vma->vm_region); vm_area_free(vma); } -@@ -1218,7 +1218,7 @@ unsigned long do_mmap(struct file *file, +@@ -1135,7 +1135,7 @@ unsigned long do_mmap(struct file *file, goto error_just_free; } } @@ -310,9 +340,9 @@ index bd2b4e5ef144..acdab5253263 100644 kmem_cache_free(vm_region_jar, region); region = pregion; result = start; -@@ -1295,10 +1295,10 @@ unsigned long do_mmap(struct file *file, - up_write(&nommu_region_sem); +@@ -1221,10 +1221,10 @@ unsigned long do_mmap(struct file *file, error: + vma_iter_free(&vmi); if (region->vm_file) - fput(region->vm_file); + vmr_fput(region); @@ -325,7 +355,7 @@ index bd2b4e5ef144..acdab5253263 100644 diff --git a/mm/prfile.c b/mm/prfile.c new file mode 100644 -index 000000000000..00d51187c325 +index 000000000000..8f820a235364 --- /dev/null +++ b/mm/prfile.c @@ -0,0 +1,86 @@ @@ -337,7 +367,7 @@ index 000000000000..00d51187c325 + * + * See Documentation/filesystems/aufs/design/06mmap.txt + * -+ * Copyright (c) 2014-2020 Junjro R. Okajima ++ * Copyright (c) 2014-2022 Junjro R. Okajima + * Copyright (c) 2014 Ian Campbell + */ + @@ -416,5 +446,5 @@ index 000000000000..00d51187c325 +} +#endif /* !CONFIG_MMU */ -- -2.19.1 +2.39.2 diff --git a/features/aufs/aufs5-standalone.patch b/features/aufs/aufs6-standalone.patch index 76e2e3b6..d7ceb50a 100644 --- a/features/aufs/aufs5-standalone.patch +++ b/features/aufs/aufs6-standalone.patch @@ -1,32 +1,30 @@ -From e18a42e141f22255451c94fcafbec83ea17ceca2 Mon Sep 17 00:00:00 2001 +From da930b7640bef946a6d703e28ec8c8d785245ab1 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Mon, 16 Mar 2020 23:45:18 -0400 -Subject: [PATCH 4/6] aufs5: standalone +Date: Thu, 21 Sep 2023 17:50:11 -0400 +Subject: [PATCH 4/8] aufs6: standalone Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- fs/dcache.c | 2 ++ fs/exec.c | 1 + fs/fcntl.c | 1 + - fs/file_table.c | 2 ++ - fs/inode.c | 1 + + fs/file_table.c | 1 + fs/namespace.c | 3 +++ fs/notify/group.c | 1 + fs/open.c | 1 + - fs/read_write.c | 4 ++++ - fs/splice.c | 2 ++ - fs/sync.c | 1 + + fs/read_write.c | 2 ++ + fs/splice.c | 1 + fs/xattr.c | 1 + kernel/locking/lockdep.c | 1 + kernel/task_work.c | 1 + security/security.c | 8 ++++++++ - 15 files changed, 30 insertions(+) + 13 files changed, 24 insertions(+) diff --git a/fs/dcache.c b/fs/dcache.c -index 046000653e4d..15aa871d1b45 100644 +index 6c930ceed526..576ad162cdec 100644 --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -1371,6 +1371,7 @@ void d_walk(struct dentry *parent, void *data, +@@ -1450,6 +1450,7 @@ void d_walk(struct dentry *parent, void *data, seq = 1; goto again; } @@ -34,7 +32,7 @@ index 046000653e4d..15aa871d1b45 100644 struct check_mount { struct vfsmount *mnt; -@@ -2916,6 +2917,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) +@@ -3051,6 +3052,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) write_sequnlock(&rename_lock); } @@ -43,10 +41,10 @@ index 046000653e4d..15aa871d1b45 100644 /** * d_ancestor - search for an ancestor diff --git a/fs/exec.c b/fs/exec.c -index db17be51b112..4bb61917a29a 100644 +index 6518e33ea813..b67efac6a1ad 100644 --- a/fs/exec.c +++ b/fs/exec.c -@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path) +@@ -112,6 +112,7 @@ bool path_noexec(const struct path *path) return (path->mnt->mnt_flags & MNT_NOEXEC) || (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC); } @@ -55,10 +53,10 @@ index db17be51b112..4bb61917a29a 100644 #ifdef CONFIG_USELIB /* diff --git a/fs/fcntl.c b/fs/fcntl.c -index 0b28a37f7e50..f2c90a416b75 100644 +index 84a52a8eec92..fdd334fc02fb 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg) +@@ -87,6 +87,7 @@ int setfl(int fd, struct file *filp, unsigned int arg) out: return error; } @@ -67,10 +65,10 @@ index 0b28a37f7e50..f2c90a416b75 100644 static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, int force) diff --git a/fs/file_table.c b/fs/file_table.c -index 30d55c9a1744..34b9bbf4c556 100644 +index ee21b3da9d08..c45ac36795dd 100644 --- a/fs/file_table.c +++ b/fs/file_table.c -@@ -162,6 +162,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred) +@@ -225,6 +225,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred) } return ERR_PTR(-ENFILE); } @@ -78,31 +76,11 @@ index 30d55c9a1744..34b9bbf4c556 100644 /* * Variant of alloc_empty_file() that doesn't check and modify nr_files. -@@ -375,6 +376,7 @@ void __fput_sync(struct file *file) - } - - EXPORT_SYMBOL(fput); -+EXPORT_SYMBOL_GPL(__fput_sync); - - void __init files_init(void) - { -diff --git a/fs/inode.c b/fs/inode.c -index 7700c5e4783b..6284b41fcf3f 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1694,6 +1694,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) - return inode->i_op->update_time(inode, time, flags); - return generic_update_time(inode, time, flags); - } -+EXPORT_SYMBOL_GPL(update_time); - - /** - * touch_atime - update the access time diff --git a/fs/namespace.c b/fs/namespace.c -index c742051ba969..e02a680b7fe9 100644 +index 6c57487f126b..16be9ac1c734 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt) +@@ -466,6 +466,7 @@ void __mnt_drop_write(struct vfsmount *mnt) mnt_dec_writers(real_mount(mnt)); preempt_enable(); } @@ -110,7 +88,7 @@ index c742051ba969..e02a680b7fe9 100644 /** * mnt_drop_write - give up write access to a mount -@@ -781,6 +782,7 @@ int is_current_mnt_ns(struct vfsmount *mnt) +@@ -877,6 +878,7 @@ int is_current_mnt_ns(struct vfsmount *mnt) { return check_mnt(real_mount(mnt)); } @@ -118,7 +96,7 @@ index c742051ba969..e02a680b7fe9 100644 /* * vfsmount lock must be held for write -@@ -1903,6 +1905,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, +@@ -2152,6 +2154,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } @@ -127,10 +105,10 @@ index c742051ba969..e02a680b7fe9 100644 static void lock_mnt_tree(struct mount *mnt) { diff --git a/fs/notify/group.c b/fs/notify/group.c -index 133f723aca07..0b9f7f6d8390 100644 +index 1de6631a3925..3008eb37a18d 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c -@@ -99,6 +99,7 @@ void fsnotify_get_group(struct fsnotify_group *group) +@@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group) { refcount_inc(&group->refcnt); } @@ -139,10 +117,10 @@ index 133f723aca07..0b9f7f6d8390 100644 /* * Drop a reference to a group. Free it if it's through. diff --git a/fs/open.c b/fs/open.c -index b69d6eed67e6..cb777a1888f7 100644 +index 98f6601fbac6..8624e4ffa15b 100644 --- a/fs/open.c +++ b/fs/open.c -@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, +@@ -67,6 +67,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry, inode_unlock(dentry->d_inode); return ret; } @@ -151,35 +129,19 @@ index b69d6eed67e6..cb777a1888f7 100644 long vfs_truncate(const struct path *path, loff_t length) { diff --git a/fs/read_write.c b/fs/read_write.c -index bcb853105beb..e54db6078e3f 100644 +index 4771701c896b..c79270aba792 100644 --- a/fs/read_write.c +++ b/fs/read_write.c -@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) - +@@ -477,6 +477,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) + inc_syscr(current); return ret; } +EXPORT_SYMBOL_GPL(vfs_read); static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos) { -@@ -508,6 +509,7 @@ vfs_readf_t vfs_readf(struct file *file) - return new_sync_read; - return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */ - } -+EXPORT_SYMBOL_GPL(vfs_readf); - - vfs_writef_t vfs_writef(struct file *file) - { -@@ -519,6 +521,7 @@ vfs_writef_t vfs_writef(struct file *file) - return new_sync_write; - return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */ - } -+EXPORT_SYMBOL_GPL(vfs_writef); - - ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos) - { -@@ -588,6 +591,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ - +@@ -592,6 +593,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ + file_end_write(file); return ret; } +EXPORT_SYMBOL_GPL(vfs_write); @@ -187,42 +149,22 @@ index bcb853105beb..e54db6078e3f 100644 /* file_ppos returns &file->f_pos or NULL if file is stream */ static inline loff_t *file_ppos(struct file *file) diff --git a/fs/splice.c b/fs/splice.c -index b1f536d03c09..0872306175b4 100644 +index 7216ef993b5f..7ce1f1bc4268 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); +@@ -932,6 +932,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + return warn_unsupported(out, "write"); + return out->f_op->splice_write(pipe, out, ppos, len, flags); } +EXPORT_SYMBOL_GPL(do_splice_from); /* - * Attempt to initiate a splice from a file to a pipe. -@@ -891,6 +892,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL_GPL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/fs/sync.c b/fs/sync.c -index 457f4e4a5cc1..67c66358f3fe 100644 ---- a/fs/sync.c -+++ b/fs/sync.c -@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait) - sb->s_op->sync_fs(sb, wait); - return __sync_blockdev(sb->s_bdev, wait); - } -+EXPORT_SYMBOL_GPL(__sync_filesystem); - - /* - * Write out and wait upon all dirty data associated with this + * Indicate to the caller that there was a premature EOF when reading from the diff --git a/fs/xattr.c b/fs/xattr.c -index 90dd78f0eb27..40b01dd1b14a 100644 +index efd4736bc94b..ce1a2c39ab23 100644 --- a/fs/xattr.c +++ b/fs/xattr.c -@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value, +@@ -406,6 +406,7 @@ vfs_getxattr_alloc(struct mnt_idmap *idmap, struct dentry *dentry, *xattr_value = value; return error; } @@ -231,10 +173,10 @@ index 90dd78f0eb27..40b01dd1b14a 100644 ssize_t __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index e52169c2086b..d9bc5cbe9078 100644 +index db4297f60bd3..9aca18312afb 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c -@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) +@@ -239,6 +239,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) */ return lock_classes + class_idx; } @@ -243,82 +185,82 @@ index e52169c2086b..d9bc5cbe9078 100644 #ifdef CONFIG_LOCK_STAT diff --git a/kernel/task_work.c b/kernel/task_work.c -index 0fef395662a6..83fb1ecfc33d 100644 +index 065e1ef8fc8d..c623c6f0c645 100644 --- a/kernel/task_work.c +++ b/kernel/task_work.c -@@ -116,3 +116,4 @@ void task_work_run(void) +@@ -182,3 +182,4 @@ void task_work_run(void) } while (work); } } +EXPORT_SYMBOL_GPL(task_work_run); diff --git a/security/security.c b/security/security.c -index 565bc9b67276..248a63945e9f 100644 +index 23b129d482a7..fca4c5707a1c 100644 --- a/security/security.c +++ b/security/security.c -@@ -1068,6 +1068,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) +@@ -1750,6 +1750,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) return 0; return call_int_hook(path_rmdir, 0, dir, dentry); } +EXPORT_SYMBOL_GPL(security_path_rmdir); - int security_path_unlink(const struct path *dir, struct dentry *dentry) - { -@@ -1084,6 +1085,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, + /** + * security_path_unlink() - Check if removing a hard link is allowed +@@ -1785,6 +1786,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, return 0; return call_int_hook(path_symlink, 0, dir, dentry, old_name); } +EXPORT_SYMBOL_GPL(security_path_symlink); - int security_path_link(struct dentry *old_dentry, const struct path *new_dir, - struct dentry *new_dentry) -@@ -1092,6 +1094,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, + /** + * security_path_link - Check if creating a hard link is allowed +@@ -1803,6 +1805,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, return 0; return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry); } +EXPORT_SYMBOL_GPL(security_path_link); - int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, - const struct path *new_dir, struct dentry *new_dentry, -@@ -1119,6 +1122,7 @@ int security_path_truncate(const struct path *path) - return 0; - return call_int_hook(path_truncate, 0, path); - } -+EXPORT_SYMBOL_GPL(security_path_truncate); - - int security_path_chmod(const struct path *path, umode_t mode) - { -@@ -1126,6 +1130,7 @@ int security_path_chmod(const struct path *path, umode_t mode) + /** + * security_path_rename() - Check if renaming a file is allowed +@@ -1864,6 +1867,7 @@ int security_path_chmod(const struct path *path, umode_t mode) return 0; return call_int_hook(path_chmod, 0, path, mode); } +EXPORT_SYMBOL_GPL(security_path_chmod); - int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) - { -@@ -1133,6 +1138,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) + /** + * security_path_chown() - Check if changing the file's owner/group is allowed +@@ -1881,6 +1885,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) return 0; return call_int_hook(path_chown, 0, path, uid, gid); } +EXPORT_SYMBOL_GPL(security_path_chown); - int security_path_chroot(const struct path *path) - { -@@ -1233,6 +1239,7 @@ int security_inode_permission(struct inode *inode, int mask) + /** + * security_path_chroot() - Check if changing the root directory is allowed +@@ -2110,6 +2115,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return call_int_hook(inode_permission, 0, inode, mask); } +EXPORT_SYMBOL_GPL(security_inode_permission); - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -1410,6 +1417,7 @@ int security_file_permission(struct file *file, int mask) + /** + * security_inode_setattr() - Check if setting file attributes is allowed +@@ -2588,6 +2594,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } +EXPORT_SYMBOL_GPL(security_file_permission); - int security_file_alloc(struct file *file) + /** + * security_file_alloc() - Allocate and init a file's LSM blob +@@ -2854,6 +2861,7 @@ int security_file_truncate(struct file *file) { + return call_int_hook(file_truncate, 0, file); + } ++EXPORT_SYMBOL_GPL(security_file_truncate); + + /** + * security_task_alloc() - Allocate a task's LSM blob -- -2.19.1 +2.34.1 diff --git a/features/aufs/ausfs5-base.patch b/features/aufs/ausfs5-base.patch deleted file mode 100644 index 636baef8..00000000 --- a/features/aufs/ausfs5-base.patch +++ /dev/null @@ -1,343 +0,0 @@ -From 019d87a19a09ca1d993958ce57f320a286b120c8 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Mon, 16 Mar 2020 23:44:15 -0400 -Subject: [PATCH 2/6] ausfs5: base - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - MAINTAINERS | 13 +++++++++++++ - drivers/block/loop.c | 18 ++++++++++++++++++ - fs/dcache.c | 2 +- - fs/fcntl.c | 4 +++- - fs/inode.c | 2 +- - fs/namespace.c | 6 ++++++ - fs/read_write.c | 22 ++++++++++++++++++++++ - fs/splice.c | 10 +++++----- - fs/sync.c | 2 +- - include/linux/fs.h | 10 ++++++++++ - include/linux/lockdep.h | 3 +++ - include/linux/mnt_namespace.h | 3 +++ - include/linux/splice.h | 6 ++++++ - kernel/locking/lockdep.c | 3 ++- - 14 files changed, 94 insertions(+), 10 deletions(-) - -diff --git a/MAINTAINERS b/MAINTAINERS -index cc1d18cb5d18..fd46c7c13f08 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -2919,6 +2919,19 @@ F: include/linux/audit.h - F: include/uapi/linux/audit.h - F: kernel/audit* - -+AUFS (advanced multi layered unification filesystem) FILESYSTEM -+M: "J. R. Okajima" <hooanon05g@gmail.com> -+L: aufs-users@lists.sourceforge.net (members only) -+L: linux-unionfs@vger.kernel.org -+W: http://aufs.sourceforge.net -+T: git://github.com/sfjro/aufs4-linux.git -+S: Supported -+F: Documentation/filesystems/aufs/ -+F: Documentation/ABI/testing/debugfs-aufs -+F: Documentation/ABI/testing/sysfs-aufs -+F: fs/aufs/ -+F: include/uapi/linux/aufs_type.h -+ - AUXILIARY DISPLAY DRIVERS - M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com> - S: Maintained -diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index ef6e251857c8..a5c78e0aebe7 100644 ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -748,6 +748,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, - return error; - } - -+/* -+ * for AUFS -+ * no get/put for file. -+ */ -+struct file *loop_backing_file(struct super_block *sb) -+{ -+ struct file *ret; -+ struct loop_device *l; -+ -+ ret = NULL; -+ if (MAJOR(sb->s_dev) == LOOP_MAJOR) { -+ l = sb->s_bdev->bd_disk->private_data; -+ ret = l->lo_backing_file; -+ } -+ return ret; -+} -+EXPORT_SYMBOL_GPL(loop_backing_file); -+ - /* loop sysfs attributes */ - - static ssize_t loop_attr_show(struct device *dev, char *page, -diff --git a/fs/dcache.c b/fs/dcache.c -index b280e07e162b..046000653e4d 100644 ---- a/fs/dcache.c -+++ b/fs/dcache.c -@@ -1266,7 +1266,7 @@ enum d_walk_ret { - * - * The @enter() callbacks are called with d_lock held. - */ --static void d_walk(struct dentry *parent, void *data, -+void d_walk(struct dentry *parent, void *data, - enum d_walk_ret (*enter)(void *, struct dentry *)) - { - struct dentry *this_parent; -diff --git a/fs/fcntl.c b/fs/fcntl.c -index 2e4c0fa2074b..0b28a37f7e50 100644 ---- a/fs/fcntl.c -+++ b/fs/fcntl.c -@@ -32,7 +32,7 @@ - - #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) - --static int setfl(int fd, struct file * filp, unsigned long arg) -+int setfl(int fd, struct file *filp, unsigned long arg) - { - struct inode * inode = file_inode(filp); - int error = 0; -@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg) - - if (filp->f_op->check_flags) - error = filp->f_op->check_flags(arg); -+ if (!error && filp->f_op->setfl) -+ error = filp->f_op->setfl(filp, arg); - if (error) - return error; - -diff --git a/fs/inode.c b/fs/inode.c -index 93d9252a00ab..7700c5e4783b 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1688,7 +1688,7 @@ EXPORT_SYMBOL(generic_update_time); - * This does the actual work of updating an inodes time or version. Must have - * had called mnt_want_write() before calling this. - */ --static int update_time(struct inode *inode, struct timespec64 *time, int flags) -+int update_time(struct inode *inode, struct timespec64 *time, int flags) - { - if (inode->i_op->update_time) - return inode->i_op->update_time(inode, time, flags); -diff --git a/fs/namespace.c b/fs/namespace.c -index 85b5f7bea82e..c742051ba969 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt) - return mnt->mnt_ns == current->nsproxy->mnt_ns; - } - -+/* for aufs, CONFIG_AUFS_BR_FUSE */ -+int is_current_mnt_ns(struct vfsmount *mnt) -+{ -+ return check_mnt(real_mount(mnt)); -+} -+ - /* - * vfsmount lock must be held for write - */ -diff --git a/fs/read_write.c b/fs/read_write.c -index 59d819c5b92e..bcb853105beb 100644 ---- a/fs/read_write.c -+++ b/fs/read_write.c -@@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p, - return -EINVAL; - } - -+vfs_readf_t vfs_readf(struct file *file) -+{ -+ const struct file_operations *fop = file->f_op; -+ -+ if (fop->read) -+ return fop->read; -+ if (fop->read_iter) -+ return new_sync_read; -+ return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */ -+} -+ -+vfs_writef_t vfs_writef(struct file *file) -+{ -+ const struct file_operations *fop = file->f_op; -+ -+ if (fop->write) -+ return fop->write; -+ if (fop->write_iter) -+ return new_sync_write; -+ return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */ -+} -+ - ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos) - { - mm_segment_t old_fs; -diff --git a/fs/splice.c b/fs/splice.c -index d671936d0aad..b1f536d03c09 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -849,8 +849,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -866,9 +866,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/fs/sync.c b/fs/sync.c -index 4d1ff010bc5a..457f4e4a5cc1 100644 ---- a/fs/sync.c -+++ b/fs/sync.c -@@ -28,7 +28,7 @@ - * wait == 1 case since in that case write_inode() functions do - * sync_dirty_buffer() and thus effectively write one block at a time. - */ --static int __sync_filesystem(struct super_block *sb, int wait) -+int __sync_filesystem(struct super_block *sb, int wait) - { - if (wait) - sync_inodes_sb(sb); -diff --git a/include/linux/fs.h b/include/linux/fs.h -index 601cc94122fa..140cf70235c8 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -1350,6 +1350,7 @@ extern void fasync_free(struct fasync_struct *); - /* can be called from interrupts */ - extern void kill_fasync(struct fasync_struct **, int, int); - -+extern int setfl(int fd, struct file *filp, unsigned long arg); - extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); - extern int f_setown(struct file *filp, unsigned long arg, int force); - extern void f_delown(struct file *filp); -@@ -1842,6 +1843,7 @@ struct file_operations { - ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); - unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); - int (*check_flags)(int); -+ int (*setfl)(struct file *, unsigned long); - int (*flock) (struct file *, int, struct file_lock *); - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); - ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); -@@ -1912,6 +1914,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, - struct iovec *fast_pointer, - struct iovec **ret_pointer); - -+typedef ssize_t (*vfs_readf_t)(struct file *, char __user *, size_t, loff_t *); -+typedef ssize_t (*vfs_writef_t)(struct file *, const char __user *, size_t, -+ loff_t *); -+vfs_readf_t vfs_readf(struct file *file); -+vfs_writef_t vfs_writef(struct file *file); -+ - extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); - extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); - extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); -@@ -2344,6 +2352,7 @@ extern int current_umask(void); - extern void ihold(struct inode * inode); - extern void iput(struct inode *); - extern int generic_update_time(struct inode *, struct timespec64 *, int); -+extern int update_time(struct inode *, struct timespec64 *, int); - - /* /sys/fs */ - extern struct kobject *fs_kobj; -@@ -2628,6 +2637,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) - return false; - } - #endif -+extern int __sync_filesystem(struct super_block *, int); - extern int sync_filesystem(struct super_block *); - extern const struct file_operations def_blk_fops; - extern const struct file_operations def_chr_fops; -diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h -index 664f52c6dd4c..f2208851f527 100644 ---- a/include/linux/lockdep.h -+++ b/include/linux/lockdep.h -@@ -331,6 +331,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, - return lock->key == key; - } - -+struct lock_class *lockdep_hlock_class(struct held_lock *hlock); -+ - /* - * Acquire a lock. - * -@@ -472,6 +474,7 @@ struct lockdep_map { }; - - #define lockdep_depth(tsk) (0) - -+#define lockdep_is_held(lock) (1) - #define lockdep_is_held_type(l, r) (1) - - #define lockdep_assert_held(l) do { (void)(l); } while (0) -diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h -index 35942084cd40..24f5fd1a789d 100644 ---- a/include/linux/mnt_namespace.h -+++ b/include/linux/mnt_namespace.h -@@ -6,11 +6,14 @@ - struct mnt_namespace; - struct fs_struct; - struct user_namespace; -+struct vfsmount; - - extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, - struct user_namespace *, struct fs_struct *); - extern void put_mnt_ns(struct mnt_namespace *ns); - -+extern int is_current_mnt_ns(struct vfsmount *mnt); -+ - extern const struct file_operations proc_mounts_operations; - extern const struct file_operations proc_mountinfo_operations; - extern const struct file_operations proc_mountstats_operations; -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 74b4911ac16d..19789fbea567 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; - extern const struct pipe_buf_operations default_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif -diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index 32406ef0d6a2..e52169c2086b 100644 ---- a/kernel/locking/lockdep.c -+++ b/kernel/locking/lockdep.c -@@ -153,7 +153,7 @@ static - struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; - static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS); - --static inline struct lock_class *hlock_class(struct held_lock *hlock) -+inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) - { - unsigned int class_idx = hlock->class_idx; - -@@ -174,6 +174,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) - */ - return lock_classes + class_idx; - } -+#define hlock_class(hlock) lockdep_hlock_class(hlock) - - #ifdef CONFIG_LOCK_STAT - static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats); --- -2.19.1 - diff --git a/features/bluetooth/bluetooth-vhci.cfg b/features/bluetooth/bluetooth-vhci.cfg new file mode 100644 index 00000000..3f7c7850 --- /dev/null +++ b/features/bluetooth/bluetooth-vhci.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_BT_HCIVHCI=y diff --git a/features/bluetooth/bluetooth-vhci.scc b/features/bluetooth/bluetooth-vhci.scc new file mode 100644 index 00000000..e99f33d5 --- /dev/null +++ b/features/bluetooth/bluetooth-vhci.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Bluetooth Virtual HCI device driver" +define KFEATURE_COMPATIBILITY all + +include bluetooth.scc + +kconf non-hardware bluetooth-vhci.cfg diff --git a/features/bpf/bpf.cfg b/features/bpf/bpf.cfg index b90e87a5..50c27ceb 100644 --- a/features/bpf/bpf.cfg +++ b/features/bpf/bpf.cfg @@ -3,4 +3,5 @@ CONFIG_BPF=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_BPF_EVENTS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_CGROUP_BPF=y diff --git a/features/can/can.cfg b/features/can/can.cfg index a15e6061..d50e8109 100644 --- a/features/can/can.cfg +++ b/features/can/can.cfg @@ -19,8 +19,6 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m CONFIG_CAN_PEAK_USB=m CONFIG_CAN_8DEV_USB=m -# x86 PCH -#CONFIG_PCH_CAN=m # drivers for ISA/PCI cards CONFIG_CAN_C_CAN_PCI=m # Philips/NXP SJA1000 based PCI(e) diff --git a/features/can/m_can.cfg b/features/can/m_can.cfg new file mode 100644 index 00000000..d89b23aa --- /dev/null +++ b/features/can/m_can.cfg @@ -0,0 +1,5 @@ +CONFIG_CAN=m +CONFIG_CAN_M_CAN=m +CONFIG_CAN_M_CAN_PCI=m +CONFIG_CAN_M_CAN_PLATFORM=m +CONFIG_CAN_M_CAN_TCAN4X5X=m diff --git a/features/can/m_can.scc b/features/can/m_can.scc new file mode 100644 index 00000000..9a169170 --- /dev/null +++ b/features/can/m_can.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Bosch M_CAN controller support" +define KFEATURE_COMPATIBILITY board + +kconf hardware m_can.cfg diff --git a/features/cgroups/cgroups.cfg b/features/cgroups/cgroups.cfg index 5c6cb1b0..d2d0c3ea 100644 --- a/features/cgroups/cgroups.cfg +++ b/features/cgroups/cgroups.cfg @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT # General controller group CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y +CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y @@ -13,13 +13,11 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y -# CONFIG_BFQ_CGROUP_DEBUG is not set +CONFIG_BFQ_CGROUP_DEBUG=n # Namespace controller diff --git a/features/clear_warn_once/clear_warn_once-add-a-clear_warn_once-boot-parameter.patch b/features/clear_warn_once/clear_warn_once-add-a-clear_warn_once-boot-parameter.patch new file mode 100644 index 00000000..8016e2a6 --- /dev/null +++ b/features/clear_warn_once/clear_warn_once-add-a-clear_warn_once-boot-parameter.patch @@ -0,0 +1,75 @@ +From 9ad5defd90591efb015c9a6c59b47108fe68e961 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 16 Dec 2020 12:22:58 -0500 +Subject: [PATCH 3/3] clear_warn_once: add a clear_warn_once= boot parameter + +In the event debugfs is not mounted, or if built with the .config +setting DEBUG_FS_ALLOW_NONE chosen, this gives the sysadmin access +to reset the WARN_ONCE() state on a periodic basis. + +Link: https://lore.kernel.org/r/20201126063029.2030-1-paul.gortmaker@windriver.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + .../admin-guide/kernel-parameters.txt | 8 +++++++ + kernel/panic.c | 21 +++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +index 74ba077e99e5..b0c5a7458c03 100644 +--- a/Documentation/admin-guide/kernel-parameters.txt ++++ b/Documentation/admin-guide/kernel-parameters.txt +@@ -5352,6 +5352,14 @@ + vt.underline= [VT] Default color for underlined text; 0-15. + Default: 3 = cyan. + ++ clear_warn_once= ++ [KNL] ++ Set the WARN_ONCE reset period in minutes. Normally ++ a WARN_ONCE() will only ever emit a message once per ++ boot, but for example, setting this to 60 would ++ effectively rate-limit WARN_ONCE to once per hour. ++ Default: 0 = never. ++ + watchdog timers [HW,WDT] For information on watchdog timers, + see Documentation/watchdog/watchdog-parameters.rst + or other driver-specific files in the +diff --git a/kernel/panic.c b/kernel/panic.c +index e3a462e39062..f4f3633f4f69 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -697,10 +697,31 @@ static __init int register_warn_debugfs(void) + /* Don't care about failure */ + debugfs_create_file_unsafe("clear_warn_once", 0600, NULL, + &clear_warn_once, &clear_warn_once_fops); ++ ++ /* if a bootarg was used, set the initial timer */ ++ if (clear_warn_once) ++ warn_once_set(NULL, clear_warn_once); ++ + return 0; + } + + device_initcall(register_warn_debugfs); ++ ++static int __init warn_once_setup(char *s) ++{ ++ int r; ++ ++ if (!s) ++ return -EINVAL; ++ ++ r = kstrtoull(s, 0, &clear_warn_once); ++ if (r) ++ return r; ++ ++ return 1; ++} ++__setup("clear_warn_once=", warn_once_setup); ++ + #endif + + #ifdef CONFIG_STACKPROTECTOR +-- +2.19.1 + diff --git a/features/clear_warn_once/clear_warn_once-bind-a-timer-to-written-reset-value.patch b/features/clear_warn_once/clear_warn_once-bind-a-timer-to-written-reset-value.patch new file mode 100644 index 00000000..63053deb --- /dev/null +++ b/features/clear_warn_once/clear_warn_once-bind-a-timer-to-written-reset-value.patch @@ -0,0 +1,104 @@ +From fbda05a6df0125f733e0e28a3e0ae60bb6765d51 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 16 Dec 2020 12:22:57 -0500 +Subject: [PATCH 2/3] clear_warn_once: bind a timer to written reset value + +Existing documentation has a write of "1" to clear/reset all the +WARN_ONCE and similar to the as-booted state, so they can possibly +be re-triggered again during debugging/testing. + +But having them auto-reset once a day, or once a week, might shed +valuable information to a sysadmin on what the system is doing while +trying to debug an issue. + +Here we extend the existing debugfs variable to bind a timer to the +written value N, so that it will reset every N minutes, for N>1. +Writing a zero will clear any previously set timer value. + +The pre-existing behaviour of writing N=1 will do a one-shot clear. + +Link: https://lore.kernel.org/r/20201126063029.2030-1-paul.gortmaker@windriver.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + .../admin-guide/clearing-warn-once.rst | 9 ++++++ + kernel/panic.c | 32 +++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/Documentation/admin-guide/clearing-warn-once.rst b/Documentation/admin-guide/clearing-warn-once.rst +index 211fd926cf00..8d058bbc0859 100644 +--- a/Documentation/admin-guide/clearing-warn-once.rst ++++ b/Documentation/admin-guide/clearing-warn-once.rst +@@ -7,3 +7,12 @@ echo 1 > /sys/kernel/debug/clear_warn_once + + clears the state and allows the warnings to print once again. + This can be useful after test suite runs to reproduce problems. ++ ++Values greater than one set a timer for a periodic state reset; e.g. ++ ++echo 60 > /sys/kernel/debug/clear_warn_once ++ ++will establish an hourly state reset, effectively turning WARN_ONCE ++into a long period rate-limited warning. ++ ++Writing a value of zero (or one) will remove any previously set timer. +diff --git a/kernel/panic.c b/kernel/panic.c +index 53088219d7df..e3a462e39062 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -636,6 +636,7 @@ EXPORT_SYMBOL(__warn_printk); + /* Support resetting WARN*_ONCE state */ + + static u64 clear_warn_once; ++static bool warn_timer_active; + + static void do_clear_warn_once(void) + { +@@ -643,6 +644,14 @@ static void do_clear_warn_once(void) + memset(__start_once, 0, __end_once - __start_once); + } + ++static void timer_warn_once(struct timer_list *timer) ++{ ++ do_clear_warn_once(); ++ timer->expires = jiffies + clear_warn_once * HZ * 60; ++ add_timer(timer); ++} ++static DEFINE_TIMER(warn_reset_timer, timer_warn_once); ++ + static int warn_once_get(void *data, u64 *val) + { + *val = clear_warn_once; +@@ -653,6 +662,29 @@ static int warn_once_set(void *data, u64 val) + { + clear_warn_once = val; + ++ if (val > 1) { /* set/reset new timer */ ++ unsigned long expires = jiffies + val * HZ * 60; ++ ++ if (warn_timer_active) { ++ mod_timer(&warn_reset_timer, expires); ++ } else { ++ warn_timer_active = 1; ++ warn_reset_timer.expires = expires; ++ add_timer(&warn_reset_timer); ++ } ++ return 0; ++ } ++ ++ if (warn_timer_active) { ++ del_timer_sync(&warn_reset_timer); ++ warn_timer_active = 0; ++ } ++ clear_warn_once = 0; ++ ++ if (val == 0) /* cleared timer, we are done */ ++ return 0; ++ ++ /* Getting here means val == 1 ---> so clear existing data */ + do_clear_warn_once(); + return 0; + } +-- +2.19.1 + diff --git a/features/clear_warn_once/clear_warn_once-expand-debugfs-to-include-read-suppo.patch b/features/clear_warn_once/clear_warn_once-expand-debugfs-to-include-read-suppo.patch new file mode 100644 index 00000000..c1a46aa5 --- /dev/null +++ b/features/clear_warn_once/clear_warn_once-expand-debugfs-to-include-read-suppo.patch @@ -0,0 +1,77 @@ +From 2365198f516a84982bca08e7b3f862d264b7a17e Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 16 Dec 2020 12:22:56 -0500 +Subject: [PATCH 1/3] clear_warn_once: expand debugfs to include read support + +The existing clear_warn_once variable is write-only; used as per the +documentation to reset the warn_once to as-booted state with: + + echo 1 > /sys/kernel/debug/clear_warn_once + +The objective is to expand on that functionality, which requires the +debugfs variable to be read/write and not just write-only. + +Here, we deal with the debugfs boilerplate associated with converting +it from write-only to read-write, in order to factor that out for easier +review, and for what may be a possible future useful bisect point. + +Existing functionality is unchanged - the only difference is that we +have tied in a variable that lets you now read the variable and see +the last value written. + +Link: https://lore.kernel.org/r/20201126063029.2030-1-paul.gortmaker@windriver.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + kernel/panic.c | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/kernel/panic.c b/kernel/panic.c +index f470a038b05b..53088219d7df 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -635,21 +635,36 @@ EXPORT_SYMBOL(__warn_printk); + + /* Support resetting WARN*_ONCE state */ + +-static int clear_warn_once_set(void *data, u64 val) ++static u64 clear_warn_once; ++ ++static void do_clear_warn_once(void) + { + generic_bug_clear_once(); + memset(__start_once, 0, __end_once - __start_once); ++} ++ ++static int warn_once_get(void *data, u64 *val) ++{ ++ *val = clear_warn_once; ++ return 0; ++} ++ ++static int warn_once_set(void *data, u64 val) ++{ ++ clear_warn_once = val; ++ ++ do_clear_warn_once(); + return 0; + } + +-DEFINE_DEBUGFS_ATTRIBUTE(clear_warn_once_fops, NULL, clear_warn_once_set, +- "%lld\n"); ++DEFINE_DEBUGFS_ATTRIBUTE(clear_warn_once_fops, warn_once_get, warn_once_set, ++ "%llu\n"); + + static __init int register_warn_debugfs(void) + { + /* Don't care about failure */ +- debugfs_create_file_unsafe("clear_warn_once", 0200, NULL, NULL, +- &clear_warn_once_fops); ++ debugfs_create_file_unsafe("clear_warn_once", 0600, NULL, ++ &clear_warn_once, &clear_warn_once_fops); + return 0; + } + +-- +2.19.1 + diff --git a/features/clear_warn_once/clear_warn_once.scc b/features/clear_warn_once/clear_warn_once.scc new file mode 100644 index 00000000..d5e0e017 --- /dev/null +++ b/features/clear_warn_once/clear_warn_once.scc @@ -0,0 +1,4 @@ +patch clear_warn_once-expand-debugfs-to-include-read-suppo.patch +patch clear_warn_once-bind-a-timer-to-written-reset-value.patch +patch clear_warn_once-add-a-clear_warn_once-boot-parameter.patch +patch sched-isolation-really-align-nohz_full-with-rcu_nocb.patch diff --git a/features/clear_warn_once/sched-isolation-really-align-nohz_full-with-rcu_nocb.patch b/features/clear_warn_once/sched-isolation-really-align-nohz_full-with-rcu_nocb.patch new file mode 100644 index 00000000..35145584 --- /dev/null +++ b/features/clear_warn_once/sched-isolation-really-align-nohz_full-with-rcu_nocb.patch @@ -0,0 +1,88 @@ +Date: Mon, 21 Feb 2022 13:20:08 -0500 +Subject: [PATCH 1/2] sched/isolation: really align nohz_full with rcu_nocbs +From: Paul Gortmaker <paul.gortmaker@windriver.com> +To: linux-kernel@vger.kernel.org, Frederic Weisbecker <fweisbec@gmail.com>, + Peter Zijlstra <peterz@infradead.org> +CC: Paul Gortmaker <paul.gortmaker@windriver.com>, Thomas Gleixner + <tglx@linutronix.de>, "Paul E . McKenney" <paulmck@kernel.org>, Ingo Molnar + <mingo@kernel.org> +X-Mailer: git-send-email 2.17.1 +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=utf-8 + +At the moment it is currently possible to sneak a core into nohz_full +that lies between nr_possible and NR_CPUS - but you won't "see" it +because cpumask_pr_args() implicitly hides anything above nr_cpu_ids. + +This becomes a problem when the nohz_full CPU set doesn't contain at +least one other valid nohz CPU - in which case we end up with the +tick_nohz_full_running set and no tick core specified, which trips an +endless sequence of WARN() and renders the machine unusable. + +I inadvertently opened the door for this when fixing an overly +restrictive nohz_full conditional in the below Fixes: commit - and then +courtesy of my optimistic ACPI reporting nr_possible of 64 (the default +Kconfig for NR_CPUS) and the not-so helpful implict filtering done by +cpumask_pr_args, I unfortunately did not spot it during my testing. + +So here, I don't rely on what was printed anymore, but code exactly what +our restrictions should be in order to be aligned with rcu_nocbs - which +was the original goal. Since the checks lie in "__init" code it is largely +free for us to do this anyway. + +Building with NOHZ_FULL and NR_CPUS=128 on an otherwise defconfig, and +booting with "rcu_nocbs=8-127 nohz_full=96-127" on the same 16 core T5500 +Dell machine now results in the following (only relevant lines shown): + + smpboot: Allowing 64 CPUs, 48 hotplug CPUs + setup_percpu: NR_CPUS:128 nr_cpumask_bits:128 nr_cpu_ids:64 nr_node_ids:2 + housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' contains nonexistent CPUs. + housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' has no valid CPUs. + rcu: RCU restricting CPUs from NR_CPUS=128 to nr_cpu_ids=64. + rcu: Note: kernel parameter 'rcu_nocbs=', 'nohz_full', or 'isolcpus=' contains nonexistent CPUs. + rcu: Offload RCU callbacks from CPUs: 8-63. + +One can see both new housekeeping checks are triggered in the above. +The same invalid boot arg combination would have previously resulted in +an infinitely scrolling mix of WARN from all cores per tick on this box. + +We may need to revisit these sanity checks when nohz_full is accepted as +a stand alone keyword "enable" w/o a cpuset (see rcu/nohz d2cf0854d728). + +Fixes: 915a2bc3c6b7 ("sched/isolation: Reconcile rcu_nocbs= and nohz_full=") +Cc: Frederic Weisbecker <fweisbec@gmail.com> +Cc: Peter Zijlstra <peterz@infradead.org> +Cc: Thomas Gleixner <tglx@linutronix.de> +Cc: Paul E. McKenney <paulmck@kernel.org> +Cc: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +--- + kernel/sched/isolation.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c +index b4d10815c45a..f7d2406c1f1d 100644 +--- a/kernel/sched/isolation.c ++++ b/kernel/sched/isolation.c +@@ -126,6 +126,17 @@ static int __init housekeeping_setup(char *str, unsigned long flags) + goto free_non_housekeeping_mask; + } + ++ if (!cpumask_subset(non_housekeeping_mask, cpu_possible_mask)) { ++ pr_info("housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' contains nonexistent CPUs.\n"); ++ cpumask_and(non_housekeeping_mask, cpu_possible_mask, ++ non_housekeeping_mask); ++ } ++ ++ if (cpumask_empty(non_housekeeping_mask)) { ++ pr_info("housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' has no valid CPUs.\n"); ++ goto free_non_housekeeping_mask; ++ } ++ + alloc_bootmem_cpumask_var(&housekeeping_staging); + cpumask_andnot(housekeeping_staging, + cpu_possible_mask, non_housekeeping_mask); +-- +2.17.1 + diff --git a/features/debug/debug-btf.cfg b/features/debug/debug-btf.cfg new file mode 100644 index 00000000..59df424f --- /dev/null +++ b/features/debug/debug-btf.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_DEBUG_INFO_BTF=y +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y diff --git a/features/debug/debug-btf.scc b/features/debug/debug-btf.scc new file mode 100644 index 00000000..57dfb930 --- /dev/null +++ b/features/debug/debug-btf.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable BTF debug" +define KFEATURE_COMPATIBILITY all + +include debug-kernel.scc +kconf non-hardware debug-btf.cfg diff --git a/features/debug/debug-kernel.cfg b/features/debug/debug-kernel.cfg index 53fcbf0a..048ed3d9 100644 --- a/features/debug/debug-kernel.cfg +++ b/features/debug/debug-kernel.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_PREEMPT=y diff --git a/features/debug/debug-runtime.cfg b/features/debug/debug-runtime.cfg new file mode 100644 index 00000000..344bad2f --- /dev/null +++ b/features/debug/debug-runtime.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_PREEMPT=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y +CONFIG_PROVE_LOCKING=y +CONFIG_DEBUG_TIMEKEEPING=y
\ No newline at end of file diff --git a/features/debug/debug-runtime.scc b/features/debug/debug-runtime.scc new file mode 100644 index 00000000..2db9a271 --- /dev/null +++ b/features/debug/debug-runtime.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + +define KFEATURE_DESCRIPTION "Enable kernel reuntime debugging" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware debug-runtime.cfg diff --git a/features/debug/printk.cfg b/features/debug/printk.cfg index 0df20f91..5beb425f 100644 --- a/features/debug/printk.cfg +++ b/features/debug/printk.cfg @@ -5,8 +5,5 @@ CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=y - -CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EFI_EARLYCON=y CONFIG_TTY_PRINTK=y diff --git a/features/docker/docker.scc b/features/docker/docker.scc new file mode 100644 index 00000000..2bc55019 --- /dev/null +++ b/features/docker/docker.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + +define KFEATURE_DESCRIPTION "Enable Features needed by docker in addition to LXC features" +define KFEATURE_COMPATIBILITY board + +include cfg/docker.scc diff --git a/features/drm-bochs/drm-bochs.cfg b/features/drm-bochs/drm-bochs.cfg index 1c37b67d..2d061433 100644 --- a/features/drm-bochs/drm-bochs.cfg +++ b/features/drm-bochs/drm-bochs.cfg @@ -8,11 +8,9 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_TTM=y @@ -22,7 +20,7 @@ CONFIG_DRM_PANEL=y CONFIG_DRM_BRIDGE=y CONFIG_DRM_PANEL_BRIDGE=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y -CONFIG_FB_CMDLINE=y +CONFIG_VIDEO_CMDLINE=y CONFIG_FB_NOTIFY=y CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y diff --git a/features/drm-emgd/drm-emgd.cfg b/features/drm-emgd/drm-emgd.cfg index 13678d58..298549ad 100644 --- a/features/drm-emgd/drm-emgd.cfg +++ b/features/drm-emgd/drm-emgd.cfg @@ -5,11 +5,10 @@ CONFIG_DRM_EGD=m CONFIG_DRM_KMS_HELPER=m CONFIG_I2C=y -CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_DEV=m CONFIG_VIDEO_IVTV=y CONFIG_MEDIA_SUPPORT=m CONFIG_VIDEO_DEV=m -CONFIG_I2C_ALGOBIT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_CFB_FILLRECT=y diff --git a/features/drm-gma500/drm-gma500.cfg b/features/drm-gma500/drm-gma500.cfg index 3e320e9f..dc26f5d1 100644 --- a/features/drm-gma500/drm-gma500.cfg +++ b/features/drm-gma500/drm-gma500.cfg @@ -1,6 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_DRM=y -CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y diff --git a/features/drm-psb/drm-psb.cfg b/features/drm-psb/drm-psb.cfg index 86e508bd..2af3ab9c 100644 --- a/features/drm-psb/drm-psb.cfg +++ b/features/drm-psb/drm-psb.cfg @@ -3,11 +3,10 @@ CONFIG_DRM=y CONFIG_DRM_PSB=m CONFIG_I2C=y -CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_DEV=y CONFIG_VIDEO_IVTV=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y -CONFIG_I2C_ALGOBIT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_CFB_FILLRECT=y diff --git a/features/edac/edac.cfg b/features/edac/edac.cfg index 9b3d3fc5..4f75d2f8 100644 --- a/features/edac/edac.cfg +++ b/features/edac/edac.cfg @@ -15,3 +15,11 @@ CONFIG_RAS=y CONFIG_EDAC=y CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_SBRIDGE=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_GHES=y +CONFIG_EDAC_PND2=m +CONFIG_EDAC_SKX=m +CONFIG_EDAC_I10NM=m +CONFIG_EDAC_IGEN6=m diff --git a/features/edf/edf.cfg b/features/edf/edf.cfg index 97e4b7cd..531548fb 100644 --- a/features/edf/edf.cfg +++ b/features/edf/edf.cfg @@ -2,4 +2,4 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_HZ_1000=y -# CONFIG_NO_HZ is not set +CONFIG_NO_HZ=n diff --git a/features/eg20t/eg20t.cfg b/features/eg20t/eg20t.cfg index 8bfff936..9c411acf 100644 --- a/features/eg20t/eg20t.cfg +++ b/features/eg20t/eg20t.cfg @@ -30,4 +30,3 @@ CONFIG_GPIO_PCH=y CONFIG_CAN=y CONFIG_CAN_DEV=y -CONFIG_PCH_CAN=y diff --git a/features/f2fs/f2fs.cfg b/features/f2fs/f2fs.cfg index 4e59ac15..6b1e6e80 100644 --- a/features/f2fs/f2fs.cfg +++ b/features/f2fs/f2fs.cfg @@ -5,5 +5,4 @@ CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y CONFIG_F2FS_CHECK_FS=y -CONFIG_F2FS_IO_TRACE=y CONFIG_F2FS_FAULT_INJECTION=y diff --git a/features/firewire/firewire.cfg b/features/firewire/firewire.cfg index 5006e4f3..9dbe643c 100644 --- a/features/firewire/firewire.cfg +++ b/features/firewire/firewire.cfg @@ -3,14 +3,14 @@ CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m -# CONFIG_DVB_FIREDTV is not set +CONFIG_DVB_FIREDTV=n CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m CONFIG_SND_DICE=m -# CONFIG_SND_OXFW is not set -# CONFIG_SND_ISIGHT is not set -# CONFIG_SND_FIREWORKS is not set -# CONFIG_SND_BEBOB is not set -# CONFIG_SND_FIREWIRE_DIGI00X is not set +CONFIG_SND_OXFW=n +CONFIG_SND_ISIGHT=n +CONFIG_SND_FIREWORKS=n +CONFIG_SND_BEBOB=n +CONFIG_SND_FIREWIRE_DIGI00X=n CONFIG_SND_FIREWIRE_TASCAM=m -# CONFIG_FIREWIRE_SERIAL is not set +CONFIG_FIREWIRE_SERIAL=n diff --git a/features/firmware/firmware.cfg b/features/firmware/firmware.cfg index 37c41e91..87bf6153 100644 --- a/features/firmware/firmware.cfg +++ b/features/firmware/firmware.cfg @@ -2,5 +2,8 @@ # # Generic Driver Options # -CONFIG_FW_LOADER=m + +# the dependencies of this are =y, so we can't force this +# to =m. +CONFIG_FW_LOADER=y CONFIG_EXTRA_FIRMWARE="" diff --git a/features/ftrace/ftrace-function-tracer-disable.cfg b/features/ftrace/ftrace-function-tracer-disable.cfg index e60ac8a9..e27cba4b 100644 --- a/features/ftrace/ftrace-function-tracer-disable.cfg +++ b/features/ftrace/ftrace-function-tracer-disable.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_FUNCTION_GRAPH_TRACER is not set -# CONFIG_DYNAMIC_FTRACE is not set +CONFIG_FUNCTION_TRACER=n +CONFIG_FUNCTION_GRAPH_TRACER=n +CONFIG_DYNAMIC_FTRACE=n diff --git a/features/full_nohz/full_nohz.cfg b/features/full_nohz/full_nohz.cfg index fbccdad7..16db2004 100644 --- a/features/full_nohz/full_nohz.cfg +++ b/features/full_nohz/full_nohz.cfg @@ -1,3 +1,3 @@ # SPDX-License-Identifier: MIT CONFIG_NO_HZ_FULL=y -CONFIG_RCU_FAST_NO_HZ=y +CONFIG_RCU_EXPERT=y diff --git a/features/gpio/sim.cfg b/features/gpio/sim.cfg new file mode 100644 index 00000000..ce76a1fe --- /dev/null +++ b/features/gpio/sim.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT + +CONFIG_GPIOLIB=y +CONFIG_GPIO_SIM=m diff --git a/features/gpio/sim.scc b/features/gpio/sim.scc new file mode 100644 index 00000000..d98952dd --- /dev/null +++ b/features/gpio/sim.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + +define KFEATURE_DESCRIPTION "Enable support for the GPIO simulator module" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware sim.cfg diff --git a/features/gre/gre.cfg b/features/gre/gre.cfg index cd436df7..c713f965 100644 --- a/features/gre/gre.cfg +++ b/features/gre/gre.cfg @@ -4,4 +4,4 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IPV6_GRE=m CONFIG_OPENVSWITCH_GRE=y -# CONFIG_PPTP is not set +CONFIG_PPTP=n diff --git a/features/grsec/grsec.cfg b/features/grsec/grsec.cfg index f984225d..b90fb86a 100644 --- a/features/grsec/grsec.cfg +++ b/features/grsec/grsec.cfg @@ -3,16 +3,16 @@ # Grsecurity # CONFIG_GRKERNSEC=y -# CONFIG_GRKERNSEC_LOW is not set -# CONFIG_GRKERNSEC_MEDIUM is not set -# CONFIG_GRKERNSEC_HIGH is not set +CONFIG_GRKERNSEC_LOW=n +CONFIG_GRKERNSEC_MEDIUM=n +CONFIG_GRKERNSEC_HIGH=n CONFIG_GRKERNSEC_CUSTOM=y CONFIG_GRKERNSEC_KMEM=y CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODSTOP=y -# CONFIG_GRKERNSEC_HIDESYM is not set +CONFIG_GRKERNSEC_HIDESYM=n # # Role Based Access Control Options @@ -99,16 +99,16 @@ CONFIG_PAX_RANDKSTACK=y CONFIG_PAX_MEMORY_UDEREF=y CONFIG_GRKERNSEC_IO=y -# CONFIG_GRKERNSEC_MODHARDEN is not set -# CONFIG_GRKERNSEC_NO_RBAC is not set -# CONFIG_GRKERNSEC_ROFS is not set -# CONFIG_GRKERNSEC_AUDIT_PTRACE is not set -# CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set -# CONFIG_GRKERNSEC_HARDEN_PTRACE is not set -# CONFIG_GRKERNSEC_BLACKHOLE is not set -# CONFIG_GRKERNSEC_VM86 is not set -# CONFIG_PAX_MPROTECT_ALLOW_PTRACE is not set -# CONFIG_PAX_SEGMEXEC is not set -# CONFIG_PAX_KERNEXEC is not set -# CONFIG_PAX_NOELFRELOCS is not set -# CONFIG_PAX_USERCOPY is not set +CONFIG_GRKERNSEC_MODHARDEN=n +CONFIG_GRKERNSEC_NO_RBAC=n +CONFIG_GRKERNSEC_ROFS=n +CONFIG_GRKERNSEC_AUDIT_PTRACE=n +CONFIG_GRKERNSEC_AUDIT_TEXTREL=n +CONFIG_GRKERNSEC_HARDEN_PTRACE=n +CONFIG_GRKERNSEC_BLACKHOLE=n +CONFIG_GRKERNSEC_VM86=n +CONFIG_PAX_MPROTECT_ALLOW_PTRACE=n +CONFIG_PAX_SEGMEXEC=n +CONFIG_PAX_KERNEXEC=n +CONFIG_PAX_NOELFRELOCS=n +CONFIG_PAX_USERCOPY=n diff --git a/features/grsec/pax.cfg b/features/grsec/pax.cfg index 6042947a..4ea6b0c3 100644 --- a/features/grsec/pax.cfg +++ b/features/grsec/pax.cfg @@ -7,8 +7,8 @@ CONFIG_PAX=y CONFIG_PAX_SOFTMODE=y CONFIG_PAX_EI_PAX=y CONFIG_PAX_PT_PAX_FLAGS=y -# CONFIG_PAX_NO_ACL_FLAGS is not set -# CONFIG_PAX_HAVE_ACL_FLAGS is not set +CONFIG_PAX_NO_ACL_FLAGS=n +CONFIG_PAX_HAVE_ACL_FLAGS=n CONFIG_PAX_HOOK_ACL_FLAGS=y # @@ -27,7 +27,7 @@ CONFIG_PAX_EMUPLT=y # CONFIG_PAX_ASLR=y CONFIG_PAX_RANDUSTACK=y -# CONFIG_PAX_RANDMMAP is not set +CONFIG_PAX_RANDMMAP=n # # Miscellaneous hardening features diff --git a/features/hid/hid.cfg b/features/hid/hid.cfg new file mode 100644 index 00000000..cfd84dbd --- /dev/null +++ b/features/hid/hid.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT + +CONFIG_HID_SUPPORT=y +CONFIG_HID=y diff --git a/features/hid/hid.scc b/features/hid/hid.scc new file mode 100644 index 00000000..28d242df --- /dev/null +++ b/features/hid/hid.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable base HID config" +define KFEATURE_COMPATIBILITY board + +kconf hardware hid.cfg diff --git a/features/hostapd/hostapd.scc b/features/hostapd/hostapd.scc index d03b3ce2..aedf9549 100644 --- a/features/hostapd/hostapd.scc +++ b/features/hostapd/hostapd.scc @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -kconf hardware hostapd.cfg +kconf non-hardware hostapd.cfg diff --git a/features/i3c/i3c.cfg b/features/i3c/i3c.cfg new file mode 100644 index 00000000..17f0ce91 --- /dev/null +++ b/features/i3c/i3c.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +CONFIG_I3C=m +CONFIG_CDNS_I3C_MASTER=m +CONFIG_DW_I3C_MASTER=m +CONFIG_SVC_I3C_MASTER=m +CONFIG_MIPI_I3C_HCI=m diff --git a/features/i3c/i3c.scc b/features/i3c/i3c.scc new file mode 100644 index 00000000..f5615e88 --- /dev/null +++ b/features/i3c/i3c.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable I3C Support" +define KFEATURE_COMPATIBILITY board + +kconf hardware i3c.cfg diff --git a/features/i915/i915.cfg b/features/i915/i915.cfg index 8489fabb..f5e9351a 100644 --- a/features/i915/i915.cfg +++ b/features/i915/i915.cfg @@ -3,12 +3,9 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y CONFIG_AGP=y CONFIG_AGP_INTEL=y CONFIG_DRM=y -CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_I915=m -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_I915_ALPHA_SUPPORT=y diff --git a/features/ice/ice.cfg b/features/ice/ice.cfg new file mode 100644 index 00000000..855d37ea --- /dev/null +++ b/features/ice/ice.cfg @@ -0,0 +1 @@ +CONFIG_ICE=m diff --git a/features/ice/ice.scc b/features/ice/ice.scc new file mode 100644 index 00000000..e02d0906 --- /dev/null +++ b/features/ice/ice.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Intel(R) Ethernet Connection E800 Series Support" +define KFEATURE_COMPATIBILITY board + +kconf hardware ice.cfg diff --git a/features/ieee802154/ieee802154-hwsim.cfg b/features/ieee802154/ieee802154-hwsim.cfg new file mode 100644 index 00000000..5fe6f5c6 --- /dev/null +++ b/features/ieee802154/ieee802154-hwsim.cfg @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +# dependencies +CONFIG_MAC802154=y +CONFIG_NETDEVICES=y +CONFIG_IEEE802154=y +CONFIG_IEEE802154_DRIVERS=y + +CONFIG_IEEE802154_HWSIM=y diff --git a/features/ieee802154/ieee802154-hwsim.scc b/features/ieee802154/ieee802154-hwsim.scc new file mode 100644 index 00000000..c29d43f5 --- /dev/null +++ b/features/ieee802154/ieee802154-hwsim.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable simulated radio testing tool for mac802154" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware ieee802154-hwsim.cfg diff --git a/features/igc/igc.cfg b/features/igc/igc.cfg new file mode 100644 index 00000000..946ace52 --- /dev/null +++ b/features/igc/igc.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_IGC=m diff --git a/features/igc/igc.scc b/features/igc/igc.scc new file mode 100644 index 00000000..7b26e476 --- /dev/null +++ b/features/igc/igc.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Intel Ethernet Controller I225-LM/I225-V family" +define KFEATURE_COMPATIBILITY board + +kconf hardware igc.cfg diff --git a/features/ima/ima.cfg b/features/ima/ima.cfg index 1c613636..5fd3288e 100644 --- a/features/ima/ima.cfg +++ b/features/ima/ima.cfg @@ -1,19 +1,34 @@ # SPDX-License-Identifier: MIT CONFIG_IMA=y +CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 -CONFIG_IMA_NG_TEMPLATE=y -CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" -CONFIG_IMA_DEFAULT_HASH_SHA1=y -CONFIG_IMA_DEFAULT_HASH="sha1" -CONFIG_IMA_APPRAISE=y -CONFIG_IMA_APPRAISE_BOOTPARAM=y -CONFIG_IMA_TRUSTED_KEYRING=y +CONFIG_IMA_SIG_TEMPLATE=y +CONFIG_IMA_DEFAULT_TEMPLATE="ima-sig" +CONFIG_IMA_DEFAULT_HASH_SHA256=y +CONFIG_IMA_DEFAULT_HASH="sha256" +CONFIG_IMA_ARCH_POLICY=y +CONFIG_IMA_APPRAISE_BUILD_POLICY=y +CONFIG_IMA_APPRAISE_REQUIRE_POLICY_SIGS=y +CONFIG_IMA_APPRAISE_SIGNED_INIT=y +CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y +CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y +CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_SIGNATURE=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA_READ_POLICY=y -CONFIG_IMA_LOAD_X509=y -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" - -#CONFIG_INTEGRITY_SIGNATURE=y -#CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y -#CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_EVM=y +CONFIG_KEYS=y +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SECONDARY_TRUSTED_KEYRING=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS8_PRIVATE_KEY_PARSER=y +CONFIG_CRYPTO_ECDSA=y +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y diff --git a/features/ima/ima_evm_root_ca.cfg b/features/ima/ima_evm_root_ca.cfg index b4392afb..0761fb28 100644 --- a/features/ima/ima_evm_root_ca.cfg +++ b/features/ima/ima_evm_root_ca.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set +CONFIG_IMA_APPRAISE_SIGNED_INIT=n CONFIG_EVM_LOAD_X509=y CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" diff --git a/features/initramfs/initramfs-add-wrapper.patch b/features/initramfs/initramfs-add-wrapper.patch index 26468afc..29fb9220 100644 --- a/features/initramfs/initramfs-add-wrapper.patch +++ b/features/initramfs/initramfs-add-wrapper.patch @@ -1,4 +1,4 @@ -From 1975393f0ee791bb184a9acfa1108c7578648c84 Mon Sep 17 00:00:00 2001 +From e541445b92cc3750f5376a5998b57ab778f5d410 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Mon, 8 Oct 2018 13:33:11 -0400 Subject: [PATCH] initramfs: allow an optional wrapper script around initramfs @@ -15,18 +15,18 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/Makefile b/usr/Makefile -index 748f6a60bb1e..7dfd8d858244 100644 +index c12e6b15ce72..ed29c43088aa 100644 --- a/usr/Makefile +++ b/usr/Makefile -@@ -24,7 +24,7 @@ $(obj)/initramfs_data.o: $(obj)/$(datafile_y) FORCE - # Generate the initramfs cpio archive +@@ -55,7 +55,7 @@ cpio-data := $(obj)/initramfs_data.cpio + hostprogs := gen_init_cpio - hostprogs-y := gen_init_cpio --initramfs := $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs_list.sh -+initramfs := $(INITRAMFS_WRAPPER) $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs_list.sh - ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ - $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d) - ramfs-args := \ + # .initramfs_data.cpio.d is used to identify all files included +-# in initramfs and to detect if any files are added/removed. ++# in initramfs $(INITRAMFS_WRAPPER) and to detect if any files are added/removed. + # Removed files are identified by directory timestamp being updated + # The dependency list is generated by gen_initramfs.sh -l + -include $(obj)/.initramfs_data.cpio.d -- -2.5.0 +2.19.1 diff --git a/features/inline/inline.scc b/features/inline/inline.scc deleted file mode 100644 index ef6dde14..00000000 --- a/features/inline/inline.scc +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT -define KFEATURE_DESCRIPTION "Allow gcc to uninline functions marked 'inline'" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware inline.cfg diff --git a/features/intel-dptf/intel-dptf.cfg b/features/intel-dptf/intel-dptf.cfg new file mode 100644 index 00000000..38aa260f --- /dev/null +++ b/features/intel-dptf/intel-dptf.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_DPTF_PCH_FIVR=m diff --git a/features/intel-dptf/intel-dptf.scc b/features/intel-dptf/intel-dptf.scc new file mode 100644 index 00000000..b488a2c5 --- /dev/null +++ b/features/intel-dptf/intel-dptf.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Dynamic Platform and Thermal Framework PCH FIVR Participant device support" + +kconf non-hardware intel-dptf.cfg diff --git a/features/intel-idxd/intel-idxd.cfg b/features/intel-idxd/intel-idxd.cfg new file mode 100644 index 00000000..abd30923 --- /dev/null +++ b/features/intel-idxd/intel-idxd.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_IDXD=m diff --git a/features/intel-idxd/intel-idxd.scc b/features/intel-idxd/intel-idxd.scc new file mode 100644 index 00000000..c20a3d76 --- /dev/null +++ b/features/intel-idxd/intel-idxd.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Data Accelerators support" + +kconf hardware intel-idxd.cfg diff --git a/features/intel-persistent-memory/intel-x86-64-dax.cfg b/features/intel-persistent-memory/intel-x86-64-dax.cfg index 9e887919..ca53f2de 100644 --- a/features/intel-persistent-memory/intel-x86-64-dax.cfg +++ b/features/intel-persistent-memory/intel-x86-64-dax.cfg @@ -5,4 +5,3 @@ CONFIG_DEV_DAX=m CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_KMEM=m -CONFIG_DEV_DAX_PMEM_COMPAT=m diff --git a/features/intel-persistent-memory/intel-x86-64-pmem.cfg b/features/intel-persistent-memory/intel-x86-64-pmem.cfg index a0ab17e9..e7f039e9 100644 --- a/features/intel-persistent-memory/intel-x86-64-pmem.cfg +++ b/features/intel-persistent-memory/intel-x86-64-pmem.cfg @@ -16,7 +16,6 @@ CONFIG_ZONE_DEVICE=y # CONFIG_LIBNVDIMM=m CONFIG_BLK_DEV_PMEM=m -CONFIG_ND_BLK=m CONFIG_BTT=y CONFIG_NVDIMM_PFN=y CONFIG_NVDIMM_DAX=y diff --git a/features/intel-pinctrl/intel-pinctrl.cfg b/features/intel-pinctrl/intel-pinctrl.cfg index 406cf3ce..ca928504 100644 --- a/features/intel-pinctrl/intel-pinctrl.cfg +++ b/features/intel-pinctrl/intel-pinctrl.cfg @@ -1,5 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_ALDERLAKE=y CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_BROXTON=y @@ -12,3 +13,5 @@ CONFIG_PINCTRL_GEMINILAKE=y CONFIG_PINCTRL_ICELAKE=y CONFIG_PINCTRL_LEWISBURG=y CONFIG_PINCTRL_LYNXPOINT=m +CONFIG_PINCTRL_TIGERLAKE=y +CONFIG_PINCTRL_ELKHARTLAKE=y diff --git a/features/intel-sgx/intel-sgx.cfg b/features/intel-sgx/intel-sgx.cfg new file mode 100644 index 00000000..35010062 --- /dev/null +++ b/features/intel-sgx/intel-sgx.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_X86_SGX=y diff --git a/features/intel-sgx/intel-sgx.scc b/features/intel-sgx/intel-sgx.scc new file mode 100644 index 00000000..2ec2ec60 --- /dev/null +++ b/features/intel-sgx/intel-sgx.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Software Guard eXtensions (SGX)" + +kconf hardware intel-sgx.cfg diff --git a/features/intel-sst/intel-sst.cfg b/features/intel-sst/intel-sst.cfg new file mode 100644 index 00000000..05172701 --- /dev/null +++ b/features/intel-sst/intel-sst.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_SPEED_SELECT_INTERFACE=m diff --git a/features/intel-sst/intel-sst.scc b/features/intel-sst/intel-sst.scc new file mode 100644 index 00000000..1ab6626b --- /dev/null +++ b/features/intel-sst/intel-sst.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Speed Select Technology interface" + +kconf hardware intel-sst.cfg diff --git a/features/intel-tco/intel-tco.cfg b/features/intel-tco/intel-tco.cfg index 3310d62e..7512eb97 100644 --- a/features/intel-tco/intel-tco.cfg +++ b/features/intel-tco/intel-tco.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_ITCO_WDT=y +CONFIG_ITCO_WDT=m diff --git a/features/intel-th/intel-th.cfg b/features/intel-th/intel-th.cfg new file mode 100644 index 00000000..a74438fa --- /dev/null +++ b/features/intel-th/intel-th.cfg @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_TH=m +CONFIG_INTEL_TH_PCI=m +CONFIG_INTEL_TH_ACPI=m +CONFIG_INTEL_TH_GTH=m +CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TH_MSU=m +CONFIG_INTEL_TH_PTI=m diff --git a/features/intel-th/intel-th.scc b/features/intel-th/intel-th.scc new file mode 100644 index 00000000..8b971982 --- /dev/null +++ b/features/intel-th/intel-th.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Intel Trace Hub support" + +kconf hardware intel-th.cfg diff --git a/features/intel-uncore-frequency/intel-uncore-frequency.cfg b/features/intel-uncore-frequency/intel-uncore-frequency.cfg new file mode 100644 index 00000000..52d5ae13 --- /dev/null +++ b/features/intel-uncore-frequency/intel-uncore-frequency.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_UNCORE_FREQ_CONTROL=m diff --git a/features/intel-uncore-frequency/intel-uncore-frequency.scc b/features/intel-uncore-frequency/intel-uncore-frequency.scc new file mode 100644 index 00000000..75da5a35 --- /dev/null +++ b/features/intel-uncore-frequency/intel-uncore-frequency.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Uncore frequency control driver" + +kconf hardware intel-uncore-frequency.cfg diff --git a/features/iommu/iommu.cfg b/features/iommu/iommu.cfg index 4becf3eb..56221474 100644 --- a/features/iommu/iommu.cfg +++ b/features/iommu/iommu.cfg @@ -5,4 +5,4 @@ CONFIG_IOMMU_API=y CONFIG_IOMMU_IOVA=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_DEFAULT_ON=n diff --git a/features/iscsi/iscsi.cfg b/features/iscsi/iscsi.cfg new file mode 100644 index 00000000..7c47204b --- /dev/null +++ b/features/iscsi/iscsi.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m diff --git a/features/iscsi/iscsi.scc b/features/iscsi/iscsi.scc new file mode 100644 index 00000000..4fc0cec3 --- /dev/null +++ b/features/iscsi/iscsi.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "iSCSI Initiator over TCP/IP" + +kconf non-hardware iscsi.cfg diff --git a/features/kfence/kfence.cfg b/features/kfence/kfence.cfg new file mode 100644 index 00000000..6f4875c3 --- /dev/null +++ b/features/kfence/kfence.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_KFENCE=y diff --git a/features/kfence/kfence.scc b/features/kfence/kfence.scc new file mode 100644 index 00000000..741bca26 --- /dev/null +++ b/features/kfence/kfence.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "a low-overhead sampling-based memory safety error detector" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware kfence.cfg diff --git a/features/kmemcheck/kmemcheck.cfg b/features/kmemcheck/kmemcheck.cfg index 210e7e26..0e6fbef9 100644 --- a/features/kmemcheck/kmemcheck.cfg +++ b/features/kmemcheck/kmemcheck.cfg @@ -1,8 +1,8 @@ # SPDX-License-Identifier: MIT # To get more information CONFIG_DEBUG_INFO=y -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_FUNCTION_TRACER=n +CONFIG_DEBUG_PAGEALLOC=n # kmemcheck related CONFIG_KMEMCHECK=y diff --git a/features/landlock/landlock.cfg b/features/landlock/landlock.cfg new file mode 100644 index 00000000..dfe9f066 --- /dev/null +++ b/features/landlock/landlock.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_SECURITY_LANDLOCK=y + diff --git a/features/landlock/landlock.scc b/features/landlock/landlock.scc new file mode 100644 index 00000000..d2917123 --- /dev/null +++ b/features/landlock/landlock.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable the landlock security module" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware landlock.cfg + diff --git a/features/leds/leds.cfg b/features/leds/leds.cfg index eb40627c..33f3da76 100644 --- a/features/leds/leds.cfg +++ b/features/leds/leds.cfg @@ -13,4 +13,3 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # Include them here, but they won't be enabled unless GPIO is explicitly # enabled as well. CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGER_GPIO=y diff --git a/features/lto/lto-disable.cfg b/features/lto/lto-disable.cfg index 81939aff..75bedad3 100644 --- a/features/lto/lto-disable.cfg +++ b/features/lto/lto-disable.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT -# CONFIG_LTO_MENU is not set -# CONFIG_LTO is not set -# CONFIG_LTO_DEBUG is not set -# CONFIG_LTO_CP_CLONE is not set -# CONFIG_LTO_SLIM is not set +CONFIG_LTO_MENU=n +CONFIG_LTO=n +CONFIG_LTO_DEBUG=n +CONFIG_LTO_CP_CLONE=n +CONFIG_LTO_SLIM=n diff --git a/features/lxc/lxc-enable.scc b/features/lxc/lxc-enable.scc index 1482f6ad..1fabf96d 100644 --- a/features/lxc/lxc-enable.scc +++ b/features/lxc/lxc-enable.scc @@ -2,4 +2,4 @@ define KFEATURE_DESCRIPTION "Enable LXC support" define KFEATURE_COMPATIBILITY all -kconf non-hardware lxc.cfg +include cfg/lxc.scc diff --git a/features/lxc/lxc.cfg b/features/lxc/lxc.cfg deleted file mode 100644 index c289ddd0..00000000 --- a/features/lxc/lxc.cfg +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: MIT -# Misc configs -CONFIG_VETH=y -CONFIG_MACVLAN=y diff --git a/features/mac80211/mac80211-hwsim.cfg b/features/mac80211/mac80211-hwsim.cfg new file mode 100644 index 00000000..863a041f --- /dev/null +++ b/features/mac80211/mac80211-hwsim.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +# dependencies +CONFIG_CFG80211=y +CONFIG_MAC80211=y + +CONFIG_MAC80211_HWSIM=y diff --git a/features/mac80211/mac80211-hwsim.scc b/features/mac80211/mac80211-hwsim.scc new file mode 100644 index 00000000..71df2daf --- /dev/null +++ b/features/mac80211/mac80211-hwsim.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable simulated radio testing tool for mac80211" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware mac80211-hwsim.cfg diff --git a/features/mac80211/mac80211.scc b/features/mac80211/mac80211.scc index 5939f434..01806b6e 100644 --- a/features/mac80211/mac80211.scc +++ b/features/mac80211/mac80211.scc @@ -2,4 +2,4 @@ define KFEATURE_DESCRIPTION "Enable mac 80211 + WLAN support" define KFEATURE_COMPATIBILITY board -kconf hardware mac80211.cfg +kconf non-hardware mac80211.cfg diff --git a/features/media/media-dvb-frontends.cfg b/features/media/media-dvb-frontends.cfg index acada3df..10f02cc5 100644 --- a/features/media/media-dvb-frontends.cfg +++ b/features/media/media-dvb-frontends.cfg @@ -29,12 +29,9 @@ CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m CONFIG_DVB_TUNER_ITD1000=m CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m CONFIG_DVB_DS3000=m @@ -44,12 +41,10 @@ CONFIG_DVB_TDA10071=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m CONFIG_DVB_MT352=m diff --git a/features/media/media-i2c.cfg b/features/media/media-i2c.cfg index f87806a9..2069c5b2 100644 --- a/features/media/media-i2c.cfg +++ b/features/media/media-i2c.cfg @@ -9,9 +9,6 @@ CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_TVAUDIO=m CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/features/media/media-pci-capture.cfg b/features/media/media-pci-capture.cfg index 33f1079e..fdf12149 100644 --- a/features/media/media-pci-capture.cfg +++ b/features/media/media-pci-capture.cfg @@ -11,10 +11,6 @@ CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV_ALSA=m CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m - # # Media capture/analog/hybrid TV support # @@ -43,17 +39,6 @@ CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - CONFIG_DVB_B2C2_FLEXCOP_PCI=m CONFIG_DVB_PLUTO2=m diff --git a/features/media/media-platform.cfg b/features/media/media-platform.cfg index 58ad7330..135e3eeb 100644 --- a/features/media/media-platform.cfg +++ b/features/media/media-platform.cfg @@ -2,5 +2,6 @@ # # Media Platform Configuration # +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m diff --git a/features/media/media-radio.cfg b/features/media/media-radio.cfg index 19453262..ca695abf 100644 --- a/features/media/media-radio.cfg +++ b/features/media/media-radio.cfg @@ -3,7 +3,7 @@ # Media AM/FM Radio Adapters # CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_SI470X=m CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m diff --git a/features/media/media-usb-tv.cfg b/features/media/media-usb-tv.cfg index 393cf377..33e2279a 100644 --- a/features/media/media-usb-tv.cfg +++ b/features/media/media-usb-tv.cfg @@ -7,9 +7,7 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_STK1160_COMMON=m # # Analog/digital TV USB devices @@ -18,9 +16,6 @@ CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices diff --git a/features/media/media-usb-webcams.cfg b/features/media/media-usb-webcams.cfg index 93361188..8549b0a8 100644 --- a/features/media/media-usb-webcams.cfg +++ b/features/media/media-usb-webcams.cfg @@ -56,12 +56,5 @@ CONFIG_USB_GSPCA_ZC3XX=m CONFIG_USB_PWC=m CONFIG_USB_PWC_INPUT_EVDEV=y -# Vision's CPiA2 (Colour Processor Interface ASIC) Camera Drivers -CONFIG_VIDEO_CPIA2=m - - -# USB Syntek DC1125 Camera Support -CONFIG_USB_STKWEBCAM=m - # USB Sensoray 2255 video capture Device CONFIG_USB_S2255=m diff --git a/features/media/media.cfg b/features/media/media.cfg index 401acae6..148fa991 100644 --- a/features/media/media.cfg +++ b/features/media/media.cfg @@ -10,7 +10,6 @@ CONFIG_MEDIA_CONTROLLER=y # Enable the V4L2 core and API # CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y # @@ -19,14 +18,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L2_MEM2MEM_DEV=m # -# Used by drivers that need Videobuf modules -# -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_DMA_CONTIG=m -CONFIG_VIDEOBUF_VMALLOC=m - -# # Used by drivers that need Videobuf2 modules # CONFIG_VIDEOBUF2_CORE=m @@ -38,7 +29,7 @@ CONFIG_VIDEOBUF2_VMALLOC=m # # Digital Video Broadcast support # -CONFIG_DVB_CORE=y +CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_DVB_MAX_ADAPTERS=8 CONFIG_DVB_DYNAMIC_MINORS=y diff --git a/features/mei/amt.cfg b/features/mei/amt.cfg index f1c7aa59..df0bf237 100644 --- a/features/mei/amt.cfg +++ b/features/mei/amt.cfg @@ -1,3 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_SYSFS=y CONFIG_INTEL_MEI_WDT=m diff --git a/features/minnow-io/minnow-io.cfg b/features/minnow-io/minnow-io.cfg index 5ca458d1..c8fe2ce3 100644 --- a/features/minnow-io/minnow-io.cfg +++ b/features/minnow-io/minnow-io.cfg @@ -4,7 +4,6 @@ CONFIG_MINNOWBOARD_GPIO=m CONFIG_MINNOWBOARD_KEYS=m # GPIO Support -CONFIG_GPIO_SYSFS=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y diff --git a/features/misc/bosch-pressure-sensor-i2c.cfg b/features/misc/bosch-pressure-sensor-i2c.cfg index 420a95f7..8594140b 100644 --- a/features/misc/bosch-pressure-sensor-i2c.cfg +++ b/features/misc/bosch-pressure-sensor-i2c.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_BMP280 is not set +CONFIG_BMP280=n CONFIG_BMP085=m CONFIG_BMP085_I2C=m diff --git a/features/net/net.scc b/features/net/net.scc index a907e016..606aaa91 100644 --- a/features/net/net.scc +++ b/features/net/net.scc @@ -1,4 +1,3 @@ # SPDX-License-Identifier: MIT kconf hardware net.cfg -patch netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch diff --git a/features/net/netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch b/features/net/netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch deleted file mode 100644 index d1fdbf98..00000000 --- a/features/net/netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b383959122e464ccdc21f6b37af88152d29cdf95 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Tue, 25 Jun 2019 18:15:50 +0800 -Subject: [PATCH] netfilter: Fix remainder of pseudo-header protocol 0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since v5.1-rc1, some types of packets do not get unreachable reply with the -following iptables setting. Fox example, - -$ iptables -A INPUT -p icmp --icmp-type 8 -j REJECT -$ ping 127.0.0.1 -c 1 -PING 127.0.0.1 (127.0.0.1) 56(84) bytes of data. -— 127.0.0.1 ping statistics — -1 packets transmitted, 0 received, 100% packet loss, time 0ms - -We should have got the following reply from command line, but we did not. -From 127.0.0.1 icmp_seq=1 Destination Port Unreachable - -Yi Zhao reported it and narrowed it down to: -7fc38225363d ("netfilter: reject: skip csum verification for protocols that don't support it"), - -This is because nf_ip_checksum still expects pseudo-header protocol type 0 for -packets that are of neither TCP or UDP, and thus ICMP packets are mistakenly -treated as TCP/UDP. - -This patch corrects the conditions in nf_ip_checksum and all other places that -still call it with protocol 0. - -Fixes: 7fc38225363d ("netfilter: reject: skip csum verification for protocols that don't support it") -Reported-by: Yi Zhao <yi.zhao@windriver.com> -Signed-off-by: He Zhe <zhe.he@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - net/netfilter/nf_conntrack_proto_icmp.c | 2 +- - net/netfilter/nf_nat_proto.c | 2 +- - net/netfilter/utils.c | 5 +++-- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/net/netfilter/nf_conntrack_proto_icmp.c b/net/netfilter/nf_conntrack_proto_icmp.c -index a824367ed518..dd53e2b20f6b 100644 ---- a/net/netfilter/nf_conntrack_proto_icmp.c -+++ b/net/netfilter/nf_conntrack_proto_icmp.c -@@ -218,7 +218,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl, - /* See ip_conntrack_proto_tcp.c */ - if (state->net->ct.sysctl_checksum && - state->hook == NF_INET_PRE_ROUTING && -- nf_ip_checksum(skb, state->hook, dataoff, 0)) { -+ nf_ip_checksum(skb, state->hook, dataoff, IPPROTO_ICMP)) { - icmp_error_log(skb, state, "bad hw icmp checksum"); - return -NF_ACCEPT; - } -diff --git a/net/netfilter/nf_nat_proto.c b/net/netfilter/nf_nat_proto.c -index 07da07788f6b..83a24cc5753b 100644 ---- a/net/netfilter/nf_nat_proto.c -+++ b/net/netfilter/nf_nat_proto.c -@@ -564,7 +564,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, - - if (!skb_make_writable(skb, hdrlen + sizeof(*inside))) - return 0; -- if (nf_ip_checksum(skb, hooknum, hdrlen, 0)) -+ if (nf_ip_checksum(skb, hooknum, hdrlen, IPPROTO_ICMP)) - return 0; - - inside = (void *)skb->data + hdrlen; -diff --git a/net/netfilter/utils.c b/net/netfilter/utils.c -index 06dc55590441..51b454d8fa9c 100644 ---- a/net/netfilter/utils.c -+++ b/net/netfilter/utils.c -@@ -17,7 +17,8 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, - case CHECKSUM_COMPLETE: - if (hook != NF_INET_PRE_ROUTING && hook != NF_INET_LOCAL_IN) - break; -- if ((protocol == 0 && !csum_fold(skb->csum)) || -+ if ((protocol != IPPROTO_TCP && protocol != IPPROTO_UDP && -+ !csum_fold(skb->csum)) || - !csum_tcpudp_magic(iph->saddr, iph->daddr, - skb->len - dataoff, protocol, - skb->csum)) { -@@ -26,7 +27,7 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, - } - /* fall through */ - case CHECKSUM_NONE: -- if (protocol == 0) -+ if (protocol != IPPROTO_TCP && protocol != IPPROTO_UDP) - skb->csum = 0; - else - skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr, --- -2.19.1 - diff --git a/features/net/xdp/xdp.cfg b/features/net/xdp/xdp.cfg new file mode 100644 index 00000000..061b65a4 --- /dev/null +++ b/features/net/xdp/xdp.cfg @@ -0,0 +1 @@ +CONFIG_XDP_SOCKETS=y diff --git a/features/net/xdp/xdp.scc b/features/net/xdp/xdp.scc new file mode 100644 index 00000000..e4df6d09 --- /dev/null +++ b/features/net/xdp/xdp.scc @@ -0,0 +1 @@ +kconf hardware xdp.cfg diff --git a/features/net_sched/net_sched.cfg b/features/net_sched/net_sched.cfg index c9714dab..137ca752 100644 --- a/features/net_sched/net_sched.cfg +++ b/features/net_sched/net_sched.cfg @@ -7,7 +7,6 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_PRIO=m @@ -16,12 +15,13 @@ CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_MULTIQ=m + # # Classification # @@ -31,3 +31,8 @@ CONFIG_NET_CLS_BASIC=y CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_U32=y CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_EMATCH=y + +CONFIG_NET_EMATCH_U32=y +CONFIG_NET_EMATCH_META=y diff --git a/features/netfilter/netfilter.cfg b/features/netfilter/netfilter.cfg index 4e8d1bb6..ba275be4 100644 --- a/features/netfilter/netfilter.cfg +++ b/features/netfilter/netfilter.cfg @@ -13,9 +13,9 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CT_PROTO_GRE=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m @@ -29,13 +29,14 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HL=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m @@ -91,7 +92,6 @@ CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m diff --git a/features/nf_tables/nf_tables.cfg b/features/nf_tables/nf_tables.cfg index afb13964..5b0f28df 100644 --- a/features/nf_tables/nf_tables.cfg +++ b/features/nf_tables/nf_tables.cfg @@ -1,32 +1,24 @@ # SPDX-License-Identifier: MIT -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_INET=m -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m +CONFIG_NF_TABLES=y +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_CT=m -CONFIG_NFT_SET_RBTREE=m -CONFIG_NFT_SET_HASH=m -CONFIG_NFT_RBTREE=m CONFIG_NFT_HASH=m -CONFIG_NFT_COUNTER=m CONFIG_NFT_MASQ=m -CONFIG_NFT_MASQ_IPV4=m CONFIG_NFT_REDIR=m -CONFIG_NFT_REDIR_IPV4=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m +CONFIG_NFT_CONNLIMIT=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_NAT=m CONFIG_NFT_QUEUE=m CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m -CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT_IPV6=m -CONFIG_NF_TABLES_ARP=m -CONFIG_NF_TABLES_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m -CONFIG_NFT_REJECT_IPV6=m +CONFIG_NF_TABLES_ARP=y +CONFIG_NF_TABLES_IPV6=y CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_SOCKET=m diff --git a/features/nf_tables/nft_test.cfg b/features/nf_tables/nft_test.cfg new file mode 100644 index 00000000..0a959d0e --- /dev/null +++ b/features/nf_tables/nft_test.cfg @@ -0,0 +1,13 @@ +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_FLOW_TABLE_INET=m +CONFIG_NF_FLOW_TABLE=m +CONFIG_NFT_FIB_INET=y +CONFIG_NFT_FIB_IPV4=y +CONFIG_NFT_FIB_IPV6=y +CONFIG_NFT_FLOW_OFFLOAD=m +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_OSF=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_SYNPROXY=m +CONFIG_NFT_XFRM=m +CONFIG_VETH=y diff --git a/features/nf_tables/nft_test.scc b/features/nf_tables/nft_test.scc new file mode 100644 index 00000000..8181c215 --- /dev/null +++ b/features/nf_tables/nft_test.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Add extra nftables modules" +define KFEATURE_COMPATIBILITY all + +include nf_tables.cfg +include nft_test.cfg diff --git a/features/nfsd/nfsd.cfg b/features/nfsd/nfsd.cfg index ff94b98c..8cd76e3c 100644 --- a/features/nfsd/nfsd.cfg +++ b/features/nfsd/nfsd.cfg @@ -1,6 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V3_ACL=n CONFIG_NFSD_V4=y -# CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/features/numa/numa.cfg b/features/numa/numa.cfg index 351c5d97..2cf4bae2 100644 --- a/features/numa/numa.cfg +++ b/features/numa/numa.cfg @@ -1,9 +1,9 @@ # SPDX-License-Identifier: MIT CONFIG_NUMA=y +CONFIG_NUMA_BALANCING=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_X86_64_ACPI_NUMA=y -CONFIG_NODES_SPAN_OTHER_NODES=y CONFIG_NUMA_EMU=y CONFIG_NODES_SHIFT=6 -CONFIG_NEED_MULTIPLE_NODES=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_ACPI_NUMA=y diff --git a/features/ocicontainer/cgroup.scc b/features/ocicontainer/cgroup.scc new file mode 100644 index 00000000..4bfbccef --- /dev/null +++ b/features/ocicontainer/cgroup.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable cgroups needed to run containerd" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware features/cgroups/cgroups.cfg diff --git a/features/ocicontainer/ebtables.cfg b/features/ocicontainer/ebtables.cfg new file mode 100644 index 00000000..a3c514e1 --- /dev/null +++ b/features/ocicontainer/ebtables.cfg @@ -0,0 +1,2 @@ +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_NAT=m diff --git a/features/ocicontainer/ebtables.scc b/features/ocicontainer/ebtables.scc new file mode 100644 index 00000000..b3895e58 --- /dev/null +++ b/features/ocicontainer/ebtables.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable ebtables support" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware ebtables.cfg diff --git a/features/ocicontainer/ocicontainer.scc b/features/ocicontainer/ocicontainer.scc new file mode 100644 index 00000000..d18e9dfc --- /dev/null +++ b/features/ocicontainer/ocicontainer.scc @@ -0,0 +1,7 @@ +include xt-checksum.scc +include ebtables.scc +include features/vswitch/vswitch.scc +include features/lxc/lxc-enable.scc +include features/docker/docker.scc +include cgroup.scc + diff --git a/features/ocicontainer/xt-checksum.cfg b/features/ocicontainer/xt-checksum.cfg new file mode 100644 index 00000000..58afbff6 --- /dev/null +++ b/features/ocicontainer/xt-checksum.cfg @@ -0,0 +1 @@ +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m diff --git a/features/ocicontainer/xt-checksum.scc b/features/ocicontainer/xt-checksum.scc new file mode 100644 index 00000000..d3804f0c --- /dev/null +++ b/features/ocicontainer/xt-checksum.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Add extra iptables modules" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware xt-checksum.cfg diff --git a/features/optee/optee.cfg b/features/optee/optee.cfg new file mode 100644 index 00000000..3aa27f0a --- /dev/null +++ b/features/optee/optee.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_TEE=y +CONFIG_OPTEE=y diff --git a/features/optee/optee.scc b/features/optee/optee.scc new file mode 100644 index 00000000..db4c19e5 --- /dev/null +++ b/features/optee/optee.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable optee support" + +kconf hardware optee.cfg diff --git a/features/pci/pci-of-generic.cfg b/features/pci/pci-of-generic.cfg new file mode 100644 index 00000000..67a3ccff --- /dev/null +++ b/features/pci/pci-of-generic.cfg @@ -0,0 +1,3 @@ +# Support a simple generic PCI host controller, such as the one emulated by kvmtool +CONFIG_PCI_HOST_GENERIC=y + diff --git a/features/pci/pci-of-generic.scc b/features/pci/pci-of-generic.scc new file mode 100644 index 00000000..cc76fb88 --- /dev/null +++ b/features/pci/pci-of-generic.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Generic PCI OF device" +define KFEATURE_COMPATIBILITY board + +kconf hardware pci-of-generic.cfg diff --git a/features/pci/pci.cfg b/features/pci/pci.cfg index f3c57c54..3ed13b59 100644 --- a/features/pci/pci.cfg +++ b/features/pci/pci.cfg @@ -1,12 +1,8 @@ # SPDX-License-Identifier: MIT CONFIG_PCI=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MSI=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI=y -# CONFIG_HOTPLUG_PCI_PCIE is not set - - - +CONFIG_HOTPLUG_PCI_PCIE=n diff --git a/features/perf/libbpf-Fix-build-warning-on-ref_ctr_off.patch b/features/perf/libbpf-Fix-build-warning-on-ref_ctr_off.patch new file mode 100644 index 00000000..10ed1460 --- /dev/null +++ b/features/perf/libbpf-Fix-build-warning-on-ref_ctr_off.patch @@ -0,0 +1,46 @@ +From a41f5bda3e72b4f2bcdbe84cd65190121e3cc3ff Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Dec 2022 18:23:47 -0800 +Subject: [PATCH] libbpf: Fix build warning on ref_ctr_off + +Clang warns on 32-bit ARM on this comparision + +libbpf.c:10497:18: error: result of comparison of constant 4294967296 with expression of type 'size_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare] + if (ref_ctr_off >= (1ULL << PERF_UPROBE_REF_CTR_OFFSET_BITS)) + ~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Check for platform long int to be larger than 32-bits before enabling +this check, it false on 32bit anyways. + +Cc: Alexei Starovoitov <ast@kernel.org> +Cc: Daniel Borkmann <daniel@iogearbox.net> +Cc: Song Liu <song@kernel.org> +Cc: Yonghong Song <yhs@fb.com> +Cc: Jiri Olsa <jolsa@kernel.org> +Cc: Paul Walmsley <paul.walmsley@sifive.com> +Cc: Palmer Dabbelt <palmer@dabbelt.com> +Cc: Nathan Chancellor <nathan@kernel.org> +Cc: Nick Desaulniers <ndesaulniers@google.com> + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + tools/lib/bpf/libbpf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c +index 05c4db355f28..23991e0d21a9 100644 +--- a/tools/lib/bpf/libbpf.c ++++ b/tools/lib/bpf/libbpf.c +@@ -9867,7 +9867,7 @@ static int perf_event_open_probe(bool uprobe, bool retprobe, const char *name, + char errmsg[STRERR_BUFSIZE]; + int type, pfd; + +- if ((__u64)ref_ctr_off >= (1ULL << PERF_UPROBE_REF_CTR_OFFSET_BITS)) ++ if (BITS_PER_LONG > 32 && (__u64)ref_ctr_off >= (1ULL << PERF_UPROBE_REF_CTR_OFFSET_BITS)) + return -EINVAL; + + memset(&attr, 0, attr_sz); +-- +2.34.1 + diff --git a/features/perf/perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch b/features/perf/perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch new file mode 100644 index 00000000..91ab18c5 --- /dev/null +++ b/features/perf/perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch @@ -0,0 +1,33 @@ +From 4b69a5a32098d3abcd0800f6d24fa29451a82c3a Mon Sep 17 00:00:00 2001 +From: Jiping Ma <jiping.ma2@windriver.com> +Date: Thu, 30 Apr 2020 09:35:06 +0800 +Subject: [PATCH] perf: perf can not parser the backtrace of app in the 32bit + system and 64bit kernel. + +Record PC value from regs[15], it should be regs[32], which cause perf +parser the backtrace failed. + +Signed-off-by: Jiping Ma <jiping.ma2@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/kernel/perf_regs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c +index 0bbac612146e..04088e6b6092 100644 +--- a/arch/arm64/kernel/perf_regs.c ++++ b/arch/arm64/kernel/perf_regs.c +@@ -32,6 +32,10 @@ u64 perf_reg_value(struct pt_regs *regs, int idx) + if ((u32)idx == PERF_REG_ARM64_PC) + return regs->pc; + ++ if (perf_reg_abi(current) == PERF_SAMPLE_REGS_ABI_32 ++ && idx == 15) ++ return regs->regs[PERF_REG_ARM64_PC]; ++ + return regs->regs[idx]; + } + +-- +2.19.1 + diff --git a/features/perf/perf.scc b/features/perf/perf.scc index b4478355..dc9de471 100644 --- a/features/perf/perf.scc +++ b/features/perf/perf.scc @@ -9,3 +9,6 @@ patch perf-add-SLANG_INC-for-slang.h.patch patch perf-fix-bench-numa-compilation.patch patch perf-mips64-Convert-__u64-to-unsigned-long-long.patch patch perf-x86-32-explicitly-include-errno.h.patch +patch perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch +patch libbpf-Fix-build-warning-on-ref_ctr_off.patch +patch tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch diff --git a/features/perf/tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch b/features/perf/tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch new file mode 100644 index 00000000..31008bfa --- /dev/null +++ b/features/perf/tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch @@ -0,0 +1,37 @@ +From 2c720c18adae3422b022c2c88fb91379b1f3e2c6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Dec 2022 18:33:48 -0800 +Subject: [PATCH 3/3] tools: Remove some options from CLANG_CROSS_FLAGS + +These options are not needed with OE/Yocto since compiler is already +passing these options via TOOLCHAIN_OPTIONS, having these options infact +regressed OE builds because build time --sysroot on OE cross compiler is +/not/exist and that creates problems where clang can no more find system +headers anymore during compilation + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + tools/scripts/Makefile.include | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include +index 0efb8f2b33ce..3d206d772cc2 100644 +--- a/tools/scripts/Makefile.include ++++ b/tools/scripts/Makefile.include +@@ -101,9 +101,9 @@ ifeq ($(CLANG_CROSS_FLAGS),) + CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) + GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc 2>/dev/null)) + ifneq ($(GCC_TOOLCHAIN_DIR),) +-CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE)) +-CLANG_CROSS_FLAGS += --sysroot=$(shell $(CROSS_COMPILE)gcc -print-sysroot) +-CLANG_CROSS_FLAGS += --gcc-toolchain=$(realpath $(GCC_TOOLCHAIN_DIR)/..) ++#CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE)) ++#CLANG_CROSS_FLAGS += --sysroot=$(shell $(CROSS_COMPILE)gcc -print-sysroot) ++#CLANG_CROSS_FLAGS += --gcc-toolchain=$(realpath $(GCC_TOOLCHAIN_DIR)/..) + endif # GCC_TOOLCHAIN_DIR + endif # CLANG_CROSS_FLAGS + CFLAGS += $(CLANG_CROSS_FLAGS) +-- +2.19.1 + diff --git a/features/profiling/profiling.cfg b/features/profiling/profiling.cfg index 3c28606c..9728b889 100644 --- a/features/profiling/profiling.cfg +++ b/features/profiling/profiling.cfg @@ -1,6 +1,5 @@ # SPDX-License-Identifier: MIT # for oprofile and powertop CONFIG_PROFILING=y -CONFIG_OPROFILE=y CONFIG_FRAME_POINTER=y CONFIG_X86_LOCAL_APIC=y diff --git a/features/qat/qat.cfg b/features/qat/qat.cfg index 2dc36225..5f138f1f 100644 --- a/features/qat/qat.cfg +++ b/features/qat/qat.cfg @@ -10,3 +10,5 @@ CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=y +CONFIG_PCIEAER=y +CONFIG_RAS=y diff --git a/features/qat/y_or_m_enabled.cfg b/features/qat/y_or_m_enabled.cfg new file mode 100644 index 00000000..357efc5a --- /dev/null +++ b/features/qat/y_or_m_enabled.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_CRYPTO_CCM +CONFIG_CRYPTO_GCM diff --git a/features/random/random.scc b/features/random/random.scc deleted file mode 100644 index 0fd6584c..00000000 --- a/features/random/random.scc +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT -define KFEATURE_DESCRIPTION "Trust CPU's random number generator for initializing kernel's CRNG" -define KFEATURE_COMPATIBILITY arch - -kconf hardware random.cfg diff --git a/features/reproducibility/reproducibility.cfg b/features/reproducibility/reproducibility.cfg new file mode 100644 index 00000000..97e7462c --- /dev/null +++ b/features/reproducibility/reproducibility.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_IKHEADERS=m diff --git a/features/reproducibility/reproducibility.scc b/features/reproducibility/reproducibility.scc new file mode 100644 index 00000000..e8b069cd --- /dev/null +++ b/features/reproducibility/reproducibility.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable kernel build reproducibility options" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware reproducibility.cfg diff --git a/features/rt/rt.scc b/features/rt/rt.scc index 548d2d44..4cc0cb9a 100644 --- a/features/rt/rt.scc +++ b/features/rt/rt.scc @@ -1 +1,3 @@ # SPDX-License-Identifier: MIT +# + diff --git a/features/scsi/scsi-debug.cfg b/features/scsi/scsi-debug.cfg index 11dc381f..90e6aa4b 100644 --- a/features/scsi/scsi-debug.cfg +++ b/features/scsi/scsi-debug.cfg @@ -1,2 +1,3 @@ # SPDX-License-Identifier: MIT +CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_DEBUG=m diff --git a/features/scsi/scsi-debug.scc b/features/scsi/scsi-debug.scc index 2032872a..f591db62 100644 --- a/features/scsi/scsi-debug.scc +++ b/features/scsi/scsi-debug.scc @@ -5,5 +5,6 @@ define KFEATURE_COMPATIBILITY board # if we are turning on debug support, we need to be sure that core scsi # support is enabled. include scsi.scc +include disk.scc kconf hardware scsi-debug.cfg diff --git a/features/security/security-arm64.cfg b/features/security/security-arm64.cfg new file mode 100644 index 00000000..5222afb3 --- /dev/null +++ b/features/security/security-arm64.cfg @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: MIT + +# Make sure PAN emulation is enabled. +CONFIG_ARM64_SW_TTBR0_PAN=y + +# Enable Kernel Page Table Isolation to remove an entire class of cache timing side-channels. +CONFIG_UNMAP_KERNEL_AT_EL0=y + +# Software Shadow Stack or PAC +CONFIG_SHADOW_CALL_STACK=y + +# Pointer authentication (ARMv8.3 and later). If hardware actually supports it, one can +# turn off CONFIG_STACKPROTECTOR_STRONG with this enabled. +CONFIG_ARM64_PTR_AUTH=y +CONFIG_ARM64_PTR_AUTH_KERNEL=y + +# Available in ARMv8.5 and later. +CONFIG_ARM64_BTI=y +CONFIG_ARM64_BTI_KERNEL=y +CONFIG_ARM64_MTE=y +CONFIG_KASAN_HW_TAGS=y +CONFIG_ARM64_E0PD=y + +# Available in ARMv8.7 and later. +CONFIG_ARM64_EPAN=y + +# Enable Control Flow Integrity +CONFIG_CFI_CLANG=y +# CONFIG_CFI_PERMISSIVE is not set diff --git a/features/security/security-x86_64.cfg b/features/security/security-x86_64.cfg new file mode 100644 index 00000000..1c12034a --- /dev/null +++ b/features/security/security-x86_64.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +# Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target. +CONFIG_LEGACY_VSYSCALL_NONE=y diff --git a/features/security/security.cfg b/features/security/security.cfg index 0486eb1a..336adcc4 100644 --- a/features/security/security.cfg +++ b/features/security/security.cfg @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT # Protect against ioctl buffer overflows CONFIG_HARDENED_USERCOPY=y -# CONFIG_HARDENED_USERCOPY_FALLBACK is not set # Check for memory copies that might overflow a structure in str*() and mem*() # functions both at build-time and run-time @@ -15,31 +14,24 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y -# Perform extensive checks on reference counting -CONFIG_REFCOUNT_FULL=y - # Disable to ensure random heap placement to make exploits harder -# CONFIG_COMPAT_BRK is not set +CONFIG_COMPAT_BRK=n # Disable; exposes kernel text image layout -# CONFIG_PROC_KCORE is not set +CONFIG_PROC_KCORE=n # Increases the low-level kernel attack surface. Disable it instead. # Removes the modify_ldt system call. CONFIG_EXPERT=y CONFIG_MODIFY_LDT_SYSCALL=n -# Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target. -# CONFIG_LEGACY_VSYSCALL_EMULATE is not set -CONFIG_LEGACY_VSYSCALL_NONE=y - # Prior to v4.1, assists heap memory attacks; best to keep interface disabled. -# CONFIG_INET_DIAG is not set +CONFIG_INET_DIAG=n # Do not allow direct physical memory access (enable only STRICT mode...) # Note that drivers like uvesafb/v86d depending on direct physical memory # access would be affected. -# CONFIG_DEVMEM is not set +CONFIG_DEVMEM=y CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y @@ -48,7 +40,6 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_DEBUG_LIST=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y # Information exposure CONFIG_PAGE_POISONING=y @@ -64,3 +55,15 @@ CONFIG_STRICT_MODULE_RWX=y # Meltdown and Spectre CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y + +# Exposing the TPM's Random Number Generator as a hwrng device. +CONFIG_HW_RANDOM_TPM=y + +# Warn on W+X mappings at boot +CONFIG_DEBUG_WX=y + +# Restrict unprivileged access to the kernel syslog +CONFIG_SECURITY_DMESG_RESTRICT=y + +# The kernel will automatically load the module of any line dicipline that is asked for. +CONFIG_LDISC_AUTOLOAD=n diff --git a/features/security/security.scc b/features/security/security.scc index 4abdf457..f3a651c0 100644 --- a/features/security/security.scc +++ b/features/security/security.scc @@ -3,3 +3,11 @@ define KFEATURE_DESCRIPTION "Enable/disable configurations that impact kernel se define KFEATURE_COMPATIBILITY all kconf non-hardware security.cfg + +if [ "$KARCH" = "x86_64" ]; then + kconf non-hardware security-x86_64.cfg +fi + +if [ "$KARCH" = "arm64" ]; then + kconf non-hardware security-arm64.cfg +fi diff --git a/features/soc/baytrail/baytrail.cfg b/features/soc/baytrail/baytrail.cfg index 390ef51b..c1b1120a 100644 --- a/features/soc/baytrail/baytrail.cfg +++ b/features/soc/baytrail/baytrail.cfg @@ -14,7 +14,6 @@ CONFIG_X86_INTEL_LPSS=y # GPIO Support CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_SERIAL_8250_DW=y diff --git a/features/soc/broxton/broxton.cfg b/features/soc/broxton/broxton.cfg index b62b895c..4a760f6b 100644 --- a/features/soc/broxton/broxton.cfg +++ b/features/soc/broxton/broxton.cfg @@ -15,10 +15,9 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_INTEL_IDMA64=y # GPIO support -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y # ACPI operation region support for BXT WhiskeyCove PMIC -CONFIG_INTEL_SOC_PMIC_BXTWC=y +CONFIG_INTEL_SOC_PMIC_BXTWC=m CONFIG_BXT_WC_PMIC_OPREGION=y diff --git a/features/soc/skylake/skylake.cfg b/features/soc/skylake/skylake.cfg index 34066635..a1641a09 100644 --- a/features/soc/skylake/skylake.cfg +++ b/features/soc/skylake/skylake.cfg @@ -16,7 +16,6 @@ CONFIG_SENSORS_I5500=m CONFIG_SND_HDA_I915=y CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SST=m -CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_DYNAMIC_MINORS=y CONFIG_CRC8=m diff --git a/features/sound/intel-snd-sof.cfg b/features/sound/intel-snd-sof.cfg new file mode 100644 index 00000000..5efcd0c8 --- /dev/null +++ b/features/sound/intel-snd-sof.cfg @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +CONFIG_SOUNDWIRE=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y +CONFIG_SND_SOC_SOF_PCI=m +CONFIG_SND_SOC_SOF_ALDERLAKE=m +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m +CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y +CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m +CONFIG_SND_SOC_SOF_HDA_LINK=y +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y diff --git a/features/sound/intel-snd-sof.scc b/features/sound/intel-snd-sof.scc new file mode 100644 index 00000000..85632930 --- /dev/null +++ b/features/sound/intel-snd-sof.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Sound Open Firmware(SOF) support for Intel audio DSPs" + +kconf hardware intel-snd-sof.cfg diff --git a/features/stm/stm.cfg b/features/stm/stm.cfg new file mode 100644 index 00000000..83fe45a9 --- /dev/null +++ b/features/stm/stm.cfg @@ -0,0 +1,7 @@ +CONFIG_STM=m +CONFIG_STM_PROTO_BASIC=m +CONFIG_STM_PROTO_SYS_T=m +CONFIG_STM_DUMMY=m +CONFIG_STM_SOURCE_CONSOLE=m +CONFIG_STM_SOURCE_HEARTBEAT=m +CONFIG_STM_SOURCE_FTRACE=m diff --git a/features/stm/stm.scc b/features/stm/stm.scc new file mode 100644 index 00000000..1e340623 --- /dev/null +++ b/features/stm/stm.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "A System Trace Module support" + +kconf hardware stm.cfg diff --git a/features/telemetry/intel-telemetry.cfg b/features/telemetry/intel-telemetry.cfg index dd07fe91..9372aa17 100644 --- a/features/telemetry/intel-telemetry.cfg +++ b/features/telemetry/intel-telemetry.cfg @@ -3,8 +3,8 @@ CONFIG_X86_64=y # Other dependencies -CONFIG_INTEL_PMC_IPC=y +CONFIG_MFD_INTEL_PMC_BXT=m CONFIG_INTEL_PUNIT_IPC=y # The feature -CONFIG_INTEL_TELEMETRY=y +CONFIG_INTEL_TELEMETRY=m diff --git a/features/thermal/coretemp-x86_64.cfg b/features/thermal/coretemp-x86_64.cfg new file mode 100644 index 00000000..4a34163a --- /dev/null +++ b/features/thermal/coretemp-x86_64.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +# ACPI INT340X thermal drivers +CONFIG_INT340X_THERMAL=m + diff --git a/features/thermal/coretemp.cfg b/features/thermal/coretemp.cfg index 85e2d58b..1b89b549 100644 --- a/features/thermal/coretemp.cfg +++ b/features/thermal/coretemp.cfg @@ -8,12 +8,10 @@ CONFIG_SENSORS_CORETEMP=m # Intel SoCs DTS thermal driver CONFIG_INTEL_SOC_DTS_THERMAL=m -# ACPI INT340X thermal drivers -CONFIG_INT340X_THERMAL=m - # Intel PowerClamp idle injection driver CONFIG_INTEL_POWERCLAMP=m # Intel PMIC thermal driver +CONFIG_MFD_INTEL_PMC_BXT=m CONFIG_INTEL_SOC_PMIC_BXTWC=m CONFIG_INTEL_BXT_PMIC_THERMAL=m diff --git a/features/thermal/coretemp.scc b/features/thermal/coretemp.scc index 272d5578..ded07295 100644 --- a/features/thermal/coretemp.scc +++ b/features/thermal/coretemp.scc @@ -3,3 +3,7 @@ define KFEATURE_DESCRIPTION "Coretemp support for Intel platforms" define KFEATURE_COMPATIBILITY board kconf hardware coretemp.cfg +if [ "$KARCH" = "x86_64" ] ; then + kconf hardware coretemp-x86_64.cfg +fi + diff --git a/features/thunderbolt/thunderbolt.cfg b/features/thunderbolt/thunderbolt.cfg index 2408da5b..b110f956 100644 --- a/features/thunderbolt/thunderbolt.cfg +++ b/features/thunderbolt/thunderbolt.cfg @@ -1,2 +1,4 @@ # SPDX-License-Identifier: MIT -CONFIG_THUNDERBOLT=m +CONFIG_USB4=m +CONFIG_INTEL_WMI_THUNDERBOLT=m +CONFIG_USB4_NET=m diff --git a/features/tpm/tpm-1.2.cfg b/features/tpm/tpm-1.2.cfg new file mode 100644 index 00000000..d1fcf98c --- /dev/null +++ b/features/tpm/tpm-1.2.cfg @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT +# Enable TPM 1.2 device drivers. +CONFIG_TCG_TIS_I2C_ATMEL=y +CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_TCG_TIS_I2C_NUVOTON=y +CONFIG_TCG_NSC=y +CONFIG_TCG_ATMEL=y +CONFIG_TCG_INFINEON=y +CONFIG_TCG_TIS_ST33ZP24=y +CONFIG_TCG_TIS_ST33ZP24_I2C=y +CONFIG_TCG_TIS_ST33ZP24_SPI=y
\ No newline at end of file diff --git a/features/tpm/tpm-1.2.scc b/features/tpm/tpm-1.2.scc new file mode 100644 index 00000000..74900486 --- /dev/null +++ b/features/tpm/tpm-1.2.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) 1.2 drivers" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware tpm-1.2.cfg diff --git a/features/tpm/tpm-2.0-crb.cfg b/features/tpm/tpm-2.0-crb.cfg new file mode 100644 index 00000000..27a1ba25 --- /dev/null +++ b/features/tpm/tpm-2.0-crb.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +# Enable TPM device drivers. +CONFIG_TCG_CRB=y diff --git a/features/tpm/tpm-2.0-crb.scc b/features/tpm/tpm-2.0-crb.scc new file mode 100644 index 00000000..1274b3c7 --- /dev/null +++ b/features/tpm/tpm-2.0-crb.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable TCG CRB TPM (Trusted Computing Group Command Response Buffer Trusted Platform Module) 2.0 driver" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware tpm-2.0-crb.cfg diff --git a/features/tpm/tpm-2.0.cfg b/features/tpm/tpm-2.0.cfg new file mode 100644 index 00000000..9f427afa --- /dev/null +++ b/features/tpm/tpm-2.0.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +# Enable TPM device drivers. +CONFIG_SPI=y +CONFIG_TCG_TIS_SPI=y diff --git a/features/tpm/tpm-2.0.scc b/features/tpm/tpm-2.0.scc new file mode 100644 index 00000000..83440f8b --- /dev/null +++ b/features/tpm/tpm-2.0.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) 2.0 drivers" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware tpm-2.0.cfg diff --git a/features/tpm/tpm-common.cfg b/features/tpm/tpm-common.cfg new file mode 100644 index 00000000..7e2ea6c1 --- /dev/null +++ b/features/tpm/tpm-common.cfg @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +# Enable TPM hardware support. +CONFIG_TCG_TPM=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y diff --git a/features/tpm/tpm-common.scc b/features/tpm/tpm-common.scc new file mode 100644 index 00000000..31a070c0 --- /dev/null +++ b/features/tpm/tpm-common.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable common TCG TPM (Trusted Computing Group Trusted Platform Module) features" +define KFEATURE_COMPATIBILITY board + +kconf hardware tpm-common.cfg diff --git a/features/tpm/tpm.cfg b/features/tpm/tpm.cfg deleted file mode 100644 index ea10c1fb..00000000 --- a/features/tpm/tpm.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: MIT -# Enable TPM device drivers. -CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_TPM=y -CONFIG_TCG_TIS_CORE=y -CONFIG_TCG_TIS=y -CONFIG_SPI=y -CONFIG_TCG_TIS_SPI=y -CONFIG_TCG_TIS_I2C_ATMEL=y -CONFIG_TCG_TIS_I2C_INFINEON=y -CONFIG_TCG_TIS_I2C_NUVOTON=y -CONFIG_TCG_NSC=y -CONFIG_TCG_ATMEL=y -CONFIG_TCG_INFINEON=y -CONFIG_TCG_CRB=y -CONFIG_TCG_VTPM_PROXY=y -CONFIG_TCG_TIS_ST33ZP24=y -CONFIG_TCG_TIS_ST33ZP24_I2C=y -CONFIG_TCG_TIS_ST33ZP24_SPI=y diff --git a/features/tpm/tpm.scc b/features/tpm/tpm.scc index a1435480..1f3ba9cf 100644 --- a/features/tpm/tpm.scc +++ b/features/tpm/tpm.scc @@ -1,5 +1,9 @@ # SPDX-License-Identifier: MIT -define KFEATURE_DESCRIPTION "Enable TCG TPM driver (Trusted Computing Group Trusted Platform Module)" +define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) drivers" define KFEATURE_COMPATIBILITY board -kconf hardware tpm.cfg +include tpm-common.scc +include tpm-1.2.scc +include tpm-2.0.scc +include tpm-2.0-crb.scc +include vtpm.scc diff --git a/features/tpm/vtpm.cfg b/features/tpm/vtpm.cfg new file mode 100644 index 00000000..eeb58e96 --- /dev/null +++ b/features/tpm/vtpm.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +# Enable vTPM device drivers. +CONFIG_TCG_VTPM_PROXY=y diff --git a/features/tpm/vtpm.scc b/features/tpm/vtpm.scc new file mode 100644 index 00000000..e927ffb6 --- /dev/null +++ b/features/tpm/vtpm.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable virtual TCG TPM (Trusted Computing Group Trusted Platform Module) proxy driver" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware vtpm.cfg diff --git a/bsp/intel-x86/intel-x86-hugepage.cfg b/features/transparent-hugepage/transparent-hugepage.cfg index 1367b519..5079bf3f 100644 --- a/bsp/intel-x86/intel-x86-hugepage.cfg +++ b/features/transparent-hugepage/transparent-hugepage.cfg @@ -1,3 +1,6 @@ # SPDX-License-Identifier: MIT +# +# Memory Management options +# CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y diff --git a/features/transparent-hugepage/transparent-hugepage.scc b/features/transparent-hugepage/transparent-hugepage.scc new file mode 100644 index 00000000..3cad4b3a --- /dev/null +++ b/features/transparent-hugepage/transparent-hugepage.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Transparent Hugepage Support" + +kconf hardware transparent-hugepage.cfg diff --git a/features/tsn/tsn.cfg b/features/tsn/tsn.cfg new file mode 100644 index 00000000..c0cac7db --- /dev/null +++ b/features/tsn/tsn.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_CBS=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_TAPRIO=m diff --git a/features/tsn/tsn.scc b/features/tsn/tsn.scc new file mode 100644 index 00000000..0f33451e --- /dev/null +++ b/features/tsn/tsn.scc @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Time-Sensitive Networking support" +kconf non-hardware tsn.cfg diff --git a/features/tun/tun.cfg b/features/tun/tun.cfg new file mode 100644 index 00000000..b45d3e9b --- /dev/null +++ b/features/tun/tun.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# dependency +CONFIG_INET=y + +CONFIG_TUN=y diff --git a/features/tun/tun.scc b/features/tun/tun.scc new file mode 100644 index 00000000..5a4cc3bc --- /dev/null +++ b/features/tun/tun.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable universal TUN/TAP device driver support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware tun.cfg diff --git a/features/uptime/uptime-allow-the-optional-limiting-of-kernel-runtime.patch b/features/uptime/uptime-allow-the-optional-limiting-of-kernel-runtime.patch deleted file mode 100644 index aa143059..00000000 --- a/features/uptime/uptime-allow-the-optional-limiting-of-kernel-runtime.patch +++ /dev/null @@ -1,251 +0,0 @@ -From a21e483b57c8c31beaa5063268ec35da375daf04 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Tue, 12 Jul 2011 10:26:50 -0400 -Subject: [PATCH] uptime: allow the optional limiting of kernel runtime - -Introduce the ability to limit the limit the uptime of a kernel. -When enabled, these options set a maximum uptime on the kernel, and -(optionally) trigger a clean reboot at expiration. - -This functionality may appear to be very close to the softdog watchdog -implementation. It is. But can't be the softdog for several reasons: - - - The soft watchdog should be available while this functionality is active - - The duration range is different between this and the softdog. The - timeout available here is potentially quite a bit longer. - - At expiration, there are different expiration requirements and actions. - - This functionality is specific to a particular use case and should - not impact mainline functionality - -To cleanly restart the kernel after one minute of uptime, the following -config items would be required: - - CONFIG_UPTIME_LIMITED_KERNEL=y - CONFIG_UPTIME_LIMIT_DURATION=1 - CONFIG_UPTIME_LIMIT_KERNEL_REBOOT=y - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -diff --git a/init/Kconfig b/init/Kconfig -index cac3f096050d..77d6d5fa1b1d 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1376,6 +1376,31 @@ menuconfig EXPERT - environments which can tolerate a "non-standard" kernel. - Only use this if you really know what you are doing. - -+config UPTIME_LIMITED_KERNEL -+ bool "Create a kernel with uptime limitations" -+ default n -+ help -+ Limit the amount of time a kernel can run. The associated UPTIME_LIMIT* -+ kernel config options should be used to tune the behaviour. -+ -+config UPTIME_LIMIT_DURATION -+ int "Kernel uptime limit in minutes" -+ depends on UPTIME_LIMITED_KERNEL -+ range 0 14400 -+ default 0 -+ help -+ Define the uptime limitation on a kernel in minutes. Once -+ the defined time expires the kernel will emit a warning, cease -+ to be usable and eventually restart. The valid range is 0 (disable) -+ to 14400 (10 days) -+ -+config UPTIME_LIMIT_KERNEL_REBOOT -+ bool "Reboot a time limited kernel at expiration" -+ depends on UPTIME_LIMITED_KERNEL -+ default y -+ help -+ Reboot an uptime limited kernel at expiration. -+ - config UID16 - bool "Enable 16-bit UID system calls" if EXPERT - depends on HAVE_UID16 && MULTIUSER -diff --git a/kernel/Makefile b/kernel/Makefile -index e2ec54e2b952..6b7bdddd624b 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -45,6 +45,7 @@ obj-$(CONFIG_FREEZER) += freezer.o - obj-$(CONFIG_PROFILING) += profile.o - obj-$(CONFIG_STACKTRACE) += stacktrace.o - obj-y += time/ -+obj-$(CONFIG_UPTIME_LIMITED_KERNEL) += uptime_limit.o - obj-$(CONFIG_FUTEX) += futex.o - ifeq ($(CONFIG_COMPAT),y) - obj-$(CONFIG_FUTEX) += futex_compat.o -diff --git a/kernel/uptime_limit.c b/kernel/uptime_limit.c -new file mode 100644 -index 000000000000..b6a1a5e4f9d9 ---- /dev/null -+++ b/kernel/uptime_limit.c -@@ -0,0 +1,166 @@ -+/* -+ * uptime_limit.c -+ * -+ * This file contains the functions which can limit kernel uptime -+ * -+ * Copyright (C) 2011 Bruce Ashfield (bruce.ashfield@windriver.com) -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * -+ * This functionality is somewhat close to the softdog watchdog -+ * implementation, but it cannot be used directly for several reasons: -+ * -+ * - The soft watchdog should be available while this functionality is active -+ * - The duration range is different between this and the softdog. The -+ * timeout available here is potentially quite a bit longer. -+ * - At expiration, there are different expiration requirements and actions. -+ * - This functionality is specific to a particular use case and should -+ * not impact mainline functionality -+ * -+ */ -+#include <linux/kernel.h> -+#include <linux/reboot.h> -+#include <linux/timer.h> -+#include <linux/delay.h> -+#include <linux/kthread.h> -+ -+#define UPTIME_LIMIT_IN_SECONDS (CONFIG_UPTIME_LIMIT_DURATION * 60) -+#define MIN(X, Y) ((X) <= (Y) ? (X) : (Y)) -+#define TEN_MINUTES_IN_SECONDS 600 -+ -+enum uptime_expiration_type { -+ uptime_no_action, -+ uptime_reboot -+}; -+ -+static enum uptime_expiration_type uptime_expiration_action = uptime_no_action; -+static struct timer_list timelimit_timer; -+static struct task_struct *uptime_worker_task; -+ -+static void timelimit_expire(unsigned long timeout_seconds) -+{ -+ char msg[128]; -+ int msglen = 127; -+ -+ if (timeout_seconds) { -+ if (timeout_seconds >= 60) -+ snprintf(msg, msglen, -+ "Uptime: kernel validity duration has %d %s remaining\n", -+ (int) timeout_seconds / 60, "minute(s)"); -+ else -+ snprintf(msg, msglen, -+ "Uptime: kernel validity duration has %d %s remaining\n", -+ (int) timeout_seconds, "seconds"); -+ -+ printk(KERN_CRIT "%s", msg); -+ -+ timelimit_timer.expires = jiffies + timeout_seconds * HZ; -+ timelimit_timer.data = 0; -+ add_timer_on(&timelimit_timer, cpumask_first(cpu_online_mask)); -+ } else { -+ printk(KERN_CRIT "Uptime: Kernel validity timeout has expired\n"); -+#ifdef CONFIG_UPTIME_LIMIT_KERNEL_REBOOT -+ uptime_expiration_action = uptime_reboot; -+ wake_up_process(uptime_worker_task); -+ } -+#endif -+} -+ -+/* -+ * This thread starts and then immediately goes to sleep. When it is woken -+ * up, it carries out the instructions left in uptime_expiration_action. If -+ * no action was specified it simply goes back to sleep. -+ */ -+static int uptime_worker(void *unused) -+{ -+ set_current_state(TASK_INTERRUPTIBLE); -+ -+ while (!kthread_should_stop()) { -+ schedule(); -+ -+ if (kthread_should_stop()) -+ break; -+ -+ if (uptime_expiration_action == uptime_reboot) { -+ printk(KERN_CRIT "Uptime: restarting machine\n"); -+ kernel_restart(NULL); -+ } -+ -+ set_current_state(TASK_INTERRUPTIBLE); -+ } -+ __set_current_state(TASK_RUNNING); -+ -+ return 0; -+} -+ -+static int timeout_enable(int cpu) -+{ -+ int err = 0; -+ int warning_limit; -+ -+ /* -+ * Create an uptime worker thread. This thread is required since the -+ * safe version of kernel restart cannot be called from a -+ * non-interruptible context. Which means we cannot call it directly -+ * from a timer callback. So we arrange for the timer expiration to -+ * wakeup a thread, which performs the action. -+ */ -+ uptime_worker_task = kthread_create(uptime_worker, -+ (void *)(unsigned long)cpu, -+ "uptime_worker/%d", cpu); -+ if (IS_ERR(uptime_worker_task)) { -+ printk(KERN_ERR "Uptime: task for cpu %i failed\n", cpu); -+ err = PTR_ERR(uptime_worker_task); -+ goto out; -+ } -+ /* bind to cpu0 to avoid migration and hot plug nastiness */ -+ kthread_bind(uptime_worker_task, cpu); -+ wake_up_process(uptime_worker_task); -+ -+ /* Create the timer that will wake the uptime thread at expiration */ -+ init_timer(&timelimit_timer); -+ timelimit_timer.function = timelimit_expire; -+ /* -+ * Fire two timers. One warning timeout and the final timer -+ * which will carry out the expiration action. The warning timer will -+ * expire at the minimum of half the original time or ten minutes. -+ */ -+ warning_limit = MIN(UPTIME_LIMIT_IN_SECONDS/2, TEN_MINUTES_IN_SECONDS); -+ timelimit_timer.expires = jiffies + warning_limit * HZ; -+ timelimit_timer.data = UPTIME_LIMIT_IN_SECONDS - warning_limit; -+ -+ add_timer_on(&timelimit_timer, cpumask_first(cpu_online_mask)); -+out: -+ return err; -+} -+ -+static int __init timelimit_init(void) -+{ -+ int err = 0; -+ -+ printk(KERN_INFO "Uptime: system uptime restrictions enabled\n"); -+ -+ /* -+ * Enable the timeout thread for cpu 0 only, assuming that the -+ * uptime limit is non-zero, to protect against any cpu -+ * migration issues. -+ */ -+ if (UPTIME_LIMIT_IN_SECONDS) -+ err = timeout_enable(0); -+ -+ return err; -+} -+device_initcall(timelimit_init); --- -2.10.1 - diff --git a/features/uptime/uptime.scc b/features/uptime/uptime.scc deleted file mode 100644 index 4f8a58ba..00000000 --- a/features/uptime/uptime.scc +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: MIT -patch uptime-allow-the-optional-limiting-of-kernel-runtime.patch diff --git a/features/usb/usb-dummy-hcd.cfg b/features/usb/usb-dummy-hcd.cfg new file mode 100644 index 00000000..ab7c2143 --- /dev/null +++ b/features/usb/usb-dummy-hcd.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_USB_DUMMY_HCD=y diff --git a/features/usb/usb-dummy-hcd.scc b/features/usb/usb-dummy-hcd.scc new file mode 100644 index 00000000..6684ed9c --- /dev/null +++ b/features/usb/usb-dummy-hcd.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable emulated USB host and device support (dummy HCD)" +define KFEATURE_COMPATIBILITY all + +include usb-base.scc + +kconf non-hardware usb-dummy-hcd.cfg diff --git a/features/usb/usb-raw-gadget.cfg b/features/usb/usb-raw-gadget.cfg new file mode 100644 index 00000000..6e169ab5 --- /dev/null +++ b/features/usb/usb-raw-gadget.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# dependency +CONFIG_USB_GADGET=y + +CONFIG_USB_RAW_GADGET=y diff --git a/features/usb/usb-raw-gadget.scc b/features/usb/usb-raw-gadget.scc new file mode 100644 index 00000000..9f0c2eb8 --- /dev/null +++ b/features/usb/usb-raw-gadget.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable USB raw gadget" +define KFEATURE_COMPATIBILITY all + +include usb-base.scc + +kconf non-hardware usb-raw-gadget.cfg diff --git a/features/usb/usb-typec.cfg b/features/usb/usb-typec.cfg index f8cef1d3..3c5a2312 100644 --- a/features/usb/usb-typec.cfg +++ b/features/usb/usb-typec.cfg @@ -3,7 +3,9 @@ CONFIG_TYPEC=m CONFIG_TYPEC_TCPM=m # Dependencies -CONFIG_INTEL_PMC_IPC=y +CONFIG_MFD_INTEL_PMC_BXT=m # Intel WhiskeyCove PMIC USB Type-C PHY driver CONFIG_TYPEC_WCOVE=m + +CONFIG_TYPEC_TCPCI=m diff --git a/features/vdso/vdso.cfg b/features/vdso/vdso.cfg index 9b1cdd3d..ba84655b 100644 --- a/features/vdso/vdso.cfg +++ b/features/vdso/vdso.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_COMPAT_VDSO is not set +CONFIG_COMPAT_VDSO=n diff --git a/features/vfat/fat-Replace-prandom_u32-with-get_random_u32.patch b/features/vfat/fat-Replace-prandom_u32-with-get_random_u32.patch new file mode 100644 index 00000000..3d4b8092 --- /dev/null +++ b/features/vfat/fat-Replace-prandom_u32-with-get_random_u32.patch @@ -0,0 +1,40 @@ +From 0b07d2478b6baf627d000f7f1901b148f2a6dfc2 Mon Sep 17 00:00:00 2001 +From: Kevin Hao <kexin.hao@windriver.com> +Date: Fri, 7 Apr 2023 21:03:41 +0800 +Subject: [PATCH] fat: Replace prandom_u32() with get_random_u32() + +The prandom_u32() is just wrapper of get_random_u32() and has been +removed by commit de492c83cae0 ("prandom: remove unused functions"). +So use get_random_u32() directly. + +Signed-off-by: Kevin Hao <kexin.hao@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/fat/namei_vfat.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c +index ef5cf74789ca..ef79a242751d 100644 +--- a/fs/fat/namei_vfat.c ++++ b/fs/fat/namei_vfat.c +@@ -616,7 +616,7 @@ static void vfat_build_dummy_83_buffer(struct inode *dir, char *msdos_name, + 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x22, 0x2a, + 0x3a, 0x3c, 0x3e, 0x3f, 0x5b, 0x5d, 0x7c }; + int i, tilde_pos, slash_pos; +- u32 rand_num = prandom_u32(); ++ u32 rand_num = get_random_u32(); + + /* We need a '~' in the prefix to make Win98 happy. */ + tilde_pos = rand_num % 8; +@@ -651,7 +651,7 @@ static void vfat_build_dummy_83_buffer(struct inode *dir, char *msdos_name, + invalidchar[rand_num % sizeof(invalidchar)]; + rand_num /= sizeof(invalidchar); + if (rand_num < sizeof(invalidchar)) +- rand_num = prandom_u32(); ++ rand_num = get_random_u32(); + } + } + } +-- +2.34.1 + diff --git a/features/vfat/vfat.scc b/features/vfat/vfat.scc index cfe1c7d9..24ec7dfd 100644 --- a/features/vfat/vfat.scc +++ b/features/vfat/vfat.scc @@ -3,3 +3,4 @@ patch FAT-Add-CONFIG_VFAT_FS_NO_DUALNAMES-option.patch patch FAT-Add-CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES-option.patch patch FAT-Added-FAT_NO_83NAME.patch patch fat-don-t-use-obsolete-random32-call-in-namei_vfat.patch +patch fat-Replace-prandom_u32-with-get_random_u32.patch diff --git a/features/vfio/vfio.cfg b/features/vfio/vfio.cfg index 267fbaf8..94991365 100644 --- a/features/vfio/vfio.cfg +++ b/features/vfio/vfio.cfg @@ -1,6 +1,5 @@ # SPDX-License-Identifier: MIT CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO_VIRQFD=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y diff --git a/features/vswitch/vswitch.cfg b/features/vswitch/vswitch.cfg new file mode 100644 index 00000000..7e39b558 --- /dev/null +++ b/features/vswitch/vswitch.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# Misc configs +CONFIG_OPENVSWITCH=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_ACT_POLICE=m diff --git a/features/vswitch/vswitch.scc b/features/vswitch/vswitch.scc new file mode 100644 index 00000000..12c6affb --- /dev/null +++ b/features/vswitch/vswitch.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware vswitch.cfg diff --git a/features/wifi/ralink-pci.cfg b/features/wifi/ralink-pci.cfg index b4639ea0..c7e95040 100644 --- a/features/wifi/ralink-pci.cfg +++ b/features/wifi/ralink-pci.cfg @@ -10,7 +10,7 @@ CONFIG_RT2500PCI=m CONFIG_RT61PCI=m CONFIG_RT2800PCI=m CONFIG_RT2800PCI_RT33XX=y -config RT2800PCI_RT35XX=y -config RT2800PCI_RT53XX=y -config RT2800PCI_RT3290=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y diff --git a/features/x2apic/x2apic.cfg b/features/x2apic/x2apic.cfg index ca91dc0d..8efa10f8 100644 --- a/features/x2apic/x2apic.cfg +++ b/features/x2apic/x2apic.cfg @@ -1,3 +1,5 @@ # SPDX-License-Identifier: MIT + +CONFIG_IOMMU_SUPPORT=y CONFIG_IRQ_REMAP=y CONFIG_X86_X2APIC=y diff --git a/features/xen/xen-x86.cfg b/features/xen/xen-x86.cfg new file mode 100644 index 00000000..69fcd731 --- /dev/null +++ b/features/xen/xen-x86.cfg @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT + +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PCI_XEN=y +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_DEBUG_FS=n +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PCIDEV_FRONTEND=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_SAVE_RESTORE=y diff --git a/features/xen/xen.cfg b/features/xen/xen.cfg new file mode 100644 index 00000000..7da87825 --- /dev/null +++ b/features/xen/xen.cfg @@ -0,0 +1,38 @@ +CONFIG_PARAVIRT=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_MMU_NOTIFIER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_SYS_HYPERVISOR=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_XEN_WDT=m +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=y +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=y +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PRIVCMD=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_PVCALLS_FRONTEND=y +CONFIG_XEN_PVCALLS_BACKEND=y diff --git a/features/xen/xen.scc b/features/xen/xen.scc new file mode 100644 index 00000000..e7c85a1b --- /dev/null +++ b/features/xen/xen.scc @@ -0,0 +1,8 @@ +define KFEATURE_DESCRIPTION "Xen Kernel Support" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware xen.cfg + +if [ "$KARCH" = "x86_64" ] || [ "$KARCH" = "i386" ]; then + kconf non-hardware xen-x86.cfg +fi diff --git a/features/xilinx/hdmi-module/hdmi-module.cfg b/features/xilinx/hdmi-module/hdmi-module.cfg new file mode 100644 index 00000000..b0117515 --- /dev/null +++ b/features/xilinx/hdmi-module/hdmi-module.cfg @@ -0,0 +1,224 @@ +# SPDX-License-Identifier: MIT +CONFIG_VIDEO_TDA1997X=n +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_OSSEMUL=n +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_HRTIMER=n +CONFIG_SND_DYNAMIC_MINORS=n +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=n +CONFIG_SND_DEBUG=n +CONFIG_SND_SEQUENCER=n +CONFIG_SND_DRIVERS=y +CONFIG_SND_DUMMY=n +CONFIG_SND_ALOOP=n +CONFIG_SND_MTPAV=n +CONFIG_SND_SERIAL_U16550=n +CONFIG_SND_MPU401=n + +# +# HD-Audio +# +# end of HD-Audio + +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=n +CONFIG_SND_USB_UA101=n +CONFIG_SND_USB_CAIAQ=n +CONFIG_SND_USB_6FIRE=n +CONFIG_SND_USB_HIFACE=n +CONFIG_SND_BCD2000=n +CONFIG_SND_USB_POD=n +CONFIG_SND_USB_PODHD=n +CONFIG_SND_USB_TONEPORT=n +CONFIG_SND_USB_VARIAX=n +CONFIG_SND_SOC=y +CONFIG_SND_SOC_AMD_ACP=n +CONFIG_SND_ATMEL_SOC=n +CONFIG_SND_DESIGNWARE_I2S=n + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +CONFIG_SND_SOC_FSL_ASRC=n +CONFIG_SND_SOC_FSL_SAI=n +CONFIG_SND_SOC_FSL_AUDMIX=n +CONFIG_SND_SOC_FSL_SSI=n +CONFIG_SND_SOC_FSL_SPDIF=n +CONFIG_SND_SOC_FSL_ESAI=n +CONFIG_SND_SOC_FSL_MICFIL=n +CONFIG_SND_SOC_IMX_AUDMUX=n +# end of SoC Audio for Freescale CPUs + +CONFIG_SND_I2S_HI6210_I2S=n +CONFIG_SND_SOC_IMG=n +CONFIG_SND_SOC_MTK_BTCVSD=n +CONFIG_SND_SOC_SOF_TOPLEVEL=n + +# +# STMicroelectronics STM32 SOC audio support +# +# end of STMicroelectronics STM32 SOC audio support + +CONFIG_SND_SOC_XILINX_DP=n +CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=n +CONFIG_SND_SOC_XILINX_SDI=n +CONFIG_SND_SOC_XILINX_I2S=n +CONFIG_SND_SOC_XILINX_SPDIF=n +CONFIG_SND_SOC_XTFPGA_I2S=n +CONFIG_ZX_TDM=n +CONFIG_SND_SOC_I2C_AND_SPI=y + +# +# CODEC drivers +# +CONFIG_SND_SOC_AC97_CODEC=n +CONFIG_SND_SOC_ADAU1701=n +CONFIG_SND_SOC_ADAU1761_I2C=n +CONFIG_SND_SOC_ADAU1761_SPI=n +CONFIG_SND_SOC_ADAU7002=n +CONFIG_SND_SOC_AK4104=n +CONFIG_SND_SOC_AK4118=n +CONFIG_SND_SOC_AK4458=n +CONFIG_SND_SOC_AK4554=n +CONFIG_SND_SOC_AK4613=n +CONFIG_SND_SOC_AK4642=n +CONFIG_SND_SOC_AK5386=n +CONFIG_SND_SOC_AK5558=n +CONFIG_SND_SOC_ALC5623=n +CONFIG_SND_SOC_BD28623=n +CONFIG_SND_SOC_BT_SCO=n +CONFIG_SND_SOC_CS35L32=n +CONFIG_SND_SOC_CS35L33=n +CONFIG_SND_SOC_CS35L34=n +CONFIG_SND_SOC_CS35L35=n +CONFIG_SND_SOC_CS35L36=n +CONFIG_SND_SOC_CS42L42=n +CONFIG_SND_SOC_CS42L51_I2C=n +CONFIG_SND_SOC_CS42L52=n +CONFIG_SND_SOC_CS42L56=n +CONFIG_SND_SOC_CS42L73=n +CONFIG_SND_SOC_CS4265=n +CONFIG_SND_SOC_CS4270=n +CONFIG_SND_SOC_CS4271_I2C=n +CONFIG_SND_SOC_CS4271_SPI=n +CONFIG_SND_SOC_CS42XX8_I2C=n +CONFIG_SND_SOC_CS43130=n +CONFIG_SND_SOC_CS4341=n +CONFIG_SND_SOC_CS4349=n +CONFIG_SND_SOC_CS53L30=n +CONFIG_SND_SOC_CX2072X=n +CONFIG_SND_SOC_DMIC=n +CONFIG_SND_SOC_ES7134=n +CONFIG_SND_SOC_ES7241=n +CONFIG_SND_SOC_ES8316=n +CONFIG_SND_SOC_ES8328_I2C=n +CONFIG_SND_SOC_ES8328_SPI=n +CONFIG_SND_SOC_GTM601=n +CONFIG_SND_SOC_INNO_RK3036=n +CONFIG_SND_SOC_MAX98088=n +CONFIG_SND_SOC_MAX98357A=n +CONFIG_SND_SOC_MAX98504=n +CONFIG_SND_SOC_MAX9867=n +CONFIG_SND_SOC_MAX98927=n +CONFIG_SND_SOC_MAX98373=n +CONFIG_SND_SOC_MAX9860=n +CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=n +CONFIG_SND_SOC_PCM1681=n +CONFIG_SND_SOC_PCM1789_I2C=n +CONFIG_SND_SOC_PCM179X_I2C=n +CONFIG_SND_SOC_PCM179X_SPI=n +CONFIG_SND_SOC_PCM186X_I2C=n +CONFIG_SND_SOC_PCM186X_SPI=n +CONFIG_SND_SOC_PCM3060_I2C=n +CONFIG_SND_SOC_PCM3060_SPI=n +CONFIG_SND_SOC_PCM3168A_I2C=n +CONFIG_SND_SOC_PCM3168A_SPI=n +CONFIG_SND_SOC_PCM512x_I2C=n +CONFIG_SND_SOC_PCM512x_SPI=n +CONFIG_SND_SOC_RK3328=n +CONFIG_SND_SOC_RT5616=n +CONFIG_SND_SOC_RT5631=n +CONFIG_SND_SOC_SGTL5000=n +CONFIG_SND_SOC_SIMPLE_AMPLIFIER=n +CONFIG_SND_SOC_SIRF_AUDIO_CODEC=n +CONFIG_SND_SOC_SPDIF=n +CONFIG_SND_SOC_SSM2305=n +CONFIG_SND_SOC_SSM2602_SPI=n +CONFIG_SND_SOC_SSM2602_I2C=n +CONFIG_SND_SOC_SSM4567=n +CONFIG_SND_SOC_STA32X=n +CONFIG_SND_SOC_STA350=n +CONFIG_SND_SOC_STI_SAS=n +CONFIG_SND_SOC_TAS2552=n +CONFIG_SND_SOC_TAS5086=n +CONFIG_SND_SOC_TAS571X=n +CONFIG_SND_SOC_TAS5720=n +CONFIG_SND_SOC_TAS6424=n +CONFIG_SND_SOC_TDA7419=n +CONFIG_SND_SOC_TFA9879=n +CONFIG_SND_SOC_TLV320AIC23_I2C=n +CONFIG_SND_SOC_TLV320AIC23_SPI=n +CONFIG_SND_SOC_TLV320AIC31XX=n +CONFIG_SND_SOC_TLV320AIC32X4_I2C=n +CONFIG_SND_SOC_TLV320AIC32X4_SPI=n +CONFIG_SND_SOC_TLV320AIC3X=n +CONFIG_SND_SOC_TS3A227E=n +CONFIG_SND_SOC_TSCS42XX=n +CONFIG_SND_SOC_TSCS454=n +CONFIG_SND_SOC_UDA1334=n +CONFIG_SND_SOC_WM8510=n +CONFIG_SND_SOC_WM8523=n +CONFIG_SND_SOC_WM8524=n +CONFIG_SND_SOC_WM8580=n +CONFIG_SND_SOC_WM8711=n +CONFIG_SND_SOC_WM8728=n +CONFIG_SND_SOC_WM8731=n +CONFIG_SND_SOC_WM8737=n +CONFIG_SND_SOC_WM8741=n +CONFIG_SND_SOC_WM8750=n +CONFIG_SND_SOC_WM8753=n +CONFIG_SND_SOC_WM8770=n +CONFIG_SND_SOC_WM8776=n +CONFIG_SND_SOC_WM8782=n +CONFIG_SND_SOC_WM8804_I2C=n +CONFIG_SND_SOC_WM8804_SPI=n +CONFIG_SND_SOC_WM8903=n +CONFIG_SND_SOC_WM8904=n +CONFIG_SND_SOC_WM8960=n +CONFIG_SND_SOC_WM8962=n +CONFIG_SND_SOC_WM8974=n +CONFIG_SND_SOC_WM8978=n +CONFIG_SND_SOC_WM8985=n +CONFIG_SND_SOC_ZX_AUD96P22=n +CONFIG_SND_SOC_MAX9759=n +CONFIG_SND_SOC_MT6351=n +CONFIG_SND_SOC_MT6358=n +CONFIG_SND_SOC_NAU8540=n +CONFIG_SND_SOC_NAU8810=n +CONFIG_SND_SOC_NAU8822=n +CONFIG_SND_SOC_NAU8824=n +CONFIG_SND_SOC_TPA6130A2=n +# end of CODEC drivers + +CONFIG_SND_SIMPLE_CARD=n +CONFIG_SND_AUDIO_GRAPH_CARD=n +CONFIG_SND_XEN_FRONTEND=n +CONFIG_HID_PRODIKEYS=n +CONFIG_USB_CONFIGFS_F_UAC1=n +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=n +CONFIG_USB_CONFIGFS_F_UAC2=n +CONFIG_USB_CONFIGFS_F_MIDI=n diff --git a/features/xilinx/hdmi-module/hdmi-module.scc b/features/xilinx/hdmi-module/hdmi-module.scc new file mode 100644 index 00000000..d248e936 --- /dev/null +++ b/features/xilinx/hdmi-module/hdmi-module.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for hdmi module " +define KFEATURE_COMPATIBILITY board + +kconf hardware hdmi-module.cfg + diff --git a/features/xilinx/overlay_of/overlay_of.cfg b/features/xilinx/overlay_of/overlay_of.cfg new file mode 100644 index 00000000..901d4786 --- /dev/null +++ b/features/xilinx/overlay_of/overlay_of.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +# Device Tree support +CONFIG_OF_CONFIGFS=y +CONFIG_OF_OVERLAY=y diff --git a/features/xilinx/overlay_of/overlay_of.scc b/features/xilinx/overlay_of/overlay_of.scc new file mode 100644 index 00000000..1e61bb37 --- /dev/null +++ b/features/xilinx/overlay_of/overlay_of.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable overlay" +define KFEATURE_COMPATIBILITY board + +kconfig hardware overlay_of.cfg diff --git a/features/xilinx/v4l2/v4l2.cfg b/features/xilinx/v4l2/v4l2.cfg new file mode 100644 index 00000000..32a948a3 --- /dev/null +++ b/features/xilinx/v4l2/v4l2.cfg @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Media support +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y + +# V4L +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y + +# Xilinx Video drivers +CONFIG_VIDEO_XILINX=y +CONFIG_VIDEO_XILINX_CFA=y +CONFIG_VIDEO_XILINX_CRESAMPLE=y +CONFIG_VIDEO_XILINX_HLS=y +CONFIG_VIDEO_XILINX_REMAPPER=y +CONFIG_VIDEO_XILINX_RGB2YUV=y +CONFIG_VIDEO_XILINX_SCALER=y +CONFIG_VIDEO_XILINX_SWITCH=y +CONFIG_VIDEO_XILINX_TPG=y +CONFIG_VIDEO_XILINX_VTC=y + diff --git a/features/xilinx/v4l2/v4l2.scc b/features/xilinx/v4l2/v4l2.scc new file mode 100644 index 00000000..bd1201e8 --- /dev/null +++ b/features/xilinx/v4l2/v4l2.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Xilinx V4L2 support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware v4l2.cfg diff --git a/features/yaffs2/0001-yaffs2-convert-read_page-readfolio.patch b/features/yaffs2/0001-yaffs2-convert-read_page-readfolio.patch new file mode 100644 index 00000000..78a5c311 --- /dev/null +++ b/features/yaffs2/0001-yaffs2-convert-read_page-readfolio.patch @@ -0,0 +1,76 @@ +From a10fa57649a96e7cd87ec4b93badc2b441b06ec5 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 29 Jun 2022 10:51:56 -0400 +Subject: [PATCH] yaffs2: convert read_page -> readfolio + +This is a first pass of changing yaffs2 to use the new read_folio, +versus readpage routines. We also adjust writepage to no longer use +flags, which have been dropped in 5.19+ + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 8ceb66c0d070..52f2d13c7126 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -367,13 +367,13 @@ static int yaffs_readpage_unlock(struct file *f, struct page *pg) + return ret; + } + +-static int yaffs_readpage(struct file *f, struct page *pg) ++static int yaffs_read_folio(struct file *f, struct folio *folio) + { + int ret; + +- yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); +- ret = yaffs_readpage_unlock(f, pg); +- yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_folio"); ++ ret = yaffs_readpage_unlock(f, &folio->page); ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_folio done"); + return ret; + } + +@@ -548,9 +548,16 @@ static void yaffs_release_space(struct file *f) + } + + #if (YAFFS_USE_WRITE_BEGIN_END > 0) ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0) ++static int yaffs_write_begin(struct file *filp, struct address_space *mapping, ++ loff_t pos, unsigned len, ++ struct page **pagep, void **fsdata) ++#else + static int yaffs_write_begin(struct file *filp, struct address_space *mapping, + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata) ++#endif + { + struct page *pg = NULL; + pgoff_t index = pos >> PAGE_CACHE_SHIFT; +@@ -559,7 +566,9 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, + int space_held = 0; + + /* Get a page */ +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0) ++ pg = grab_cache_page_write_begin(mapping, index); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) + pg = grab_cache_page_write_begin(mapping, index, flags); + #else + pg = __grab_cache_page(mapping, index); +@@ -748,7 +757,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, + #endif + + static struct address_space_operations yaffs_file_address_operations = { +- .readpage = yaffs_readpage, ++ .read_folio = yaffs_read_folio, + .writepage = yaffs_writepage, + #if (YAFFS_USE_WRITE_BEGIN_END > 0) + .write_begin = yaffs_write_begin, +-- +2.19.1 + diff --git a/features/yaffs2/0001-yaffs2-replace-bdevname-call-with-sprintf.patch b/features/yaffs2/0001-yaffs2-replace-bdevname-call-with-sprintf.patch new file mode 100644 index 00000000..b3c829ab --- /dev/null +++ b/features/yaffs2/0001-yaffs2-replace-bdevname-call-with-sprintf.patch @@ -0,0 +1,34 @@ +From ae1445c1cc1cec47fa51f7831cd9110ecd5b2a55 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 3 Oct 2022 15:16:27 -0400 +Subject: [PATCH] yaffs2: replace bdevname call with sprintf + +commit 900d156bac2bc474cf7c7bee4efbc6c83ec5ae58 [block: remove bdevname] +removed this function, we follow the pattern and use sprintf as a +replacement. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 52f2d13c7126..140f7aa7a1a1 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -117,7 +117,11 @@ + #define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) + + /* FIXME: use sb->s_id instead ? */ +-#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) ++//#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) ++static inline char* yaffs_devname(struct super_block *sb, char *buf) { ++ snprintf(buf, sizeof(buf), "%pg", sb->s_bdev); ++ return buf; ++} + + #else + +-- +2.19.1 + diff --git a/features/yaffs2/0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch b/features/yaffs2/0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch new file mode 100644 index 00000000..9ea1aa07 --- /dev/null +++ b/features/yaffs2/0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch @@ -0,0 +1,64 @@ +From 70f40841c195a81a8ef8290862adeb86fe264b24 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:04:31 -0400 +Subject: [PATCH] yaffs2: update VFS ctime operations to 6.6+ + +In 6.6+ kernels the inode ctime is hidden, and should only +be accessed through accesor routines. We convert one of our +calls to the accesor, but the other, we use the new "hidden" +__ctime. + +We also convert the interator to use the shared iterator and +iterator wrap routines. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 04abeee99ff5..8a9738de8906 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -282,7 +282,7 @@ MODULE_PARM(yaffs_gc_control, "i"); + } while (0) + #else + #define update_dir_time(dir) do {\ +- (dir)->i_ctime = (dir)->i_mtime = current_time(dir); \ ++ (dir)->i_mtime = inode_set_ctime_to_ts( dir, current_time(dir) ); \ + } while (0) + #endif + +@@ -1901,7 +1901,7 @@ static int yaffs_iterate(struct file *f, struct dir_context *dc) + + return ret_val; + } +- ++WRAP_DIR_ITER(yaffs_iterate) + #else + + static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) +@@ -2018,7 +2018,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) + static const struct file_operations yaffs_dir_operations = { + .read = generic_read_dir, + #ifdef YAFFS_USE_DIR_ITERATE +- .iterate = yaffs_iterate, ++ .iterate_shared = shared_yaffs_iterate, + #else + .readdir = yaffs_readdir, + #endif +@@ -2079,8 +2079,9 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, + inode->i_atime.tv_nsec = 0; + inode->i_mtime.tv_sec = (time64_t) obj->yst_mtime; + inode->i_mtime.tv_nsec = 0; +- inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime; +- inode->i_ctime.tv_nsec = 0; ++ //inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime; ++ inode->__i_ctime.tv_sec = (time64_t) obj->yst_ctime; ++ inode->__i_ctime.tv_nsec = 0; + #else + inode->i_rdev = obj->yst_rdev; + inode->i_atime = obj->yst_atime; +-- +2.34.1 + diff --git a/features/yaffs2/0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch b/features/yaffs2/0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch new file mode 100644 index 00000000..13bbba8a --- /dev/null +++ b/features/yaffs2/0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch @@ -0,0 +1,105 @@ +From d16f6eab238d58479a7140507a2eb32573c1a106 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Fri, 19 Mar 2021 12:13:36 -0400 +Subject: [PATCH] yaffs2: v5.12+ build fixups (not runtime tested) + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index a9cf8edc2245..ee9d6955ed79 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -897,7 +897,7 @@ static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) + static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + { + #ifdef YAFFS_USE_SETATTR_COPY +- setattr_copy(inode, attr); ++ setattr_copy(&init_user_ns,inode, attr); + return 0; + #else + return inode_setattr(inode, attr); +@@ -905,7 +905,7 @@ static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + + } + +-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) ++static int yaffs_setattr(struct user_namespace *ns, struct dentry *dentry, struct iattr *attr) + { + struct inode *inode = dentry->d_inode; + int error = 0; +@@ -921,7 +921,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) + #endif + + if (error == 0) +- error = setattr_prepare(dentry, attr); ++ error = setattr_prepare(&init_user_ns,dentry, attr); + if (error == 0) { + int result; + if (!error) { +@@ -1339,7 +1339,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_mknod(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + dev_t rdev) + #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, +@@ -1433,20 +1433,20 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, + } + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ++static int yaffs_mkdir(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode) + #else + static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) + #endif + { + int ret_val; + yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir"); +- ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); ++ ret_val = yaffs_mknod(ns, dir, dentry, mode | S_IFDIR, 0); + return ret_val; + } + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +-static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_create(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + bool dummy) + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) + static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, +@@ -1459,7 +1459,7 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) + #endif + { + yaffs_trace(YAFFS_TRACE_OS, "yaffs_create"); +- return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); ++ return yaffs_mknod(ns, dir, dentry, mode | S_IFREG, 0); + } + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +@@ -1551,7 +1551,8 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, + return -EPERM; + } + +-static int yaffs_symlink(struct inode *dir, struct dentry *dentry, ++static int yaffs_symlink(struct user_namespace *ns, ++ struct inode *dir, struct dentry *dentry, + const char *symname) + { + struct yaffs_obj *obj; +@@ -1597,7 +1598,7 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, + * NB: POSIX says you can rename an object over an old object of the same name + */ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) +-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, ++static int yaffs_rename(struct user_namespace *ns, struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry, unsigned int unused) + #else + static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch b/features/yaffs2/yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch new file mode 100644 index 00000000..7a47c4a5 --- /dev/null +++ b/features/yaffs2/yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch @@ -0,0 +1,44 @@ +From ea777841e8ea883bfa160693e650882f86e75167 Mon Sep 17 00:00:00 2001 +From: Quanyang Wang <quanyang.wang@windriver.com> +Date: Sun, 13 Jun 2021 12:08:21 +0800 +Subject: [PATCH] yaffs: fix -Wstringop-overread compile warning in + yaffs_fix_null_name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In yaffs_fix_null_name, "if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0)" +is used to judge if the "name" string is zero length. But this is wrong +when the "name" char array size is less than YAFFS_MAX_NAME_LENGTH and +this will trigger compile warnig as below: + +fs/yaffs2/yaffs_guts.c:4501:13: warning: ‘strnlen’ specified bound 255 exceeds source size 16 [-Wstringop-overread] + 4501 | if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) { + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Let's use buffer_size to do this instead of YAFFS_MAX_NAME_LENGTH +because buffer_size is passed to yaffs_fix_null_name by caller with +appropriate value which is fixed to the size of "name" char array. + +Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_guts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c +index 40a5b46cf6ca..0cc794ebc347 100644 +--- a/fs/yaffs2/yaffs_guts.c ++++ b/fs/yaffs2/yaffs_guts.c +@@ -4498,7 +4498,7 @@ static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name, + int buffer_size) + { + /* Create an object name if we could not find one. */ +- if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) { ++ if (strnlen(name, buffer_size) == 0) { + YCHAR local_name[20]; + YCHAR num_string[20]; + YCHAR *x = &num_string[19]; +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-fix-misplaced-variable-declaration.patch b/features/yaffs2/yaffs-fix-misplaced-variable-declaration.patch new file mode 100644 index 00000000..b7da6b82 --- /dev/null +++ b/features/yaffs2/yaffs-fix-misplaced-variable-declaration.patch @@ -0,0 +1,40 @@ +From f28b801ca5c4853b60f16eaf5525b05b5174ab43 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Thu, 30 Apr 2020 12:59:46 -0400 +Subject: [PATCH] yaffs: fix misplaced variable declaration + +A variable declaration landed one function higher than intended, +leading to an unused variable warning for configurations with +YAFFS_USE_DIR_ITERATE=y and a build failure for configurations +with the same being unset. + +Fixes: "yaffs: Fix build failure by handling inode i_version with proper atomic API" +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 598ecd57a0ed..3ffdc0129637 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -1826,7 +1826,6 @@ static int yaffs_iterate(struct file *f, struct dir_context *dc) + int ret_val = 0; + + char name[YAFFS_MAX_NAME_LENGTH + 1]; +- u64 i_version; + + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); + dev = obj->my_dev; +@@ -1898,6 +1897,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) + unsigned long offset, curoffs; + struct yaffs_obj *l; + int ret_val = 0; ++ u64 i_version; + + char name[YAFFS_MAX_NAME_LENGTH + 1]; + +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-fix-mtime-itime-field-access.patch b/features/yaffs2/yaffs-fix-mtime-itime-field-access.patch new file mode 100644 index 00000000..482312a0 --- /dev/null +++ b/features/yaffs2/yaffs-fix-mtime-itime-field-access.patch @@ -0,0 +1,65 @@ +From 7614fa80bc6abefd1450b5c4c3839386ac2b92cc Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 22 Nov 2023 12:04:28 -0500 +Subject: [PATCH] yaffs: fix mtime/itime field access + +Adapting our inode field access to the following upstream +commit: + + commit 12cd44023651666bd44baa36a5c999698890debb + Author: Jeff Layton <jlayton@kernel.org> + Date: Fri Sep 29 09:05:52 2023 -0400 + + fs: rename inode i_atime and i_mtime fields + + Rename these two fields to discourage direct access (and to help ensure + that we mop up any leftover direct accesses). + + Signed-off-by: Jeff Layton <jlayton@kernel.org> + Signed-off-by: Christian Brauner <brauner@kernel.org> + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 8a9738de8906..ec4016cfeedf 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -282,7 +282,7 @@ MODULE_PARM(yaffs_gc_control, "i"); + } while (0) + #else + #define update_dir_time(dir) do {\ +- (dir)->i_mtime = inode_set_ctime_to_ts( dir, current_time(dir) ); \ ++ (dir)->__i_mtime = inode_set_ctime_to_ts( dir, current_time(dir) ); \ + } while (0) + #endif + +@@ -2075,17 +2075,17 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + + inode->i_rdev = old_decode_dev(obj->yst_rdev); +- inode->i_atime.tv_sec = (time64_t) (obj->yst_atime); +- inode->i_atime.tv_nsec = 0; +- inode->i_mtime.tv_sec = (time64_t) obj->yst_mtime; +- inode->i_mtime.tv_nsec = 0; ++ inode->__i_atime.tv_sec = (time64_t) (obj->yst_atime); ++ inode->__i_atime.tv_nsec = 0; ++ inode->__i_mtime.tv_sec = (time64_t) obj->yst_mtime; ++ inode->__i_mtime.tv_nsec = 0; + //inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime; + inode->__i_ctime.tv_sec = (time64_t) obj->yst_ctime; + inode->__i_ctime.tv_nsec = 0; + #else + inode->i_rdev = obj->yst_rdev; +- inode->i_atime = obj->yst_atime; +- inode->i_mtime = obj->yst_mtime; ++ inode->__i_atime = obj->yst_atime; ++ inode->__i_mtime = obj->yst_mtime; + inode->i_ctime = obj->yst_ctime; + #endif + inode->i_size = yaffs_get_obj_length(obj); +-- +2.34.1 + diff --git a/features/yaffs2/yaffs-include-blkdev.h.patch b/features/yaffs2/yaffs-include-blkdev.h.patch new file mode 100644 index 00000000..e75911de --- /dev/null +++ b/features/yaffs2/yaffs-include-blkdev.h.patch @@ -0,0 +1,28 @@ +From a07a378f2bbfc640c6b76abfa3ef2a32a86cbfa2 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Sat, 29 Aug 2020 10:25:04 -0400 +Subject: [PATCH] yaffs: include blkdev.h + +The definition of BDEVNAME_SIZE has moved, so we add the new .h + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 3ffdc0129637..a9cf8edc2245 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -74,6 +74,8 @@ + #include <linux/config.h> + #endif + ++#include <linux/blkdev.h> ++ + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/slab.h> +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch b/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch new file mode 100644 index 00000000..4956ff5e --- /dev/null +++ b/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch @@ -0,0 +1,49 @@ +From f3ffb6a61225aa0a89d0edfeb7cdd99b9963faa0 Mon Sep 17 00:00:00 2001 +From: Meng Li <Meng.Li@windriver.com> +Date: Thu, 21 Oct 2021 09:27:20 +0800 +Subject: [PATCH] yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR + and NULL + +When run below command to mount a yaffs2 FS to nor flash, there +is kernel panic as below: +Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020 +...... +Internal error: Oops: 96000004 [#1] PREEMPT SMP +Modules linked in: +CPU: 1 PID: 335 Comm: mount Not tainted 5.10.73-yocto-standard #1 +...... +Call trace: + yaffs_internal_read_super.constprop.0+0x24c/0x6fc + yaffs2_internal_read_super_mtd+0x28/0x40 + mount_bdev+0x1cc/0x200 + ...... + el0_sync_handler+0x1a4/0x1b0 + el0_sync+0x180/0x1c0 +Because in function yaffs_get_mtd_device(), it check the type of +mtd device. If it is not NAND flash, NULL will be returned. This +causes kernel panic if the ret value is not checked whether it +is NULL or not. So, replace IS_ERR with IS_ERR_OR_NULL to check +both ERR and NULL. + +Signed-off-by: Meng Li <Meng.Li@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index ee9d6955ed79..8ceb66c0d070 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -2965,7 +2965,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, + + + mtd = yaffs_get_mtd_device(sb->s_dev); +- if (IS_ERR(mtd)) { ++ if (IS_ERR_OR_NULL(mtd)) { + return NULL; + } + +-- +2.19.1 + diff --git a/features/yaffs2/yaffs2-Fix-miscalculation-of-devname-buffer-length.patch b/features/yaffs2/yaffs2-Fix-miscalculation-of-devname-buffer-length.patch new file mode 100644 index 00000000..79deb483 --- /dev/null +++ b/features/yaffs2/yaffs2-Fix-miscalculation-of-devname-buffer-length.patch @@ -0,0 +1,65 @@ +From dded404c66bb87f08216afd1e3c9d84359e80012 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Wed, 31 May 2023 14:01:07 +0800 +Subject: [PATCH] yaffs2: Fix miscalculation of devname buffer length + +The following build warning helps us find a real mishandling of array length. + +fs/yaffs2/yaffs_vfs.c:122:29: warning: argument to 'sizeof' in 'snprintf' call +is the same expression as the destination; did you mean to provide an explicit +length? [-Wsizeof-pointer-memaccess] + +If an array is passed as a function parameter it'll be treated as a simple +pointer and thus sizeof will return the length of a pointer rather than the +length of the array. + +Add and pass the buffer length to make it work correctly. + +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 140f7aa7a1a1..e9e29a41a680 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -118,8 +118,8 @@ + + /* FIXME: use sb->s_id instead ? */ + //#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) +-static inline char* yaffs_devname(struct super_block *sb, char *buf) { +- snprintf(buf, sizeof(buf), "%pg", sb->s_bdev); ++static inline char* yaffs_devname(struct super_block *sb, char *buf, unsigned long len) { ++ snprintf(buf, len, "%pg", sb->s_bdev); + return buf; + } + +@@ -2944,12 +2944,12 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, + + if (!sb->s_dev) + printk(KERN_INFO "yaffs: sb->s_dev is NULL\n"); +- else if (!yaffs_devname(sb, devname_buf)) ++ else if (!yaffs_devname(sb, devname_buf, sizeof(devname_buf))) + printk(KERN_INFO "yaffs: devname is NULL\n"); + else + printk(KERN_INFO "yaffs: dev is %d name is \"%s\" %s\n", + sb->s_dev, +- yaffs_devname(sb, devname_buf), read_only ? "ro" : "rw"); ++ yaffs_devname(sb, devname_buf, sizeof(devname_buf)), read_only ? "ro" : "rw"); + + if (!data_str) + data_str = ""; +@@ -2974,7 +2974,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, + yaffs_trace(YAFFS_TRACE_ALWAYS, + "yaffs: Attempting MTD mount of %u.%u,\"%s\"", + MAJOR(sb->s_dev), MINOR(sb->s_dev), +- yaffs_devname(sb, devname_buf)); ++ yaffs_devname(sb, devname_buf, sizeof(devname_buf))); + + + mtd = yaffs_get_mtd_device(sb->s_dev); +-- +2.34.1 + diff --git a/features/yaffs2/yaffs2-convert-user_namespace-to-mnt_idmap.patch b/features/yaffs2/yaffs2-convert-user_namespace-to-mnt_idmap.patch new file mode 100644 index 00000000..1a67540b --- /dev/null +++ b/features/yaffs2/yaffs2-convert-user_namespace-to-mnt_idmap.patch @@ -0,0 +1,96 @@ +From 5440769b1bbff51e64557c2a981a6cdfece8adec Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Fri, 17 Mar 2023 22:31:42 -0400 +Subject: [PATCH] yaffs2: convert user_namespace to mnt_idmap + +commit c1632a0f11209338fc300c66252bcc4686e609e8 [fs: port ->setattr() to +pass mnt_idmap] changes the parameters to attr operations to a +mnt_idmap. + +yaffs2 isn't using the user namespace directly, so we switch to the +default map. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 140f7aa7a1a1..3844d542608e 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -910,7 +910,7 @@ static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) + static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + { + #ifdef YAFFS_USE_SETATTR_COPY +- setattr_copy(&init_user_ns,inode, attr); ++ setattr_copy(&nop_mnt_idmap,inode, attr); + return 0; + #else + return inode_setattr(inode, attr); +@@ -918,7 +918,7 @@ static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + + } + +-static int yaffs_setattr(struct user_namespace *ns, struct dentry *dentry, struct iattr *attr) ++static int yaffs_setattr(struct mnt_idmap *ns, struct dentry *dentry, struct iattr *attr) + { + struct inode *inode = dentry->d_inode; + int error = 0; +@@ -934,7 +934,7 @@ static int yaffs_setattr(struct user_namespace *ns, struct dentry *dentry, struc + #endif + + if (error == 0) +- error = setattr_prepare(&init_user_ns,dentry, attr); ++ error = setattr_prepare(&nop_mnt_idmap,dentry, attr); + if (error == 0) { + int result; + if (!error) { +@@ -1352,7 +1352,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mknod(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_mknod(struct mnt_idmap *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + dev_t rdev) + #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, +@@ -1446,7 +1446,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, + } + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mkdir(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode) ++static int yaffs_mkdir(struct mnt_idmap *ns, struct inode *dir, struct dentry *dentry, umode_t mode) + #else + static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) + #endif +@@ -1459,7 +1459,7 @@ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +-static int yaffs_create(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_create(struct mnt_idmap *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + bool dummy) + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) + static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, +@@ -1564,7 +1564,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, + return -EPERM; + } + +-static int yaffs_symlink(struct user_namespace *ns, ++static int yaffs_symlink(struct mnt_idmap *ns, + struct inode *dir, struct dentry *dentry, + const char *symname) + { +@@ -1611,7 +1611,7 @@ static int yaffs_symlink(struct user_namespace *ns, + * NB: POSIX says you can rename an object over an old object of the same name + */ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) +-static int yaffs_rename(struct user_namespace *ns, struct inode *old_dir, struct dentry *old_dentry, ++static int yaffs_rename(struct mnt_idmap *ns, struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry, unsigned int unused) + #else + static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, +-- +2.34.1 + diff --git a/features/yaffs2/yaffs2-v6.5-fixups.patch b/features/yaffs2/yaffs2-v6.5-fixups.patch new file mode 100644 index 00000000..0159a00b --- /dev/null +++ b/features/yaffs2/yaffs2-v6.5-fixups.patch @@ -0,0 +1,26 @@ +From e9ca040537fb905d7a55ee9d20ce0414eed5f10e Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 27 Jul 2023 18:17:32 -0400 +Subject: [PATCH] yaffs2: v6.5 fixups + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 32864c715545..04abeee99ff5 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -844,7 +844,7 @@ static const struct file_operations yaffs_file_operations = { + .mmap = generic_file_mmap, + .flush = yaffs_file_flush, + .fsync = yaffs_sync_object, +- .splice_read = generic_file_splice_read, ++ .splice_read = copy_splice_read, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) + .splice_write = iter_file_splice_write, + #else +-- +2.34.1 + diff --git a/features/yaffs2/yaffs2.scc b/features/yaffs2/yaffs2.scc index c890ea27..5b131bd7 100644 --- a/features/yaffs2/yaffs2.scc +++ b/features/yaffs2/yaffs2.scc @@ -10,3 +10,15 @@ patch yaffs-repair-yaffs_get_mtd_device.patch patch yaffs-add-strict-check-when-call-yaffs_internal_read.patch patch yaffs2-fix-memory-leak-when-proc-yaffs-is-read.patch patch yaffs2-v5.6-build-fixups.patch +patch yaffs-fix-misplaced-variable-declaration.patch +patch yaffs-include-blkdev.h.patch +patch 0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch +patch yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch +patch yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch +patch 0001-yaffs2-convert-read_page-readfolio.patch +patch 0001-yaffs2-replace-bdevname-call-with-sprintf.patch +patch yaffs2-convert-user_namespace-to-mnt_idmap.patch +patch yaffs2-Fix-miscalculation-of-devname-buffer-length.patch +patch yaffs2-v6.5-fixups.patch +patch 0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch +patch yaffs-fix-mtime-itime-field-access.patch diff --git a/features/zram/zram.cfg b/features/zram/zram.cfg new file mode 100644 index 00000000..9e58fb71 --- /dev/null +++ b/features/zram/zram.cfg @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +CONFIG_ZSMALLOC=y +CONFIG_ZSMALLOC_STAT=n +CONFIG_ZRAM=y +CONFIG_ZRAM_DEF_COMP_LZORLE=y +CONFIG_ZRAM_DEF_COMP_ZSTD=n +CONFIG_ZRAM_DEF_COMP_LZ4=n +CONFIG_ZRAM_DEF_COMP_LZO=n +CONFIG_ZRAM_DEF_COMP_LZ4HC=n +CONFIG_ZRAM_DEF_COMP_842=n +CONFIG_ZRAM_DEF_COMP="lzo-rle" +CONFIG_ZRAM_WRITEBACK=n +CONFIG_ZRAM_MEMORY_TRACKING=n +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_LZ4=y +CONFIG_CRYPTO_LZ4HC=y +CONFIG_CRYPTO_ZSTD=y +CONFIG_842_COMPRESS=y +CONFIG_842_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=y +CONFIG_LZ4HC_COMPRESS=y +CONFIG_ZSTD_COMPRESS=y diff --git a/features/zram/zram.scc b/features/zram/zram.scc new file mode 100644 index 00000000..30388842 --- /dev/null +++ b/features/zram/zram.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Compressed RAM block device support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware zram.cfg diff --git a/kern-features.rc b/kern-features.rc index 9dc78a2c..0e83053c 100644 --- a/kern-features.rc +++ b/kern-features.rc @@ -1,203 +1,296 @@ [kernel-options] - config = cgl/features/quota/quota.scc - config = cgl/features/audit/audit.scc - config = cgl/features/selinux/selinux.scc - config = cgl/features/selinux/selinux-dev.scc - config = cgl/features/aoe/aoe.scc - config = cgl/features/pstore/pstore.scc - config = cgl/features/mip6/mip6.scc - config = cgl/cfg/dmm.scc + config = cfg/crypto-obsolete-disable.scc + config = cfg/sound.scc + config = cfg/vmware-guest.scc + config = cfg/fs/btrfs.scc + config = cfg/fs/ext3.scc + config = cfg/fs/flash_fs.scc + config = cfg/fs/vfat.scc + config = cfg/fs/devtmpfs.scc + config = cfg/fs/debugfs.scc + config = cfg/fs/ext2.scc + config = cfg/fs/ext4.scc + config = cfg/8250.scc + config = cfg/usb-mass-storage.scc + config = cfg/paravirt_kvm.scc + config = cfg/debug-kselftest.scc + config = cfg/hv-guest.scc + config = cfg/smp.scc + config = cfg/smp_64.scc + config = cfg/vesafb.scc + config = cfg/boot-live.scc + config = cfg/efi.scc + config = cfg/rbd.scc + config = cfg/dmaengine.scc + config = cfg/net/ip_nf.scc + config = cfg/net/mdio.scc + config = cfg/net/ipv6.scc + config = cfg/net/ipsec.scc + config = cfg/net/ip6_nf.scc + config = cfg/net/bridge.scc + config = cfg/net/ipsec6.scc + config = cfg/virtio.scc + config = cfg/debug/kcov/debug-kcov.scc + config = cfg/debug/kcsan/debug-kcsan.scc + config = cfg/debug/syzkaller/debug-syzkaller.scc + config = cfg/debug/fault-inject/debug-fault-injection-debugfs.scc + config = cfg/x32.scc + config = cfg/timer/hpet.scc + config = cfg/timer/hz_1000.scc + config = cfg/timer/no_hz.scc + config = cfg/timer/rtc.scc + config = cfg/timer/hz_250.scc + config = cfg/timer/hz_100.scc + config = cfg/efi-ext.scc + config = arch/arm/arm64-4kb-pages.scc + config = arch/arm/arm64-64kb-pages.scc + config = arch/arm/arm64-16kb-pages.scc config = cgl/cfg/scsi_dh_hpsw.scc - config = cgl/cfg/scsi_dh_rdac.scc - config = cgl/cfg/iscsi.scc - config = cgl/cfg/scsi_dh_emc.scc - config = cgl/cfg/scsi_dh.scc - config = cgl/cfg/scsi_dh_alua.scc + config = cgl/cfg/fs/ocfs2.scc config = cgl/cfg/drbd.scc + config = cgl/cfg/scsi_dh_alua.scc + config = cgl/cfg/scsi_dh_emc.scc + config = cgl/cfg/scsi_dh_rdac.scc + config = cgl/cfg/dmm.scc + config = cgl/cfg/net/l2tp.scc config = cgl/cfg/net/macvlan.scc config = cgl/cfg/net/ip_vs.scc - config = cgl/cfg/net/l2tp.scc - config = cgl/cfg/fs/ocfs2.scc - config = features/i40e/i40e.scc + config = cgl/cfg/iscsi.scc + config = cgl/cfg/scsi_dh.scc + config = cgl/features/pstore/pstore.scc + config = cgl/features/mip6/mip6.scc + config = cgl/features/audit/audit.scc + config = cgl/features/selinux/selinux-dev.scc + config = cgl/features/selinux/selinux.scc + config = cgl/features/aoe/aoe.scc + config = cgl/features/quota/quota.scc + config = features/pwm/pwm.scc + config = features/pwm/intel_pwm.scc + config = features/usb-net/usb-net.scc config = features/hrt/hrt.scc - config = features/ramconsole/ramconsole.scc - config = features/bpf/bpf.scc - config = features/device-mapper/dm-verity.scc - config = features/kdump/kdump-enable.scc - config = features/lxc/lxc-enable.scc - config = features/leds/leds.scc - config = features/mtd/mtd.scc - config = features/edac/edac-enable.scc - config = features/qat/qat.scc - config = features/intel-e1xxxx/intel-e100.scc - config = features/serial/8250.scc - config = features/power/intel.scc - config = features/power/bq25890.scc - config = features/power/intel_pmic.scc - config = features/hugetlb/hugetlb.scc - config = features/lto/lto-debug.scc - config = features/lto/lto-disable.scc - config = features/lto/lto.scc - config = features/uprobe/uprobe.scc - config = features/uprobe/uprobe-enable.scc - config = features/pci-iov/pci-iov.scc - config = features/full_nohz/full_nohz-enable.scc - config = features/x2apic/x2apic.scc config = features/tmpfs/tmpfs-posix-acl.scc - config = features/fuse/fuse.scc - config = features/intel-txt/intel-txt.scc - config = features/uio/uio.scc - config = features/ftrace/ftrace.scc - config = features/ftrace/ftrace-function-tracer-disable.scc - config = features/taskstats/taskstats.scc - config = features/tpm/tpm.scc - config = features/intel-pmc/intel-pmc-core.scc - config = features/systemtap/systemtap.scc - config = features/kmemcheck/kmemcheck-enable.scc - config = features/latencytop/latencytop.scc - config = features/netfilter/netfilter.scc - config = features/vrf/vrf.scc - config = features/firmware/firmware.scc + config = features/lxc/lxc-enable.scc + config = features/inline/inline.scc config = features/intel-tco/intel-tco.scc - config = features/rpmb/rpmb-sim.scc - config = features/rpmb/rpmb-base.scc - config = features/rpmb/rpmb-uapi.scc - config = features/sound/snd_hda_intel.scc - config = features/scsi/disk.scc - config = features/scsi/scsi.scc - config = features/scsi/cdrom.scc - config = features/iwlwifi/iwlwifi.scc - config = features/iommu/iommu.scc - config = features/ciphers/ciphers.scc - config = features/ipmi/ipmi.scc - config = features/intel-dpdk/intel-dpdk.scc - config = features/kprobes/kprobes.scc - config = features/blktrace/blktrace.scc - config = features/powertop/powertop.scc - config = features/mac80211/mac80211.scc - config = features/nfsd/nfsd-enable.scc - config = features/namespaces/namespaces.scc - config = features/kgdb/kgdb.scc - config = features/eg20t/eg20t.scc - config = features/vfio/vfio.scc - config = features/iio/iio.scc - config = features/kexec/kexec-enable.scc + config = features/ftrace/ftrace-function-tracer-disable.scc + config = features/ftrace/ftrace.scc + config = features/vxlan/vxlan-enable.scc config = features/i915/i915.scc - config = features/usb-net/usb-net.scc - config = features/6lowpan/6lowpan.scc - config = features/inline/inline.scc - config = features/spi/spi.scc - config = features/spi/spidev.scc - config = features/usb/designware-usb2.scc + config = features/nfc/nfc-generic.scc + config = features/nfc/nfc-vendor.scc + config = features/profiling/profiling.scc + config = features/misc/bosch-pressure-sensor-i2c.scc + config = features/security/security.scc + config = features/kgdb/kgdb.scc + config = features/vrf/vrf.scc config = features/usb/usb-gadgets.scc - config = features/usb/usb-typec.scc - config = features/usb/ehci-hcd.scc - config = features/usb/serial.scc + config = features/usb/serial-all.scc + config = features/usb/designware-usb3.scc + config = features/usb/usb-dummy-hcd.scc config = features/usb/touchscreen-composite.scc config = features/usb/uhci-hcd.scc + config = features/usb/ehci-hcd.scc + config = features/usb/designware-usb2.scc config = features/usb/usb-base.scc - config = features/usb/xhci-hcd.scc - config = features/usb/designware-usb3.scc - config = features/usb/serial-all.scc config = features/usb/ohci-hcd.scc - config = features/input/keyboard-gpio.scc - config = features/input/input.scc - config = features/input/touchscreen.scc - config = features/crypto/crypto.scc - config = features/wifi/wifi-sdio.scc - config = features/wifi/wifi-usb.scc - config = features/wifi/wifi-common.scc - config = features/wifi/wifi-pci.scc - config = features/wifi/wifi-all.scc + config = features/usb/usb-typec.scc + config = features/usb/serial.scc + config = features/usb/xhci-hcd.scc + config = features/usb/usb-raw-gadget.scc + config = features/intel-uncore-frequency/intel-uncore-frequency.scc + config = features/mpx/mpx.scc config = features/igb/igb.scc - config = features/pwm/pwm.scc - config = features/pwm/intel_pwm.scc - config = features/media/media-dvb-frontends.scc - config = features/media/media-radio.scc - config = features/media/media-rc.scc - config = features/media/media-pci-capture.scc - config = features/media/media-platform.scc - config = features/media/media-tuners.scc - config = features/media/media-usb-webcams.scc - config = features/media/media-i2c.scc - config = features/media/media-usb-tv.scc - config = features/media/media.scc - config = features/criu/criu-enable.scc - config = features/numa/numa.scc + config = features/stm/stm.scc + config = features/nf_tables/nf_tables.scc + config = features/nf_tables/nft_test.scc + config = features/cgroups/cgroups.scc + config = features/can/m_can.scc config = features/can/can.scc + config = features/intel-e1xxxx/intel-e100.scc + config = features/mtd/mtd.scc + config = features/blktrace/blktrace.scc + config = features/landlock/landlock.scc + config = features/iwlegacy/iwlegacy.scc + config = features/kfence/kfence.scc + config = features/latencytop/latencytop.scc + config = features/bpf/bpf.scc + config = features/xilinx/v4l2/v4l2.scc + config = features/xilinx/overlay_of/overlay_of.scc + config = features/xilinx/hdmi-module/hdmi-module.scc + config = features/kmemcheck/kmemcheck-enable.scc + config = features/uprobe/uprobe-enable.scc + config = features/uprobe/uprobe.scc config = features/mmc/mmc-block.scc config = features/mmc/mmc-sdhci.scc config = features/mmc/mmc-base.scc config = features/mmc/mmc-realtek.scc + config = features/scsi/scsi.scc + config = features/scsi/scsi-debug.scc + config = features/scsi/cdrom.scc + config = features/scsi/disk.scc + config = features/intel-idxd/intel-idxd.scc + config = features/tun/tun.scc + config = features/hid/hid.scc + config = features/rpmb/rpmb-uapi.scc + config = features/rpmb/rpmb-sim.scc + config = features/rpmb/rpmb-base.scc + config = features/igc/igc.scc + config = features/iommu/iommu.scc + config = features/systemtap/systemtap.scc + config = features/intel-pmc/intel-pmc-core.scc + config = features/tsn/tsn.scc + config = features/power/bq25890.scc + config = features/power/intel.scc + config = features/power/intel_pmic.scc + config = features/power/arm.scc + config = features/bluetooth/bluetooth-usb.scc + config = features/bluetooth/bluetooth-vhci.scc + config = features/kexec/kexec-enable.scc + config = features/serial/8250.scc + config = features/intel-sst/intel-sst.scc + config = features/intel-dptf/intel-dptf.scc + config = features/wifi/wifi-all.scc + config = features/wifi/wifi-usb.scc + config = features/wifi/wifi-pci.scc + config = features/wifi/wifi-sdio.scc + config = features/wifi/wifi-common.scc + config = features/gpio/mockup.scc + config = features/gpio/sim.scc + config = features/kprobes/kprobes.scc config = features/mfd/mfd-intel-lpss.scc + config = features/thunderbolt/thunderbolt.scc + config = features/intel-sgx/intel-sgx.scc + config = features/transparent-hugepage/transparent-hugepage.scc + config = features/netfilter/netfilter.scc + config = features/mei/amt.scc + config = features/mei/mei.scc + config = features/mei/mei-txe.scc + config = features/mei/mei-spd.scc + config = features/mei/mei-me.scc + config = features/kdump/kdump-enable.scc + config = features/intel-persistent-memory/intel-x86-64-pmem.scc + config = features/intel-persistent-memory/intel-x86-64-pmem-preempt-rt.scc config = features/ecryptfs/ecryptfs.scc - config = features/security/security.scc - config = features/vxlan/vxlan-enable.scc - config = features/intel-pinctrl/intel-pinctrl.scc - config = features/misc/bosch-pressure-sensor-i2c.scc - config = features/profiling/profiling.scc + config = features/module-signing/signing.scc + config = features/module-signing/force-signing.scc + config = features/docker/docker.scc + config = features/reproducibility/reproducibility.scc + config = features/leds/leds.scc + config = features/apparmor/apparmor.scc + config = features/yama/yama.scc + config = features/criu/criu-enable.scc + config = features/6lowpan/6lowpan.scc + config = features/iio/iio.scc + config = features/i40e/i40e.scc + config = features/pci/pci-of-generic.scc config = features/pci/pci.scc - config = features/dca/dca.scc - config = features/mpx/mpx.scc - config = features/firewire/firewire.scc - config = features/kvm/qemu-kvm-enable.scc - config = features/cgroups/cgroups.scc - config = features/nf_tables/nf_tables.scc - config = features/telemetry/intel-telemetry.scc - config = features/thermal/coretemp.scc - config = features/i2c/i2cdev.scc config = features/i2c/i2c-ismt.scc + config = features/i2c/i2cdev.scc config = features/i2c/i2c.scc config = features/i2c/i2cdbg.scc - config = features/nfc/nfc-vendor.scc - config = features/nfc/nfc-generic.scc - config = features/iwlegacy/iwlegacy.scc - config = features/bluetooth/bluetooth-usb.scc - config = features/mei/mei-me.scc - config = features/mei/mei-spd.scc - config = features/mei/amt.scc - config = features/mei/mei-txe.scc - config = features/mei/mei.scc + config = features/iscsi/iscsi.scc + config = features/firewire/firewire.scc + config = features/iwlwifi/iwlwifi.scc + config = features/spi/spi.scc + config = features/spi/spidev.scc + config = features/kvm/qemu-kvm-enable.scc + config = features/intel-th/intel-th.scc + config = features/mac80211/mac80211-hwsim.scc + config = features/mac80211/mac80211.scc + config = features/qat/qat.scc + config = features/device-mapper/dm-verity.scc + config = features/ieee802154/ieee802154-hwsim.scc + config = features/ima/ima.scc + config = features/ima/modsign.scc + config = features/fuse/fuse.scc + config = features/xen/xen.scc + config = features/powertop/powertop.scc + config = features/full_nohz/full_nohz-enable.scc + config = features/lto/lto.scc + config = features/lto/lto-debug.scc + config = features/lto/lto-disable.scc + config = features/thermal/coretemp.scc + config = features/ice/ice.scc + config = features/ramconsole/ramconsole.scc + config = features/eg20t/eg20t.scc + config = features/edac/edac-enable.scc + config = features/vfio/vfio.scc + config = features/vswitch/vswitch.scc + config = features/dca/dca.scc + config = features/hugetlb/hugetlb.scc + config = features/intel-txt/intel-txt.scc + config = features/telemetry/intel-telemetry.scc + config = features/i3c/i3c.scc + config = features/intel-dpdk/intel-dpdk.scc + config = features/ipmi/ipmi.scc + config = features/intel-vmd/intel-vmd.scc + config = features/debug/debug-runtime.scc config = features/debug/debug-kernel.scc - config = features/debug/printk.scc config = features/debug/debug-dyndbg.scc - config = cfg/debug-kselftest.scc - config = cfg/x32.scc - config = cfg/hv-guest.scc - config = cfg/paravirt_kvm.scc - config = cfg/efi.scc - config = cfg/sound.scc - config = cfg/smp.scc - config = cfg/virtio.scc - config = cfg/vesafb.scc - config = cfg/efi-ext.scc - config = cfg/8250.scc - config = cfg/boot-live.scc - config = cfg/timer/no_hz.scc - config = cfg/timer/hz_100.scc - config = cfg/timer/hz_1000.scc - config = cfg/timer/hpet.scc - config = cfg/timer/hz_250.scc - config = cfg/timer/rtc.scc - config = cfg/net/ip_nf.scc - config = cfg/net/ipsec6.scc - config = cfg/net/ip6_nf.scc - config = cfg/net/ipsec.scc - config = cfg/net/bridge.scc - config = cfg/net/ipv6.scc - config = cfg/vmware-guest.scc - config = cfg/usb-mass-storage.scc - config = cfg/fs/ext4.scc - config = cfg/fs/devtmpfs.scc - config = cfg/fs/btrfs.scc - config = cfg/fs/debugfs.scc - config = cfg/fs/ext3.scc - config = cfg/fs/ext2.scc - config = cfg/fs/vfat.scc - config = cfg/fs/flash_fs.scc - config = cfg/dmaengine.scc - config = cfg/smp_64.scc - config = cfg/rbd.scc + config = features/debug/printk.scc + config = features/debug/debug-btf.scc + config = features/sound/snd_hda_intel.scc + config = features/zram/zram.scc + config = features/random/random.scc + config = features/mgag200/mgag200.scc + config = features/taskstats/taskstats.scc + config = features/media/media-i2c.scc + config = features/media/media.scc + config = features/media/media-usb-tv.scc + config = features/media/media-rc.scc + config = features/media/media-usb-webcams.scc + config = features/media/media-radio.scc + config = features/media/media-platform.scc + config = features/media/media-dvb-frontends.scc + config = features/media/media-tuners.scc + config = features/media/media-pci-capture.scc + config = features/input/keyboard-gpio.scc + config = features/input/input.scc + config = features/input/touchscreen.scc + config = features/nfsd/nfsd-enable.scc + config = features/nfsd/nfsd.scc + config = features/namespaces/namespaces.scc + config = features/pci-iov/pci-iov.scc + config = features/ocicontainer/xt-checksum.scc + config = features/ocicontainer/ebtables.scc + config = features/ocicontainer/cgroup.scc + config = features/numa/numa.scc + config = features/smack/smack.scc + config = features/tpm/tpm-1.2.scc + config = features/tpm/tpm-common.scc + config = features/tpm/tpm-2.0-crb.scc + config = features/tpm/tpm.scc + config = features/tpm/tpm-2.0.scc + config = features/tpm/vtpm.scc + config = features/firmware/firmware.scc + config = features/intel-pinctrl/intel-pinctrl.scc + config = features/ciphers/ciphers.scc + config = features/x2apic/x2apic.scc + config = features/uio/uio.scc + config = bsp/xilinx/board-common.scc + config = bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc config = bsp/xilinx/soc/zynq.scc config = bsp/xilinx/soc/drivers-softip.scc - config = bsp/xilinx/board-common.scc + config = bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc + config = bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc + config = bsp/pentagram/sound.scc + config = bsp/pentagram/hw_emmc.scc + config = bsp/pentagram/sensors/hw_thermal.scc + config = bsp/pentagram/hw_pwm.scc + config = bsp/pentagram/usb/usb.scc + config = bsp/pentagram/usb/customers.scc + config = bsp/pentagram/hw_i2c.scc + config = bsp/pentagram/hw_sdio.scc + config = bsp/pentagram/net/hw_net.scc + config = bsp/pentagram/spi/sp_nor.scc + config = bsp/pentagram/spi/sp_nornand.scc + config = bsp/pentagram/spi/sp_nand.scc + config = bsp/pentagram/pm.scc + config = bsp/pentagram/debug/pins9.scc + config = bsp/pentagram/debug/axi_mon.scc + config = bsp/pentagram/1w/1w-gpio.scc + config = bsp/pentagram/1w/1w-slaves.scc + config = bsp/pentagram/media/video_sen.scc + config = bsp/pentagram/media/video_out.scc + config = bsp/pentagram/sdio/sdio.scc + config = bsp/pentagram/hw_nvmem.scc diff --git a/ktypes/base/base.cfg b/ktypes/base/base.cfg index a9a514ee..19bb06d8 100644 --- a/ktypes/base/base.cfg +++ b/ktypes/base/base.cfg @@ -20,13 +20,13 @@ # General setup # CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=n CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_AUDIT is not set +CONFIG_AUDIT=n CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" @@ -34,9 +34,9 @@ CONFIG_INITRAMFS_SOURCE="" # Resource Groups # CONFIG_SYSCTL=y -# CONFIG_EMBEDDED is not set +CONFIG_EXPERT=n CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=n CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -183,10 +183,9 @@ CONFIG_SYN_COOKIES=y # TIPC Configuration (EXPERIMENTAL) # -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set +CONFIG_LLC2=n +CONFIG_X25=n +CONFIG_LAPB=n # # QoS and/or fair queueing @@ -203,7 +202,7 @@ CONFIG_SYN_COOKIES=y # # Network testing # -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=n # # Packet Radio protocols @@ -244,7 +243,7 @@ CONFIG_SYN_COOKIES=y # # FIR device drivers # -# CONFIG_BT is not set +CONFIG_BT=n # # Bluetooth device drivers @@ -259,8 +258,8 @@ CONFIG_SYN_COOKIES=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set -# CONFIG_DEBUG_DRIVER is not set +CONFIG_FW_LOADER=m +CONFIG_DEBUG_DRIVER=n # # Connector - unified userspace <-> kernelspace linker @@ -565,7 +564,7 @@ CONFIG_NETCONSOLE=y # Non-8250 serial port support # CONFIG_UNIX98_PTYS=y -# CONFIG_LEGACY_PTYS is not set +CONFIG_LEGACY_PTYS=n # # IPMI @@ -925,7 +924,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y CONFIG_TMPFS=y -# CONFIG_HUGETLB_PAGE is not set +CONFIG_HUGETLB_PAGE=n # # Layered filesystems @@ -934,22 +933,23 @@ CONFIG_TMPFS=y # # Miscellaneous filesystems # -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_SYSV_FS is not set +CONFIG_ADFS_FS=n +CONFIG_AFFS_FS=n +CONFIG_HFS_FS=n +CONFIG_HFSPLUS_FS=n +CONFIG_BEFS_FS=n +CONFIG_BFS_FS=n +CONFIG_EFS_FS=n +CONFIG_VXFS_FS=n +CONFIG_HPFS_FS=n +CONFIG_QNX4FS_FS=n +CONFIG_SYSV_FS=n # # Network File Systems # CONFIG_NFS_FS=y +CONFIG_NFS_DISABLE_UDP_SUPPORT=n CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y @@ -963,20 +963,20 @@ CONFIG_RPCSEC_GSS_KRB5=y # # Partition Types # -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set +CONFIG_ACORN_PARTITION=n +CONFIG_OSF_PARTITION=n +CONFIG_AMIGA_PARTITION=n +CONFIG_ATARI_PARTITION=n CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_EFI_PARTITION is not set +CONFIG_BSD_DISKLABEL=n +CONFIG_MINIX_SUBPARTITION=n +CONFIG_SOLARIS_X86_PARTITION=n +CONFIG_UNIXWARE_DISKLABEL=n +CONFIG_LDM_PARTITION=n +CONFIG_SGI_PARTITION=n +CONFIG_ULTRIX_PARTITION=n +CONFIG_SUN_PARTITION=n +CONFIG_EFI_PARTITION=n # # Native Language Support @@ -1003,13 +1003,13 @@ CONFIG_NLS_DEFAULT="iso8859-1" # Kernel hacking # CONFIG_MAGIC_SYSRQ=y -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_SCHEDSTATS is not set -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_KERNEL=n +CONFIG_SCHEDSTATS=n +CONFIG_DEBUG_SLAB=n +CONFIG_DEBUG_SPINLOCK=n +CONFIG_DEBUG_KOBJECT=n +CONFIG_DEBUG_HIGHMEM=n +CONFIG_DEBUG_INFO=n # # Security options @@ -1070,7 +1070,6 @@ CONFIG_MAGIC_SYSRQ=y # # Logging Options # -# CONFIG_KEYS is not set # # Cryptographic options @@ -1079,6 +1078,10 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_LIB_ARC4=y +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m # # Hardware crypto devices diff --git a/ktypes/base/base.scc b/ktypes/base/base.scc index 69b0d172..bdef6a81 100644 --- a/ktypes/base/base.scc +++ b/ktypes/base/base.scc @@ -1,9 +1,9 @@ # SPDX-License-Identifier: MIT -define KERNEL_VERSION 5.6 +define KERNEL_VERSION 6.9 # Force the base configuration # uncomment this branch line for shared kernel tree builds -# branch v5.5 +branch v6.9 force kconf non-hardware base.cfg diff --git a/ktypes/base/hardware.cfg b/ktypes/base/hardware.cfg index 361ee795..36a109f8 100644 --- a/ktypes/base/hardware.cfg +++ b/ktypes/base/hardware.cfg @@ -1,3 +1,10 @@ # SPDX-License-Identifier: MIT # Items listed in here are explicitly considered as hardware items, regardless # of what Kconfig file they were found in. + +CONFIG_BMIPS_CPUFREQ +CONFIG_LOONGSON2_CPUFREQ +CONFIG_LOONGSON1_CPUFREQ +CONFIG_SPARC_US3_CPUFREQ +CONFIG_SPARC_US2E_CPUFREQ +CONFIG_QORIQ_CPUFREQ diff --git a/ktypes/base/hardware.kcf b/ktypes/base/hardware.kcf index 1541c70f..6cbeb95b 100644 --- a/ktypes/base/hardware.kcf +++ b/ktypes/base/hardware.kcf @@ -3,7 +3,6 @@ arch/alpha/Kconfig.debug arch/arc/Kconfig arch/arc/Kconfig.debug arch/arc/plat-axs10x/Kconfig -arch/arc/plat-eznps/Kconfig arch/arc/plat-hsdk/Kconfig arch/arc/plat-tb10x/Kconfig arch/arm64/crypto/Kconfig @@ -13,22 +12,20 @@ arch/arm64/Kconfig.platforms arch/arm64/kvm/Kconfig arch/arm/common/Kconfig arch/arm/crypto/Kconfig -arch/arm/firmware/Kconfig arch/arm/Kconfig +arch/arm/Kconfig.assembler arch/arm/Kconfig.debug arch/arm/Kconfig-nommu -arch/arm/kvm/Kconfig +arch/arm/Kconfig.platforms arch/arm/mach-actions/Kconfig arch/arm/mach-alpine/Kconfig arch/arm/mach-artpec/Kconfig -arch/arm/mach-asm9260/Kconfig arch/arm/mach-aspeed/Kconfig arch/arm/mach-at91/Kconfig arch/arm/mach-axxia/Kconfig arch/arm/mach-bcm/Kconfig arch/arm/mach-berlin/Kconfig arch/arm/mach-clps711x/Kconfig -arch/arm/mach-cns3xxx/Kconfig arch/arm/mach-davinci/Kconfig arch/arm/mach-digicolor/Kconfig arch/arm/mach-dove/Kconfig @@ -38,39 +35,31 @@ arch/arm/mach-footbridge/Kconfig arch/arm/mach-gemini/Kconfig arch/arm/mach-highbank/Kconfig arch/arm/mach-hisi/Kconfig -arch/arm/mach-imx/devices/Kconfig +arch/arm/mach-hpe/Kconfig arch/arm/mach-imx/Kconfig -arch/arm/mach-integrator/Kconfig -arch/arm/mach-iop13xx/Kconfig -arch/arm/mach-iop32x/Kconfig -arch/arm/mach-iop33x/Kconfig arch/arm/mach-ixp4xx/Kconfig arch/arm/mach-keystone/Kconfig -arch/arm/mach-ks8695/Kconfig +arch/arm/mach-lpc32xx/Kconfig arch/arm/mach-mediatek/Kconfig arch/arm/mach-meson/Kconfig +arch/arm/mach-milbeaut/Kconfig arch/arm/mach-mmp/Kconfig -arch/arm/mach-moxart/Kconfig +arch/arm/mach-mstar/Kconfig arch/arm/mach-mv78xx0/Kconfig arch/arm/mach-mvebu/Kconfig arch/arm/mach-mxs/Kconfig -arch/arm/mach-netx/Kconfig arch/arm/mach-nomadik/Kconfig arch/arm/mach-npcm/Kconfig -arch/arm/mach-nspire/Kconfig arch/arm/mach-omap1/Kconfig arch/arm/mach-omap2/Kconfig arch/arm/mach-orion5x/Kconfig -arch/arm/mach-oxnas/Kconfig -arch/arm/mach-picoxcell/Kconfig -arch/arm/mach-prima2/Kconfig arch/arm/mach-pxa/Kconfig arch/arm/mach-qcom/Kconfig -arch/arm/mach-rda/Kconfig -arch/arm/mach-realview/Kconfig +arch/arm/mach-realtek/Kconfig arch/arm/mach-rockchip/Kconfig -arch/arm/mach-s3c24xx/Kconfig -arch/arm/mach-s3c64xx/Kconfig +arch/arm/mach-rpc/Kconfig +arch/arm/mach-s3c/Kconfig +arch/arm/mach-s3c/Kconfig.s3c64xx arch/arm/mach-s5pv210/Kconfig arch/arm/mach-sa1100/Kconfig arch/arm/mach-shmobile/Kconfig @@ -79,36 +68,22 @@ arch/arm/mach-spear/Kconfig arch/arm/mach-sti/Kconfig arch/arm/mach-stm32/Kconfig arch/arm/mach-sunxi/Kconfig -arch/arm/mach-tango/Kconfig arch/arm/mach-tegra/Kconfig -arch/arm/mach-u300/Kconfig -arch/arm/mach-uniphier/Kconfig arch/arm/mach-ux500/Kconfig arch/arm/mach-versatile/Kconfig -arch/arm/mach-vexpress/Kconfig arch/arm/mach-vt8500/Kconfig -arch/arm/mach-w90x900/Kconfig -arch/arm/mach-zx/Kconfig arch/arm/mach-zynq/Kconfig arch/arm/mm/Kconfig -arch/arm/plat-omap/Kconfig -arch/arm/plat-pxa/Kconfig -arch/arm/plat-samsung/Kconfig -arch/arm/plat-versatile/Kconfig -arch/c6x/Kconfig -arch/c6x/Kconfig.debug -arch/c6x/platforms/Kconfig arch/csky/Kconfig arch/csky/Kconfig.debug -arch/h8300/Kconfig -arch/h8300/Kconfig.cpu -arch/h8300/Kconfig.debug +arch/csky/Kconfig.platforms arch/hexagon/Kconfig arch/hexagon/Kconfig.debug -arch/ia64/hp/sim/Kconfig -arch/ia64/Kconfig -arch/ia64/Kconfig.debug arch/Kconfig +arch/loongarch/crypto/Kconfig +arch/loongarch/Kconfig +arch/loongarch/Kconfig.debug +arch/loongarch/kvm/Kconfig arch/m68k/Kconfig arch/m68k/Kconfig.bus arch/m68k/Kconfig.cpu @@ -126,29 +101,23 @@ arch/mips/bcm63xx/boards/Kconfig arch/mips/bcm63xx/Kconfig arch/mips/bmips/Kconfig arch/mips/cavium-octeon/Kconfig +arch/mips/crypto/Kconfig arch/mips/generic/Kconfig +arch/mips/ingenic/Kconfig arch/mips/jazz/Kconfig -arch/mips/jz4740/Kconfig arch/mips/Kconfig arch/mips/Kconfig.debug arch/mips/kvm/Kconfig arch/mips/lantiq/Kconfig -arch/mips/lasat/Kconfig +arch/mips/loongson2ef/Kconfig arch/mips/loongson32/Kconfig arch/mips/loongson64/Kconfig -arch/mips/netlogic/Kconfig -arch/mips/paravirt/Kconfig arch/mips/pic32/Kconfig -arch/mips/pistachio/Kconfig -arch/mips/pmcs-msp71xx/Kconfig arch/mips/ralink/Kconfig arch/mips/sgi-ip27/Kconfig arch/mips/sibyte/Kconfig arch/mips/txx9/Kconfig -arch/mips/vr41xx/Kconfig -arch/nds32/Kconfig -arch/nds32/Kconfig.cpu -arch/nds32/Kconfig.debug +arch/mips/vdso/Kconfig arch/nios2/Kconfig arch/nios2/Kconfig.debug arch/nios2/platform/Kconfig.platform @@ -156,6 +125,7 @@ arch/openrisc/Kconfig arch/openrisc/Kconfig.debug arch/parisc/Kconfig arch/parisc/Kconfig.debug +arch/powerpc/crypto/Kconfig arch/powerpc/Kconfig arch/powerpc/Kconfig.debug arch/powerpc/kvm/Kconfig @@ -169,12 +139,14 @@ arch/powerpc/platforms/85xx/Kconfig arch/powerpc/platforms/86xx/Kconfig arch/powerpc/platforms/8xx/Kconfig arch/powerpc/platforms/amigaone/Kconfig +arch/powerpc/platforms/book3s/Kconfig arch/powerpc/platforms/cell/Kconfig arch/powerpc/platforms/chrp/Kconfig arch/powerpc/platforms/embedded6xx/Kconfig arch/powerpc/platforms/Kconfig arch/powerpc/platforms/Kconfig.cputype arch/powerpc/platforms/maple/Kconfig +arch/powerpc/platforms/microwatt/Kconfig arch/powerpc/platforms/pasemi/Kconfig arch/powerpc/platforms/powermac/Kconfig arch/powerpc/platforms/powernv/Kconfig @@ -185,6 +157,11 @@ arch/powerpc/sysdev/xics/Kconfig arch/powerpc/sysdev/xive/Kconfig arch/riscv/Kconfig arch/riscv/Kconfig.debug +arch/riscv/Kconfig.errata +arch/riscv/Kconfig.socs +arch/riscv/kernel/tests/Kconfig.debug +arch/riscv/kvm/Kconfig +arch/s390/crypto/Kconfig arch/s390/Kconfig arch/s390/Kconfig.debug arch/s390/kvm/Kconfig @@ -201,16 +178,16 @@ arch/sh/Kconfig arch/sh/Kconfig.cpu arch/sh/Kconfig.debug arch/sh/mm/Kconfig +arch/sparc/crypto/Kconfig arch/sparc/Kconfig arch/sparc/Kconfig.debug arch/um/drivers/Kconfig arch/um/Kconfig arch/um/Kconfig.debug -arch/unicore32/Kconfig -arch/unicore32/Kconfig.debug -arch/unicore32/mm/Kconfig +arch/x86/crypto/Kconfig arch/x86/events/Kconfig arch/x86/Kconfig +arch/x86/Kconfig.assembler arch/x86/Kconfig.cpu arch/x86/Kconfig.debug arch/x86/kvm/Kconfig @@ -220,15 +197,23 @@ arch/x86/xen/Kconfig arch/xtensa/Kconfig arch/xtensa/Kconfig.debug crypto/async_tx/Kconfig +drivers/accel/habanalabs/Kconfig +drivers/accel/ivpu/Kconfig +drivers/accel/Kconfig +drivers/accel/qaic/Kconfig drivers/accessibility/Kconfig +drivers/accessibility/speakup/Kconfig drivers/acpi/apei/Kconfig drivers/acpi/arm64/Kconfig drivers/acpi/dptf/Kconfig drivers/acpi/Kconfig drivers/acpi/nfit/Kconfig +drivers/acpi/numa/Kconfig +drivers/acpi/pmic/Kconfig drivers/amba/Kconfig drivers/android/Kconfig drivers/ata/Kconfig +drivers/ata/pata_parport/Kconfig drivers/atm/Kconfig drivers/auxdisplay/Kconfig drivers/base/firmware_loader/Kconfig @@ -239,20 +224,28 @@ drivers/bcma/Kconfig drivers/block/drbd/Kconfig drivers/block/Kconfig drivers/block/mtip32xx/Kconfig -drivers/block/paride/Kconfig +drivers/block/null_blk/Kconfig +drivers/block/rnbd/Kconfig drivers/block/zram/Kconfig drivers/bluetooth/Kconfig drivers/bus/fsl-mc/Kconfig drivers/bus/Kconfig +drivers/bus/mhi/ep/Kconfig +drivers/bus/mhi/host/Kconfig +drivers/bus/mhi/Kconfig +drivers/cache/Kconfig +drivers/cdx/controller/Kconfig +drivers/cdx/Kconfig drivers/char/agp/Kconfig drivers/char/hw_random/Kconfig drivers/char/ipmi/Kconfig drivers/char/Kconfig -drivers/char/pcmcia/Kconfig drivers/char/tpm/Kconfig drivers/char/tpm/st33zp24/Kconfig drivers/char/xillybus/Kconfig drivers/clk/actions/Kconfig +drivers/clk/analogbits/Kconfig +drivers/clk/baikal-t1/Kconfig drivers/clk/bcm/Kconfig drivers/clk/hisilicon/Kconfig drivers/clk/imgtec/Kconfig @@ -262,19 +255,35 @@ drivers/clk/Kconfig drivers/clk/keystone/Kconfig drivers/clk/mediatek/Kconfig drivers/clk/meson/Kconfig +drivers/clk/microchip/Kconfig +drivers/clk/mstar/Kconfig drivers/clk/mvebu/Kconfig +drivers/clk/nuvoton/Kconfig +drivers/clk/pistachio/Kconfig drivers/clk/qcom/Kconfig +drivers/clk/ralink/Kconfig drivers/clk/renesas/Kconfig +drivers/clk/rockchip/Kconfig drivers/clk/samsung/Kconfig +drivers/clk/sifive/Kconfig +drivers/clk/socfpga/Kconfig drivers/clk/sprd/Kconfig +drivers/clk/starfive/Kconfig +drivers/clk/stm32/Kconfig +drivers/clk/sunxi/Kconfig drivers/clk/sunxi-ng/Kconfig drivers/clk/tegra/Kconfig drivers/clk/ti/Kconfig drivers/clk/uniphier/Kconfig drivers/clk/versatile/Kconfig +drivers/clk/visconti/Kconfig +drivers/clk/x86/Kconfig +drivers/clk/xilinx/Kconfig drivers/clk/zynqmp/Kconfig drivers/clocksource/Kconfig +drivers/comedi/Kconfig drivers/connector/Kconfig +drivers/counter/Kconfig drivers/cpufreq/Kconfig drivers/cpufreq/Kconfig.arm drivers/cpufreq/Kconfig.powerpc @@ -283,46 +292,70 @@ drivers/cpuidle/Kconfig drivers/cpuidle/Kconfig.arm drivers/cpuidle/Kconfig.mips drivers/cpuidle/Kconfig.powerpc +drivers/cpuidle/Kconfig.riscv +drivers/crypto/allwinner/Kconfig +drivers/crypto/amlogic/Kconfig +drivers/crypto/aspeed/Kconfig drivers/crypto/caam/Kconfig drivers/crypto/cavium/cpt/Kconfig drivers/crypto/cavium/nitrox/Kconfig drivers/crypto/ccp/Kconfig drivers/crypto/chelsio/Kconfig drivers/crypto/hisilicon/Kconfig +drivers/crypto/intel/iaa/Kconfig +drivers/crypto/intel/ixp4xx/Kconfig +drivers/crypto/intel/Kconfig +drivers/crypto/intel/keembay/Kconfig +drivers/crypto/intel/qat/Kconfig drivers/crypto/Kconfig +drivers/crypto/marvell/Kconfig drivers/crypto/nx/Kconfig -drivers/crypto/qat/Kconfig +drivers/crypto/starfive/Kconfig drivers/crypto/stm32/Kconfig -drivers/crypto/ux500/Kconfig drivers/crypto/virtio/Kconfig drivers/crypto/vmx/Kconfig +drivers/cxl/Kconfig drivers/dax/Kconfig drivers/dca/Kconfig drivers/devfreq/event/Kconfig drivers/devfreq/Kconfig drivers/dma/bestcomm/Kconfig +drivers/dma-buf/heaps/Kconfig drivers/dma-buf/Kconfig +drivers/dma/dw-edma/Kconfig drivers/dma/dw/Kconfig +drivers/dma/fsl-dpaa2-qdma/Kconfig drivers/dma/hsu/Kconfig drivers/dma/Kconfig +drivers/dma/lgm/Kconfig drivers/dma/mediatek/Kconfig +drivers/dma/ptdma/Kconfig drivers/dma/qcom/Kconfig +drivers/dma/sf-pdma/Kconfig drivers/dma/sh/Kconfig drivers/dma/ti/Kconfig +drivers/dpll/Kconfig drivers/edac/Kconfig drivers/eisa/Kconfig drivers/extcon/Kconfig drivers/firewire/Kconfig +drivers/firmware/arm_ffa/Kconfig +drivers/firmware/arm_scmi/Kconfig drivers/firmware/broadcom/Kconfig +drivers/firmware/cirrus/Kconfig drivers/firmware/efi/Kconfig drivers/firmware/google/Kconfig drivers/firmware/imx/Kconfig drivers/firmware/Kconfig drivers/firmware/meson/Kconfig +drivers/firmware/microchip/Kconfig +drivers/firmware/psci/Kconfig +drivers/firmware/qcom/Kconfig +drivers/firmware/smccc/Kconfig drivers/firmware/tegra/Kconfig drivers/firmware/xilinx/Kconfig -drivers/fmc/Kconfig drivers/fpga/Kconfig +drivers/fpga/tests/Kconfig drivers/fsi/Kconfig drivers/gnss/Kconfig drivers/gpio/Kconfig @@ -330,78 +363,106 @@ drivers/gpu/drm/amd/acp/Kconfig drivers/gpu/drm/amd/amdgpu/Kconfig drivers/gpu/drm/amd/amdkfd/Kconfig drivers/gpu/drm/amd/display/Kconfig -drivers/gpu/drm/amd/lib/Kconfig -drivers/gpu/drm/arc/Kconfig drivers/gpu/drm/armada/Kconfig +drivers/gpu/drm/arm/display/Kconfig drivers/gpu/drm/arm/Kconfig +drivers/gpu/drm/aspeed/Kconfig drivers/gpu/drm/ast/Kconfig drivers/gpu/drm/atmel-hlcdc/Kconfig -drivers/gpu/drm/bochs/Kconfig drivers/gpu/drm/bridge/adv7511/Kconfig drivers/gpu/drm/bridge/analogix/Kconfig +drivers/gpu/drm/bridge/cadence/Kconfig +drivers/gpu/drm/bridge/imx/Kconfig drivers/gpu/drm/bridge/Kconfig drivers/gpu/drm/bridge/synopsys/Kconfig -drivers/gpu/drm/cirrus/Kconfig +drivers/gpu/drm/display/Kconfig drivers/gpu/drm/etnaviv/Kconfig drivers/gpu/drm/exynos/Kconfig drivers/gpu/drm/fsl-dcu/Kconfig drivers/gpu/drm/gma500/Kconfig +drivers/gpu/drm/gud/Kconfig drivers/gpu/drm/hisilicon/hibmc/Kconfig drivers/gpu/drm/hisilicon/Kconfig drivers/gpu/drm/hisilicon/kirin/Kconfig drivers/gpu/drm/i2c/Kconfig drivers/gpu/drm/i915/Kconfig drivers/gpu/drm/i915/Kconfig.debug +drivers/gpu/drm/i915/Kconfig.profile +drivers/gpu/drm/imagination/Kconfig +drivers/gpu/drm/imx/dcss/Kconfig +drivers/gpu/drm/imx/ipuv3/Kconfig drivers/gpu/drm/imx/Kconfig +drivers/gpu/drm/imx/lcdc/Kconfig +drivers/gpu/drm/ingenic/Kconfig drivers/gpu/drm/Kconfig +drivers/gpu/drm/kmb/Kconfig +drivers/gpu/drm/lima/Kconfig +drivers/gpu/drm/logicvc/Kconfig +drivers/gpu/drm/loongson/Kconfig +drivers/gpu/drm/mcde/Kconfig drivers/gpu/drm/mediatek/Kconfig drivers/gpu/drm/meson/Kconfig drivers/gpu/drm/mgag200/Kconfig drivers/gpu/drm/msm/Kconfig drivers/gpu/drm/mxsfb/Kconfig drivers/gpu/drm/nouveau/Kconfig -drivers/gpu/drm/omapdrm/displays/Kconfig -drivers/gpu/drm/omapdrm/dss/Kconfig drivers/gpu/drm/omapdrm/Kconfig drivers/gpu/drm/panel/Kconfig +drivers/gpu/drm/panfrost/Kconfig drivers/gpu/drm/pl111/Kconfig drivers/gpu/drm/qxl/Kconfig drivers/gpu/drm/radeon/Kconfig -drivers/gpu/drm/rcar-du/Kconfig +drivers/gpu/drm/renesas/Kconfig +drivers/gpu/drm/renesas/rcar-du/Kconfig +drivers/gpu/drm/renesas/shmobile/Kconfig drivers/gpu/drm/rockchip/Kconfig -drivers/gpu/drm/shmobile/Kconfig +drivers/gpu/drm/solomon/Kconfig +drivers/gpu/drm/sprd/Kconfig drivers/gpu/drm/sti/Kconfig drivers/gpu/drm/stm/Kconfig drivers/gpu/drm/sun4i/Kconfig drivers/gpu/drm/tegra/Kconfig +drivers/gpu/drm/tidss/Kconfig drivers/gpu/drm/tilcdc/Kconfig -drivers/gpu/drm/tinydrm/Kconfig +drivers/gpu/drm/tiny/Kconfig drivers/gpu/drm/tve200/Kconfig drivers/gpu/drm/udl/Kconfig drivers/gpu/drm/v3d/Kconfig +drivers/gpu/drm/vboxvideo/Kconfig drivers/gpu/drm/vc4/Kconfig drivers/gpu/drm/virtio/Kconfig drivers/gpu/drm/vmwgfx/Kconfig +drivers/gpu/drm/xe/Kconfig +drivers/gpu/drm/xe/Kconfig.debug +drivers/gpu/drm/xe/Kconfig.profile drivers/gpu/drm/xen/Kconfig -drivers/gpu/drm/zte/Kconfig +drivers/gpu/drm/xlnx/Kconfig drivers/gpu/host1x/Kconfig drivers/gpu/ipu-v3/Kconfig +drivers/gpu/trace/Kconfig drivers/gpu/vga/Kconfig +drivers/greybus/Kconfig +drivers/hid/amd-sfh-hid/Kconfig +drivers/hid/bpf/Kconfig drivers/hid/i2c-hid/Kconfig drivers/hid/intel-ish-hid/Kconfig drivers/hid/Kconfig +drivers/hid/surface-hid/Kconfig drivers/hid/usbhid/Kconfig drivers/hsi/clients/Kconfig drivers/hsi/controllers/Kconfig drivers/hsi/Kconfig +drivers/hte/Kconfig drivers/hv/Kconfig drivers/hwmon/Kconfig drivers/hwmon/occ/Kconfig +drivers/hwmon/peci/Kconfig drivers/hwmon/pmbus/Kconfig drivers/hwspinlock/Kconfig drivers/hwtracing/coresight/Kconfig drivers/hwtracing/intel_th/Kconfig drivers/hwtracing/Kconfig +drivers/hwtracing/ptt/Kconfig drivers/hwtracing/stm/Kconfig drivers/i2c/algos/Kconfig drivers/i2c/busses/Kconfig @@ -409,53 +470,63 @@ drivers/i2c/Kconfig drivers/i2c/muxes/Kconfig drivers/i3c/Kconfig drivers/i3c/master/Kconfig -drivers/ide/Kconfig drivers/idle/Kconfig drivers/iio/accel/Kconfig drivers/iio/adc/Kconfig +drivers/iio/addac/Kconfig drivers/iio/afe/Kconfig drivers/iio/amplifiers/Kconfig drivers/iio/buffer/Kconfig +drivers/iio/cdc/Kconfig drivers/iio/chemical/Kconfig drivers/iio/common/cros_ec_sensors/Kconfig drivers/iio/common/hid-sensors/Kconfig +drivers/iio/common/inv_sensors/Kconfig drivers/iio/common/Kconfig drivers/iio/common/ms_sensors/Kconfig +drivers/iio/common/scmi_sensors/Kconfig drivers/iio/common/ssp_sensors/Kconfig drivers/iio/common/st_sensors/Kconfig -drivers/iio/counter/Kconfig drivers/iio/dac/Kconfig drivers/iio/dummy/Kconfig +drivers/iio/filter/Kconfig drivers/iio/frequency/Kconfig drivers/iio/gyro/Kconfig drivers/iio/health/Kconfig drivers/iio/humidity/Kconfig drivers/iio/imu/bmi160/Kconfig +drivers/iio/imu/bmi323/Kconfig +drivers/iio/imu/bno055/Kconfig +drivers/iio/imu/inv_icm42600/Kconfig drivers/iio/imu/inv_mpu6050/Kconfig drivers/iio/imu/Kconfig drivers/iio/imu/st_lsm6dsx/Kconfig +drivers/iio/imu/st_lsm9ds0/Kconfig drivers/iio/Kconfig drivers/iio/light/Kconfig drivers/iio/magnetometer/Kconfig drivers/iio/multiplexer/Kconfig drivers/iio/orientation/Kconfig +drivers/iio/position/Kconfig drivers/iio/potentiometer/Kconfig drivers/iio/potentiostat/Kconfig drivers/iio/pressure/Kconfig drivers/iio/proximity/Kconfig drivers/iio/resolver/Kconfig drivers/iio/temperature/Kconfig +drivers/iio/test/Kconfig drivers/iio/trigger/Kconfig drivers/infiniband/hw/bnxt_re/Kconfig -drivers/infiniband/hw/cxgb3/Kconfig drivers/infiniband/hw/cxgb4/Kconfig +drivers/infiniband/hw/efa/Kconfig +drivers/infiniband/hw/erdma/Kconfig drivers/infiniband/hw/hfi1/Kconfig drivers/infiniband/hw/hns/Kconfig -drivers/infiniband/hw/i40iw/Kconfig +drivers/infiniband/hw/irdma/Kconfig +drivers/infiniband/hw/mana/Kconfig drivers/infiniband/hw/mlx4/Kconfig drivers/infiniband/hw/mlx5/Kconfig drivers/infiniband/hw/mthca/Kconfig -drivers/infiniband/hw/nes/Kconfig drivers/infiniband/hw/ocrdma/Kconfig drivers/infiniband/hw/qedr/Kconfig drivers/infiniband/hw/qib/Kconfig @@ -464,10 +535,12 @@ drivers/infiniband/hw/vmw_pvrdma/Kconfig drivers/infiniband/Kconfig drivers/infiniband/sw/rdmavt/Kconfig drivers/infiniband/sw/rxe/Kconfig +drivers/infiniband/sw/siw/Kconfig drivers/infiniband/ulp/ipoib/Kconfig drivers/infiniband/ulp/iser/Kconfig drivers/infiniband/ulp/isert/Kconfig drivers/infiniband/ulp/opa_vnic/Kconfig +drivers/infiniband/ulp/rtrs/Kconfig drivers/infiniband/ulp/srp/Kconfig drivers/infiniband/ulp/srpt/Kconfig drivers/input/gameport/Kconfig @@ -481,32 +554,41 @@ drivers/input/rmi4/Kconfig drivers/input/serio/Kconfig drivers/input/tablet/Kconfig drivers/input/touchscreen/Kconfig +drivers/interconnect/imx/Kconfig +drivers/interconnect/Kconfig +drivers/interconnect/qcom/Kconfig +drivers/interconnect/samsung/Kconfig +drivers/iommu/amd/Kconfig +drivers/iommu/intel/Kconfig +drivers/iommu/iommufd/Kconfig drivers/iommu/Kconfig drivers/ipack/carriers/Kconfig drivers/ipack/devices/Kconfig drivers/ipack/Kconfig drivers/irqchip/Kconfig drivers/isdn/capi/Kconfig -drivers/isdn/gigaset/Kconfig -drivers/isdn/hardware/avm/Kconfig -drivers/isdn/hardware/Kconfig drivers/isdn/hardware/mISDN/Kconfig -drivers/isdn/hisax/Kconfig -drivers/isdn/hysdn/Kconfig -drivers/isdn/i4l/Kconfig drivers/isdn/Kconfig drivers/isdn/mISDN/Kconfig drivers/Kconfig +drivers/leds/blink/Kconfig +drivers/leds/flash/Kconfig drivers/leds/Kconfig +drivers/leds/rgb/Kconfig +drivers/leds/simple/Kconfig drivers/leds/trigger/Kconfig -drivers/lightnvm/Kconfig drivers/macintosh/Kconfig drivers/mailbox/Kconfig drivers/mcb/Kconfig drivers/md/bcache/Kconfig drivers/md/Kconfig drivers/md/persistent-data/Kconfig +drivers/media/cec/i2c/Kconfig drivers/media/cec/Kconfig +drivers/media/cec/platform/Kconfig +drivers/media/cec/usb/Kconfig +drivers/media/cec/usb/pulse8/Kconfig +drivers/media/cec/usb/rainshadow/Kconfig drivers/media/common/b2c2/Kconfig drivers/media/common/Kconfig drivers/media/common/saa7146/Kconfig @@ -518,13 +600,12 @@ drivers/media/dvb-frontends/cxd2880/Kconfig drivers/media/dvb-frontends/drx39xyj/Kconfig drivers/media/dvb-frontends/Kconfig drivers/media/firewire/Kconfig +drivers/media/i2c/ccs/Kconfig drivers/media/i2c/cx25840/Kconfig drivers/media/i2c/et8ek8/Kconfig drivers/media/i2c/Kconfig -drivers/media/i2c/m5mols/Kconfig -drivers/media/i2c/smiapp/Kconfig -drivers/media/i2c/soc_camera/Kconfig drivers/media/Kconfig +drivers/media/mc/Kconfig drivers/media/mmc/Kconfig drivers/media/mmc/siano/Kconfig drivers/media/pci/b2c2/Kconfig @@ -538,10 +619,12 @@ drivers/media/pci/ddbridge/Kconfig drivers/media/pci/dm1105/Kconfig drivers/media/pci/dt3155/Kconfig drivers/media/pci/intel/ipu3/Kconfig +drivers/media/pci/intel/ivsc/Kconfig +drivers/media/pci/intel/Kconfig drivers/media/pci/ivtv/Kconfig drivers/media/pci/Kconfig drivers/media/pci/mantis/Kconfig -drivers/media/pci/meye/Kconfig +drivers/media/pci/mgb4/Kconfig drivers/media/pci/netup_unidvb/Kconfig drivers/media/pci/ngene/Kconfig drivers/media/pci/pluto2/Kconfig @@ -557,21 +640,71 @@ drivers/media/pci/ttpci/Kconfig drivers/media/pci/tw5864/Kconfig drivers/media/pci/tw686x/Kconfig drivers/media/pci/tw68/Kconfig -drivers/media/platform/am437x/Kconfig +drivers/media/pci/zoran/Kconfig +drivers/media/platform/allegro-dvt/Kconfig +drivers/media/platform/amlogic/Kconfig +drivers/media/platform/amlogic/meson-ge2d/Kconfig +drivers/media/platform/amphion/Kconfig +drivers/media/platform/aspeed/Kconfig drivers/media/platform/atmel/Kconfig drivers/media/platform/cadence/Kconfig -drivers/media/platform/davinci/Kconfig -drivers/media/platform/exynos4-is/Kconfig +drivers/media/platform/chips-media/coda/Kconfig +drivers/media/platform/chips-media/Kconfig +drivers/media/platform/chips-media/wave5/Kconfig +drivers/media/platform/intel/Kconfig drivers/media/platform/Kconfig -drivers/media/platform/marvell-ccic/Kconfig -drivers/media/platform/omap/Kconfig -drivers/media/platform/rcar-vin/Kconfig -drivers/media/platform/soc_camera/Kconfig -drivers/media/platform/sti/c8sectpfe/Kconfig +drivers/media/platform/marvell/Kconfig +drivers/media/platform/mediatek/jpeg/Kconfig +drivers/media/platform/mediatek/Kconfig +drivers/media/platform/mediatek/mdp3/Kconfig +drivers/media/platform/mediatek/mdp/Kconfig +drivers/media/platform/mediatek/vcodec/Kconfig +drivers/media/platform/mediatek/vpu/Kconfig +drivers/media/platform/microchip/Kconfig +drivers/media/platform/nuvoton/Kconfig +drivers/media/platform/nvidia/Kconfig +drivers/media/platform/nvidia/tegra-vde/Kconfig +drivers/media/platform/nxp/dw100/Kconfig +drivers/media/platform/nxp/imx8-isi/Kconfig +drivers/media/platform/nxp/imx-jpeg/Kconfig +drivers/media/platform/nxp/Kconfig +drivers/media/platform/qcom/camss/Kconfig +drivers/media/platform/qcom/Kconfig +drivers/media/platform/qcom/venus/Kconfig +drivers/media/platform/renesas/Kconfig +drivers/media/platform/renesas/rcar-vin/Kconfig +drivers/media/platform/renesas/rzg2l-cru/Kconfig +drivers/media/platform/rockchip/Kconfig +drivers/media/platform/rockchip/rga/Kconfig +drivers/media/platform/rockchip/rkisp1/Kconfig +drivers/media/platform/samsung/exynos4-is/Kconfig +drivers/media/platform/samsung/exynos-gsc/Kconfig +drivers/media/platform/samsung/Kconfig +drivers/media/platform/samsung/s3c-camif/Kconfig +drivers/media/platform/samsung/s5p-g2d/Kconfig +drivers/media/platform/samsung/s5p-jpeg/Kconfig +drivers/media/platform/samsung/s5p-mfc/Kconfig +drivers/media/platform/st/Kconfig +drivers/media/platform/st/sti/bdisp/Kconfig +drivers/media/platform/st/sti/c8sectpfe/Kconfig +drivers/media/platform/st/sti/delta/Kconfig +drivers/media/platform/st/sti/hva/Kconfig +drivers/media/platform/st/sti/Kconfig +drivers/media/platform/st/stm32/Kconfig +drivers/media/platform/sunxi/Kconfig +drivers/media/platform/sunxi/sun4i-csi/Kconfig drivers/media/platform/sunxi/sun6i-csi/Kconfig -drivers/media/platform/vicodec/Kconfig -drivers/media/platform/vimc/Kconfig -drivers/media/platform/vivid/Kconfig +drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig +drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig +drivers/media/platform/sunxi/sun8i-di/Kconfig +drivers/media/platform/sunxi/sun8i-rotate/Kconfig +drivers/media/platform/ti/am437x/Kconfig +drivers/media/platform/ti/davinci/Kconfig +drivers/media/platform/ti/Kconfig +drivers/media/platform/ti/omap3isp/Kconfig +drivers/media/platform/ti/omap/Kconfig +drivers/media/platform/verisilicon/Kconfig +drivers/media/platform/via/Kconfig drivers/media/platform/xilinx/Kconfig drivers/media/radio/Kconfig drivers/media/radio/si470x/Kconfig @@ -581,12 +714,17 @@ drivers/media/rc/img-ir/Kconfig drivers/media/rc/Kconfig drivers/media/rc/keymaps/Kconfig drivers/media/spi/Kconfig +drivers/media/test-drivers/Kconfig +drivers/media/test-drivers/vicodec/Kconfig +drivers/media/test-drivers/vidtv/Kconfig +drivers/media/test-drivers/vimc/Kconfig +drivers/media/test-drivers/visl/Kconfig +drivers/media/test-drivers/vivid/Kconfig drivers/media/tuners/Kconfig drivers/media/usb/airspy/Kconfig drivers/media/usb/as102/Kconfig drivers/media/usb/au0828/Kconfig drivers/media/usb/b2c2/Kconfig -drivers/media/usb/cpia2/Kconfig drivers/media/usb/cx231xx/Kconfig drivers/media/usb/dvb-usb/Kconfig drivers/media/usb/dvb-usb-v2/Kconfig @@ -600,21 +738,15 @@ drivers/media/usb/hackrf/Kconfig drivers/media/usb/hdpvr/Kconfig drivers/media/usb/Kconfig drivers/media/usb/msi2500/Kconfig -drivers/media/usb/pulse8-cec/Kconfig drivers/media/usb/pvrusb2/Kconfig drivers/media/usb/pwc/Kconfig -drivers/media/usb/rainshadow-cec/Kconfig drivers/media/usb/s2255/Kconfig drivers/media/usb/siano/Kconfig drivers/media/usb/stk1160/Kconfig -drivers/media/usb/stkwebcam/Kconfig -drivers/media/usb/tm6000/Kconfig drivers/media/usb/ttusb-budget/Kconfig drivers/media/usb/ttusb-dec/Kconfig drivers/media/usb/usbtv/Kconfig -drivers/media/usb/usbvision/Kconfig drivers/media/usb/uvc/Kconfig -drivers/media/usb/zr364xx/Kconfig drivers/media/v4l2-core/Kconfig drivers/memory/Kconfig drivers/memory/samsung/Kconfig @@ -625,6 +757,7 @@ drivers/memstick/Kconfig drivers/message/fusion/Kconfig drivers/mfd/Kconfig drivers/misc/altera-stapl/Kconfig +drivers/misc/bcm-vk/Kconfig drivers/misc/c2port/Kconfig drivers/misc/cardreader/Kconfig drivers/misc/cb710/Kconfig @@ -634,32 +767,42 @@ drivers/misc/eeprom/Kconfig drivers/misc/genwqe/Kconfig drivers/misc/Kconfig drivers/misc/lis3lv02d/Kconfig +drivers/misc/mchp_pci1xxxx/Kconfig +drivers/misc/mei/gsc_proxy/Kconfig +drivers/misc/mei/hdcp/Kconfig drivers/misc/mei/Kconfig -drivers/misc/mic/Kconfig +drivers/misc/mei/pxp/Kconfig drivers/misc/ocxl/Kconfig +drivers/misc/pvpanic/Kconfig drivers/misc/ti-st/Kconfig +drivers/misc/uacce/Kconfig drivers/misc/vmw_vmci/Kconfig drivers/mmc/core/Kconfig drivers/mmc/host/Kconfig drivers/mmc/Kconfig +drivers/most/Kconfig drivers/mtd/chips/Kconfig drivers/mtd/devices/Kconfig +drivers/mtd/hyperbus/Kconfig drivers/mtd/Kconfig drivers/mtd/lpddr/Kconfig drivers/mtd/maps/Kconfig drivers/mtd/nand/Kconfig drivers/mtd/nand/onenand/Kconfig +drivers/mtd/nand/raw/brcmnand/Kconfig +drivers/mtd/nand/raw/ingenic/Kconfig drivers/mtd/nand/raw/Kconfig drivers/mtd/nand/spi/Kconfig drivers/mtd/parsers/Kconfig +drivers/mtd/spi-nor/controllers/Kconfig drivers/mtd/spi-nor/Kconfig drivers/mtd/ubi/Kconfig drivers/mux/Kconfig -drivers/net/appletalk/Kconfig drivers/net/arcnet/Kconfig drivers/net/caif/Kconfig drivers/net/can/cc770/Kconfig drivers/net/can/c_can/Kconfig +drivers/net/can/ctucanfd/Kconfig drivers/net/can/ifi_canfd/Kconfig drivers/net/can/Kconfig drivers/net/can/m_can/Kconfig @@ -669,14 +812,23 @@ drivers/net/can/rcar/Kconfig drivers/net/can/sja1000/Kconfig drivers/net/can/softing/Kconfig drivers/net/can/spi/Kconfig +drivers/net/can/spi/mcp251xfd/Kconfig drivers/net/can/usb/Kconfig drivers/net/dsa/b53/Kconfig +drivers/net/dsa/hirschmann/Kconfig drivers/net/dsa/Kconfig drivers/net/dsa/microchip/Kconfig drivers/net/dsa/mv88e6xxx/Kconfig +drivers/net/dsa/ocelot/Kconfig +drivers/net/dsa/qca/Kconfig +drivers/net/dsa/realtek/Kconfig +drivers/net/dsa/sja1105/Kconfig +drivers/net/dsa/xrs700x/Kconfig drivers/net/ethernet/3com/Kconfig drivers/net/ethernet/8390/Kconfig +drivers/net/ethernet/actions/Kconfig drivers/net/ethernet/adaptec/Kconfig +drivers/net/ethernet/adi/Kconfig drivers/net/ethernet/aeroflex/Kconfig drivers/net/ethernet/agere/Kconfig drivers/net/ethernet/alacritech/Kconfig @@ -691,14 +843,15 @@ drivers/net/ethernet/apm/xgene-v2/Kconfig drivers/net/ethernet/apple/Kconfig drivers/net/ethernet/aquantia/Kconfig drivers/net/ethernet/arc/Kconfig +drivers/net/ethernet/asix/Kconfig drivers/net/ethernet/atheros/Kconfig -drivers/net/ethernet/aurora/Kconfig drivers/net/ethernet/broadcom/Kconfig drivers/net/ethernet/brocade/bna/Kconfig drivers/net/ethernet/brocade/Kconfig drivers/net/ethernet/cadence/Kconfig drivers/net/ethernet/calxeda/Kconfig drivers/net/ethernet/cavium/Kconfig +drivers/net/ethernet/chelsio/inline_crypto/Kconfig drivers/net/ethernet/chelsio/Kconfig drivers/net/ethernet/cirrus/Kconfig drivers/net/ethernet/cisco/enic/Kconfig @@ -710,16 +863,20 @@ drivers/net/ethernet/dec/tulip/Kconfig drivers/net/ethernet/dlink/Kconfig drivers/net/ethernet/emulex/benet/Kconfig drivers/net/ethernet/emulex/Kconfig +drivers/net/ethernet/engleder/Kconfig drivers/net/ethernet/ezchip/Kconfig drivers/net/ethernet/faraday/Kconfig drivers/net/ethernet/freescale/dpaa2/Kconfig drivers/net/ethernet/freescale/dpaa/Kconfig +drivers/net/ethernet/freescale/enetc/Kconfig drivers/net/ethernet/freescale/fman/Kconfig drivers/net/ethernet/freescale/fs_enet/Kconfig drivers/net/ethernet/freescale/Kconfig drivers/net/ethernet/fujitsu/Kconfig +drivers/net/ethernet/fungible/funeth/Kconfig +drivers/net/ethernet/fungible/Kconfig +drivers/net/ethernet/google/Kconfig drivers/net/ethernet/hisilicon/Kconfig -drivers/net/ethernet/hp/Kconfig drivers/net/ethernet/huawei/hinic/Kconfig drivers/net/ethernet/huawei/Kconfig drivers/net/ethernet/i825xx/Kconfig @@ -727,16 +884,24 @@ drivers/net/ethernet/ibm/emac/Kconfig drivers/net/ethernet/ibm/Kconfig drivers/net/ethernet/intel/Kconfig drivers/net/ethernet/Kconfig +drivers/net/ethernet/litex/Kconfig drivers/net/ethernet/marvell/Kconfig +drivers/net/ethernet/marvell/octeon_ep/Kconfig drivers/net/ethernet/marvell/octeontx2/Kconfig +drivers/net/ethernet/marvell/prestera/Kconfig drivers/net/ethernet/mediatek/Kconfig drivers/net/ethernet/mellanox/Kconfig drivers/net/ethernet/mellanox/mlx4/Kconfig drivers/net/ethernet/mellanox/mlx5/core/Kconfig +drivers/net/ethernet/mellanox/mlxbf_gige/Kconfig drivers/net/ethernet/mellanox/mlxfw/Kconfig drivers/net/ethernet/mellanox/mlxsw/Kconfig drivers/net/ethernet/micrel/Kconfig drivers/net/ethernet/microchip/Kconfig +drivers/net/ethernet/microchip/lan966x/Kconfig +drivers/net/ethernet/microchip/sparx5/Kconfig +drivers/net/ethernet/microchip/vcap/Kconfig +drivers/net/ethernet/microsoft/Kconfig drivers/net/ethernet/moxa/Kconfig drivers/net/ethernet/mscc/Kconfig drivers/net/ethernet/myricom/Kconfig @@ -744,13 +909,13 @@ drivers/net/ethernet/natsemi/Kconfig drivers/net/ethernet/neterion/Kconfig drivers/net/ethernet/netronome/Kconfig drivers/net/ethernet/ni/Kconfig -drivers/net/ethernet/nuvoton/Kconfig drivers/net/ethernet/nvidia/Kconfig drivers/net/ethernet/nxp/Kconfig drivers/net/ethernet/oki-semi/Kconfig drivers/net/ethernet/oki-semi/pch_gbe/Kconfig drivers/net/ethernet/packetengines/Kconfig drivers/net/ethernet/pasemi/Kconfig +drivers/net/ethernet/pensando/Kconfig drivers/net/ethernet/qlogic/Kconfig drivers/net/ethernet/qualcomm/Kconfig drivers/net/ethernet/qualcomm/rmnet/Kconfig @@ -762,6 +927,7 @@ drivers/net/ethernet/samsung/Kconfig drivers/net/ethernet/seeq/Kconfig drivers/net/ethernet/sfc/falcon/Kconfig drivers/net/ethernet/sfc/Kconfig +drivers/net/ethernet/sfc/siena/Kconfig drivers/net/ethernet/sgi/Kconfig drivers/net/ethernet/silan/Kconfig drivers/net/ethernet/sis/Kconfig @@ -770,12 +936,15 @@ drivers/net/ethernet/socionext/Kconfig drivers/net/ethernet/stmicro/Kconfig drivers/net/ethernet/stmicro/stmmac/Kconfig drivers/net/ethernet/sun/Kconfig +drivers/net/ethernet/sunplus/Kconfig drivers/net/ethernet/synopsys/Kconfig drivers/net/ethernet/tehuti/Kconfig drivers/net/ethernet/ti/Kconfig drivers/net/ethernet/toshiba/Kconfig drivers/net/ethernet/tundra/Kconfig +drivers/net/ethernet/vertexcom/Kconfig drivers/net/ethernet/via/Kconfig +drivers/net/ethernet/wangxun/Kconfig drivers/net/ethernet/wiznet/Kconfig drivers/net/ethernet/xilinx/Kconfig drivers/net/ethernet/xircom/Kconfig @@ -785,19 +954,27 @@ drivers/net/hamradio/Kconfig drivers/net/hippi/Kconfig drivers/net/hyperv/Kconfig drivers/net/ieee802154/Kconfig +drivers/net/ipa/Kconfig drivers/net/Kconfig +drivers/net/mctp/Kconfig +drivers/net/mdio/Kconfig +drivers/net/pcs/Kconfig +drivers/net/phy/aquantia/Kconfig drivers/net/phy/Kconfig drivers/net/plip/Kconfig drivers/net/ppp/Kconfig +drivers/net/pse-pd/Kconfig drivers/net/slip/Kconfig drivers/net/team/Kconfig +drivers/net/thunderbolt/Kconfig drivers/net/usb/Kconfig +drivers/net/wan/framer/Kconfig drivers/net/wan/Kconfig -drivers/net/wimax/i2400m/Kconfig -drivers/net/wimax/Kconfig drivers/net/wireless/admtek/Kconfig drivers/net/wireless/ath/ar5523/Kconfig drivers/net/wireless/ath/ath10k/Kconfig +drivers/net/wireless/ath/ath11k/Kconfig +drivers/net/wireless/ath/ath12k/Kconfig drivers/net/wireless/ath/ath5k/Kconfig drivers/net/wireless/ath/ath6kl/Kconfig drivers/net/wireless/ath/ath9k/Kconfig @@ -808,16 +985,14 @@ drivers/net/wireless/ath/wil6210/Kconfig drivers/net/wireless/atmel/Kconfig drivers/net/wireless/broadcom/b43/Kconfig drivers/net/wireless/broadcom/b43legacy/Kconfig +drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig drivers/net/wireless/broadcom/brcm80211/Kconfig drivers/net/wireless/broadcom/Kconfig -drivers/net/wireless/cisco/Kconfig drivers/net/wireless/intel/ipw2x00/Kconfig drivers/net/wireless/intel/iwlegacy/Kconfig drivers/net/wireless/intel/iwlwifi/Kconfig drivers/net/wireless/intel/Kconfig -drivers/net/wireless/intersil/hostap/Kconfig drivers/net/wireless/intersil/Kconfig -drivers/net/wireless/intersil/orinoco/Kconfig drivers/net/wireless/intersil/p54/Kconfig drivers/net/wireless/Kconfig drivers/net/wireless/marvell/Kconfig @@ -827,8 +1002,18 @@ drivers/net/wireless/marvell/mwifiex/Kconfig drivers/net/wireless/mediatek/Kconfig drivers/net/wireless/mediatek/mt7601u/Kconfig drivers/net/wireless/mediatek/mt76/Kconfig +drivers/net/wireless/mediatek/mt76/mt7603/Kconfig +drivers/net/wireless/mediatek/mt76/mt7615/Kconfig drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig +drivers/net/wireless/mediatek/mt76/mt7915/Kconfig +drivers/net/wireless/mediatek/mt76/mt7921/Kconfig +drivers/net/wireless/mediatek/mt76/mt7925/Kconfig +drivers/net/wireless/mediatek/mt76/mt7996/Kconfig +drivers/net/wireless/microchip/Kconfig +drivers/net/wireless/microchip/wilc1000/Kconfig +drivers/net/wireless/purelifi/Kconfig +drivers/net/wireless/purelifi/plfxlc/Kconfig drivers/net/wireless/quantenna/Kconfig drivers/net/wireless/quantenna/qtnfmac/Kconfig drivers/net/wireless/ralink/Kconfig @@ -837,7 +1022,11 @@ drivers/net/wireless/realtek/Kconfig drivers/net/wireless/realtek/rtl818x/Kconfig drivers/net/wireless/realtek/rtl8xxxu/Kconfig drivers/net/wireless/realtek/rtlwifi/Kconfig +drivers/net/wireless/realtek/rtw88/Kconfig +drivers/net/wireless/realtek/rtw89/Kconfig drivers/net/wireless/rsi/Kconfig +drivers/net/wireless/silabs/Kconfig +drivers/net/wireless/silabs/wfx/Kconfig drivers/net/wireless/st/cw1200/Kconfig drivers/net/wireless/st/Kconfig drivers/net/wireless/ti/Kconfig @@ -845,8 +1034,10 @@ drivers/net/wireless/ti/wl1251/Kconfig drivers/net/wireless/ti/wl12xx/Kconfig drivers/net/wireless/ti/wl18xx/Kconfig drivers/net/wireless/ti/wlcore/Kconfig +drivers/net/wireless/virtual/Kconfig drivers/net/wireless/zydas/Kconfig drivers/net/wireless/zydas/zd1211rw/Kconfig +drivers/net/wwan/Kconfig drivers/nfc/fdp/Kconfig drivers/nfc/Kconfig drivers/nfc/microread/Kconfig @@ -859,6 +1050,7 @@ drivers/nfc/st21nfca/Kconfig drivers/nfc/st95hf/Kconfig drivers/nfc/st-nci/Kconfig drivers/ntb/hw/amd/Kconfig +drivers/ntb/hw/epf/Kconfig drivers/ntb/hw/idt/Kconfig drivers/ntb/hw/intel/Kconfig drivers/ntb/hw/Kconfig @@ -866,16 +1058,20 @@ drivers/ntb/hw/mscc/Kconfig drivers/ntb/Kconfig drivers/ntb/test/Kconfig drivers/nvdimm/Kconfig +drivers/nvme/common/Kconfig drivers/nvme/host/Kconfig drivers/nvme/Kconfig drivers/nvmem/Kconfig +drivers/nvmem/layouts/Kconfig drivers/nvme/target/Kconfig drivers/of/Kconfig drivers/opp/Kconfig drivers/parisc/Kconfig drivers/parport/Kconfig +drivers/pci/controller/cadence/Kconfig drivers/pci/controller/dwc/Kconfig drivers/pci/controller/Kconfig +drivers/pci/controller/mobiveil/Kconfig drivers/pci/endpoint/functions/Kconfig drivers/pci/endpoint/Kconfig drivers/pci/hotplug/Kconfig @@ -883,6 +1079,11 @@ drivers/pci/Kconfig drivers/pci/pcie/Kconfig drivers/pci/switch/Kconfig drivers/pcmcia/Kconfig +drivers/peci/controller/Kconfig +drivers/peci/Kconfig +drivers/perf/amlogic/Kconfig +drivers/perf/arm_cspmu/Kconfig +drivers/perf/hisilicon/Kconfig drivers/perf/Kconfig drivers/phy/allwinner/Kconfig drivers/phy/amlogic/Kconfig @@ -890,10 +1091,13 @@ drivers/phy/broadcom/Kconfig drivers/phy/cadence/Kconfig drivers/phy/freescale/Kconfig drivers/phy/hisilicon/Kconfig +drivers/phy/ingenic/Kconfig +drivers/phy/intel/Kconfig drivers/phy/Kconfig drivers/phy/lantiq/Kconfig drivers/phy/marvell/Kconfig drivers/phy/mediatek/Kconfig +drivers/phy/microchip/Kconfig drivers/phy/motorola/Kconfig drivers/phy/mscc/Kconfig drivers/phy/qualcomm/Kconfig @@ -902,9 +1106,12 @@ drivers/phy/renesas/Kconfig drivers/phy/rockchip/Kconfig drivers/phy/samsung/Kconfig drivers/phy/socionext/Kconfig +drivers/phy/starfive/Kconfig drivers/phy/st/Kconfig +drivers/phy/sunplus/Kconfig drivers/phy/tegra/Kconfig drivers/phy/ti/Kconfig +drivers/phy/xilinx/Kconfig drivers/pinctrl/actions/Kconfig drivers/pinctrl/aspeed/Kconfig drivers/pinctrl/bcm/Kconfig @@ -912,36 +1119,82 @@ drivers/pinctrl/berlin/Kconfig drivers/pinctrl/cirrus/Kconfig drivers/pinctrl/freescale/Kconfig drivers/pinctrl/intel/Kconfig +drivers/pinctrl/intel/Kconfig.tng drivers/pinctrl/Kconfig drivers/pinctrl/mediatek/Kconfig drivers/pinctrl/meson/Kconfig drivers/pinctrl/mvebu/Kconfig drivers/pinctrl/nomadik/Kconfig drivers/pinctrl/nuvoton/Kconfig +drivers/pinctrl/nxp/Kconfig drivers/pinctrl/pxa/Kconfig drivers/pinctrl/qcom/Kconfig +drivers/pinctrl/qcom/Kconfig.msm +drivers/pinctrl/realtek/Kconfig +drivers/pinctrl/renesas/Kconfig drivers/pinctrl/samsung/Kconfig -drivers/pinctrl/sh-pfc/Kconfig drivers/pinctrl/spear/Kconfig drivers/pinctrl/sprd/Kconfig +drivers/pinctrl/starfive/Kconfig drivers/pinctrl/stm32/Kconfig +drivers/pinctrl/sunplus/Kconfig drivers/pinctrl/sunxi/Kconfig drivers/pinctrl/tegra/Kconfig drivers/pinctrl/ti/Kconfig drivers/pinctrl/uniphier/Kconfig +drivers/pinctrl/visconti/Kconfig drivers/pinctrl/vt8500/Kconfig -drivers/pinctrl/zte/Kconfig drivers/platform/chrome/Kconfig +drivers/platform/chrome/wilco_ec/Kconfig drivers/platform/goldfish/Kconfig drivers/platform/Kconfig +drivers/platform/loongarch/Kconfig drivers/platform/mellanox/Kconfig drivers/platform/mips/Kconfig +drivers/platform/olpc/Kconfig +drivers/platform/surface/aggregator/Kconfig +drivers/platform/surface/Kconfig +drivers/platform/x86/amd/Kconfig +drivers/platform/x86/amd/pmc/Kconfig +drivers/platform/x86/amd/pmf/Kconfig +drivers/platform/x86/dell/Kconfig +drivers/platform/x86/hp/Kconfig +drivers/platform/x86/intel/atomisp2/Kconfig +drivers/platform/x86/intel/ifs/Kconfig +drivers/platform/x86/intel/int1092/Kconfig +drivers/platform/x86/intel/int3472/Kconfig +drivers/platform/x86/intel/Kconfig +drivers/platform/x86/intel/pmc/Kconfig +drivers/platform/x86/intel/pmt/Kconfig +drivers/platform/x86/intel/speed_select_if/Kconfig +drivers/platform/x86/intel/telemetry/Kconfig +drivers/platform/x86/intel/uncore-frequency/Kconfig +drivers/platform/x86/intel/wmi/Kconfig drivers/platform/x86/Kconfig +drivers/platform/x86/siemens/Kconfig +drivers/platform/x86/x86-android-tablets/Kconfig +drivers/pmdomain/actions/Kconfig +drivers/pmdomain/amlogic/Kconfig +drivers/pmdomain/apple/Kconfig +drivers/pmdomain/arm/Kconfig +drivers/pmdomain/bcm/Kconfig +drivers/pmdomain/imx/Kconfig +drivers/pmdomain/Kconfig +drivers/pmdomain/mediatek/Kconfig +drivers/pmdomain/qcom/Kconfig +drivers/pmdomain/renesas/Kconfig +drivers/pmdomain/rockchip/Kconfig +drivers/pmdomain/samsung/Kconfig +drivers/pmdomain/starfive/Kconfig +drivers/pmdomain/st/Kconfig +drivers/pmdomain/sunxi/Kconfig +drivers/pmdomain/tegra/Kconfig +drivers/pmdomain/ti/Kconfig +drivers/pmdomain/xilinx/Kconfig drivers/pnp/isapnp/Kconfig drivers/pnp/Kconfig drivers/pnp/pnpacpi/Kconfig drivers/pnp/pnpbios/Kconfig -drivers/power/avs/Kconfig drivers/powercap/Kconfig drivers/power/Kconfig drivers/power/reset/Kconfig @@ -959,6 +1212,7 @@ drivers/regulator/Kconfig drivers/remoteproc/Kconfig drivers/reset/hisilicon/Kconfig drivers/reset/Kconfig +drivers/reset/starfive/Kconfig drivers/reset/sti/Kconfig drivers/reset/tegra/Kconfig drivers/rpmsg/Kconfig @@ -980,38 +1234,46 @@ drivers/scsi/cxgbi/cxgb4i/Kconfig drivers/scsi/cxgbi/Kconfig drivers/scsi/cxlflash/Kconfig drivers/scsi/device_handler/Kconfig +drivers/scsi/elx/Kconfig drivers/scsi/esas2r/Kconfig drivers/scsi/hisi_sas/Kconfig drivers/scsi/Kconfig drivers/scsi/libsas/Kconfig drivers/scsi/megaraid/Kconfig.megaraid +drivers/scsi/mpi3mr/Kconfig drivers/scsi/mpt3sas/Kconfig drivers/scsi/mvsas/Kconfig -drivers/scsi/osd/Kconfig drivers/scsi/pcmcia/Kconfig drivers/scsi/qedf/Kconfig drivers/scsi/qedi/Kconfig drivers/scsi/qla2xxx/Kconfig drivers/scsi/qla4xxx/Kconfig drivers/scsi/smartpqi/Kconfig -drivers/scsi/ufs/Kconfig -drivers/sfi/Kconfig drivers/sh/intc/Kconfig drivers/sh/Kconfig drivers/siox/Kconfig drivers/slimbus/Kconfig -drivers/sn/Kconfig -drivers/soc/actions/Kconfig drivers/soc/amlogic/Kconfig +drivers/soc/apple/Kconfig +drivers/soc/aspeed/Kconfig drivers/soc/atmel/Kconfig drivers/soc/bcm/brcmstb/Kconfig drivers/soc/bcm/Kconfig +drivers/soc/canaan/Kconfig drivers/soc/fsl/Kconfig drivers/soc/fsl/qbman/Kconfig drivers/soc/fsl/qe/Kconfig +drivers/soc/fujitsu/Kconfig +drivers/soc/hisilicon/Kconfig drivers/soc/imx/Kconfig +drivers/soc/ixp4xx/Kconfig drivers/soc/Kconfig +drivers/soc/litex/Kconfig +drivers/soc/loongson/Kconfig drivers/soc/mediatek/Kconfig +drivers/soc/microchip/Kconfig +drivers/soc/nuvoton/Kconfig +drivers/soc/pxa/Kconfig drivers/soc/qcom/Kconfig drivers/soc/renesas/Kconfig drivers/soc/rockchip/Kconfig @@ -1022,108 +1284,81 @@ drivers/soc/ti/Kconfig drivers/soc/ux500/Kconfig drivers/soc/versatile/Kconfig drivers/soc/xilinx/Kconfig -drivers/soc/zte/Kconfig drivers/soundwire/Kconfig drivers/spi/Kconfig drivers/spmi/Kconfig drivers/ssb/Kconfig -drivers/staging/android/ion/Kconfig -drivers/staging/android/Kconfig drivers/staging/axis-fifo/Kconfig drivers/staging/board/Kconfig -drivers/staging/clocking-wizard/Kconfig -drivers/staging/comedi/Kconfig drivers/staging/emxx_udc/Kconfig -drivers/staging/erofs/Kconfig drivers/staging/fbtft/Kconfig -drivers/staging/fsl-dpaa2/Kconfig -drivers/staging/fwserial/Kconfig -drivers/staging/gasket/Kconfig +drivers/staging/fieldbus/anybuss/Kconfig +drivers/staging/fieldbus/Kconfig drivers/staging/gdm724x/Kconfig -drivers/staging/goldfish/Kconfig drivers/staging/greybus/Kconfig -drivers/staging/gs_fpgaboot/Kconfig drivers/staging/iio/accel/Kconfig drivers/staging/iio/adc/Kconfig drivers/staging/iio/addac/Kconfig -drivers/staging/iio/cdc/Kconfig drivers/staging/iio/frequency/Kconfig drivers/staging/iio/impedance-analyzer/Kconfig drivers/staging/iio/Kconfig -drivers/staging/iio/meter/Kconfig -drivers/staging/iio/resolver/Kconfig drivers/staging/Kconfig drivers/staging/ks7010/Kconfig -drivers/staging/media/bcm2048/Kconfig -drivers/staging/media/davinci_vpfe/Kconfig -drivers/staging/media/imx074/Kconfig +drivers/staging/media/atomisp/i2c/Kconfig +drivers/staging/media/atomisp/Kconfig +drivers/staging/media/av7110/Kconfig +drivers/staging/media/deprecated/atmel/Kconfig drivers/staging/media/imx/Kconfig drivers/staging/media/ipu3/Kconfig drivers/staging/media/Kconfig -drivers/staging/media/mt9t031/Kconfig +drivers/staging/media/max96712/Kconfig +drivers/staging/media/meson/vdec/Kconfig drivers/staging/media/omap4iss/Kconfig -drivers/staging/media/rockchip/vpu/Kconfig +drivers/staging/media/rkvdec/Kconfig +drivers/staging/media/starfive/camss/Kconfig +drivers/staging/media/starfive/Kconfig drivers/staging/media/sunxi/cedrus/Kconfig drivers/staging/media/sunxi/Kconfig -drivers/staging/media/tegra-vde/Kconfig -drivers/staging/media/zoran/Kconfig -drivers/staging/most/cdev/Kconfig +drivers/staging/media/sunxi/sun6i-isp/Kconfig +drivers/staging/media/tegra-video/Kconfig drivers/staging/most/dim2/Kconfig drivers/staging/most/i2c/Kconfig drivers/staging/most/Kconfig drivers/staging/most/net/Kconfig -drivers/staging/most/sound/Kconfig -drivers/staging/most/usb/Kconfig drivers/staging/most/video/Kconfig -drivers/staging/mt7621-dma/Kconfig -drivers/staging/mt7621-dts/Kconfig -drivers/staging/mt7621-eth/Kconfig -drivers/staging/mt7621-mmc/Kconfig -drivers/staging/mt7621-pci/Kconfig -drivers/staging/mt7621-pinctrl/Kconfig -drivers/staging/mt7621-spi/Kconfig -drivers/staging/netlogic/Kconfig drivers/staging/nvec/Kconfig drivers/staging/octeon/Kconfig -drivers/staging/octeon-usb/Kconfig drivers/staging/olpc_dcon/Kconfig drivers/staging/pi433/Kconfig -drivers/staging/rtl8188eu/Kconfig drivers/staging/rtl8192e/Kconfig drivers/staging/rtl8192e/rtl8192e/Kconfig -drivers/staging/rtl8192u/Kconfig drivers/staging/rtl8712/Kconfig drivers/staging/rtl8723bs/Kconfig -drivers/staging/rtlwifi/Kconfig drivers/staging/rts5208/Kconfig drivers/staging/sm750fb/Kconfig -drivers/staging/speakup/Kconfig -drivers/staging/unisys/Kconfig -drivers/staging/unisys/visorhba/Kconfig -drivers/staging/unisys/visorinput/Kconfig -drivers/staging/unisys/visornic/Kconfig -drivers/staging/vboxvideo/Kconfig drivers/staging/vc04_services/bcm2835-audio/Kconfig drivers/staging/vc04_services/bcm2835-camera/Kconfig drivers/staging/vc04_services/Kconfig -drivers/staging/vme/devices/Kconfig +drivers/staging/vc04_services/vchiq-mmal/Kconfig +drivers/staging/vme_user/Kconfig drivers/staging/vt6655/Kconfig drivers/staging/vt6656/Kconfig -drivers/staging/wilc1000/Kconfig drivers/staging/wlan-ng/Kconfig -drivers/staging/xgifb/Kconfig drivers/target/iscsi/cxgbit/Kconfig drivers/target/iscsi/Kconfig drivers/target/Kconfig drivers/target/loopback/Kconfig drivers/target/sbp/Kconfig drivers/target/tcm_fc/Kconfig +drivers/target/tcm_remote/Kconfig +drivers/tee/amdtee/Kconfig drivers/tee/Kconfig drivers/tee/optee/Kconfig drivers/thermal/broadcom/Kconfig drivers/thermal/intel/int340x_thermal/Kconfig drivers/thermal/intel/Kconfig drivers/thermal/Kconfig +drivers/thermal/mediatek/Kconfig drivers/thermal/qcom/Kconfig drivers/thermal/samsung/Kconfig drivers/thermal/st/Kconfig @@ -1135,17 +1370,24 @@ drivers/tty/Kconfig drivers/tty/serdev/Kconfig drivers/tty/serial/8250/Kconfig drivers/tty/serial/Kconfig +drivers/ufs/core/Kconfig +drivers/ufs/host/Kconfig +drivers/ufs/Kconfig drivers/uio/Kconfig drivers/usb/atm/Kconfig +drivers/usb/cdns3/Kconfig drivers/usb/chipidea/Kconfig drivers/usb/class/Kconfig +drivers/usb/common/Kconfig drivers/usb/core/Kconfig drivers/usb/dwc2/Kconfig drivers/usb/dwc3/Kconfig +drivers/usb/fotg210/Kconfig drivers/usb/gadget/Kconfig drivers/usb/gadget/legacy/Kconfig drivers/usb/gadget/udc/aspeed-vhub/Kconfig drivers/usb/gadget/udc/bdc/Kconfig +drivers/usb/gadget/udc/cdns2/Kconfig drivers/usb/gadget/udc/Kconfig drivers/usb/host/Kconfig drivers/usb/image/Kconfig @@ -1165,19 +1407,25 @@ drivers/usb/typec/altmodes/Kconfig drivers/usb/typec/Kconfig drivers/usb/typec/mux/Kconfig drivers/usb/typec/tcpm/Kconfig +drivers/usb/typec/tipd/Kconfig drivers/usb/typec/ucsi/Kconfig drivers/usb/usbip/Kconfig -drivers/usb/wusbcore/Kconfig -drivers/uwb/Kconfig +drivers/vdpa/Kconfig +drivers/vfio/cdx/Kconfig +drivers/vfio/fsl-mc/Kconfig drivers/vfio/Kconfig drivers/vfio/mdev/Kconfig +drivers/vfio/pci/hisilicon/Kconfig drivers/vfio/pci/Kconfig +drivers/vfio/pci/mlx5/Kconfig +drivers/vfio/pci/pds/Kconfig +drivers/vfio/pci/virtio/Kconfig drivers/vfio/platform/Kconfig drivers/vfio/platform/reset/Kconfig drivers/vhost/Kconfig -drivers/vhost/Kconfig.vringh drivers/video/backlight/Kconfig drivers/video/console/Kconfig +drivers/video/fbdev/core/Kconfig drivers/video/fbdev/geode/Kconfig drivers/video/fbdev/Kconfig drivers/video/fbdev/mmp/fb/Kconfig @@ -1191,28 +1439,30 @@ drivers/video/fbdev/omap2/omapfb/Kconfig drivers/video/fbdev/omap/Kconfig drivers/video/Kconfig drivers/video/logo/Kconfig +drivers/virt/acrn/Kconfig +drivers/virt/coco/efi_secret/Kconfig +drivers/virt/coco/Kconfig +drivers/virt/coco/sev-guest/Kconfig +drivers/virt/coco/tdx-guest/Kconfig drivers/virtio/Kconfig drivers/virt/Kconfig +drivers/virt/nitro_enclaves/Kconfig drivers/virt/vboxguest/Kconfig -drivers/visorbus/Kconfig -drivers/vlynq/Kconfig -drivers/vme/boards/Kconfig -drivers/vme/bridges/Kconfig -drivers/vme/Kconfig drivers/w1/Kconfig drivers/w1/masters/Kconfig drivers/w1/slaves/Kconfig drivers/watchdog/Kconfig drivers/xen/Kconfig drivers/zorro/Kconfig +mm/damon/Kconfig mm/Kconfig mm/Kconfig.debug +net/can/j1939/Kconfig net/can/Kconfig net/iucv/Kconfig net/nfc/hci/Kconfig net/nfc/Kconfig net/nfc/nci/Kconfig -net/wimax/Kconfig sound/ac97/Kconfig sound/aoa/codecs/Kconfig sound/aoa/fabrics/Kconfig @@ -1236,7 +1486,9 @@ sound/pcmcia/Kconfig sound/ppc/Kconfig sound/sh/Kconfig sound/soc/adi/Kconfig +sound/soc/amd/acp/Kconfig sound/soc/amd/Kconfig +sound/soc/apple/Kconfig sound/soc/atmel/Kconfig sound/soc/au1x/Kconfig sound/soc/bcm/Kconfig @@ -1245,39 +1497,47 @@ sound/soc/codecs/Kconfig sound/soc/dwc/Kconfig sound/soc/fsl/Kconfig sound/soc/generic/Kconfig +sound/soc/google/Kconfig sound/soc/hisilicon/Kconfig sound/soc/img/Kconfig +sound/soc/intel/avs/boards/Kconfig sound/soc/intel/boards/Kconfig sound/soc/intel/Kconfig sound/soc/jz4740/Kconfig sound/soc/Kconfig sound/soc/kirkwood/Kconfig +sound/soc/loongson/Kconfig sound/soc/mediatek/Kconfig sound/soc/meson/Kconfig sound/soc/mxs/Kconfig -sound/soc/nuc900/Kconfig sound/soc/pxa/Kconfig sound/soc/qcom/Kconfig sound/soc/rockchip/Kconfig sound/soc/samsung/Kconfig sound/soc/sh/Kconfig -sound/soc/sirf/Kconfig +sound/soc/sof/amd/Kconfig +sound/soc/sof/imx/Kconfig +sound/soc/sof/intel/Kconfig +sound/soc/sof/Kconfig +sound/soc/sof/mediatek/Kconfig +sound/soc/sof/xtensa/Kconfig sound/soc/spear/Kconfig +sound/soc/sprd/Kconfig +sound/soc/starfive/Kconfig sound/soc/sti/Kconfig sound/soc/stm/Kconfig sound/soc/sunxi/Kconfig sound/soc/tegra/Kconfig sound/soc/ti/Kconfig -sound/soc/txx9/Kconfig sound/soc/uniphier/Kconfig sound/soc/ux500/Kconfig sound/soc/xilinx/Kconfig sound/soc/xtensa/Kconfig -sound/soc/zte/Kconfig sound/sparc/Kconfig sound/spi/Kconfig sound/synth/Kconfig sound/usb/Kconfig sound/usb/line6/Kconfig +sound/virtio/Kconfig sound/x86/Kconfig sound/xen/Kconfig diff --git a/ktypes/base/non-hardware.cfg b/ktypes/base/non-hardware.cfg index 1b79c70e..0474699d 100644 --- a/ktypes/base/non-hardware.cfg +++ b/ktypes/base/non-hardware.cfg @@ -8,7 +8,6 @@ # Misc drivers CONFIG_BLK_DEV_LOOP -CONFIG_BLK_DEV_CRYPTOLOOP CONFIG_BLK_DEV_RAM CONFIG_BLK_DEV_NBD @@ -19,12 +18,38 @@ CONFIG_PREEMPT # Network related drivers/items. CONFIG_NET +CONFIG_NET_CORE CONFIG_NETCONSOLE +CONFIG_NETCONSOLE_DYNAMIC CONFIG_NETDEVICES CONFIG_TUN CONFIG_BONDING CONFIG_DUMMY +CONFIG_WIREGUARD +CONFIG_EQUALIZER + +CONFIG_MACVLAN +CONFIG_MACVTAP +CONFIG_IPVLAN +CONFIG_IPVTAP +CONFIG_VXLAN +CONFIG_GENEVE +CONFIG_BAREUDP +CONFIG_GTP + +CONFIG_NETPOLL +CONFIG_NET_POLL_CONTROLLER +CONFIG_NTB_NETDEV + +CONFIG_TAP +CONFIG_TUN +CONFIG_VETH +CONFIG_VIRTIO_NET +CONFIG_NLMON +CONFIG_NET_VRF +CONFIG_VSOCKMON +CONFIG_MHI_NET CONFIG_PPP CONFIG_PPP_ASYNC @@ -50,3 +75,15 @@ CONFIG_LEGACY_PTYS CONFIG_COMMON_CLK CONFIG_COMMON_CLK_DEBUG + +CONFIG_BT_HCIBTUSB +CONFIG_BT_HCIUART +CONFIG_BT_HCIUART_LL +CONFIG_BT_HCIUART_BCM +CONFIG_BT_HCIUART_QCA +CONFIG_LEGACY_PTY_COUNT + +CONFIG_XEN_NETDEV_FRONTEND +CONFIG_XEN_NETDEV_BACKEND +CONFIG_NETDEVSIM + diff --git a/ktypes/base/non-hardware.kcf b/ktypes/base/non-hardware.kcf index 1a83f73c..98a6ddf6 100644 --- a/ktypes/base/non-hardware.kcf +++ b/ktypes/base/non-hardware.kcf @@ -5,6 +5,7 @@ crypto/asymmetric_keys/Kconfig crypto/async_tx/Kconfig crypto/Kconfig drivers/accessibility/Kconfig +drivers/accessibility/speakup/Kconfig drivers/base/firmware_loader/Kconfig drivers/base/Kconfig drivers/base/regmap/Kconfig @@ -16,6 +17,7 @@ drivers/cpuidle/Kconfig drivers/cpuidle/Kconfig.arm drivers/cpuidle/Kconfig.mips drivers/cpuidle/Kconfig.powerpc +drivers/cpuidle/Kconfig.riscv drivers/firewire/Kconfig drivers/hv/Kconfig drivers/md/bcache/Kconfig @@ -24,95 +26,71 @@ drivers/md/persistent-data/Kconfig drivers/mtd/ubi/Kconfig drivers/remoteproc/Kconfig drivers/rpmsg/Kconfig -drivers/staging/android/ion/Kconfig -drivers/staging/android/Kconfig drivers/staging/axis-fifo/Kconfig drivers/staging/board/Kconfig -drivers/staging/clocking-wizard/Kconfig -drivers/staging/comedi/Kconfig drivers/staging/emxx_udc/Kconfig -drivers/staging/erofs/Kconfig drivers/staging/fbtft/Kconfig -drivers/staging/fsl-dpaa2/Kconfig -drivers/staging/fwserial/Kconfig -drivers/staging/gasket/Kconfig +drivers/staging/fieldbus/anybuss/Kconfig +drivers/staging/fieldbus/Kconfig drivers/staging/gdm724x/Kconfig -drivers/staging/goldfish/Kconfig drivers/staging/greybus/Kconfig -drivers/staging/gs_fpgaboot/Kconfig drivers/staging/iio/accel/Kconfig drivers/staging/iio/adc/Kconfig drivers/staging/iio/addac/Kconfig -drivers/staging/iio/cdc/Kconfig drivers/staging/iio/frequency/Kconfig drivers/staging/iio/impedance-analyzer/Kconfig drivers/staging/iio/Kconfig -drivers/staging/iio/meter/Kconfig -drivers/staging/iio/resolver/Kconfig drivers/staging/Kconfig drivers/staging/ks7010/Kconfig -drivers/staging/media/bcm2048/Kconfig -drivers/staging/media/davinci_vpfe/Kconfig -drivers/staging/media/imx074/Kconfig +drivers/staging/media/atomisp/i2c/Kconfig +drivers/staging/media/atomisp/Kconfig +drivers/staging/media/av7110/Kconfig +drivers/staging/media/deprecated/atmel/Kconfig drivers/staging/media/imx/Kconfig drivers/staging/media/ipu3/Kconfig drivers/staging/media/Kconfig -drivers/staging/media/mt9t031/Kconfig +drivers/staging/media/max96712/Kconfig +drivers/staging/media/meson/vdec/Kconfig drivers/staging/media/omap4iss/Kconfig -drivers/staging/media/rockchip/vpu/Kconfig +drivers/staging/media/rkvdec/Kconfig +drivers/staging/media/starfive/camss/Kconfig +drivers/staging/media/starfive/Kconfig drivers/staging/media/sunxi/cedrus/Kconfig drivers/staging/media/sunxi/Kconfig -drivers/staging/media/tegra-vde/Kconfig -drivers/staging/media/zoran/Kconfig -drivers/staging/most/cdev/Kconfig +drivers/staging/media/sunxi/sun6i-isp/Kconfig +drivers/staging/media/tegra-video/Kconfig drivers/staging/most/dim2/Kconfig drivers/staging/most/i2c/Kconfig drivers/staging/most/Kconfig drivers/staging/most/net/Kconfig -drivers/staging/most/sound/Kconfig -drivers/staging/most/usb/Kconfig drivers/staging/most/video/Kconfig -drivers/staging/mt7621-dma/Kconfig -drivers/staging/mt7621-dts/Kconfig -drivers/staging/mt7621-eth/Kconfig -drivers/staging/mt7621-mmc/Kconfig -drivers/staging/mt7621-pci/Kconfig -drivers/staging/mt7621-pinctrl/Kconfig -drivers/staging/mt7621-spi/Kconfig -drivers/staging/netlogic/Kconfig drivers/staging/nvec/Kconfig drivers/staging/octeon/Kconfig -drivers/staging/octeon-usb/Kconfig drivers/staging/olpc_dcon/Kconfig drivers/staging/pi433/Kconfig -drivers/staging/rtl8188eu/Kconfig drivers/staging/rtl8192e/Kconfig drivers/staging/rtl8192e/rtl8192e/Kconfig -drivers/staging/rtl8192u/Kconfig drivers/staging/rtl8712/Kconfig drivers/staging/rtl8723bs/Kconfig -drivers/staging/rtlwifi/Kconfig drivers/staging/rts5208/Kconfig drivers/staging/sm750fb/Kconfig -drivers/staging/speakup/Kconfig -drivers/staging/unisys/Kconfig -drivers/staging/unisys/visorhba/Kconfig -drivers/staging/unisys/visorinput/Kconfig -drivers/staging/unisys/visornic/Kconfig -drivers/staging/vboxvideo/Kconfig drivers/staging/vc04_services/bcm2835-audio/Kconfig drivers/staging/vc04_services/bcm2835-camera/Kconfig drivers/staging/vc04_services/Kconfig -drivers/staging/vme/devices/Kconfig +drivers/staging/vc04_services/vchiq-mmal/Kconfig +drivers/staging/vme_user/Kconfig drivers/staging/vt6655/Kconfig drivers/staging/vt6656/Kconfig -drivers/staging/wilc1000/Kconfig drivers/staging/wlan-ng/Kconfig -drivers/staging/xgifb/Kconfig drivers/vhost/Kconfig -drivers/vhost/Kconfig.vringh +drivers/virt/acrn/Kconfig +drivers/virt/coco/efi_secret/Kconfig +drivers/virt/coco/Kconfig +drivers/virt/coco/sev-guest/Kconfig +drivers/virt/coco/tdx-guest/Kconfig drivers/virtio/Kconfig drivers/virt/Kconfig +drivers/virt/nitro_enclaves/Kconfig drivers/virt/vboxguest/Kconfig drivers/xen/Kconfig fs/9p/Kconfig @@ -121,12 +99,12 @@ fs/affs/Kconfig fs/afs/Kconfig fs/aufs/Kconfig fs/autofs/Kconfig +fs/bcachefs/Kconfig fs/befs/Kconfig fs/bfs/Kconfig fs/btrfs/Kconfig fs/cachefiles/Kconfig fs/ceph/Kconfig -fs/cifs/Kconfig fs/coda/Kconfig fs/configfs/Kconfig fs/cramfs/Kconfig @@ -135,14 +113,13 @@ fs/dlm/Kconfig fs/ecryptfs/Kconfig fs/efivarfs/Kconfig fs/efs/Kconfig -fs/exofs/Kconfig -fs/exofs/Kconfig.ore +fs/erofs/Kconfig +fs/exfat/Kconfig fs/ext2/Kconfig fs/ext4/Kconfig fs/f2fs/Kconfig fs/fat/Kconfig fs/freevxfs/Kconfig -fs/fscache/Kconfig fs/fuse/Kconfig fs/gfs2/Kconfig fs/hfs/Kconfig @@ -156,6 +133,7 @@ fs/Kconfig fs/Kconfig.binfmt fs/kernfs/Kconfig fs/minix/Kconfig +fs/netfs/Kconfig fs/nfsd/Kconfig fs/nfs/Kconfig fs/nilfs2/Kconfig @@ -164,6 +142,7 @@ fs/notify/dnotify/Kconfig fs/notify/fanotify/Kconfig fs/notify/inotify/Kconfig fs/notify/Kconfig +fs/ntfs3/Kconfig fs/ntfs/Kconfig fs/ocfs2/Kconfig fs/omfs/Kconfig @@ -176,39 +155,59 @@ fs/qnx6/Kconfig fs/quota/Kconfig fs/reiserfs/Kconfig fs/romfs/Kconfig +fs/smb/client/Kconfig +fs/smb/Kconfig +fs/smb/server/Kconfig fs/squashfs/Kconfig fs/sysfs/Kconfig fs/sysv/Kconfig fs/ubifs/Kconfig fs/udf/Kconfig fs/ufs/Kconfig +fs/unicode/Kconfig +fs/vboxsf/Kconfig +fs/verity/Kconfig fs/xfs/Kconfig fs/yaffs2/Kconfig +fs/zonefs/Kconfig init/Kconfig +kernel/bpf/Kconfig +kernel/bpf/preload/Kconfig kernel/dma/Kconfig kernel/gcov/Kconfig kernel/irq/Kconfig kernel/Kconfig.freezer kernel/Kconfig.hz +kernel/Kconfig.kexec kernel/Kconfig.locks kernel/Kconfig.preempt kernel/livepatch/Kconfig +kernel/module/Kconfig kernel/power/Kconfig kernel/rcu/Kconfig kernel/rcu/Kconfig.debug kernel/time/Kconfig kernel/trace/Kconfig +kernel/trace/rv/Kconfig +lib/crypto/Kconfig lib/fonts/Kconfig lib/Kconfig lib/Kconfig.debug lib/Kconfig.kasan +lib/Kconfig.kcsan +lib/Kconfig.kfence lib/Kconfig.kgdb +lib/Kconfig.kmsan lib/Kconfig.ubsan +lib/kunit/Kconfig +lib/math/Kconfig +lib/vdso/Kconfig lib/xz/Kconfig net/6lowpan/Kconfig net/8021q/Kconfig net/802/Kconfig net/9p/Kconfig +net/appletalk/Kconfig net/atm/Kconfig net/ax25/Kconfig net/batman-adv/Kconfig @@ -217,17 +216,15 @@ net/bluetooth/cmtp/Kconfig net/bluetooth/hidp/Kconfig net/bluetooth/Kconfig net/bluetooth/rfcomm/Kconfig -net/bpfilter/Kconfig net/bridge/Kconfig net/bridge/netfilter/Kconfig net/caif/Kconfig +net/can/j1939/Kconfig net/can/Kconfig net/ceph/Kconfig net/dcb/Kconfig net/dccp/ccids/Kconfig net/dccp/Kconfig -net/decnet/Kconfig -net/decnet/netfilter/Kconfig net/dns_resolver/Kconfig net/dsa/Kconfig net/hsr/Kconfig @@ -241,13 +238,16 @@ net/ipv6/netfilter/Kconfig net/iucv/Kconfig net/kcm/Kconfig net/Kconfig +net/Kconfig.debug net/l2tp/Kconfig net/l3mdev/Kconfig net/lapb/Kconfig net/llc/Kconfig net/mac80211/Kconfig net/mac802154/Kconfig +net/mctp/Kconfig net/mpls/Kconfig +net/mptcp/Kconfig net/ncsi/Kconfig net/netfilter/ipset/Kconfig net/netfilter/ipvs/Kconfig @@ -276,19 +276,24 @@ net/tipc/Kconfig net/tls/Kconfig net/unix/Kconfig net/vmw_vsock/Kconfig -net/wimax/Kconfig net/wireless/Kconfig net/x25/Kconfig net/xdp/Kconfig net/xfrm/Kconfig samples/Kconfig +samples/rust/Kconfig security/apparmor/Kconfig security/integrity/evm/Kconfig security/integrity/ima/Kconfig security/integrity/Kconfig security/Kconfig +security/Kconfig.hardening security/keys/Kconfig +security/keys/trusted-keys/Kconfig +security/landlock/Kconfig security/loadpin/Kconfig +security/lockdown/Kconfig +security/safesetid/Kconfig security/selinux/Kconfig security/smack/Kconfig security/tomoyo/Kconfig diff --git a/ktypes/developer/developer.cfg b/ktypes/developer/developer.cfg index 2111490e..e541f76a 100644 --- a/ktypes/developer/developer.cfg +++ b/ktypes/developer/developer.cfg @@ -16,7 +16,6 @@ # General setup # CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_DEBUG_KERNEL=y # diff --git a/ktypes/preempt-rt/preempt-rt.cfg b/ktypes/preempt-rt/preempt-rt.cfg index fb4e4fcb..3c2f676e 100644 --- a/ktypes/preempt-rt/preempt-rt.cfg +++ b/ktypes/preempt-rt/preempt-rt.cfg @@ -21,7 +21,7 @@ # CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=n # # Resource Groups @@ -157,7 +157,7 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y # CONFIG_TIPC=m -# CONFIG_ATM is not set +CONFIG_ATM=n CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m @@ -291,7 +291,6 @@ CONFIG_NET_PKTGEN=m # Parallel IDE protocol modules # CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m # @@ -902,16 +901,16 @@ CONFIG_SOFT_WATCHDOG=m # # File systems # -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_FS_SECURITY is not set -# CONFIG_JFS_FS is not set +CONFIG_REISERFS_FS=n +CONFIG_REISERFS_CHECK=n +CONFIG_REISERFS_FS_SECURITY=n +CONFIG_JFS_FS=n CONFIG_FS_POSIX_ACL=y -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_OCFS2_FS=n +CONFIG_MINIX_FS=n CONFIG_ROMFS_FS=m -# CONFIG_QUOTA is not set -CONFIG_AUTOFS4_FS=y +CONFIG_QUOTA=n +CONFIG_AUTOFS_FS=y # # CD-ROM/DVD Filesystems @@ -942,8 +941,8 @@ CONFIG_CONFIGFS_FS=m # CONFIG_CIFS=m CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set +CONFIG_CODA_FS=n +CONFIG_AFS_FS=n # # Partition Types @@ -1071,7 +1070,7 @@ CONFIG_NLS_UTF8=m # Logging Options # CONFIG_SECURITY=y -# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_NETWORK=n # # Cryptographic options diff --git a/ktypes/preempt-rt/preempt-rt.scc b/ktypes/preempt-rt/preempt-rt.scc index 9c5901d9..7ff7c0a8 100644 --- a/ktypes/preempt-rt/preempt-rt.scc +++ b/ktypes/preempt-rt/preempt-rt.scc @@ -4,11 +4,13 @@ branch preempt-rt # feature block include features/blktrace/blktrace.scc -include arch/arm/arm.scc nopatch include features/hrt/hrt.scc include features/ftrace/ftrace.scc +include arch/arm/arm.scc nopatch +include features/tmpfs/tmpfs-posix-acl.scc include features/cgroups/cgroups.scc include features/net_sched/net_sched.scc +include features/kprobes/kprobes.scc include features/fuse/fuse.scc include features/serial/8250.scc diff --git a/ktypes/standard/0001-qemux86-add-configuration-symbol-to-select-values.patch b/ktypes/standard/0001-qemux86-add-configuration-symbol-to-select-values.patch new file mode 100644 index 00000000..084ce9d6 --- /dev/null +++ b/ktypes/standard/0001-qemux86-add-configuration-symbol-to-select-values.patch @@ -0,0 +1,35 @@ +From 1c56f2a0d1ded83c334aa7a0406551815a16c5a4 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 22 Feb 2021 09:53:04 -0500 +Subject: [PATCH] qemux86: add configuration symbol to select values + +On 5.10+ we are seeing some MSI interrupt assignment errors. In +our emulated 32bit platform, we are lacking this support. To avoid +the warnings, we define our own platform and select the MSI arch +fallback, which handles the missing support. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/x86/Kconfig | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index 3a5ecb1039bf..061f9f5f1933 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -483,6 +483,12 @@ config X86_CPU_RESCTRL + + Say N if unsure. + ++config QEMUX86 ++ bool "Enable for qemumx86 specific configurations" ++ default n ++ select PCI_MSI_ARCH_FALLBACKS if PCI_MSI ++ ++ + if X86_32 + config X86_BIGSMP + bool "Support for big SMP systems with more than 8 CPUs" +-- +2.19.1 + diff --git a/ktypes/standard/standard.cfg b/ktypes/standard/standard.cfg index 74f75f53..2cbeb759 100644 --- a/ktypes/standard/standard.cfg +++ b/ktypes/standard/standard.cfg @@ -21,7 +21,7 @@ # CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=n # # Resource Groups @@ -151,7 +151,7 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y # CONFIG_TIPC=m -# CONFIG_ATM is not set +CONFIG_ATM=n CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m @@ -285,7 +285,6 @@ CONFIG_NET_PKTGEN=m # Parallel IDE protocol modules # CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m # @@ -897,16 +896,16 @@ CONFIG_SOFT_WATCHDOG=m # # File systems # -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_FS_SECURITY is not set -# CONFIG_JFS_FS is not set +CONFIG_REISERFS_FS=n +CONFIG_REISERFS_CHECK=n +CONFIG_REISERFS_FS_SECURITY=n +CONFIG_JFS_FS=n CONFIG_FS_POSIX_ACL=y -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_OCFS2_FS=n +CONFIG_MINIX_FS=n CONFIG_ROMFS_FS=m -# CONFIG_QUOTA is not set -CONFIG_AUTOFS4_FS=y +CONFIG_QUOTA=n +CONFIG_AUTOFS_FS=y # # CD-ROM/DVD Filesystems @@ -915,7 +914,7 @@ CONFIG_AUTOFS4_FS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m +CONFIG_FAT_FS=y # # Pseudo filesystems @@ -936,8 +935,8 @@ CONFIG_CONFIGFS_FS=m CONFIG_CIFS=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set +CONFIG_CODA_FS=n +CONFIG_AFS_FS=n # # Partition Types @@ -1065,7 +1064,7 @@ CONFIG_NLS_UTF8=m # Logging Options # CONFIG_SECURITY=y -# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_NETWORK=n # # Cryptographic options @@ -1115,3 +1114,4 @@ CONFIG_LIBCRC32C=y CONFIG_ZLIB_DEFLATE=y CONFIG_SHMEM=y + diff --git a/ktypes/standard/standard.scc b/ktypes/standard/standard.scc index 751cc4ff..63a3fb1e 100644 --- a/ktypes/standard/standard.scc +++ b/ktypes/standard/standard.scc @@ -76,12 +76,13 @@ include features/vdso/vdso.scc include features/fuse/fuse.scc include features/serial/8250.scc -include features/uptime/uptime.scc include features/ktest/ktest.scc include features/perf/perf.scc include features/input/input.scc include features/edac/edac.scc +include features/clear_warn_once/clear_warn_once.scc + include features/bfq.scc include backports/backports.scc @@ -102,3 +103,10 @@ include cfg/systemd.scc include features/rfkill/rfkill.scc include features/bpf/bpf.scc +include features/landlock/landlock.scc + +include features/kfence/kfence.scc + +include cfg/crypto-obsolete-disable.scc + +patch 0001-qemux86-add-configuration-symbol-to-select-values.patch diff --git a/ktypes/tiny/tiny.cfg b/ktypes/tiny/tiny.cfg index 4a7b23df..3dfeaa1a 100644 --- a/ktypes/tiny/tiny.cfg +++ b/ktypes/tiny/tiny.cfg @@ -3,7 +3,6 @@ # RCU Subsystem # CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -11,9 +10,6 @@ CONFIG_SLUB=y CONFIG_BASE_SMALL=1 -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_PHYSICAL_ALIGN=0x1000000 - # -15% of bzImage size over gz CONFIG_KERNEL_LZMA=y @@ -31,3 +27,6 @@ CONFIG_BINFMT_SCRIPT=y # Support /proc/sys CONFIG_PROC_SYSCTL=y + +CONFIG_VT=y +CONFIG_POSIX_TIMERS=y diff --git a/ktypes/tiny/yocto.cfg b/ktypes/tiny/yocto.cfg index 2e51a7d7..e891070b 100644 --- a/ktypes/tiny/yocto.cfg +++ b/ktypes/tiny/yocto.cfg @@ -20,7 +20,6 @@ CONFIG_RT_MUTEXES=y # Basic logging facilities CONFIG_PRINTK=y -CONFIG_EARLY_PRINTK=y CONFIG_PRINTK_TIME=y # Provide a minimal dynamic device fs @@ -1 +1 @@ -v5.6-rc6 +v6.9-rc2 diff --git a/patches/boot/check-console-device-file-on-fs-when-booting.patch b/patches/boot/check-console-device-file-on-fs-when-booting.patch index 811db271..d1f3a339 100644 --- a/patches/boot/check-console-device-file-on-fs-when-booting.patch +++ b/patches/boot/check-console-device-file-on-fs-when-booting.patch @@ -1,4 +1,4 @@ -From 7788d947f61304e6c2273b5f252b2f4bb43408ce Mon Sep 17 00:00:00 2001 +From 2f9c3e4ee446d66e110973eb5bf9f4f00220f186 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Thu, 8 Apr 2010 23:44:21 -0700 Subject: [PATCH] check console device file on fs when booting @@ -8,45 +8,45 @@ the tell tale signs is /dev/console not being a character file. To save a whole class of questions, let's just test for the condition and let the user know. +vfs_lstat() which was used previously would fail with certain +configurations. This was likely due to the involved functions being +marked __init at some point in the past. + Signed-off-by: Richard Laroque <rlarocqu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +Signed-off-by: Sven Schwermer <sven.schwermer@disruptive-technologies.com> --- - init/main.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + init/main.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/init/main.c b/init/main.c -index 2cd736059416..ba93222f2999 100644 +index 649d9e4201a8..4e6af76ca199 100644 --- a/init/main.c +++ b/init/main.c -@@ -1157,6 +1157,18 @@ static int __ref kernel_init(void *unused) - - void console_on_rootfs(void) +@@ -1574,7 +1574,21 @@ static int __ref kernel_init(void *unused) + /* Open /dev/console, for stdin/stdout/stderr, this should never fail */ + void __init console_on_rootfs(void) { +- struct file *file = filp_open("/dev/console", O_RDWR, 0); ++ struct file *file; ++ +#ifndef CONFIG_BLK_DEV_INITRD -+ /* -+ * Use /dev/console to infer if the rootfs is setup properly. -+ * In case of initrd or initramfs /dev/console might be instantiated -+ * later by /init so don't do this check for CONFIG_BLK_DEV_INITRD -+ */ -+ if (vfs_lstat((char __user *) "/dev/console", (struct kstat __user *) &console_stat) -+ || !S_ISCHR(console_stat.mode)) { ++ /* ++ * Use /dev/console to infer if the rootfs is setup properly. ++ * In case of initrd or initramfs /dev/console might be instantiated ++ * later by /init so don't do this check for CONFIG_BLK_DEV_INITRD ++ */ ++ struct kstat stat; ++ if (init_stat("/dev/console", &stat, 0) || !S_ISCHR(stat.mode)) { + panic("/dev/console is missing or not a character device!\nPlease ensure your rootfs is properly configured\n"); + } +#endif + - /* Open the /dev/console as stdin, this should never fail */ - if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - pr_err("Warning: unable to open an initial console.\n"); -@@ -1168,6 +1180,9 @@ void console_on_rootfs(void) ++ file = filp_open("/dev/console", O_RDWR, 0); - static noinline void __init kernel_init_freeable(void) - { -+#ifndef CONFIG_BLK_DEV_INITRD -+ struct kstat console_stat; -+#endif - /* - * Wait until kthreadd is all set-up. - */ + if (IS_ERR(file)) { + pr_err("Warning: unable to open an initial console.\n"); -- 2.19.1 diff --git a/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch b/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch index 64809d68..286993ea 100644 --- a/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch +++ b/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch @@ -1,4 +1,4 @@ -From 02b8e9894174f57d64db04d3cf190415abc0ea43 Mon Sep 17 00:00:00 2001 +From ca14e0ea8ac29797e9eedfda5456b818a83626e8 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Thu, 26 Nov 2009 07:32:09 -0800 Subject: [PATCH] mount_root: clarify error messages for when no rootfs found @@ -20,33 +20,36 @@ any background that it is an end user configuration issue. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> +--- + init/do_mounts.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c -index dea5de95c2dd..8b35204910be 100644 +index 5fdef94f0864..73d5b89d0c24 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -418,7 +418,9 @@ retry: - printk("DEBUG_BLOCK_EXT_DEVT is enabled, you need to specify " - "explicit textual name for \"root=\" boot option.\n"); - #endif +@@ -231,7 +231,9 @@ void __init mount_root_generic(char *name, char *pretty_name, int flags) + pr_err("\n"); + } + - panic("VFS: Unable to mount root fs on %s", b); + printk(KERN_EMERG "VFS: Unable to mount root fs on %s\n", b); + printk(KERN_EMERG "User configuration error - no valid root filesystem found\n"); + panic("Invalid configuration from end user prevents continuing"); } - if (!(flags & MS_RDONLY)) { - flags |= MS_RDONLY; -@@ -434,7 +436,9 @@ retry: - #ifdef CONFIG_BLOCK - __bdevname(ROOT_DEV, b); - #endif -- panic("VFS: Unable to mount root fs on %s", b); -+ printk(KERN_EMERG "VFS: Unable to mount root fs on %s\n", b); + if (!(flags & SB_RDONLY)) { + flags |= SB_RDONLY; +@@ -244,7 +246,9 @@ void __init mount_root_generic(char *name, char *pretty_name, int flags) + for (i = 0, p = fs_names; i < num_fs; i++, p += strlen(p)+1) + printk(" %s", p); + printk("\n"); +- panic("VFS: Unable to mount root fs on \"%s\" or %s", pretty_name, b); ++ printk(KERN_EMERG "VFS: Unable to mount root fs on \"%s\" or %s\n", pretty_name, b); + printk(KERN_EMERG "User configuration error - no valid root filesystem found\n"); + panic("Invalid configuration from end user prevents continuing"); out: put_page(page); } -- -2.10.1 +2.34.1 diff --git a/patches/build/build.scc b/patches/build/build.scc index 181da38c..367c0cc2 100644 --- a/patches/build/build.scc +++ b/patches/build/build.scc @@ -8,3 +8,7 @@ patch kbuild-exclude-meta-directory-from-distclean-processi.patch patch modpost-mask-trivial-warnings.patch patch menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch + +# solved in 6.x by removing the need for ASM_GOTO as an arch dependency +#patch init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch +patch mconf-fix-output-of-cflags-and-libraries.patch diff --git a/patches/build/init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch b/patches/build/init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch new file mode 100644 index 00000000..13bfce6d --- /dev/null +++ b/patches/build/init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch @@ -0,0 +1,103 @@ +From e0e977e1b098d96389f2ab657849456ded9189c9 Mon Sep 17 00:00:00 2001 +From: Alexandre Belloni <alexandre.belloni@bootlin.com> +Date: Thu, 4 Aug 2022 21:03:20 +0200 +Subject: [PATCH] init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using dash as /bin/sh, the CC_HAS_ASM_GOTO_TIED_OUTPUT test fails +with a syntax error which is not the one we are looking for: + +<stdin>: In function ‘foo’: +<stdin>:1:29: warning: missing terminating " character +<stdin>:1:29: error: missing terminating " character +<stdin>:2:5: error: expected ‘:’ before ‘+’ token +<stdin>:2:7: warning: missing terminating " character +<stdin>:2:7: error: missing terminating " character +<stdin>:2:5: error: expected declaration or statement at end of input + +Move all the CC_HAS_ASM_GOTO tests to scripts/gcc-goto.sh to solve the +escaping issues. + +Fixes: 1aa0e8b144b6 ("Kconfig: Add option for asm goto w/ tied outputs to workaround clang-13 bug") +Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + init/Kconfig | 6 +++--- + scripts/gcc-goto.sh | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 3 deletions(-) + +diff --git a/init/Kconfig b/init/Kconfig +index c7900e8975f1..80b252ba58b0 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -71,16 +71,16 @@ config CC_CAN_LINK_STATIC + default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(USERCFLAGS) $(USERLDFLAGS) $(m32-flag) -static) + + config CC_HAS_ASM_GOTO +- def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC)) ++ def_bool $(success,$(srctree)/scripts/gcc-goto.sh goto $(CC)) + + config CC_HAS_ASM_GOTO_OUTPUT + depends on CC_HAS_ASM_GOTO +- def_bool $(success,echo 'int foo(int x) { asm goto ("": "=r"(x) ::: bar); return x; bar: return 0; }' | $(CC) -x c - -c -o /dev/null) ++ def_bool $(success,$(srctree)/scripts/gcc-goto.sh goto_output $(CC)) + + config CC_HAS_ASM_GOTO_TIED_OUTPUT + depends on CC_HAS_ASM_GOTO_OUTPUT + # Detect buggy gcc and clang, fixed in gcc-11 clang-14. +- def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) ++ def_bool $(success,$(srctree)/scripts/gcc-goto.sh goto_tied_output $(CC)) + + config TOOLS_SUPPORT_RELR + def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh) +diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +index 8b980fb2270a..aa9498b74df8 100755 +--- a/scripts/gcc-goto.sh ++++ b/scripts/gcc-goto.sh +@@ -3,6 +3,11 @@ + # Test for gcc 'asm goto' support + # Copyright (C) 2010, Jason Baron <jbaron@redhat.com> + ++TEST=$1 ++shift ++ ++case $TEST in ++ "goto") + cat << "END" | $@ -x c - -fno-PIE -c -o /dev/null + int main(void) + { +@@ -20,3 +25,29 @@ entry: + return 0; + } + END ++ ;; ++ ++ "goto_output") ++cat << "END" | $@ -x c - -c -o /dev/null ++int foo(int x) { ++ asm goto ("": "=r"(x) ::: bar); ++ return x; ++ bar: return 0; ++} ++END ++ ;; ++ ++ "goto_tied_output") ++cat << "END" | $@ -x c - -c -o /dev/null ++int foo(int *x) { ++ asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); ++ return *x; ++ bar: return 0; ++} ++END ++ ;; ++ ++ *) ++ exit -1 ++ ;; ++esac +-- +2.19.1 + diff --git a/patches/build/mconf-fix-output-of-cflags-and-libraries.patch b/patches/build/mconf-fix-output-of-cflags-and-libraries.patch new file mode 100644 index 00000000..565f51dd --- /dev/null +++ b/patches/build/mconf-fix-output-of-cflags-and-libraries.patch @@ -0,0 +1,38 @@ +From dee78ad1963cff9c063fba486d43fc9670285883 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 17 Jul 2023 17:17:55 -0400 +Subject: [PATCH] mconf: fix output of cflags and libraries + +commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce +process forks] changes the way that flags are detected. They are +no longer just echo'd and captured, they are written to a file and +later read. + +We adjust our CROSS ncurses patch accordingly. + +We'll eventually be able to drop this patch, but not quite yet. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + scripts/kconfig/mconf-cfg.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh +index 38cf8304bb31..a5ae56e08b07 100755 +--- a/scripts/kconfig/mconf-cfg.sh ++++ b/scripts/kconfig/mconf-cfg.sh +@@ -8,9 +8,9 @@ PKG="ncursesw" + PKG2="ncurses" + + if [ "$CROSS_CURSES_LIB" != "" ]; then +- echo libs=\'$CROSS_CURSES_LIB\' ++ echo $CROSS_CURSES_LIB > ${libs} + if [ x"$CROSS_CURSES_INC" != x ]; then +- echo cflags=\'$CROSS_CURSES_INC\' ++ echo $CROSS_CURSES_INC > ${cflags} + fi + exit 0 + fi +-- +2.34.1 + diff --git a/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch index dde1554d..9a301b63 100644 --- a/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ b/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch @@ -1,4 +1,4 @@ -From b50cad575d2b9d3f8fc0b01e83a5c7fd3cddb684 Mon Sep 17 00:00:00 2001 +From 660178adc3529a6cb06bd0bfdfd22c5cb24cee5c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Mon, 2 Jul 2018 23:10:28 -0400 Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location @@ -26,9 +26,7 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> mode change 100755 => 100644 scripts/kconfig/mconf-cfg.sh diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh -old mode 100755 -new mode 100644 -index c812872d7f9d..65a9b9e5b8a6 +index 025b565e0b7c..a3c59b360ca3 --- a/scripts/kconfig/mconf-cfg.sh +++ b/scripts/kconfig/mconf-cfg.sh @@ -4,6 +4,14 @@ @@ -43,9 +41,9 @@ index c812872d7f9d..65a9b9e5b8a6 + exit 0 +fi + - if [ -n "$(command -v pkg-config)" ]; then - if pkg-config --exists $PKG; then - echo cflags=\"$(pkg-config --cflags $PKG)\" + if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then + if ${HOSTPKG_CONFIG} --exists $PKG; then + echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" -- -2.5.0 +2.19.1 diff --git a/patches/build/modpost-mask-trivial-warnings.patch b/patches/build/modpost-mask-trivial-warnings.patch index e7c86823..1b202f5d 100644 --- a/patches/build/modpost-mask-trivial-warnings.patch +++ b/patches/build/modpost-mask-trivial-warnings.patch @@ -1,4 +1,4 @@ -From 1de72de61de403c164a6e0cf8e2b2fbe7379518b Mon Sep 17 00:00:00 2001 +From 14ad0a1925fad537a485227a5d89eb4329975e97 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Sun, 25 Jan 2009 17:58:09 -0500 Subject: [PATCH] modpost: mask trivial warnings @@ -11,14 +11,14 @@ once the kernel build kicks off. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- - scripts/mod/modpost.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + scripts/mod/modpost.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 6e892c93d104..80e998155459 100644 +index 620dc8c4c814..618c4a9e83ed 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -2010,7 +2010,7 @@ static void read_symbols(const char *modname) +@@ -1964,7 +1964,7 @@ static void read_symbols(const char *modname) char *license; char *namespace; struct module *mod; @@ -27,24 +27,15 @@ index 6e892c93d104..80e998155459 100644 Elf_Sym *sym; if (!parse_elf(&info, modname)) -@@ -2502,7 +2502,7 @@ static int dump_sym(struct symbol *sym) +@@ -2455,7 +2455,7 @@ static void read_dump(const char *fname) static void write_dump(const char *fname) { - struct buffer buf = { }; + struct buffer buf = { NULL, 0, 0 }; - struct symbol *symbol; - const char *namespace; - int n; -@@ -2556,7 +2556,7 @@ struct ext_sym_list { - int main(int argc, char **argv) - { struct module *mod; -- struct buffer buf = { }; -+ struct buffer buf = { NULL, 0, 0 }; - char *kernel_read = NULL; - char *missing_namespace_deps = NULL; - char *dump_write = NULL, *files_source = NULL; + struct symbol *sym; + -- 2.19.1 diff --git a/patches/drivers/drivers.scc b/patches/drivers/drivers.scc index 548d2d44..4d7a225e 100644 --- a/patches/drivers/drivers.scc +++ b/patches/drivers/drivers.scc @@ -1 +1,2 @@ # SPDX-License-Identifier: MIT +patch mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch diff --git a/patches/drivers/mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch b/patches/drivers/mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch new file mode 100644 index 00000000..6d36effb --- /dev/null +++ b/patches/drivers/mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch @@ -0,0 +1,89 @@ +From 30350f237490eb52050647b2a75f6f4e91b2e44d Mon Sep 17 00:00:00 2001 +From: LiweiSong <liwei.song@windriver.com> +Date: Wed, 31 May 2023 17:31:35 +0800 +Subject: [PATCH] mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, + release} to avoid race condition + +without lock mtd_table_mutex in blktrans_{open, release}, there will +be a race condition when access devices /dev/mtd1 and /dev/mtdblock1 +at the same time with a high frequency open and close test: + +kernel BUG at drivers/mtd/mtdcore.c:1221! +Internal error: Oops - BUG: 0 1 PREEMPT_RT SMP +CPU: 0 PID: 15349 Comm: mtd-test Not tainted 5.15.52-rt41-yocto-preempt-rt #1 +Hardware name: SoCFPGA Stratix 10 SoCDK (DT) +pstate: 60000005put_mtd_device+0x4c/0x84 +lr : blktrans_release+0xb0/0x120 +Call trace: +__put_mtd_device+0x4c/0x84 +blktrans_release+0xb0/0x120 +blkdev_put+0xd4/0x210 +blkdev_close+0x34/0x50 +__fput+0x8c/0x240 +____fput+0x1c/0x30 +task_work_run+0x98/00t_64_sync_handler+0xa4/0x130 +el0t_64_sync+0x1a0/0x1a4 + +since the original purpose of commit 799ae31c58ae ("mtd_blkdevs: +don't hold del_mtd_blktrans_dev in blktrans_{open, release}") is +to fix a DEADLOCK issue, here convert mutex_lock to mutex_trylock +and return immediately if failed acquire mtd_table_mutex, then +both race condition and DEADLOCK can be avoided. + +Fixes: 799ae31c58ae ("mtd_blkdevs: don't hold del_mtd_blktrans_dev in blktrans_{open, release}") +Signed-off-by: Liwei Song <liwei.song@windriver.com> +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/mtd/mtd_blkdevs.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c +index 60b222799871..31967ff4b826 100644 +--- a/drivers/mtd/mtd_blkdevs.c ++++ b/drivers/mtd/mtd_blkdevs.c +@@ -189,6 +189,8 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) + + kref_get(&dev->ref); + ++ if (!mutex_trylock(&mtd_table_mutex)) ++ return ret; + mutex_lock(&dev->lock); + + if (dev->open) +@@ -213,6 +215,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) + unlock: + dev->open++; + mutex_unlock(&dev->lock); ++ mutex_unlock(&mtd_table_mutex); + return ret; + + error_release: +@@ -221,6 +224,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) + error_put: + module_put(dev->tr->owner); + mutex_unlock(&dev->lock); ++ mutex_unlock(&mtd_table_mutex); + blktrans_dev_put(dev); + return ret; + } +@@ -229,6 +233,8 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) + { + struct mtd_blktrans_dev *dev = disk->private_data; + ++ if (!mutex_trylock(&mtd_table_mutex)) ++ return; + mutex_lock(&dev->lock); + + if (--dev->open) +@@ -243,6 +249,7 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) + } + unlock: + mutex_unlock(&dev->lock); ++ mutex_unlock(&mtd_table_mutex); + blktrans_dev_put(dev); + } + +-- +2.34.1 + diff --git a/patches/misc/arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch b/patches/misc/arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch new file mode 100644 index 00000000..e310275c --- /dev/null +++ b/patches/misc/arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch @@ -0,0 +1,43 @@ +From 7fcb1380d3fa751a1559a2632a23ebf23f404077 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Fri, 21 Aug 2020 00:52:50 +0800 +Subject: [PATCH] arm64/perf: Fix wrong cast that may cause wrong truncation + +tail is a pointer while buftail.fp is a u32. + +arch/arm64/kernel/perf_callchain.c:100:6: warning: cast from pointer to +integer of different size [-Wpointer-to-int-cast] + 100 | if ((u32)tail + 4 >= buftail.fp) + | ^ +arch/arm64/kernel/perf_callchain.c:103:9: warning: cast to pointer from +integer of different size [-Wint-to-pointer-cast]{noformat} + 103 | return (struct compat_frame_tail __user *)(buftail.fp - 4); + | ^ + +Fixes: 8818670c17d2 ("arm64/perf: fix backtrace for AAPCS with FP enabled") +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/kernel/perf_callchain.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c +index 1be96e3631ea..a4b0864c4e32 100644 +--- a/arch/arm64/kernel/perf_callchain.c ++++ b/arch/arm64/kernel/perf_callchain.c +@@ -97,10 +97,10 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, + * Frame pointers should strictly progress back up the stack + * (towards higher addresses). + */ +- if ((u32)tail + 4 >= buftail.fp) ++ if ((u64)tail + 4 >= (u64)buftail.fp) + return NULL; + +- return (struct compat_frame_tail __user *)(buftail.fp - 4); ++ return (struct compat_frame_tail __user *)((u64)buftail.fp - 4); + } + #endif /* CONFIG_COMPAT */ + +-- +2.19.1 + diff --git a/patches/misc/arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch b/patches/misc/arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch new file mode 100644 index 00000000..4c1e78cf --- /dev/null +++ b/patches/misc/arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch @@ -0,0 +1,93 @@ +From cbbce37ccc6041d3ae3d3cb3b1918a61a39820a0 Mon Sep 17 00:00:00 2001 +From: Fang Jia <fang.jia@windriver.com> +Date: Fri, 28 Dec 2018 16:28:34 +0800 +Subject: [PATCH] arm64/perf: fix backtrace for AAPCS with FP enabled + +This change is for arm64 platform compat mode. +The change for arm32 platform has been included in this commit "perf: fix +backtrace for AAPCS with FP enabled". + +This change replaces code designed for the obsolete ARM APCS ABI, which +causes failures of the perf backtrace logic unless the gcc option +-mapcs-frame is used to build all binaries on the platform. This +obsolete gcc option forces the compiler to include the stack pointer +along with the frame pointer and link register in the stack frame +for each funciton call. The current AAPCS ABI document, doesn't +explicitly describe the frame structure when the gcc frame pointer +option, -fno-omit-frame-pointer, is enabled. However, with this option +enabled, examination of the emitted prologue instructions shows that +1) R11 is used as the frame pointer, +2) only the R11 and LR are saved onto the stack, not the stack pointer, +3) after this prologue setup, the frame pointer, R11 points to the +saved location of LR on the stack. + +The use of unsigned int arithmetic in the commit is required since +the gcc emitted pointer arithmetic uses 8-byte pointer sizes, which are +incorrect addresses for the 4-byte stack address size. + +Signed-off-by: Fang Jia <fang.jia@windriver.com> +Reviewed-by: Jiwei Sun <jiwei.sun@windriver.com> +Signed-off-by: De Huo <de.huo@windriver.com> +--- + arch/arm64/kernel/perf_callchain.c | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c +index 9d63514b9836..b9bbe0b04fc1 100644 +--- a/arch/arm64/kernel/perf_callchain.c ++++ b/arch/arm64/kernel/perf_callchain.c +@@ -54,16 +54,22 @@ user_backtrace(struct frame_tail __user *tail, + + #ifdef CONFIG_COMPAT + /* +- * The registers we're interested in are at the end of the variable +- * length saved register structure. The fp points at the end of this +- * structure so the address of this struct is: +- * (struct compat_frame_tail *)(xxx->fp)-1 ++ * The AAPCS ABI, the most current replacing the obsolete APCS ABI, ++ * does not specifically describe the stack frame with respect to the ++ * frame pointer. However, the examination of emitted prologue ++ * instructions for ARM implies that with -fno-omit-framepointer, ++ * register R11 is used as the frame pointer register and saved on the ++ * stack, with LR. + * +- * This code has been adapted from the ARM OProfile support. ++ * After the prolog, the FP points to the location of the saved LR and ++ * FP+4 points to the previous frames FP as shown below: ++ * Stack Hi Mem ++ * (Value of FP)+4 Saved FP for caller ++ * (Value of FP) LR set by caller ++ * Stack Lo Mem + */ + struct compat_frame_tail { + compat_uptr_t fp; /* a (struct compat_frame_tail *) in compat mode */ +- u32 sp; + u32 lr; + } __attribute__((packed)); + +@@ -91,11 +97,10 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, + * Frame pointers should strictly progress back up the stack + * (towards higher addresses). + */ +- if (tail + 1 >= (struct compat_frame_tail __user *) +- compat_ptr(buftail.fp)) ++ if ((u32)tail + 4 >= buftail.fp) + return NULL; + +- return (struct compat_frame_tail __user *)compat_ptr(buftail.fp) - 1; ++ return (struct compat_frame_tail __user *)(buftail.fp - 4); + } + #endif /* CONFIG_COMPAT */ + +@@ -123,7 +128,7 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry, + /* AARCH32 compat mode */ + struct compat_frame_tail __user *tail; + +- tail = (struct compat_frame_tail __user *)regs->compat_fp - 1; ++ tail = (struct compat_frame_tail __user *)(regs->compat_fp - 4); + + while ((entry->nr < entry->max_stack) && + tail && !((unsigned long)tail & 0x3)) +-- +2.17.1 + diff --git a/patches/misc/defconfigs-drop-obselete-options.patch b/patches/misc/defconfigs-drop-obselete-options.patch new file mode 100644 index 00000000..9005ff6f --- /dev/null +++ b/patches/misc/defconfigs-drop-obselete-options.patch @@ -0,0 +1,137 @@ +From 681badc58988e7d15aaf4b4b239b352b1601c3c2 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 10 Aug 2020 22:40:22 -0400 +Subject: [PATCH] defconfigs: drop obselete options + +Remove the following options from the various defconfigs, since +they are no longer valid, and will be reported as such by the +tools: + + CONFIG_TYPEC_HD3SS3220 + CONFIG_MFD_CROS_EC_CHARDEV + CONFIG_MTD_M25P80 + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm/configs/axm55xx_defconfig | 1 - + arch/arm/configs/davinci_all_defconfig | 1 - + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/mvebu_v5_defconfig | 1 - + arch/arm/configs/mxs_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 1 - + 9 files changed, 9 deletions(-) + +diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig +index 46075216ee6d..c731d4ade857 100644 +--- a/arch/arm/configs/axm55xx_defconfig ++++ b/arch/arm/configs/axm55xx_defconfig +@@ -88,7 +88,6 @@ CONFIG_MTD_CFI_AMDSTD=y + CONFIG_MTD_CFI_STAA=y + CONFIG_MTD_PHYSMAP=y + CONFIG_MTD_PHYSMAP_OF=y +-CONFIG_MTD_M25P80=y + CONFIG_PROC_DEVICETREE=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_BLK_DEV_RAM=y +diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig +index e849367c0566..4d8f6f647dc6 100644 +--- a/arch/arm/configs/davinci_all_defconfig ++++ b/arch/arm/configs/davinci_all_defconfig +@@ -75,7 +75,6 @@ CONFIG_MTD_CFI=m + CONFIG_MTD_CFI_INTELEXT=m + CONFIG_MTD_CFI_AMDSTD=m + CONFIG_MTD_PHYSMAP=m +-CONFIG_MTD_M25P80=m + CONFIG_MTD_RAW_NAND=m + CONFIG_MTD_NAND_DAVINCI=m + CONFIG_MTD_SPI_NOR=m +diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig +index 33074fdab2ea..7a548296ea8c 100644 +--- a/arch/arm/configs/dove_defconfig ++++ b/arch/arm/configs/dove_defconfig +@@ -44,7 +44,6 @@ CONFIG_MTD_CFI_GEOMETRY=y + CONFIG_MTD_CFI_INTELEXT=y + CONFIG_MTD_CFI_STAA=y + CONFIG_MTD_PHYSMAP=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_SPI_NOR=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_BLK_DEV_RAM=y +diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig +index 33c917df7b32..081cd5fa2358 100644 +--- a/arch/arm/configs/keystone_defconfig ++++ b/arch/arm/configs/keystone_defconfig +@@ -120,7 +120,6 @@ CONFIG_MTD=y + CONFIG_MTD_CMDLINE_PARTS=y + CONFIG_MTD_BLOCK=y + CONFIG_MTD_PLATRAM=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_DAVINCI=y + CONFIG_MTD_SPI_NOR=y +diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig +index d57ff30dabff..3feef3fbc918 100644 +--- a/arch/arm/configs/mvebu_v5_defconfig ++++ b/arch/arm/configs/mvebu_v5_defconfig +@@ -74,7 +74,6 @@ CONFIG_MTD_CFI_GEOMETRY=y + CONFIG_MTD_CFI_INTELEXT=y + CONFIG_MTD_CFI_STAA=y + CONFIG_MTD_PHYSMAP=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_ORION=y + CONFIG_MTD_SPI_NOR=y +diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig +index ca32446b187f..bd87306385ad 100644 +--- a/arch/arm/configs/mxs_defconfig ++++ b/arch/arm/configs/mxs_defconfig +@@ -46,7 +46,6 @@ CONFIG_MTD=y + CONFIG_MTD_CMDLINE_PARTS=y + CONFIG_MTD_BLOCK=y + CONFIG_MTD_DATAFLASH=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_SST25L=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_GPMI_NAND=y +diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig +index 58f4834289e6..87bbad9b3055 100644 +--- a/arch/arm/configs/pxa_defconfig ++++ b/arch/arm/configs/pxa_defconfig +@@ -178,7 +178,6 @@ CONFIG_MTD_RAM=m + CONFIG_MTD_ROM=m + CONFIG_MTD_COMPLEX_MAPPINGS=y + CONFIG_MTD_PXA2XX=m +-CONFIG_MTD_M25P80=m + CONFIG_MTD_BLOCK2MTD=y + CONFIG_MTD_DOCG3=m + CONFIG_MTD_RAW_NAND=m +diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig +index 0daa9c0d298e..f03cf1f465fb 100644 +--- a/arch/arm/configs/qcom_defconfig ++++ b/arch/arm/configs/qcom_defconfig +@@ -61,7 +61,6 @@ CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y + CONFIG_MTD=y + CONFIG_MTD_BLOCK=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_QCOM=y + CONFIG_MTD_SPI_NOR=y +diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig +index 2d9404ea52c6..f7ae6f5867ed 100644 +--- a/arch/arm/configs/socfpga_defconfig ++++ b/arch/arm/configs/socfpga_defconfig +@@ -47,7 +47,6 @@ CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y + CONFIG_MTD=y + CONFIG_MTD_BLOCK=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_DENALI_DT=y + CONFIG_MTD_SPI_NOR=y +-- +2.19.1 + diff --git a/patches/misc/iwlwifi-select-MAC80211_LEDS-conditionally.patch b/patches/misc/iwlwifi-select-MAC80211_LEDS-conditionally.patch new file mode 100644 index 00000000..2db53044 --- /dev/null +++ b/patches/misc/iwlwifi-select-MAC80211_LEDS-conditionally.patch @@ -0,0 +1,36 @@ +From 4e50d844ef9f358236e3c711b5a669ca721623e8 Mon Sep 17 00:00:00 2001 +From: Liwei Song <liwei.song@windriver.com> +Date: Mon, 28 Jun 2021 17:04:40 +0800 +Subject: [PATCH] iwlwifi: select MAC80211_LEDS conditionally + +MAC80211_LEDS depends on LEDS_CLASS=y or LEDS_CLASS=MAC80211, +add condition to enable it in iwlwifi/Kconfig to avoid below +compile warning when LEDS_CLASS was set to m: + +WARNING: unmet direct dependencies detected for MAC80211_LEDS + Depends on [n]: NET [=y] && WIRELESS [=y] && MAC80211 [=y] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=MAC80211 [=y]) + Selected by [m]: + - IWLWIFI_LEDS [=y] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_INTEL [=y] && IWLWIFI [=m] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=IWLWIFI [=m]) && (IWLMVM [=m] || IWLDVM [=m]) + +Signed-off-by: Liwei Song <liwei.song@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/net/wireless/intel/iwlwifi/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig +index 1085afbefba8..0e1de69c259f 100644 +--- a/drivers/net/wireless/intel/iwlwifi/Kconfig ++++ b/drivers/net/wireless/intel/iwlwifi/Kconfig +@@ -50,7 +50,7 @@ config IWLWIFI_LEDS + depends on LEDS_CLASS=y || LEDS_CLASS=IWLWIFI + depends on IWLMVM || IWLDVM + select LEDS_TRIGGERS +- select MAC80211_LEDS ++ select MAC80211_LEDS if (LEDS_CLASS=y || LEDS_CLASS=MAC80211) + default y + + config IWLDVM +-- +2.19.1 + diff --git a/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch b/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch new file mode 100644 index 00000000..da04c927 --- /dev/null +++ b/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch @@ -0,0 +1,43 @@ +From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Sun, 10 Jul 2022 22:56:53 -0400 +Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues + +The script build_OID_registry captures the full path of itself +in the generated data. This causes reproduciblity issues as the +path is captured and packaged. + +We use the basename of the script instead, and that allows us +to be reprodicible, with slightly less information captured in +the output data (but the generating script can still easily +be found). + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + lib/build_OID_registry | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/build_OID_registry b/lib/build_OID_registry +index d7fc32ea8ac2..f6de0a7f7457 100755 +--- a/lib/build_OID_registry ++++ b/lib/build_OID_registry +@@ -8,6 +8,7 @@ + # + + use strict; ++use File::Basename; + + my @names = (); + my @oids = (); +@@ -35,7 +36,7 @@ close IN_FILE || die; + # + open C_FILE, ">$ARGV[1]" or die; + print C_FILE "/*\n"; +-print C_FILE " * Automatically generated by ", $0, ". Do not edit\n"; ++print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n"; + print C_FILE " */\n"; + + # +-- +2.19.1 + diff --git a/patches/misc/linux-yocto-Handle-bin-awk-issues.patch b/patches/misc/linux-yocto-Handle-bin-awk-issues.patch index 88739fb8..6c524699 100644 --- a/patches/misc/linux-yocto-Handle-bin-awk-issues.patch +++ b/patches/misc/linux-yocto-Handle-bin-awk-issues.patch @@ -1,4 +1,4 @@ -From 8bbf2b4e5a9d91bf465b4a370591abec1ba397bb Mon Sep 17 00:00:00 2001 +From 3e7a2ca72d99a2277ac42c578bd8f55ef9ef9141 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue, 22 Aug 2017 09:50:50 +0100 Subject: [PATCH] linux-yocto: Handle /bin/awk issues @@ -11,14 +11,12 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- - arch/arm/tools/gen-mach-types | 2 +- - arch/sh/tools/gen-mach-types | 2 +- - arch/x86/tools/gen-insn-attr-x86.awk | 2 +- - tools/arch/x86/tools/gen-insn-attr-x86.awk | 2 +- - tools/perf/arch/x86/tests/gen-insn-x86-dat.awk | 2 +- - .../selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk | 0 - 6 files changed, 5 insertions(+), 5 deletions(-) - mode change 100755 => 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk + arch/arm/tools/gen-mach-types | 2 +- + arch/sh/tools/gen-mach-types | 2 +- + arch/x86/tools/gen-insn-attr-x86.awk | 2 +- + tools/arch/x86/tools/gen-insn-attr-x86.awk | 2 +- + tools/perf/arch/x86/tests/gen-insn-x86-dat.awk | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types index cbe1c33bb871..cb2b69f2a39d 100644 @@ -41,7 +39,7 @@ index 6d7c2d8eaf55..2a4a42a6d70c 100644 # # Awk script to generate include/generated/machtypes.h diff --git a/arch/x86/tools/gen-insn-attr-x86.awk b/arch/x86/tools/gen-insn-attr-x86.awk -index a42015b305f4..1c2832e9f77d 100644 +index af38469afd14..21a7a5db887e 100644 --- a/arch/x86/tools/gen-insn-attr-x86.awk +++ b/arch/x86/tools/gen-insn-attr-x86.awk @@ -1,4 +1,4 @@ @@ -51,7 +49,7 @@ index a42015b305f4..1c2832e9f77d 100644 # gen-insn-attr-x86.awk: Instruction attribute table generator # Written by Masami Hiramatsu <mhiramat@redhat.com> diff --git a/tools/arch/x86/tools/gen-insn-attr-x86.awk b/tools/arch/x86/tools/gen-insn-attr-x86.awk -index a42015b305f4..1c2832e9f77d 100644 +index af38469afd14..21a7a5db887e 100644 --- a/tools/arch/x86/tools/gen-insn-attr-x86.awk +++ b/tools/arch/x86/tools/gen-insn-attr-x86.awk @@ -1,4 +1,4 @@ @@ -70,9 +68,6 @@ index 1a29f6379bde..6285ff7158a5 100644 # SPDX-License-Identifier: GPL-2.0-only # gen-insn-x86-dat.awk: script to convert data for the insn-x86 test # Copyright (c) 2015, Intel Corporation. -diff --git a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk -old mode 100755 -new mode 100644 -- -2.19.1 +2.34.1 diff --git a/patches/misc/misc.scc b/patches/misc/misc.scc index dc091c36..904f41c0 100644 --- a/patches/misc/misc.scc +++ b/patches/misc/misc.scc @@ -6,5 +6,12 @@ patch compiler.h-Undef-before-redefining-__attribute_const.patch patch uvesafb-print-error-message-when-task-timeout-occurs.patch patch uvesafb-provide-option-to-specify-timeout-for-task-c.patch patch linux-yocto-Handle-bin-awk-issues.patch -patch modpost-srcversion-sometimes-incorrect.patch -patch x86-boot-compressed-64-Define-__force_order-only-whe.patch +patch arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch +patch defconfigs-drop-obselete-options.patch +patch arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch +patch net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch +patch iwlwifi-select-MAC80211_LEDS-conditionally.patch +patch vt-conmakehash-improve-reproducibility.patch +patch lib-build_OID_registry-fix-reproducibility-issues.patch +patch tools-use-basename-to-identify-file-in-gen-mach-type.patch +patch pnmtologo-use-relocatable-file-name.patch diff --git a/patches/misc/modpost-srcversion-sometimes-incorrect.patch b/patches/misc/modpost-srcversion-sometimes-incorrect.patch deleted file mode 100644 index ab8d1b7c..00000000 --- a/patches/misc/modpost-srcversion-sometimes-incorrect.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 74f6cd2b6976e37491779fcb1bc4966d3a61492c Mon Sep 17 00:00:00 2001 -From: Juro Bystricky <juro.bystricky@intel.com> -Date: Fri, 30 Mar 2018 10:14:05 -0700 -Subject: [PATCH] modpost: srcversion sometimes incorrect - -"srcversion" field inserted into module modinfo section contains a -sum of the source files which made it. However, this field can -be incorrect. Building the same module can end up having inconsistent -srcversion field eventhough the sources remain the same. -This can be reproduced by building modules in a deeply nested directory, -but other factors contribute as well. - -The reason for incorrect srcversion is that some source files can be -simply silently skipped from the checksum calculation due to limited -buffer space for line parsing. - -This patch addresses two issues: - -1. Allocates a larger line buffer (32k vs 4k). -2. Issues a warning if a line length exceeds the line buffer. - -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - scripts/mod/modpost.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index b9bd26f3e6c9..7d2f1d659a43 100644 ---- a/scripts/mod/modpost.c -+++ b/scripts/mod/modpost.c -@@ -385,9 +385,10 @@ void *grab_file(const char *filename, unsigned long *size) - * spaces in the beginning of the line is trimmed away. - * Return a pointer to a static buffer. - **/ -+#define MODPOST_MAX_LINE 32768 - char *get_next_line(unsigned long *pos, void *file, unsigned long size) - { -- static char line[4096]; -+ static char line[MODPOST_MAX_LINE]; - int skip = 1; - size_t len = 0; - signed char *p = (signed char *)file + *pos; -@@ -402,8 +403,11 @@ char *get_next_line(unsigned long *pos, void *file, unsigned long size) - if (*p != '\n' && (*pos < size)) { - len++; - *s++ = *p++; -- if (len > 4095) -+ if (len > (sizeof(line)-1)) { -+ warn(" %s: line exceeds buffer size %zu bytes\n" -+ , __func__, sizeof(line)); - break; /* Too long, stop */ -+ } - } else { - /* End of string */ - *s = '\0'; --- -2.5.0 - diff --git a/patches/misc/net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch b/patches/misc/net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch new file mode 100644 index 00000000..263c6190 --- /dev/null +++ b/patches/misc/net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch @@ -0,0 +1,45 @@ +From 56fd8c36614e9aaeadec647ce3d07f1ceb16a0a4 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 5 May 2021 00:11:29 -0400 +Subject: [PATCH] net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119) + +There were some proposed fixes for this back in 2020, but the discussion +largely fizzled out[1] and never got picked up again. + +We can see other distros are either blacklisting it from user space[2] +or explicitly calling it out as "is not set" in their base config[3] but +that really doesn't bind the workaround to the kernel source in any +robust transportable way. + +So I've done the tried and true "depends on BROKEN" to ensure the +workaround goes wherever the kernel source goes. + +We can revert this if a real fix eventually appears, but given that it +was marked "EXPERIMENTAL" back when we had that, I don't expect we'll +need to. Also note that none of our base ktypes or BSPs enabled it. + +[1] https://lore.kernel.org/netdev/20201013171849.236025-1-kleber.souza@canonical.com/T/ +[2] https://access.redhat.com/security/cve/cve-2020-16119 +[3] https://github.com/archlinux/svntogit-packages/commit/c07751100e1d64d9aa5789881ddc2ef68e43aed4 + +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + net/dccp/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig +index 0c7d2f66ba27..efa01566da0f 100644 +--- a/net/dccp/Kconfig ++++ b/net/dccp/Kconfig +@@ -2,6 +2,7 @@ + menuconfig IP_DCCP + tristate "The DCCP Protocol" + depends on INET ++ depends on BROKEN + help + Datagram Congestion Control Protocol (RFC 4340) + +-- +2.19.1 + diff --git a/patches/misc/pnmtologo-use-relocatable-file-name.patch b/patches/misc/pnmtologo-use-relocatable-file-name.patch new file mode 100644 index 00000000..bcfb5904 --- /dev/null +++ b/patches/misc/pnmtologo-use-relocatable-file-name.patch @@ -0,0 +1,52 @@ +From 4da597cafebb4d6743da1dd54099dadb6c356e08 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 14 Jul 2022 14:43:46 -0400 +Subject: [PATCH] pnmtologo: use relocatable file name + +The logo generation utility is capturing the source of the logo +in the generated .c file. The source file is absolute (as passed +by make), so the full path is captured. + +This makes the source fail reproducibility tests. + +We use basename() to just get the source file name, and use +that in the generated .c file. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/video/logo/pnmtologo.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c +index ada5ef6e51b7..7527be845443 100644 +--- a/drivers/video/logo/pnmtologo.c ++++ b/drivers/video/logo/pnmtologo.c +@@ -13,7 +13,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> +- ++#include <libgen.h> + + static const char *programname; + static const char *filename; +@@ -223,6 +223,7 @@ static inline int is_equal(struct color c1, struct color c2) + + static void write_header(void) + { ++ char *filename_basename = basename(filename); + /* open logo file */ + if (outputname) { + out = fopen(outputname, "w"); +@@ -235,7 +236,7 @@ static void write_header(void) + fputs("/*\n", out); + fputs(" * DO NOT EDIT THIS FILE!\n", out); + fputs(" *\n", out); +- fprintf(out, " * It was automatically generated from %s\n", filename); ++ fprintf(out, " * It was automatically generated from %s\n", filename_basename); + fputs(" *\n", out); + fprintf(out, " * Linux logo %s\n", logoname); + fputs(" */\n\n", out); +-- +2.34.1 + diff --git a/patches/misc/tools-use-basename-to-identify-file-in-gen-mach-type.patch b/patches/misc/tools-use-basename-to-identify-file-in-gen-mach-type.patch new file mode 100644 index 00000000..cd091361 --- /dev/null +++ b/patches/misc/tools-use-basename-to-identify-file-in-gen-mach-type.patch @@ -0,0 +1,41 @@ +From 6c085baf183868ed45d8c1d44408d7b24724cde5 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 13 Jul 2022 12:18:15 -0400 +Subject: [PATCH] tools: use basename to identify file in gen-mach-types + +FILENAME is replaced by the full path to the executing script. If +the script is executed via a fully specified path, that is captured +in the output. Although it doesn't impact the output, it does trigger +reproducibility warnings/errors. + +So we introduce a basename() function in the script and use it to +make sure the output file contains only the name of the awk script. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm/tools/gen-mach-types | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types +index cb2b69f2a39d..1fcdba948623 100644 +--- a/arch/arm/tools/gen-mach-types ++++ b/arch/arm/tools/gen-mach-types +@@ -21,10 +21,14 @@ NF == 3 { + num[nr] = ""; nr++ + } + ++ function basename(file) { ++ sub(".*/", "", file) ++ return file ++ } + + END { + printf("/*\n"); +- printf(" * This was automagically generated from %s!\n", FILENAME); ++ printf(" * This was automagically generated from %s!\n", basename(FILENAME)); + printf(" * Do NOT edit\n"); + printf(" */\n\n"); + printf("#ifndef __ASM_ARM_MACH_TYPE_H\n"); +-- +2.19.1 + diff --git a/patches/misc/vt-conmakehash-improve-reproducibility.patch b/patches/misc/vt-conmakehash-improve-reproducibility.patch new file mode 100644 index 00000000..cf663271 --- /dev/null +++ b/patches/misc/vt-conmakehash-improve-reproducibility.patch @@ -0,0 +1,53 @@ +From 0f586f4ee8adacac79b64d1f3d47799a5eb7fbea Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Sun, 10 Jul 2022 21:37:07 -0400 +Subject: [PATCH] vt/conmakehash: improve reproducibility + +The file generated by conmakehash capture the application +path used to generate the file. While that can be informative, +it varies based on where the kernel was built, as the full +path is captured. + +We tweak the application to use a second input as the "capture +name", and then modify the Makefile to pass the basename of +the source, making it reproducible. + +This could be improved by using some sort of path mapping, +or the application manipualing argv[1] itself, but for now +this solves the reprodicibility issue. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/tty/vt/Makefile | 2 +- + drivers/tty/vt/conmakehash.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile +index fe30ce512819..cb51c21b58f9 100644 +--- a/drivers/tty/vt/Makefile ++++ b/drivers/tty/vt/Makefile +@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c + hostprogs += conmakehash + + quiet_cmd_conmk = CONMK $@ +- cmd_conmk = $(obj)/conmakehash $< > $@ ++ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@ + + $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash + $(call cmd,conmk) +diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c +index cddd789fe46e..d62510b280e9 100644 +--- a/drivers/tty/vt/conmakehash.c ++++ b/drivers/tty/vt/conmakehash.c +@@ -253,7 +253,7 @@ int main(int argc, char *argv[]) + #include <linux/types.h>\n\ + \n\ + u8 dfont_unicount[%d] = \n\ +-{\n\t", argv[1], fontlen); ++{\n\t", argv[2], fontlen); + + for ( i = 0 ; i < fontlen ; i++ ) + { +-- +2.19.1 + diff --git a/patches/misc/x86-boot-compressed-64-Define-__force_order-only-whe.patch b/patches/misc/x86-boot-compressed-64-Define-__force_order-only-whe.patch deleted file mode 100644 index c7b61b58..00000000 --- a/patches/misc/x86-boot-compressed-64-Define-__force_order-only-whe.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ac6cf33b0484a6cedafb19fe999f5570e969cdbe Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Dec 2019 17:42:02 -0800 -Subject: [PATCH] x86/boot/compressed/64: Define __force_order only when - CONFIG_RANDOMIZE_BASE is unset - -kaslr_64.c also defines the same variable, however when both files are -included into final link, linker complains about multiple definition of -`__force_order' which is coming from kaslr_64.o and pgtable_64.o, its -possible that kaslr_64.o is disabled via CONFIG_RANDOMIZE_BASE config -option, therefore define it conditionally only when -CONFIG_RANDOMIZE_BASE is not set - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> -Cc: Kees Cook <keescook@chromium.org> -Cc: "H. Peter Anvin" <hpa@zytor.com> -Cc: Ingo Molnar <mingo@redhat.com> -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: x86-ml <x86@kernel.org> -Cc: Arnd Bergmann <arnd@arndb.de> -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - arch/x86/boot/compressed/pgtable_64.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/x86/boot/compressed/pgtable_64.c b/arch/x86/boot/compressed/pgtable_64.c -index c8862696a47b..077d19268b0b 100644 ---- a/arch/x86/boot/compressed/pgtable_64.c -+++ b/arch/x86/boot/compressed/pgtable_64.c -@@ -12,7 +12,9 @@ - * It is not referenced from the code, but GCC < 5 with -fPIE would fail - * due to an undefined symbol. Define it to make these ancient GCCs work. - */ -+#ifndef CONFIG_RANDOMIZE_BASE - unsigned long __force_order; -+#endif - - #define BIOS_START_MIN 0x20000U /* 128K, less than this is insane */ - #define BIOS_START_MAX 0x9f000U /* 640K, absolute maximum */ --- -2.19.1 - diff --git a/small/small.cfg b/small/small.cfg index d21ab751..0a6df066 100644 --- a/small/small.cfg +++ b/small/small.cfg @@ -19,7 +19,7 @@ # # General setup # -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=n CONFIG_CC_OPTIMIZE_FOR_SIZE=y # @@ -94,15 +94,15 @@ CONFIG_BINFMT_MISC=y # # Networking options # -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=n +CONFIG_INET_XFRM_MODE_TUNNEL=n +CONFIG_INET_XFRM_MODE_BEET=n +CONFIG_IPV6=n # # Core Netfilter Configuration # -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=n # # IP: Netfilter Configuration @@ -115,7 +115,7 @@ CONFIG_BINFMT_MISC=y # # IP: Virtual Server Configuration # -# CONFIG_IP_VS is not set +CONFIG_IP_VS=n # # IPVS transport protocol load balancing support @@ -132,21 +132,21 @@ CONFIG_BINFMT_MISC=y # # DCCP Configuration (EXPERIMENTAL) # -# CONFIG_IP_DCCP is not set +CONFIG_IP_DCCP=n # # SCTP Configuration (EXPERIMENTAL) # -# CONFIG_IP_SCTP is not set +CONFIG_IP_SCTP=n # # TIPC Configuration (EXPERIMENTAL) # -# CONFIG_TIPC is not set +CONFIG_TIPC=n -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_ECONET is not set +CONFIG_ATM=n +CONFIG_BRIDGE=n +CONFIG_ECONET=n # # QoS and/or fair queueing @@ -155,33 +155,31 @@ CONFIG_BINFMT_MISC=y # # Queueing/Scheduling # -# CONFIG_NET_SCH_CBQ is not set -# CONFIG_NET_SCH_HTB is not set -# CONFIG_NET_SCH_HFSC is not set -# CONFIG_NET_SCH_PRIO is not set -# CONFIG_NET_SCH_RED is not set -# CONFIG_NET_SCH_SFQ is not set -# CONFIG_NET_SCH_TEQL is not set -# CONFIG_NET_SCH_TBF is not set -# CONFIG_NET_SCH_GRED is not set -# CONFIG_NET_SCH_DSMARK is not set -# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_HTB=n +CONFIG_NET_SCH_HFSC=n +CONFIG_NET_SCH_PRIO=n +CONFIG_NET_SCH_RED=n +CONFIG_NET_SCH_SFQ=n +CONFIG_NET_SCH_TEQL=n +CONFIG_NET_SCH_TBF=n +CONFIG_NET_SCH_GRED=n +CONFIG_NET_SCH_NETEM=n # # Classification # -# CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set -# CONFIG_NET_CLS_ROUTE4 is not set -# CONFIG_NET_CLS_FW is not set -# CONFIG_NET_CLS_U32 is not set -# CONFIG_NET_CLS_RSVP is not set -# CONFIG_NET_CLS_RSVP6 is not set +CONFIG_NET_CLS_BASIC=n +CONFIG_NET_CLS_TCINDEX=n +CONFIG_NET_CLS_ROUTE4=n +CONFIG_NET_CLS_FW=n +CONFIG_NET_CLS_U32=n +CONFIG_NET_CLS_RSVP=n +CONFIG_NET_CLS_RSVP6=n # # Network testing # -# CONFIG_NET_PKTGEN is not set +CONFIG_NET_PKTGEN=n # # Packet Radio protocols @@ -995,13 +993,13 @@ CONFIG_NLS_UTF8=y # # Logging Options # -# CONFIG_SECURITY is not set +CONFIG_SECURITY=n # # Cryptographic options # -# CONFIG_CRYPTO_ECB is not set -# CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_ECB=n +CONFIG_CRYPTO_PCBC=n # # Hardware crypto devices |