From d2d7e4afd6d3c2a993339657ad428f030d2f3e05 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 01/29] linux (Generic): update to linux-5.4-rc1 --- packages/linux/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 0e1bd6f14d..aeb46727fe 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,9 +37,9 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.3.13" - PKG_SHA256="9f04e53f03d0ead6561195fb71aac18cbee419112ed54f9d4fc1515a5fa5c92f" - PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" + PKG_VERSION="5.4-rc1" + PKG_SHA256="69fe1a33748cae6581cce2b85783485b807c77f1227d69acfd6aac44c40330a9" + PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; esac From 9d538c73aa234cf1841a90e44803ca297fd6a749 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 02/29] linux (Generic): config options for 5.4-rc1 --- projects/Generic/linux/linux.x86_64.conf | 77 +++++++++++++++--------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index cadca4378e..2c148781ae 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.3.11 Kernel Configuration +# Linux/x86_64 5.4.0-rc1 Kernel Configuration # # @@ -309,6 +309,7 @@ CONFIG_PARAVIRT=y CONFIG_PARAVIRT_SPINLOCKS=y # CONFIG_XEN is not set CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y # CONFIG_PVH is not set # CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y @@ -373,7 +374,6 @@ CONFIG_X86_CPUID=y # CONFIG_X86_5LEVEL is not set CONFIG_X86_DIRECT_GBPAGES=y # CONFIG_X86_CPA_STATISTICS is not set -CONFIG_ARCH_HAS_MEM_ENCRYPT=y # CONFIG_AMD_MEM_ENCRYPT is not set CONFIG_NUMA=y # CONFIG_AMD_NUMA is not set @@ -563,6 +563,8 @@ CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_CPU_IDLE_GOV_TEO is not set +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_HALTPOLL_CPUIDLE=y # end of CPU Idle CONFIG_INTEL_IDLE=y @@ -617,6 +619,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y # CONFIG_RESET_ATTACK_MITIGATION is not set +# CONFIG_EFI_RCI2_TABLE is not set # end of EFI (Extensible Firmware Interface) Support CONFIG_EFI_DEV_PATH_PARSER=y @@ -660,6 +663,7 @@ CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y @@ -724,6 +728,7 @@ CONFIG_ARCH_HAS_REFCOUNT=y # CONFIG_REFCOUNT_FULL is not set CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y # CONFIG_LOCK_EVENT_COUNTS is not set +CONFIG_ARCH_HAS_MEM_ENCRYPT=y # # GCOV-based kernel profiling @@ -746,6 +751,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y @@ -758,6 +765,7 @@ CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set # CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_SED_OPAL is not set @@ -872,12 +880,12 @@ CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_ARCH_HAS_PTE_DEVMAP=y -# CONFIG_HMM_MIRROR is not set CONFIG_FRAME_VECTOR=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set +# CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y # end of Memory Management options @@ -1536,7 +1544,6 @@ CONFIG_NVME_MULTIPATH=y # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set # CONFIG_PHANTOM is not set -# CONFIG_SGI_IOC4 is not set # CONFIG_TIFM_CORE is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set @@ -1982,10 +1989,10 @@ CONFIG_FORCEDETH=y # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set +# CONFIG_NET_VENDOR_PENSANDO is not set CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=y # CONFIG_QLCNIC is not set -# CONFIG_QLGE is not set # CONFIG_NETXEN_NIC is not set # CONFIG_QED is not set # CONFIG_NET_VENDOR_QUALCOMM is not set @@ -2036,6 +2043,7 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set CONFIG_AMD_PHY=y # CONFIG_AQUANTIA_PHY is not set # CONFIG_AX88796B_PHY is not set @@ -2144,6 +2152,7 @@ CONFIG_ATH9K_AHB=y CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_CHANNEL_CONTEXT=y CONFIG_ATH9K_PCOEM=y +# CONFIG_ATH9K_PCI_NO_EEPROM is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_ATH9K_HWRNG=y @@ -2215,7 +2224,6 @@ CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLWIFI_OPMODE_MODULAR=y # CONFIG_IWLWIFI_BCAST_FILTERING is not set -# CONFIG_IWLWIFI_PCIE_RTPM is not set # # Debugging Options @@ -2450,6 +2458,7 @@ CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_JOYSTICK_PXRC is not set +# CONFIG_JOYSTICK_FSIA6B is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_PROPERTIES=y @@ -2627,11 +2636,11 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_DWLIB=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_RT288X is not set # CONFIG_SERIAL_8250_LPSS is not set CONFIG_SERIAL_8250_MID=y -# CONFIG_SERIAL_8250_MOXA is not set # # Non-8250 serial port support @@ -2646,6 +2655,7 @@ CONFIG_SERIAL_CORE=y # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set # end of Serial drivers CONFIG_SERIAL_MCTRL_GPIO=y @@ -2674,6 +2684,7 @@ CONFIG_DEVPORT=y # end of Character devices # CONFIG_RANDOM_TRUST_CPU is not set +# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # # I2C support @@ -2934,6 +2945,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set # CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m @@ -3021,7 +3033,6 @@ CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_STTS751 is not set # CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_ADC128D818 is not set -# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_INA209 is not set @@ -3118,7 +3129,6 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set -# CONFIG_MFD_CROS_EC is not set # CONFIG_MFD_MADERA is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_DA9052_I2C is not set @@ -3285,6 +3295,7 @@ CONFIG_MEDIA_CONTROLLER_REQUEST_API=y CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L2_SUBDEV_API is not set CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2_I2C=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m @@ -3898,6 +3909,7 @@ CONFIG_DRM_RADEON=y CONFIG_DRM_AMDGPU=y CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_CIK=y +# CONFIG_DRM_AMDGPU_USERPTR is not set # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set # @@ -3912,6 +3924,7 @@ CONFIG_DRM_AMD_ACP=y CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN1_0=y CONFIG_DRM_AMD_DC_DCN2_0=y +CONFIG_DRM_AMD_DC_DCN2_1=y CONFIG_DRM_AMD_DC_DSC_SUPPORT=y # CONFIG_DEBUG_KERNEL_DC is not set # end of Display Engine Configuration @@ -3978,8 +3991,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # end of Display Interface Bridges # CONFIG_DRM_ETNAVIV is not set -# CONFIG_DRM_HISI_HIBMC is not set -# CONFIG_DRM_TINYDRM is not set +# CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_VBOXVIDEO is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y @@ -4195,6 +4207,7 @@ CONFIG_SND_VIRTUOSO=m # CONFIG_SND_HDA=m CONFIG_SND_HDA_INTEL=m +# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y @@ -4222,6 +4235,7 @@ CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_I915=y CONFIG_SND_HDA_EXT_CORE=m CONFIG_SND_HDA_PREALLOC_SIZE=2048 +CONFIG_SND_INTEL_NHLT=m CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y @@ -4380,7 +4394,7 @@ CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_CX2072X=m CONFIG_SND_SOC_DA7213=m CONFIG_SND_SOC_DA7219=m -# CONFIG_SND_SOC_DMIC is not set +CONFIG_SND_SOC_DMIC=m # CONFIG_SND_SOC_ES7134 is not set # CONFIG_SND_SOC_ES7241 is not set CONFIG_SND_SOC_ES8316=m @@ -4437,6 +4451,7 @@ CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_TSCS42XX is not set # CONFIG_SND_SOC_TSCS454 is not set +# CONFIG_SND_SOC_UDA1334 is not set # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8524 is not set @@ -4505,6 +4520,7 @@ CONFIG_HID_CHICONY=y # CONFIG_HID_PRODIKEYS is not set # CONFIG_HID_CMEDIA is not set # CONFIG_HID_CP2112 is not set +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=y CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y @@ -4609,6 +4625,9 @@ CONFIG_I2C_HID=m CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y +# CONFIG_USB_LED_TRIG is not set +# CONFIG_USB_ULPI_BUS is not set +# CONFIG_USB_CONN_GPIO is not set CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y @@ -4625,7 +4644,6 @@ CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 CONFIG_USB_MON=m -# CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers @@ -4693,6 +4711,7 @@ CONFIG_USB_UAS=y # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USBIP_CORE is not set +# CONFIG_USB_CDNS3 is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set # CONFIG_USB_DWC2 is not set @@ -4812,9 +4831,6 @@ CONFIG_TYPEC=m # end of USB Type-C Alternate Mode drivers # CONFIG_USB_ROLE_SWITCH is not set -# CONFIG_USB_LED_TRIG is not set -# CONFIG_USB_ULPI_BUS is not set -# CONFIG_UWB is not set CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_MINORS=32 @@ -4826,6 +4842,7 @@ CONFIG_MMC_BLOCK_MINORS=32 # # CONFIG_MMC_DEBUG is not set CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_IO_ACCESSORS=y CONFIG_MMC_SDHCI_PCI=y # CONFIG_MMC_RICOH_MMC is not set CONFIG_MMC_SDHCI_ACPI=y @@ -5038,6 +5055,7 @@ CONFIG_DMA_ENGINE_RAID=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set +# CONFIG_DMABUF_SELFTESTS is not set # end of DMABUF options CONFIG_DCA=m @@ -5068,6 +5086,7 @@ CONFIG_VIRTIO_MMIO=y # CONFIG_HYPERV is not set # end of Microsoft Hyper-V guest support +# CONFIG_GREYBUS is not set CONFIG_STAGING=y # CONFIG_PRISM2_USB is not set # CONFIG_COMEDI is not set @@ -5105,7 +5124,6 @@ CONFIG_STAGING_MEDIA=y # CONFIG_WILC1000_SDIO is not set # CONFIG_MOST is not set # CONFIG_KS7010 is not set -# CONFIG_GREYBUS is not set # # Gasket devices @@ -5113,9 +5131,12 @@ CONFIG_STAGING_MEDIA=y # CONFIG_STAGING_GASKET_FRAMEWORK is not set # end of Gasket devices -# CONFIG_EROFS_FS is not set # CONFIG_FIELDBUS_DEV is not set # CONFIG_KPC2000 is not set +# CONFIG_USB_WUSB_CBAF is not set +# CONFIG_UWB is not set +# CONFIG_EXFAT_FS is not set +# CONFIG_QLGE is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WMI is not set # CONFIG_ACER_WIRELESS is not set @@ -5187,6 +5208,7 @@ CONFIG_INTEL_ATOMISP2_PM=y # end of Intel Speed Select Technology interface support CONFIG_PMC_ATOM=y +# CONFIG_MFD_CROS_EC is not set # CONFIG_CHROME_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_CLKDEV_LOOKUP=y @@ -5397,6 +5419,7 @@ CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y # CONFIG_FS_ENCRYPTION is not set +# CONFIG_FS_VERITY is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -5406,6 +5429,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m # CONFIG_CUSE is not set +# CONFIG_VIRTIO_FS is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -5502,6 +5526,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_EROFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V2=y @@ -5541,6 +5566,7 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DFS_UPCALL is not set CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_ROOT is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y @@ -5686,16 +5712,7 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y # CONFIG_CRYPTO_CHACHA20POLY1305 is not set # CONFIG_CRYPTO_AEGIS128 is not set -# CONFIG_CRYPTO_AEGIS128L is not set -# CONFIG_CRYPTO_AEGIS256 is not set # CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set -# CONFIG_CRYPTO_MORUS640_SSE2 is not set -# CONFIG_CRYPTO_MORUS1280 is not set -# CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS1280_AVX2 is not set CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m @@ -5715,6 +5732,7 @@ CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set # CONFIG_CRYPTO_ADIANTUM is not set +# CONFIG_CRYPTO_ESSIV is not set # # Hash modes @@ -5747,6 +5765,7 @@ CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA1_SSSE3=y CONFIG_CRYPTO_SHA256_SSSE3=y CONFIG_CRYPTO_SHA512_SSSE3=y +CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SHA3 is not set @@ -5759,9 +5778,9 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # +CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set -CONFIG_CRYPTO_AES_X86_64=y CONFIG_CRYPTO_AES_NI_INTEL=y # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_LIB_ARC4=y @@ -5776,6 +5795,7 @@ CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set +CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_DES3_EDE_X86_64=y # CONFIG_CRYPTO_FCRYPT is not set @@ -5955,7 +5975,6 @@ CONFIG_DYNAMIC_DEBUG=y CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_INSTALL is not set CONFIG_OPTIMIZE_INLINING=y From bca69ea0ed3e62d1164c301f3e6865a8235973a4 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 03/29] Generic: disable digital_devices - not 5.4-rc1 compatible Failure: http://milhouse.libreelec.tv/other/digital_devices.txt --- projects/Generic/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Generic/options b/projects/Generic/options index 6c34ef056f..5ffa1f33c4 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -82,7 +82,7 @@ # driver addons to install: # for a list of additional drivers see packages/linux-driver-addons # Space separated list is supported, - DRIVER_ADDONS="crazycat digital_devices dvb-latest" + DRIVER_ADDONS="crazycat dvb-latest" # Default size of the ova image, in MB, eg. 4096 OVA_SIZE="4096" From 090ee755bac09e09815c3adf38ee09c4d1e5a3eb Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 04/29] xf86-video-nvidia-legacy: fix 5.4-rc1 build --- ...video-nvidia-legacy-04-fix-linux-5.4.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-04-fix-linux-5.4.patch diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-04-fix-linux-5.4.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-04-fix-linux-5.4.patch new file mode 100644 index 0000000000..4dcadf3d11 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-04-fix-linux-5.4.patch @@ -0,0 +1,26 @@ +From dbff36065f2359d8ba0e6e359428998f20208f8b Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Tue, 1 Oct 2019 16:20:08 +0100 +Subject: [PATCH] DRIVER_PRIME: remove it for 5.4-rc1 + +Ref: https://github.com/torvalds/linux/commit/0424fdaf883a689d5185c0d0665b265373945898 +--- + kernel/nv-drm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c +index 7097069..a0110fa 100644 +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -156,7 +156,7 @@ static const struct file_operations nv_drm_fops = { + }; + + static struct drm_driver nv_drm_driver = { +- .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY, ++ .driver_features = DRIVER_GEM | DRIVER_LEGACY, + .load = nv_drm_load, + .unload = nv_drm_unload, + .fops = &nv_drm_fops, +-- +2.14.1 + From 0db58ddefd6e59151b5cb99dc7c08366a0019fc2 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 05/29] TEMP: linux (Generic): add namespace fixes and cleanup --- .../linux-999-namespace-fixes-cleanup.patch | 957 ++++++++++++++++++ 1 file changed, 957 insertions(+) create mode 100644 packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch diff --git a/packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch b/packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch new file mode 100644 index 0000000000..f9a61ba67f --- /dev/null +++ b/packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch @@ -0,0 +1,957 @@ +From patchwork Fri Sep 27 09:35:57 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Masahiro Yamada +X-Patchwork-Id: 1131974 +Return-Path: +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id CF6D9C4360C + for ; Fri, 27 Sep 2019 09:37:23 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id A32A821906 + for ; Fri, 27 Sep 2019 09:37:23 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com + header.b="a/t82mTw" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1727164AbfI0JhW (ORCPT + ); + Fri, 27 Sep 2019 05:37:22 -0400 +Received: from conuserg-07.nifty.com ([210.131.2.74]:33057 "EHLO + conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1726438AbfI0JhC (ORCPT + ); + Fri, 27 Sep 2019 05:37:02 -0400 +Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp + [153.142.97.92]) (authenticated) + by conuserg-07.nifty.com with ESMTP id x8R9a5ub001372; + Fri, 27 Sep 2019 18:36:07 +0900 +DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ub001372 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; + s=dec2015msa; t=1569576967; + bh=vJzF8WlgUqc1RsR95UB9lwwYV0dr5aBFLgK7a4VpJl0=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=a/t82mTwbwWZPr0/tQv9F1qEmfxY+FFesX4KbzmGMTG21vQhlXMBP7rrvpG/Gvk6w + EC+o8FZKVJbbAVEZoykh5cD2QqCDz/m+73YH1vmQ2Up3QMvK99h0chvD0XxdoYMafC + uOsZH+QvFnmPwiHz1IRaSCJXFXASiKeDWhOTxiFDswTY2pRWlD9V3c//TfIpSFUCwr + Rz0S84dpoQubEEROWm9wXT/T9ga6jnFTjaA5V4G6/pBsqw1cEZTCcCRkj3XXFk4KLL + 2mhnuT7X3lne5Abip9GRwCQrTuntCf8So9MR7YqWsmfYyqDEW/17TOx+STvRxZF6TM + Cy6NJ4OYl1HKw== +X-Nifty-SrcIP: [153.142.97.92] +From: Masahiro Yamada +To: Jessica Yu +Cc: Matthias Maennich , + Greg Kroah-Hartman , + Joel Fernandes , + Martijn Coenen , + Will Deacon , + Masahiro Yamada , + Michal Marek , + linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org +Subject: [PATCH 1/7] modpost: fix broken sym->namespace for external module + builds +Date: Fri, 27 Sep 2019 18:35:57 +0900 +Message-Id: <20190927093603.9140-2-yamada.masahiro@socionext.com> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> +References: <20190927093603.9140-1-yamada.masahiro@socionext.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +Currently, external module builds produce tons of false-positives: + + WARNING: module uses symbol from namespace , but does not import it. + +Here, the part shows a random string. + +When you build external modules, the symbol info of vmlinux and +in-kernel modules are read from $(objtree)/Module.symvers, but +read_dump() is buggy in multiple ways: + +[1] When the modpost is run for vmlinux and in-kernel modules, +sym_extract_namespace() correctly allocates memory for the namespace. +On the other hand, read_dump() does not, then sym->namespace will +point to somewhere in the line buffer of get_next_line(). The data +in the buffer will be replaced soon, and sym->namespace will end up +with pointing to unrelated data. As a result, check_exports() will +show random strings in the warning messages. + +[2] When there is no namespace, sym_extract_namespace() returns NULL. +On the other hand, read_dump() sets namespace to an empty string "". +(but, it will be later replaced with unrelated data due to bug [1].) +The check_exports() shows a warning unless exp->namespace is NULL, +so every symbol read from read_dump() emits the warning, which is +mostly false positive. + +To address [1], I added NOFAIL(strdup(...)) to allocate memory. +For [2], I changed the if-conditional in check_exports(). + +Signed-off-by: Masahiro Yamada +Reviewed-by: Matthias Maennich +--- + + 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 3961941e8e7a..5c628a7d80f7 100644 +--- a/scripts/mod/modpost.c ++++ b/scripts/mod/modpost.c +@@ -2195,7 +2195,7 @@ static int check_exports(struct module *mod) + else + basename = mod->name; + +- if (exp->namespace) { ++ if (exp->namespace && exp->namespace[0]) { + add_namespace(&mod->required_namespaces, + exp->namespace); + +@@ -2453,7 +2453,7 @@ static void read_dump(const char *fname, unsigned int kernel) + mod = new_module(modname); + mod->skip = 1; + } +- s = sym_add_exported(symname, namespace, mod, ++ s = sym_add_exported(symname, NOFAIL(strdup(namespace)), mod, + export_no(export)); + s->kernel = kernel; + s->preloaded = 1; + +From patchwork Fri Sep 27 09:35:58 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Masahiro Yamada +X-Patchwork-Id: 1131972 +Return-Path: +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 6F487C352AB + for ; Fri, 27 Sep 2019 09:37:16 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id 40D38207E0 + for ; Fri, 27 Sep 2019 09:37:16 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com + header.b="2NU1Uj+G" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1727114AbfI0JhP (ORCPT + ); + Fri, 27 Sep 2019 05:37:15 -0400 +Received: from conuserg-07.nifty.com ([210.131.2.74]:33064 "EHLO + conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1726444AbfI0JhC (ORCPT + ); + Fri, 27 Sep 2019 05:37:02 -0400 +Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp + [153.142.97.92]) (authenticated) + by conuserg-07.nifty.com with ESMTP id x8R9a5uc001372; + Fri, 27 Sep 2019 18:36:08 +0900 +DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5uc001372 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; + s=dec2015msa; t=1569576968; + bh=k0hBXKWoJkYYxdDyuOyeX7IT6hvCtlLoJTUWwkZpHoo=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=2NU1Uj+GZgATSlHQ/wpNiFGS13yTeurDYkQ5oWGWobbFSPBjB+S2L6Fw/LgnWkTAq + hWIRQQ41fCSLUNCBf+HYJZpbU959wGqrEA72oxHXEOjKJMSWh0zUo3N/sSGmjzhqzA + D32uDOKQCjHot8mwF7RjQ3ysW8A3joNSk4qE8q1zcFV/svc+eMf4VFKUt2JxAYJCKw + rysk1hb7vz3OotkLSrzSX5ezVfEFv12Sr9ojoceyMo6VmsPBBWJhLrk4vNps7///3U + yEBu+i2JGF6ZOMzg2oRMYSRJkvsMvIqDtV92F3sTt+tEvDeBMXe70++/0/ZmSO0rt4 + ozmoh+j5CsHlw== +X-Nifty-SrcIP: [153.142.97.92] +From: Masahiro Yamada +To: Jessica Yu +Cc: Matthias Maennich , + Greg Kroah-Hartman , + Joel Fernandes , + Martijn Coenen , + Will Deacon , + Masahiro Yamada , + Michal Marek , + Will Deacon , linux-kbuild@vger.kernel.org, + linux-kernel@vger.kernel.org +Subject: [PATCH 2/7] module: swap the order of symbol.namespace +Date: Fri, 27 Sep 2019 18:35:58 +0900 +Message-Id: <20190927093603.9140-3-yamada.masahiro@socionext.com> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> +References: <20190927093603.9140-1-yamada.masahiro@socionext.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +Currently, EXPORT_SYMBOL_NS(_GPL) constructs the kernel symbol as +follows: + + __ksymtab_SYMBOL.NAMESPACE + +The sym_extract_namespace() in modpost allocates memory for the part +SYMBOL.NAMESPACE when '.' is contained. One problem is that the pointer +returned by strdup() is lost because the symbol name will be copied to +malloc'ed memory by alloc_symbol(). No one will keep track of the +pointer of strdup'ed memory. + +sym->namespace still points to the NAMESPACE part. So, if you like, +you can free it with complicated code like this: + + free(sym->namespace - strlen(sym->name) - 1); + +I would not say it is fatal since we seldom bother to manually free +memory in host programs. But, I can fix it in an elegant way. + +I swapped the order of the symbol and the namespace as follows: + + __ksymtab_NAMESPACE.SYMBOL + +then, simplified sym_extract_namespace() so that it allocates memory +only for the NAMESPACE part. + +I prefer this order because it is intuitive and also matches to major +languages. For example, NAMESPACE::NAME in C++, MODULE.NAME in Python. + +Signed-off-by: Masahiro Yamada +Reviewed-by: Matthias Maennich +--- + + include/linux/export.h | 4 ++-- + scripts/mod/modpost.c | 16 +++++++--------- + 2 files changed, 9 insertions(+), 11 deletions(-) + +diff --git a/include/linux/export.h b/include/linux/export.h +index 95f55b7f83a0..0695d4e847d9 100644 +--- a/include/linux/export.h ++++ b/include/linux/export.h +@@ -52,7 +52,7 @@ extern struct module __this_module; + __ADDRESSABLE(sym) \ + asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \ + " .balign 4 \n" \ +- "__ksymtab_" #sym NS_SEPARATOR #ns ": \n" \ ++ "__ksymtab_" #ns NS_SEPARATOR #sym ": \n" \ + " .long " #sym "- . \n" \ + " .long __kstrtab_" #sym "- . \n" \ + " .long __kstrtab_ns_" #sym "- . \n" \ +@@ -76,7 +76,7 @@ struct kernel_symbol { + #else + #define __KSYMTAB_ENTRY_NS(sym, sec, ns) \ + static const struct kernel_symbol __ksymtab_##sym##__##ns \ +- asm("__ksymtab_" #sym NS_SEPARATOR #ns) \ ++ asm("__ksymtab_" #ns NS_SEPARATOR #sym) \ + __attribute__((section("___ksymtab" sec "+" #sym), used)) \ + __aligned(sizeof(void *)) \ + = { (unsigned long)&sym, __kstrtab_##sym, __kstrtab_ns_##sym } +diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c +index 5c628a7d80f7..d171b0cffb05 100644 +--- a/scripts/mod/modpost.c ++++ b/scripts/mod/modpost.c +@@ -350,18 +350,16 @@ static enum export export_from_sec(struct elf_info *elf, unsigned int sec) + + static const char *sym_extract_namespace(const char **symname) + { +- size_t n; +- char *dupsymname; ++ char *namespace = NULL; ++ char *ns_separator; + +- n = strcspn(*symname, "."); +- if (n < strlen(*symname) - 1) { +- dupsymname = NOFAIL(strdup(*symname)); +- dupsymname[n] = '\0'; +- *symname = dupsymname; +- return dupsymname + n + 1; ++ ns_separator = strchr(*symname, '.'); ++ if (ns_separator) { ++ namespace = NOFAIL(strndup(*symname, ns_separator - *symname)); ++ *symname = ns_separator + 1; + } + +- return NULL; ++ return namespace; + } + + /** + +From patchwork Fri Sep 27 09:35:59 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Masahiro Yamada +X-Patchwork-Id: 1131975 +Return-Path: +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 2FA71C4360C + for ; Fri, 27 Sep 2019 09:37:27 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id E8AAC207E0 + for ; Fri, 27 Sep 2019 09:37:26 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com + header.b="NKUk7uGl" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1727198AbfI0Jh0 (ORCPT + ); + Fri, 27 Sep 2019 05:37:26 -0400 +Received: from conuserg-07.nifty.com ([210.131.2.74]:33056 "EHLO + conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1726339AbfI0JhB (ORCPT + ); + Fri, 27 Sep 2019 05:37:01 -0400 +Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp + [153.142.97.92]) (authenticated) + by conuserg-07.nifty.com with ESMTP id x8R9a5ud001372; + Fri, 27 Sep 2019 18:36:09 +0900 +DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ud001372 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; + s=dec2015msa; t=1569576969; + bh=Fynp0G6evPgfPqhsg7r4WZQkR9spuRzwJdxpkYdeONU=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=NKUk7uGll+V8LdUDPB1GVeeJOolszILWQCZ7SBQwkVdpbGuFn/6kDpUjNB0/QnynN + 2qtuscgntP19CTgrkmvl5MSiiiCNBM8MTMvqvOQ4ZMK6qxLZECMooRQMg6/8GhwHCg + 4qU/g9rGsuM3KtYDnkAKAF8mdbt1DU2+OHsXQWxPZbNlhE1f7JA0E0NXhTwlDXPVww + 4avl6+5iYDzdjgiBkx4qQI4Jn3n3WKQrBxF1+7k8g8hxJW9+fKH4EYxiht2YQCla4r + xGD/ItNo3FzzIpks94EAkkrKdxQaT80bh4XJSdYX5FJ+9Eyq/pDWRgWKZzoce+x0d1 + X55tIS908scnw== +X-Nifty-SrcIP: [153.142.97.92] +From: Masahiro Yamada +To: Jessica Yu +Cc: Matthias Maennich , + Greg Kroah-Hartman , + Joel Fernandes , + Martijn Coenen , + Will Deacon , + Masahiro Yamada , + Will Deacon , linux-kernel@vger.kernel.org +Subject: [PATCH 3/7] module: rename __kstrtab_ns_* to __kstrtabns_* to avoid + symbol conflict +Date: Fri, 27 Sep 2019 18:35:59 +0900 +Message-Id: <20190927093603.9140-4-yamada.masahiro@socionext.com> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> +References: <20190927093603.9140-1-yamada.masahiro@socionext.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +The module namespace produces __strtab_ns_ symbols to store +namespace strings, but it does not guarantee the name uniqueness. +This is a potential problem because we have exported symbols staring +with "ns_". + +For example, kernel/capability.c exports the following symbols: + + EXPORT_SYMBOL(ns_capable); + EXPORT_SYMBOL(capable); + +Assume a situation where those are converted as follows: + + EXPORT_SYMBOL_NS(ns_capable, some_namespace); + EXPORT_SYMBOL_NS(capable, some_namespace); + +The former expands to "__kstrtab_ns_capable" and "__kstrtab_ns_ns_capable", +and the latter to "__kstrtab_capable" and "__kstrtab_ns_capable". +Then, we have the duplication for "__kstrtab_ns_capable". + +To ensure the uniqueness, rename "__kstrtab_ns_*" to "__kstrtabns_*". + +Signed-off-by: Masahiro Yamada +Reviewed-by: Matthias Maennich +--- + + include/linux/export.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/linux/export.h b/include/linux/export.h +index 0695d4e847d9..621158ecd2e2 100644 +--- a/include/linux/export.h ++++ b/include/linux/export.h +@@ -55,7 +55,7 @@ extern struct module __this_module; + "__ksymtab_" #ns NS_SEPARATOR #sym ": \n" \ + " .long " #sym "- . \n" \ + " .long __kstrtab_" #sym "- . \n" \ +- " .long __kstrtab_ns_" #sym "- . \n" \ ++ " .long __kstrtabns_" #sym "- . \n" \ + " .previous \n") + + #define __KSYMTAB_ENTRY(sym, sec) \ +@@ -79,7 +79,7 @@ struct kernel_symbol { + asm("__ksymtab_" #ns NS_SEPARATOR #sym) \ + __attribute__((section("___ksymtab" sec "+" #sym), used)) \ + __aligned(sizeof(void *)) \ +- = { (unsigned long)&sym, __kstrtab_##sym, __kstrtab_ns_##sym } ++ = { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym } + + #define __KSYMTAB_ENTRY(sym, sec) \ + static const struct kernel_symbol __ksymtab_##sym \ +@@ -112,7 +112,7 @@ struct kernel_symbol { + /* For every exported symbol, place a struct in the __ksymtab section */ + #define ___EXPORT_SYMBOL_NS(sym, sec, ns) \ + ___export_symbol_common(sym, sec); \ +- static const char __kstrtab_ns_##sym[] \ ++ static const char __kstrtabns_##sym[] \ + __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ + = #ns; \ + __KSYMTAB_ENTRY_NS(sym, sec, ns) + +From patchwork Fri Sep 27 09:36:00 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Masahiro Yamada +X-Patchwork-Id: 1131970 +Return-Path: +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 5D966C4360C + for ; Fri, 27 Sep 2019 09:37:09 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id 2A589207E0 + for ; Fri, 27 Sep 2019 09:37:09 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com + header.b="B0R09e0l" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1726978AbfI0JhE (ORCPT + ); + Fri, 27 Sep 2019 05:37:04 -0400 +Received: from conuserg-07.nifty.com ([210.131.2.74]:33058 "EHLO + conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1725946AbfI0JhC (ORCPT + ); + Fri, 27 Sep 2019 05:37:02 -0400 +Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp + [153.142.97.92]) (authenticated) + by conuserg-07.nifty.com with ESMTP id x8R9a5ue001372; + Fri, 27 Sep 2019 18:36:09 +0900 +DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ue001372 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; + s=dec2015msa; t=1569576970; + bh=rsB4h06qUtfwfDPTJVMKf592jd7/Pnx6aEXTAIEd2KQ=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=B0R09e0lhFhBsdHnZKZbSPkPCeaxl+CutXvTjvjYBVKQU6KfUokdgT6QnYPVYx9wb + xAd/Fv3g/mfSwGtaTAxLBxI0MBNqFfbWzXBvBHZDBuDAX7qag5oUXZFIPClKjPjlxp + ly8cVPCH0Cp5U086RNQcP6jOioiNfOR4p99a8FEL2hN3iy5qKWy0Zgbyim33YVDDrQ + /qGdifZtVgss0BFFcDYhsC2Blr+ZrYDH7zXPihfT1eeOpJZSHsKxTVwgG8wtRfAHoS + Ij28vs2WB3r/nyt+Fisu8vTIOE6fD1AMQ4wsotlJs1AhLopuFrNqG8FbluLbYQWEJ+ + uT96h2QAFsYNg== +X-Nifty-SrcIP: [153.142.97.92] +From: Masahiro Yamada +To: Jessica Yu +Cc: Matthias Maennich , + Greg Kroah-Hartman , + Joel Fernandes , + Martijn Coenen , + Will Deacon , + Masahiro Yamada , + Will Deacon , linux-kernel@vger.kernel.org +Subject: [PATCH 4/7] module: avoid code duplication in include/linux/export.h +Date: Fri, 27 Sep 2019 18:36:00 +0900 +Message-Id: <20190927093603.9140-5-yamada.masahiro@socionext.com> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> +References: <20190927093603.9140-1-yamada.masahiro@socionext.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +include/linux/export.h has lots of code duplication between +EXPORT_SYMBOL and EXPORT_SYMBOL_NS. + +To improve the maintainability and readability, unify the +implementation. + +When the symbol has no namespace, pass the empty string "" to +the 'ns' parameter. + +The drawback of this change is, it grows the code size. +When the symbol has no namespace, sym->namespace was previously +NULL, but it is now am empty string "". So, it increases 1 byte +for every no namespace EXPORT_SYMBOL. + +A typical kernel configuration has 10K exported symbols, so it +increases 10KB in rough estimation. + +I did not come up with a good idea to refactor it without increasing +the code size. + +I am not sure how big a deal it is, but at least include/linux/export.h +looks nicer. + +Signed-off-by: Masahiro Yamada +--- + + include/linux/export.h | 100 +++++++++++++---------------------------- + kernel/module.c | 2 +- + 2 files changed, 33 insertions(+), 69 deletions(-) + +diff --git a/include/linux/export.h b/include/linux/export.h +index 621158ecd2e2..55245a405a2f 100644 +--- a/include/linux/export.h ++++ b/include/linux/export.h +@@ -48,45 +48,28 @@ extern struct module __this_module; + * absolute relocations that require runtime processing on relocatable + * kernels. + */ +-#define __KSYMTAB_ENTRY_NS(sym, sec, ns) \ ++#define __KSYMTAB_ENTRY(sym, sec, ns) \ + __ADDRESSABLE(sym) \ + asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \ + " .balign 4 \n" \ +- "__ksymtab_" #ns NS_SEPARATOR #sym ": \n" \ ++ "__ksymtab_" ns NS_SEPARATOR #sym ": \n" \ + " .long " #sym "- . \n" \ + " .long __kstrtab_" #sym "- . \n" \ + " .long __kstrtabns_" #sym "- . \n" \ + " .previous \n") + +-#define __KSYMTAB_ENTRY(sym, sec) \ +- __ADDRESSABLE(sym) \ +- asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \ +- " .balign 4 \n" \ +- "__ksymtab_" #sym ": \n" \ +- " .long " #sym "- . \n" \ +- " .long __kstrtab_" #sym "- . \n" \ +- " .long 0 \n" \ +- " .previous \n") +- + struct kernel_symbol { + int value_offset; + int name_offset; + int namespace_offset; + }; + #else +-#define __KSYMTAB_ENTRY_NS(sym, sec, ns) \ +- static const struct kernel_symbol __ksymtab_##sym##__##ns \ +- asm("__ksymtab_" #ns NS_SEPARATOR #sym) \ +- __attribute__((section("___ksymtab" sec "+" #sym), used)) \ +- __aligned(sizeof(void *)) \ +- = { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym } +- +-#define __KSYMTAB_ENTRY(sym, sec) \ ++#define __KSYMTAB_ENTRY(sym, sec, ns) \ + static const struct kernel_symbol __ksymtab_##sym \ +- asm("__ksymtab_" #sym) \ ++ asm("__ksymtab_" ns NS_SEPARATOR #sym) \ + __attribute__((section("___ksymtab" sec "+" #sym), used)) \ + __aligned(sizeof(void *)) \ +- = { (unsigned long)&sym, __kstrtab_##sym, NULL } ++ = { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym } + + struct kernel_symbol { + unsigned long value; +@@ -97,29 +80,21 @@ struct kernel_symbol { + + #ifdef __GENKSYMS__ + +-#define ___EXPORT_SYMBOL(sym,sec) __GENKSYMS_EXPORT_SYMBOL(sym) +-#define ___EXPORT_SYMBOL_NS(sym,sec,ns) __GENKSYMS_EXPORT_SYMBOL(sym) ++#define ___EXPORT_SYMBOL(sym, sec, ns) __GENKSYMS_EXPORT_SYMBOL(sym) + + #else + +-#define ___export_symbol_common(sym, sec) \ ++/* For every exported symbol, place a struct in the __ksymtab section */ ++#define ___EXPORT_SYMBOL(sym, sec, ns) \ + extern typeof(sym) sym; \ + __CRC_SYMBOL(sym, sec); \ + static const char __kstrtab_##sym[] \ + __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ +- = #sym \ +- +-/* For every exported symbol, place a struct in the __ksymtab section */ +-#define ___EXPORT_SYMBOL_NS(sym, sec, ns) \ +- ___export_symbol_common(sym, sec); \ ++ = #sym; \ + static const char __kstrtabns_##sym[] \ + __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ +- = #ns; \ +- __KSYMTAB_ENTRY_NS(sym, sec, ns) +- +-#define ___EXPORT_SYMBOL(sym, sec) \ +- ___export_symbol_common(sym, sec); \ +- __KSYMTAB_ENTRY(sym, sec) ++ = ns; \ ++ __KSYMTAB_ENTRY(sym, sec, ns) + + #endif + +@@ -130,8 +105,7 @@ struct kernel_symbol { + * be reused in other execution contexts such as the UEFI stub or the + * decompressor. + */ +-#define __EXPORT_SYMBOL_NS(sym, sec, ns) +-#define __EXPORT_SYMBOL(sym, sec) ++#define __EXPORT_SYMBOL(sym, sec, ns) + + #elif defined(CONFIG_TRIM_UNUSED_KSYMS) + +@@ -147,48 +121,38 @@ struct kernel_symbol { + #define __ksym_marker(sym) \ + static int __ksym_marker_##sym[0] __section(".discard.ksym") __used + +-#define __EXPORT_SYMBOL(sym, sec) \ ++#define __EXPORT_SYMBOL(sym, sec, ns) \ + __ksym_marker(sym); \ +- __cond_export_sym(sym, sec, __is_defined(__KSYM_##sym)) +-#define __cond_export_sym(sym, sec, conf) \ +- ___cond_export_sym(sym, sec, conf) +-#define ___cond_export_sym(sym, sec, enabled) \ +- __cond_export_sym_##enabled(sym, sec) +-#define __cond_export_sym_1(sym, sec) ___EXPORT_SYMBOL(sym, sec) +-#define __cond_export_sym_0(sym, sec) /* nothing */ +- +-#define __EXPORT_SYMBOL_NS(sym, sec, ns) \ +- __ksym_marker(sym); \ +- __cond_export_ns_sym(sym, sec, ns, __is_defined(__KSYM_##sym)) +-#define __cond_export_ns_sym(sym, sec, ns, conf) \ +- ___cond_export_ns_sym(sym, sec, ns, conf) +-#define ___cond_export_ns_sym(sym, sec, ns, enabled) \ +- __cond_export_ns_sym_##enabled(sym, sec, ns) +-#define __cond_export_ns_sym_1(sym, sec, ns) ___EXPORT_SYMBOL_NS(sym, sec, ns) +-#define __cond_export_ns_sym_0(sym, sec, ns) /* nothing */ ++ __cond_export_sym(sym, sec, ns, __is_defined(__KSYM_##sym)) ++#define __cond_export_sym(sym, sec, ns, conf) \ ++ ___cond_export_sym(sym, sec, ns, conf) ++#define ___cond_export_sym(sym, sec, ns, enabled) \ ++ __cond_export_sym_##enabled(sym, sec, ns) ++#define __cond_export_sym_1(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns) ++#define __cond_export_sym_0(sym, sec, ns) /* nothing */ + + #else + +-#define __EXPORT_SYMBOL_NS(sym,sec,ns) ___EXPORT_SYMBOL_NS(sym,sec,ns) +-#define __EXPORT_SYMBOL(sym,sec) ___EXPORT_SYMBOL(sym,sec) ++#define __EXPORT_SYMBOL(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns) + + #endif /* CONFIG_MODULES */ + + #ifdef DEFAULT_SYMBOL_NAMESPACE +-#undef __EXPORT_SYMBOL +-#define __EXPORT_SYMBOL(sym, sec) \ +- __EXPORT_SYMBOL_NS(sym, sec, DEFAULT_SYMBOL_NAMESPACE) ++#include ++#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, __stringify(DEFAULT_SYMBOL_NAMESPACE)) ++#else ++#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "") + #endif + +-#define EXPORT_SYMBOL(sym) __EXPORT_SYMBOL(sym, "") +-#define EXPORT_SYMBOL_GPL(sym) __EXPORT_SYMBOL(sym, "_gpl") +-#define EXPORT_SYMBOL_GPL_FUTURE(sym) __EXPORT_SYMBOL(sym, "_gpl_future") +-#define EXPORT_SYMBOL_NS(sym, ns) __EXPORT_SYMBOL_NS(sym, "", ns) +-#define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL_NS(sym, "_gpl", ns) ++#define EXPORT_SYMBOL(sym) _EXPORT_SYMBOL(sym, "") ++#define EXPORT_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "_gpl") ++#define EXPORT_SYMBOL_GPL_FUTURE(sym) _EXPORT_SYMBOL(sym, "_gpl_future") ++#define EXPORT_SYMBOL_NS(sym, ns) __EXPORT_SYMBOL(sym, "", #ns) ++#define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL(sym, "_gpl", #ns) + + #ifdef CONFIG_UNUSED_SYMBOLS +-#define EXPORT_UNUSED_SYMBOL(sym) __EXPORT_SYMBOL(sym, "_unused") +-#define EXPORT_UNUSED_SYMBOL_GPL(sym) __EXPORT_SYMBOL(sym, "_unused_gpl") ++#define EXPORT_UNUSED_SYMBOL(sym) _EXPORT_SYMBOL(sym, "_unused") ++#define EXPORT_UNUSED_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "_unused_gpl") + #else + #define EXPORT_UNUSED_SYMBOL(sym) + #define EXPORT_UNUSED_SYMBOL_GPL(sym) +diff --git a/kernel/module.c b/kernel/module.c +index 32873bcce738..73f69ff86db5 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -1399,7 +1399,7 @@ static int verify_namespace_is_imported(const struct load_info *info, + char *imported_namespace; + + namespace = kernel_symbol_namespace(sym); +- if (namespace) { ++ if (namespace && namespace[0]) { + imported_namespace = get_modinfo(info, "import_ns"); + while (imported_namespace) { + if (strcmp(namespace, imported_namespace) == 0) + +From patchwork Fri Sep 27 09:36:01 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Masahiro Yamada +X-Patchwork-Id: 1131971 +Return-Path: +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 89BFFC32774 + for ; Fri, 27 Sep 2019 09:37:11 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id 5C04721848 + for ; Fri, 27 Sep 2019 09:37:11 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com + header.b="EM8WpQlH" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1726896AbfI0JhD (ORCPT + ); + Fri, 27 Sep 2019 05:37:03 -0400 +Received: from conuserg-07.nifty.com ([210.131.2.74]:33065 "EHLO + conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1726473AbfI0JhC (ORCPT + ); + Fri, 27 Sep 2019 05:37:02 -0400 +Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp + [153.142.97.92]) (authenticated) + by conuserg-07.nifty.com with ESMTP id x8R9a5uf001372; + Fri, 27 Sep 2019 18:36:10 +0900 +DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5uf001372 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; + s=dec2015msa; t=1569576971; + bh=PdteufK64PUrtistqDZxQfPkOhODuQM4/dZUBLfPgTA=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=EM8WpQlHl/RRg5lRspAhRnXuVP7NMRwN3vND8I4as8aaLPekCtI2sURqIXOQUzDqJ + TJHa0dr1aSxHTVohjmVKh7oax8Y6aHX6vl0frGNzHY2Kajqt1EupmVDFm5uVTT36nI + WTqmMnV47W4d6qBAKQZwm29A4ypO1YqbCZQRbrrvANW8PLu1Z4gsMkTGzAkFJ/v6aw + HY/TlIH66PvW6R/IEv69y/UWP17UXOHEpE7VWJKN4aqBCdnNEQwkFNCXzd0B4zz7VG + d5miMuXHwDAUjJBe6WWgZaWnkP07YEIXzgMDUvwQxkliu+OIVfQBRM26Bg370XpJOe + 0pyYPUk423uwg== +X-Nifty-SrcIP: [153.142.97.92] +From: Masahiro Yamada +To: Jessica Yu +Cc: Matthias Maennich , + Greg Kroah-Hartman , + Joel Fernandes , + Martijn Coenen , + Will Deacon , + Masahiro Yamada , + Michal Marek , + linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org +Subject: [PATCH 5/7] kbuild: fix build error of 'make nsdeps' in clean tree +Date: Fri, 27 Sep 2019 18:36:01 +0900 +Message-Id: <20190927093603.9140-6-yamada.masahiro@socionext.com> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> +References: <20190927093603.9140-1-yamada.masahiro@socionext.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +Running 'make nsdeps' in a clean source tree fails as follows: + +$ make -s clean; make -s defconfig; make nsdeps + [ snip ] +awk: fatal: cannot open file `init/modules.order' for reading (No such file or directory) +make: *** [Makefile;1307: modules.order] Error 2 +make: *** Deleting file 'modules.order' +make: *** Waiting for unfinished jobs.... + +The cause of the error is 'make nsdeps' does not build modules at all. +Set KBUILD_MODULES to fix it. + +Signed-off-by: Masahiro Yamada +Reviewed-by: Matthias Maennich +--- + + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d456746da347..80ba8efd56bb 100644 +--- a/Makefile ++++ b/Makefile +@@ -616,7 +616,7 @@ endif + # in addition to whatever we do anyway. + # Just "make" or "make all" shall build modules as well + +-ifneq ($(filter all _all modules,$(MAKECMDGOALS)),) ++ifneq ($(filter all _all modules nsdeps,$(MAKECMDGOALS)),) + KBUILD_MODULES := 1 + endif + + +From patchwork Fri Sep 27 09:36:02 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Masahiro Yamada +X-Patchwork-Id: 1131968 +Return-Path: +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 25162C4360C + for ; Fri, 27 Sep 2019 09:37:03 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id ECEED21848 + for ; Fri, 27 Sep 2019 09:37:02 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com + header.b="frbgdxeG" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1726730AbfI0JhC (ORCPT + ); + Fri, 27 Sep 2019 05:37:02 -0400 +Received: from conuserg-07.nifty.com ([210.131.2.74]:33054 "EHLO + conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1726385AbfI0JhB (ORCPT + ); + Fri, 27 Sep 2019 05:37:01 -0400 +Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp + [153.142.97.92]) (authenticated) + by conuserg-07.nifty.com with ESMTP id x8R9a5ug001372; + Fri, 27 Sep 2019 18:36:12 +0900 +DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ug001372 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; + s=dec2015msa; t=1569576972; + bh=UQ6bH4/qZBZ6u3bYLv57zfd3f4RxEgvS4K1+jdI01bE=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=frbgdxeGGQj1AAOjEhqLFlCDcjeLt7cStOzPH2l82NztyjA71sxo14Zi/bXCzvh4P + 9kwGdlzThgqbZ5CzsQdWDHGtrdB9yVtVpy5U1E7UswRYGVcjPc0tI+RKVhIb6drVlP + ytCFvoZbIb64pCdDTruU+ag/LDUV+50pjhDetlTWyp8DFje/JNuoquAbcFNwlWw2GC + wiGq7O8KYRo0/d/OJBomxqPpMxuswzr450Tbaau6QB7nrV6HzL4rkxGg0xrB/NddBz + +gXUFIRw3MPzkk2lypyO98bt6neq0ofHuGCZqKUpFvH9K9bOSqQF+kDIgy6RdYXUfy + ELHedr+p7EVNQ== +X-Nifty-SrcIP: [153.142.97.92] +From: Masahiro Yamada +To: Jessica Yu +Cc: Matthias Maennich , + Greg Kroah-Hartman , + Joel Fernandes , + Martijn Coenen , + Will Deacon , + Masahiro Yamada , + linux-kernel@vger.kernel.org +Subject: [PATCH 6/7] nsdeps: fix hashbang of scripts/nsdeps +Date: Fri, 27 Sep 2019 18:36:02 +0900 +Message-Id: <20190927093603.9140-7-yamada.masahiro@socionext.com> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> +References: <20190927093603.9140-1-yamada.masahiro@socionext.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +This script does not use bash-extension. I am guessing this hashbang +was copied from scripts/coccicheck, which really uses bash-extension. + +/bin/sh is enough for this script. + +Signed-off-by: Masahiro Yamada +Reviewed-by: Matthias Maennich +--- + + scripts/nsdeps | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/nsdeps b/scripts/nsdeps +index ac2b6031dd13..964b7fb8c546 100644 +--- a/scripts/nsdeps ++++ b/scripts/nsdeps +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # SPDX-License-Identifier: GPL-2.0 + # Linux kernel symbol namespace import generator + # + +From patchwork Fri Sep 27 09:36:03 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Masahiro Yamada +X-Patchwork-Id: 1131973 +Return-Path: +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 18E37C4360C + for ; Fri, 27 Sep 2019 09:37:20 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id E582321906 + for ; Fri, 27 Sep 2019 09:37:19 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com + header.b="uoWzyLR7" +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1727135AbfI0JhT (ORCPT + ); + Fri, 27 Sep 2019 05:37:19 -0400 +Received: from conuserg-07.nifty.com ([210.131.2.74]:33055 "EHLO + conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S1726423AbfI0JhC (ORCPT + ); + Fri, 27 Sep 2019 05:37:02 -0400 +Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp + [153.142.97.92]) (authenticated) + by conuserg-07.nifty.com with ESMTP id x8R9a5uh001372; + Fri, 27 Sep 2019 18:36:13 +0900 +DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5uh001372 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; + s=dec2015msa; t=1569576973; + bh=8Z1yZcx7lt82yK82hKDWaRuslS2lyBCS5/OQGziEcvs=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=uoWzyLR7WPO97Yw+7t2zQ6Bn+mWJ4wLoAivcRWkOp71OIQ4a7nclOHfnfEZcMfLq2 + gsfADMWqfz6bC+Epby+QMFO9UMLLAPmaOoQiOYb4pN843ldf5QrkWkPYAZ6B4KFLrT + EHjvPttNsdP+0/CAKOdTvY3Xf4STusL1CBVtA2fcq1OK8Cg9yfWAdPAWeW/HbjcZ5n + OtN0uNov4PROdyIluCGO1s+S4YLwJN+stI+hpC18A8xDmwkxfwzvczxj5ajXXyzHRu + AYi7QmobHJr+rFXav0f1osZ59d0aD+l8SF0fF46Q3Cp3f7aXef+eMDSH6iHp7z5uGT + ekA/bWw/6OMew== +X-Nifty-SrcIP: [153.142.97.92] +From: Masahiro Yamada +To: Jessica Yu +Cc: Matthias Maennich , + Greg Kroah-Hartman , + Joel Fernandes , + Martijn Coenen , + Will Deacon , + Masahiro Yamada , + linux-kernel@vger.kernel.org +Subject: [PATCH 7/7] nsdeps: make generated patches independent of locale +Date: Fri, 27 Sep 2019 18:36:03 +0900 +Message-Id: <20190927093603.9140-8-yamada.masahiro@socionext.com> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> +References: <20190927093603.9140-1-yamada.masahiro@socionext.com> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +scripts/nsdeps automatically generates a patch to add MODULE_IMPORT_NS +tags, and what is nicer, it sorts the lines alphabetically with the +"sort" command. However, the output from the "sort" command depends +on locale. + +Especially when namespaces contain underscores, the result is +different depending on the locale. + +For example, I got this: + +$ { echo usbcommon; echo usb_common; } | LANG=en_US.UTF-8 sort +usbcommon +usb_common +$ { echo usbcommon; echo usb_common; } | LANG=C sort +usb_common +usbcommon + +So, this means people might potentially send different patches. + +This kind of issue was reported in the past, for example, +commit f55f2328bb28 ("kbuild: make sorting initramfs contents +independent of locale"). + +Adding "LANG=C" is a conventional way of fixing when a deterministic +result is desirable. + +Signed-off-by: Masahiro Yamada +Reviewed-by: Matthias Maennich +--- + + scripts/nsdeps | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/nsdeps b/scripts/nsdeps +index 964b7fb8c546..3754dac13b31 100644 +--- a/scripts/nsdeps ++++ b/scripts/nsdeps +@@ -41,7 +41,7 @@ generate_deps() { + for source_file in $mod_source_files; do + sed '/MODULE_IMPORT_NS/Q' $source_file > ${source_file}.tmp + offset=$(wc -l ${source_file}.tmp | awk '{print $1;}') +- cat $source_file | grep MODULE_IMPORT_NS | sort -u >> ${source_file}.tmp ++ cat $source_file | grep MODULE_IMPORT_NS | LANG=C sort -u >> ${source_file}.tmp + tail -n +$((offset +1)) ${source_file} | grep -v MODULE_IMPORT_NS >> ${source_file}.tmp + if ! diff -q ${source_file} ${source_file}.tmp; then + mv ${source_file}.tmp ${source_file} From 8b95d14369605306da2cc9efdfb491bd22c07d45 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 06/29] linux (Generic): update to linux-5.4-rc2 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index aeb46727fe..b154ba1557 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,8 +37,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc1" - PKG_SHA256="69fe1a33748cae6581cce2b85783485b807c77f1227d69acfd6aac44c40330a9" + PKG_VERSION="5.4-rc2" + PKG_SHA256="4c7089427e042f32498f9158ab4e7a892feaf6d74325ffac268c37cfc339d636" PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; From c0017abd9eb9b16260b072b69e87eb193775c8d9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 07/29] xf86-video-nvidia-legacy: fix SUBDIRS= removal in 5.4-rc2 --- ...cy-05-fix-SUBDIRS-removed-in-5.4-rc2.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-05-fix-SUBDIRS-removed-in-5.4-rc2.patch diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-05-fix-SUBDIRS-removed-in-5.4-rc2.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-05-fix-SUBDIRS-removed-in-5.4-rc2.patch new file mode 100644 index 0000000000..3b1d555098 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-05-fix-SUBDIRS-removed-in-5.4-rc2.patch @@ -0,0 +1,26 @@ +From 8d1388c2ec0febfd77527a8bc5791a5b75bfcb66 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Tue, 8 Oct 2019 04:08:51 +0100 +Subject: [PATCH] Fix deprecated SUBDIRS= in 5.4-rc2 + +Ref: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.4-rc2&id=7e35b42591c058b91282f95ce3b2cf0c05ffe93d +--- + kernel/nvidia-modules-common.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/nvidia-modules-common.mk b/kernel/nvidia-modules-common.mk +index 918e8a9..8d36dbb 100644 +--- a/kernel/nvidia-modules-common.mk ++++ b/kernel/nvidia-modules-common.mk +@@ -176,7 +176,7 @@ ifndef NV_VERBOSE + endif + + KBUILD_PARAMS += KBUILD_VERBOSE=$(NV_VERBOSE) +-KBUILD_PARAMS += -C $(KERNEL_SOURCES) SUBDIRS=$(PWD) ++KBUILD_PARAMS += -C $(KERNEL_SOURCES) M=$(PWD) + KBUILD_PARAMS += ARCH=$(ARCH) + + # +-- +2.14.1 + From e508ea39b2064d909eda0d3dfa27927d57388cf6 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 08/29] linux (Generic): update to linux-5.4-rc3 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index b154ba1557..e18a6bb5bb 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,8 +37,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc2" - PKG_SHA256="4c7089427e042f32498f9158ab4e7a892feaf6d74325ffac268c37cfc339d636" + PKG_VERSION="5.4-rc3" + PKG_SHA256="c50d29a05e5d8deea6c6bd3478ca7f13170febe928436e1fad49a11bc359e9c2" PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; From bfab7af3601179e1912a6194577fd4273e74cdcd Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 09/29] linux (Generic): config options for 5.4-rc3 --- projects/Generic/linux/linux.x86_64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 2c148781ae..88dc5e2310 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.0-rc1 Kernel Configuration +# Linux/x86_64 5.4.0-rc3 Kernel Configuration # # From 71e1fa0af4033dfaf504e43c7010f907fbdc8bd3 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 10/29] Revert "TEMP: linux (Generic): add namespace fixes and cleanup" This reverts commit 9ec9aa5ea531b801fc973a1d090fe52e273a7b47. --- .../linux-999-namespace-fixes-cleanup.patch | 957 ------------------ 1 file changed, 957 deletions(-) delete mode 100644 packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch diff --git a/packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch b/packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch deleted file mode 100644 index f9a61ba67f..0000000000 --- a/packages/linux/patches/default/linux-999-namespace-fixes-cleanup.patch +++ /dev/null @@ -1,957 +0,0 @@ -From patchwork Fri Sep 27 09:35:57 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Masahiro Yamada -X-Patchwork-Id: 1131974 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id CF6D9C4360C - for ; Fri, 27 Sep 2019 09:37:23 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id A32A821906 - for ; Fri, 27 Sep 2019 09:37:23 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com - header.b="a/t82mTw" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727164AbfI0JhW (ORCPT - ); - Fri, 27 Sep 2019 05:37:22 -0400 -Received: from conuserg-07.nifty.com ([210.131.2.74]:33057 "EHLO - conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726438AbfI0JhC (ORCPT - ); - Fri, 27 Sep 2019 05:37:02 -0400 -Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp - [153.142.97.92]) (authenticated) - by conuserg-07.nifty.com with ESMTP id x8R9a5ub001372; - Fri, 27 Sep 2019 18:36:07 +0900 -DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ub001372 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; - s=dec2015msa; t=1569576967; - bh=vJzF8WlgUqc1RsR95UB9lwwYV0dr5aBFLgK7a4VpJl0=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=a/t82mTwbwWZPr0/tQv9F1qEmfxY+FFesX4KbzmGMTG21vQhlXMBP7rrvpG/Gvk6w - EC+o8FZKVJbbAVEZoykh5cD2QqCDz/m+73YH1vmQ2Up3QMvK99h0chvD0XxdoYMafC - uOsZH+QvFnmPwiHz1IRaSCJXFXASiKeDWhOTxiFDswTY2pRWlD9V3c//TfIpSFUCwr - Rz0S84dpoQubEEROWm9wXT/T9ga6jnFTjaA5V4G6/pBsqw1cEZTCcCRkj3XXFk4KLL - 2mhnuT7X3lne5Abip9GRwCQrTuntCf8So9MR7YqWsmfYyqDEW/17TOx+STvRxZF6TM - Cy6NJ4OYl1HKw== -X-Nifty-SrcIP: [153.142.97.92] -From: Masahiro Yamada -To: Jessica Yu -Cc: Matthias Maennich , - Greg Kroah-Hartman , - Joel Fernandes , - Martijn Coenen , - Will Deacon , - Masahiro Yamada , - Michal Marek , - linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH 1/7] modpost: fix broken sym->namespace for external module - builds -Date: Fri, 27 Sep 2019 18:35:57 +0900 -Message-Id: <20190927093603.9140-2-yamada.masahiro@socionext.com> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> -References: <20190927093603.9140-1-yamada.masahiro@socionext.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -Currently, external module builds produce tons of false-positives: - - WARNING: module uses symbol from namespace , but does not import it. - -Here, the part shows a random string. - -When you build external modules, the symbol info of vmlinux and -in-kernel modules are read from $(objtree)/Module.symvers, but -read_dump() is buggy in multiple ways: - -[1] When the modpost is run for vmlinux and in-kernel modules, -sym_extract_namespace() correctly allocates memory for the namespace. -On the other hand, read_dump() does not, then sym->namespace will -point to somewhere in the line buffer of get_next_line(). The data -in the buffer will be replaced soon, and sym->namespace will end up -with pointing to unrelated data. As a result, check_exports() will -show random strings in the warning messages. - -[2] When there is no namespace, sym_extract_namespace() returns NULL. -On the other hand, read_dump() sets namespace to an empty string "". -(but, it will be later replaced with unrelated data due to bug [1].) -The check_exports() shows a warning unless exp->namespace is NULL, -so every symbol read from read_dump() emits the warning, which is -mostly false positive. - -To address [1], I added NOFAIL(strdup(...)) to allocate memory. -For [2], I changed the if-conditional in check_exports(). - -Signed-off-by: Masahiro Yamada -Reviewed-by: Matthias Maennich ---- - - 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 3961941e8e7a..5c628a7d80f7 100644 ---- a/scripts/mod/modpost.c -+++ b/scripts/mod/modpost.c -@@ -2195,7 +2195,7 @@ static int check_exports(struct module *mod) - else - basename = mod->name; - -- if (exp->namespace) { -+ if (exp->namespace && exp->namespace[0]) { - add_namespace(&mod->required_namespaces, - exp->namespace); - -@@ -2453,7 +2453,7 @@ static void read_dump(const char *fname, unsigned int kernel) - mod = new_module(modname); - mod->skip = 1; - } -- s = sym_add_exported(symname, namespace, mod, -+ s = sym_add_exported(symname, NOFAIL(strdup(namespace)), mod, - export_no(export)); - s->kernel = kernel; - s->preloaded = 1; - -From patchwork Fri Sep 27 09:35:58 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Masahiro Yamada -X-Patchwork-Id: 1131972 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 6F487C352AB - for ; Fri, 27 Sep 2019 09:37:16 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 40D38207E0 - for ; Fri, 27 Sep 2019 09:37:16 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com - header.b="2NU1Uj+G" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727114AbfI0JhP (ORCPT - ); - Fri, 27 Sep 2019 05:37:15 -0400 -Received: from conuserg-07.nifty.com ([210.131.2.74]:33064 "EHLO - conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726444AbfI0JhC (ORCPT - ); - Fri, 27 Sep 2019 05:37:02 -0400 -Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp - [153.142.97.92]) (authenticated) - by conuserg-07.nifty.com with ESMTP id x8R9a5uc001372; - Fri, 27 Sep 2019 18:36:08 +0900 -DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5uc001372 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; - s=dec2015msa; t=1569576968; - bh=k0hBXKWoJkYYxdDyuOyeX7IT6hvCtlLoJTUWwkZpHoo=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=2NU1Uj+GZgATSlHQ/wpNiFGS13yTeurDYkQ5oWGWobbFSPBjB+S2L6Fw/LgnWkTAq - hWIRQQ41fCSLUNCBf+HYJZpbU959wGqrEA72oxHXEOjKJMSWh0zUo3N/sSGmjzhqzA - D32uDOKQCjHot8mwF7RjQ3ysW8A3joNSk4qE8q1zcFV/svc+eMf4VFKUt2JxAYJCKw - rysk1hb7vz3OotkLSrzSX5ezVfEFv12Sr9ojoceyMo6VmsPBBWJhLrk4vNps7///3U - yEBu+i2JGF6ZOMzg2oRMYSRJkvsMvIqDtV92F3sTt+tEvDeBMXe70++/0/ZmSO0rt4 - ozmoh+j5CsHlw== -X-Nifty-SrcIP: [153.142.97.92] -From: Masahiro Yamada -To: Jessica Yu -Cc: Matthias Maennich , - Greg Kroah-Hartman , - Joel Fernandes , - Martijn Coenen , - Will Deacon , - Masahiro Yamada , - Michal Marek , - Will Deacon , linux-kbuild@vger.kernel.org, - linux-kernel@vger.kernel.org -Subject: [PATCH 2/7] module: swap the order of symbol.namespace -Date: Fri, 27 Sep 2019 18:35:58 +0900 -Message-Id: <20190927093603.9140-3-yamada.masahiro@socionext.com> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> -References: <20190927093603.9140-1-yamada.masahiro@socionext.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -Currently, EXPORT_SYMBOL_NS(_GPL) constructs the kernel symbol as -follows: - - __ksymtab_SYMBOL.NAMESPACE - -The sym_extract_namespace() in modpost allocates memory for the part -SYMBOL.NAMESPACE when '.' is contained. One problem is that the pointer -returned by strdup() is lost because the symbol name will be copied to -malloc'ed memory by alloc_symbol(). No one will keep track of the -pointer of strdup'ed memory. - -sym->namespace still points to the NAMESPACE part. So, if you like, -you can free it with complicated code like this: - - free(sym->namespace - strlen(sym->name) - 1); - -I would not say it is fatal since we seldom bother to manually free -memory in host programs. But, I can fix it in an elegant way. - -I swapped the order of the symbol and the namespace as follows: - - __ksymtab_NAMESPACE.SYMBOL - -then, simplified sym_extract_namespace() so that it allocates memory -only for the NAMESPACE part. - -I prefer this order because it is intuitive and also matches to major -languages. For example, NAMESPACE::NAME in C++, MODULE.NAME in Python. - -Signed-off-by: Masahiro Yamada -Reviewed-by: Matthias Maennich ---- - - include/linux/export.h | 4 ++-- - scripts/mod/modpost.c | 16 +++++++--------- - 2 files changed, 9 insertions(+), 11 deletions(-) - -diff --git a/include/linux/export.h b/include/linux/export.h -index 95f55b7f83a0..0695d4e847d9 100644 ---- a/include/linux/export.h -+++ b/include/linux/export.h -@@ -52,7 +52,7 @@ extern struct module __this_module; - __ADDRESSABLE(sym) \ - asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \ - " .balign 4 \n" \ -- "__ksymtab_" #sym NS_SEPARATOR #ns ": \n" \ -+ "__ksymtab_" #ns NS_SEPARATOR #sym ": \n" \ - " .long " #sym "- . \n" \ - " .long __kstrtab_" #sym "- . \n" \ - " .long __kstrtab_ns_" #sym "- . \n" \ -@@ -76,7 +76,7 @@ struct kernel_symbol { - #else - #define __KSYMTAB_ENTRY_NS(sym, sec, ns) \ - static const struct kernel_symbol __ksymtab_##sym##__##ns \ -- asm("__ksymtab_" #sym NS_SEPARATOR #ns) \ -+ asm("__ksymtab_" #ns NS_SEPARATOR #sym) \ - __attribute__((section("___ksymtab" sec "+" #sym), used)) \ - __aligned(sizeof(void *)) \ - = { (unsigned long)&sym, __kstrtab_##sym, __kstrtab_ns_##sym } -diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 5c628a7d80f7..d171b0cffb05 100644 ---- a/scripts/mod/modpost.c -+++ b/scripts/mod/modpost.c -@@ -350,18 +350,16 @@ static enum export export_from_sec(struct elf_info *elf, unsigned int sec) - - static const char *sym_extract_namespace(const char **symname) - { -- size_t n; -- char *dupsymname; -+ char *namespace = NULL; -+ char *ns_separator; - -- n = strcspn(*symname, "."); -- if (n < strlen(*symname) - 1) { -- dupsymname = NOFAIL(strdup(*symname)); -- dupsymname[n] = '\0'; -- *symname = dupsymname; -- return dupsymname + n + 1; -+ ns_separator = strchr(*symname, '.'); -+ if (ns_separator) { -+ namespace = NOFAIL(strndup(*symname, ns_separator - *symname)); -+ *symname = ns_separator + 1; - } - -- return NULL; -+ return namespace; - } - - /** - -From patchwork Fri Sep 27 09:35:59 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Masahiro Yamada -X-Patchwork-Id: 1131975 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 2FA71C4360C - for ; Fri, 27 Sep 2019 09:37:27 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id E8AAC207E0 - for ; Fri, 27 Sep 2019 09:37:26 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com - header.b="NKUk7uGl" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727198AbfI0Jh0 (ORCPT - ); - Fri, 27 Sep 2019 05:37:26 -0400 -Received: from conuserg-07.nifty.com ([210.131.2.74]:33056 "EHLO - conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726339AbfI0JhB (ORCPT - ); - Fri, 27 Sep 2019 05:37:01 -0400 -Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp - [153.142.97.92]) (authenticated) - by conuserg-07.nifty.com with ESMTP id x8R9a5ud001372; - Fri, 27 Sep 2019 18:36:09 +0900 -DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ud001372 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; - s=dec2015msa; t=1569576969; - bh=Fynp0G6evPgfPqhsg7r4WZQkR9spuRzwJdxpkYdeONU=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=NKUk7uGll+V8LdUDPB1GVeeJOolszILWQCZ7SBQwkVdpbGuFn/6kDpUjNB0/QnynN - 2qtuscgntP19CTgrkmvl5MSiiiCNBM8MTMvqvOQ4ZMK6qxLZECMooRQMg6/8GhwHCg - 4qU/g9rGsuM3KtYDnkAKAF8mdbt1DU2+OHsXQWxPZbNlhE1f7JA0E0NXhTwlDXPVww - 4avl6+5iYDzdjgiBkx4qQI4Jn3n3WKQrBxF1+7k8g8hxJW9+fKH4EYxiht2YQCla4r - xGD/ItNo3FzzIpks94EAkkrKdxQaT80bh4XJSdYX5FJ+9Eyq/pDWRgWKZzoce+x0d1 - X55tIS908scnw== -X-Nifty-SrcIP: [153.142.97.92] -From: Masahiro Yamada -To: Jessica Yu -Cc: Matthias Maennich , - Greg Kroah-Hartman , - Joel Fernandes , - Martijn Coenen , - Will Deacon , - Masahiro Yamada , - Will Deacon , linux-kernel@vger.kernel.org -Subject: [PATCH 3/7] module: rename __kstrtab_ns_* to __kstrtabns_* to avoid - symbol conflict -Date: Fri, 27 Sep 2019 18:35:59 +0900 -Message-Id: <20190927093603.9140-4-yamada.masahiro@socionext.com> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> -References: <20190927093603.9140-1-yamada.masahiro@socionext.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -The module namespace produces __strtab_ns_ symbols to store -namespace strings, but it does not guarantee the name uniqueness. -This is a potential problem because we have exported symbols staring -with "ns_". - -For example, kernel/capability.c exports the following symbols: - - EXPORT_SYMBOL(ns_capable); - EXPORT_SYMBOL(capable); - -Assume a situation where those are converted as follows: - - EXPORT_SYMBOL_NS(ns_capable, some_namespace); - EXPORT_SYMBOL_NS(capable, some_namespace); - -The former expands to "__kstrtab_ns_capable" and "__kstrtab_ns_ns_capable", -and the latter to "__kstrtab_capable" and "__kstrtab_ns_capable". -Then, we have the duplication for "__kstrtab_ns_capable". - -To ensure the uniqueness, rename "__kstrtab_ns_*" to "__kstrtabns_*". - -Signed-off-by: Masahiro Yamada -Reviewed-by: Matthias Maennich ---- - - include/linux/export.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/linux/export.h b/include/linux/export.h -index 0695d4e847d9..621158ecd2e2 100644 ---- a/include/linux/export.h -+++ b/include/linux/export.h -@@ -55,7 +55,7 @@ extern struct module __this_module; - "__ksymtab_" #ns NS_SEPARATOR #sym ": \n" \ - " .long " #sym "- . \n" \ - " .long __kstrtab_" #sym "- . \n" \ -- " .long __kstrtab_ns_" #sym "- . \n" \ -+ " .long __kstrtabns_" #sym "- . \n" \ - " .previous \n") - - #define __KSYMTAB_ENTRY(sym, sec) \ -@@ -79,7 +79,7 @@ struct kernel_symbol { - asm("__ksymtab_" #ns NS_SEPARATOR #sym) \ - __attribute__((section("___ksymtab" sec "+" #sym), used)) \ - __aligned(sizeof(void *)) \ -- = { (unsigned long)&sym, __kstrtab_##sym, __kstrtab_ns_##sym } -+ = { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym } - - #define __KSYMTAB_ENTRY(sym, sec) \ - static const struct kernel_symbol __ksymtab_##sym \ -@@ -112,7 +112,7 @@ struct kernel_symbol { - /* For every exported symbol, place a struct in the __ksymtab section */ - #define ___EXPORT_SYMBOL_NS(sym, sec, ns) \ - ___export_symbol_common(sym, sec); \ -- static const char __kstrtab_ns_##sym[] \ -+ static const char __kstrtabns_##sym[] \ - __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ - = #ns; \ - __KSYMTAB_ENTRY_NS(sym, sec, ns) - -From patchwork Fri Sep 27 09:36:00 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Masahiro Yamada -X-Patchwork-Id: 1131970 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 5D966C4360C - for ; Fri, 27 Sep 2019 09:37:09 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 2A589207E0 - for ; Fri, 27 Sep 2019 09:37:09 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com - header.b="B0R09e0l" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726978AbfI0JhE (ORCPT - ); - Fri, 27 Sep 2019 05:37:04 -0400 -Received: from conuserg-07.nifty.com ([210.131.2.74]:33058 "EHLO - conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1725946AbfI0JhC (ORCPT - ); - Fri, 27 Sep 2019 05:37:02 -0400 -Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp - [153.142.97.92]) (authenticated) - by conuserg-07.nifty.com with ESMTP id x8R9a5ue001372; - Fri, 27 Sep 2019 18:36:09 +0900 -DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ue001372 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; - s=dec2015msa; t=1569576970; - bh=rsB4h06qUtfwfDPTJVMKf592jd7/Pnx6aEXTAIEd2KQ=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=B0R09e0lhFhBsdHnZKZbSPkPCeaxl+CutXvTjvjYBVKQU6KfUokdgT6QnYPVYx9wb - xAd/Fv3g/mfSwGtaTAxLBxI0MBNqFfbWzXBvBHZDBuDAX7qag5oUXZFIPClKjPjlxp - ly8cVPCH0Cp5U086RNQcP6jOioiNfOR4p99a8FEL2hN3iy5qKWy0Zgbyim33YVDDrQ - /qGdifZtVgss0BFFcDYhsC2Blr+ZrYDH7zXPihfT1eeOpJZSHsKxTVwgG8wtRfAHoS - Ij28vs2WB3r/nyt+Fisu8vTIOE6fD1AMQ4wsotlJs1AhLopuFrNqG8FbluLbYQWEJ+ - uT96h2QAFsYNg== -X-Nifty-SrcIP: [153.142.97.92] -From: Masahiro Yamada -To: Jessica Yu -Cc: Matthias Maennich , - Greg Kroah-Hartman , - Joel Fernandes , - Martijn Coenen , - Will Deacon , - Masahiro Yamada , - Will Deacon , linux-kernel@vger.kernel.org -Subject: [PATCH 4/7] module: avoid code duplication in include/linux/export.h -Date: Fri, 27 Sep 2019 18:36:00 +0900 -Message-Id: <20190927093603.9140-5-yamada.masahiro@socionext.com> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> -References: <20190927093603.9140-1-yamada.masahiro@socionext.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -include/linux/export.h has lots of code duplication between -EXPORT_SYMBOL and EXPORT_SYMBOL_NS. - -To improve the maintainability and readability, unify the -implementation. - -When the symbol has no namespace, pass the empty string "" to -the 'ns' parameter. - -The drawback of this change is, it grows the code size. -When the symbol has no namespace, sym->namespace was previously -NULL, but it is now am empty string "". So, it increases 1 byte -for every no namespace EXPORT_SYMBOL. - -A typical kernel configuration has 10K exported symbols, so it -increases 10KB in rough estimation. - -I did not come up with a good idea to refactor it without increasing -the code size. - -I am not sure how big a deal it is, but at least include/linux/export.h -looks nicer. - -Signed-off-by: Masahiro Yamada ---- - - include/linux/export.h | 100 +++++++++++++---------------------------- - kernel/module.c | 2 +- - 2 files changed, 33 insertions(+), 69 deletions(-) - -diff --git a/include/linux/export.h b/include/linux/export.h -index 621158ecd2e2..55245a405a2f 100644 ---- a/include/linux/export.h -+++ b/include/linux/export.h -@@ -48,45 +48,28 @@ extern struct module __this_module; - * absolute relocations that require runtime processing on relocatable - * kernels. - */ --#define __KSYMTAB_ENTRY_NS(sym, sec, ns) \ -+#define __KSYMTAB_ENTRY(sym, sec, ns) \ - __ADDRESSABLE(sym) \ - asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \ - " .balign 4 \n" \ -- "__ksymtab_" #ns NS_SEPARATOR #sym ": \n" \ -+ "__ksymtab_" ns NS_SEPARATOR #sym ": \n" \ - " .long " #sym "- . \n" \ - " .long __kstrtab_" #sym "- . \n" \ - " .long __kstrtabns_" #sym "- . \n" \ - " .previous \n") - --#define __KSYMTAB_ENTRY(sym, sec) \ -- __ADDRESSABLE(sym) \ -- asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \ -- " .balign 4 \n" \ -- "__ksymtab_" #sym ": \n" \ -- " .long " #sym "- . \n" \ -- " .long __kstrtab_" #sym "- . \n" \ -- " .long 0 \n" \ -- " .previous \n") -- - struct kernel_symbol { - int value_offset; - int name_offset; - int namespace_offset; - }; - #else --#define __KSYMTAB_ENTRY_NS(sym, sec, ns) \ -- static const struct kernel_symbol __ksymtab_##sym##__##ns \ -- asm("__ksymtab_" #ns NS_SEPARATOR #sym) \ -- __attribute__((section("___ksymtab" sec "+" #sym), used)) \ -- __aligned(sizeof(void *)) \ -- = { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym } -- --#define __KSYMTAB_ENTRY(sym, sec) \ -+#define __KSYMTAB_ENTRY(sym, sec, ns) \ - static const struct kernel_symbol __ksymtab_##sym \ -- asm("__ksymtab_" #sym) \ -+ asm("__ksymtab_" ns NS_SEPARATOR #sym) \ - __attribute__((section("___ksymtab" sec "+" #sym), used)) \ - __aligned(sizeof(void *)) \ -- = { (unsigned long)&sym, __kstrtab_##sym, NULL } -+ = { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym } - - struct kernel_symbol { - unsigned long value; -@@ -97,29 +80,21 @@ struct kernel_symbol { - - #ifdef __GENKSYMS__ - --#define ___EXPORT_SYMBOL(sym,sec) __GENKSYMS_EXPORT_SYMBOL(sym) --#define ___EXPORT_SYMBOL_NS(sym,sec,ns) __GENKSYMS_EXPORT_SYMBOL(sym) -+#define ___EXPORT_SYMBOL(sym, sec, ns) __GENKSYMS_EXPORT_SYMBOL(sym) - - #else - --#define ___export_symbol_common(sym, sec) \ -+/* For every exported symbol, place a struct in the __ksymtab section */ -+#define ___EXPORT_SYMBOL(sym, sec, ns) \ - extern typeof(sym) sym; \ - __CRC_SYMBOL(sym, sec); \ - static const char __kstrtab_##sym[] \ - __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ -- = #sym \ -- --/* For every exported symbol, place a struct in the __ksymtab section */ --#define ___EXPORT_SYMBOL_NS(sym, sec, ns) \ -- ___export_symbol_common(sym, sec); \ -+ = #sym; \ - static const char __kstrtabns_##sym[] \ - __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ -- = #ns; \ -- __KSYMTAB_ENTRY_NS(sym, sec, ns) -- --#define ___EXPORT_SYMBOL(sym, sec) \ -- ___export_symbol_common(sym, sec); \ -- __KSYMTAB_ENTRY(sym, sec) -+ = ns; \ -+ __KSYMTAB_ENTRY(sym, sec, ns) - - #endif - -@@ -130,8 +105,7 @@ struct kernel_symbol { - * be reused in other execution contexts such as the UEFI stub or the - * decompressor. - */ --#define __EXPORT_SYMBOL_NS(sym, sec, ns) --#define __EXPORT_SYMBOL(sym, sec) -+#define __EXPORT_SYMBOL(sym, sec, ns) - - #elif defined(CONFIG_TRIM_UNUSED_KSYMS) - -@@ -147,48 +121,38 @@ struct kernel_symbol { - #define __ksym_marker(sym) \ - static int __ksym_marker_##sym[0] __section(".discard.ksym") __used - --#define __EXPORT_SYMBOL(sym, sec) \ -+#define __EXPORT_SYMBOL(sym, sec, ns) \ - __ksym_marker(sym); \ -- __cond_export_sym(sym, sec, __is_defined(__KSYM_##sym)) --#define __cond_export_sym(sym, sec, conf) \ -- ___cond_export_sym(sym, sec, conf) --#define ___cond_export_sym(sym, sec, enabled) \ -- __cond_export_sym_##enabled(sym, sec) --#define __cond_export_sym_1(sym, sec) ___EXPORT_SYMBOL(sym, sec) --#define __cond_export_sym_0(sym, sec) /* nothing */ -- --#define __EXPORT_SYMBOL_NS(sym, sec, ns) \ -- __ksym_marker(sym); \ -- __cond_export_ns_sym(sym, sec, ns, __is_defined(__KSYM_##sym)) --#define __cond_export_ns_sym(sym, sec, ns, conf) \ -- ___cond_export_ns_sym(sym, sec, ns, conf) --#define ___cond_export_ns_sym(sym, sec, ns, enabled) \ -- __cond_export_ns_sym_##enabled(sym, sec, ns) --#define __cond_export_ns_sym_1(sym, sec, ns) ___EXPORT_SYMBOL_NS(sym, sec, ns) --#define __cond_export_ns_sym_0(sym, sec, ns) /* nothing */ -+ __cond_export_sym(sym, sec, ns, __is_defined(__KSYM_##sym)) -+#define __cond_export_sym(sym, sec, ns, conf) \ -+ ___cond_export_sym(sym, sec, ns, conf) -+#define ___cond_export_sym(sym, sec, ns, enabled) \ -+ __cond_export_sym_##enabled(sym, sec, ns) -+#define __cond_export_sym_1(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns) -+#define __cond_export_sym_0(sym, sec, ns) /* nothing */ - - #else - --#define __EXPORT_SYMBOL_NS(sym,sec,ns) ___EXPORT_SYMBOL_NS(sym,sec,ns) --#define __EXPORT_SYMBOL(sym,sec) ___EXPORT_SYMBOL(sym,sec) -+#define __EXPORT_SYMBOL(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns) - - #endif /* CONFIG_MODULES */ - - #ifdef DEFAULT_SYMBOL_NAMESPACE --#undef __EXPORT_SYMBOL --#define __EXPORT_SYMBOL(sym, sec) \ -- __EXPORT_SYMBOL_NS(sym, sec, DEFAULT_SYMBOL_NAMESPACE) -+#include -+#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, __stringify(DEFAULT_SYMBOL_NAMESPACE)) -+#else -+#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "") - #endif - --#define EXPORT_SYMBOL(sym) __EXPORT_SYMBOL(sym, "") --#define EXPORT_SYMBOL_GPL(sym) __EXPORT_SYMBOL(sym, "_gpl") --#define EXPORT_SYMBOL_GPL_FUTURE(sym) __EXPORT_SYMBOL(sym, "_gpl_future") --#define EXPORT_SYMBOL_NS(sym, ns) __EXPORT_SYMBOL_NS(sym, "", ns) --#define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL_NS(sym, "_gpl", ns) -+#define EXPORT_SYMBOL(sym) _EXPORT_SYMBOL(sym, "") -+#define EXPORT_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "_gpl") -+#define EXPORT_SYMBOL_GPL_FUTURE(sym) _EXPORT_SYMBOL(sym, "_gpl_future") -+#define EXPORT_SYMBOL_NS(sym, ns) __EXPORT_SYMBOL(sym, "", #ns) -+#define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL(sym, "_gpl", #ns) - - #ifdef CONFIG_UNUSED_SYMBOLS --#define EXPORT_UNUSED_SYMBOL(sym) __EXPORT_SYMBOL(sym, "_unused") --#define EXPORT_UNUSED_SYMBOL_GPL(sym) __EXPORT_SYMBOL(sym, "_unused_gpl") -+#define EXPORT_UNUSED_SYMBOL(sym) _EXPORT_SYMBOL(sym, "_unused") -+#define EXPORT_UNUSED_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "_unused_gpl") - #else - #define EXPORT_UNUSED_SYMBOL(sym) - #define EXPORT_UNUSED_SYMBOL_GPL(sym) -diff --git a/kernel/module.c b/kernel/module.c -index 32873bcce738..73f69ff86db5 100644 ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -1399,7 +1399,7 @@ static int verify_namespace_is_imported(const struct load_info *info, - char *imported_namespace; - - namespace = kernel_symbol_namespace(sym); -- if (namespace) { -+ if (namespace && namespace[0]) { - imported_namespace = get_modinfo(info, "import_ns"); - while (imported_namespace) { - if (strcmp(namespace, imported_namespace) == 0) - -From patchwork Fri Sep 27 09:36:01 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Masahiro Yamada -X-Patchwork-Id: 1131971 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 89BFFC32774 - for ; Fri, 27 Sep 2019 09:37:11 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 5C04721848 - for ; Fri, 27 Sep 2019 09:37:11 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com - header.b="EM8WpQlH" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726896AbfI0JhD (ORCPT - ); - Fri, 27 Sep 2019 05:37:03 -0400 -Received: from conuserg-07.nifty.com ([210.131.2.74]:33065 "EHLO - conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726473AbfI0JhC (ORCPT - ); - Fri, 27 Sep 2019 05:37:02 -0400 -Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp - [153.142.97.92]) (authenticated) - by conuserg-07.nifty.com with ESMTP id x8R9a5uf001372; - Fri, 27 Sep 2019 18:36:10 +0900 -DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5uf001372 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; - s=dec2015msa; t=1569576971; - bh=PdteufK64PUrtistqDZxQfPkOhODuQM4/dZUBLfPgTA=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=EM8WpQlHl/RRg5lRspAhRnXuVP7NMRwN3vND8I4as8aaLPekCtI2sURqIXOQUzDqJ - TJHa0dr1aSxHTVohjmVKh7oax8Y6aHX6vl0frGNzHY2Kajqt1EupmVDFm5uVTT36nI - WTqmMnV47W4d6qBAKQZwm29A4ypO1YqbCZQRbrrvANW8PLu1Z4gsMkTGzAkFJ/v6aw - HY/TlIH66PvW6R/IEv69y/UWP17UXOHEpE7VWJKN4aqBCdnNEQwkFNCXzd0B4zz7VG - d5miMuXHwDAUjJBe6WWgZaWnkP07YEIXzgMDUvwQxkliu+OIVfQBRM26Bg370XpJOe - 0pyYPUk423uwg== -X-Nifty-SrcIP: [153.142.97.92] -From: Masahiro Yamada -To: Jessica Yu -Cc: Matthias Maennich , - Greg Kroah-Hartman , - Joel Fernandes , - Martijn Coenen , - Will Deacon , - Masahiro Yamada , - Michal Marek , - linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH 5/7] kbuild: fix build error of 'make nsdeps' in clean tree -Date: Fri, 27 Sep 2019 18:36:01 +0900 -Message-Id: <20190927093603.9140-6-yamada.masahiro@socionext.com> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> -References: <20190927093603.9140-1-yamada.masahiro@socionext.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -Running 'make nsdeps' in a clean source tree fails as follows: - -$ make -s clean; make -s defconfig; make nsdeps - [ snip ] -awk: fatal: cannot open file `init/modules.order' for reading (No such file or directory) -make: *** [Makefile;1307: modules.order] Error 2 -make: *** Deleting file 'modules.order' -make: *** Waiting for unfinished jobs.... - -The cause of the error is 'make nsdeps' does not build modules at all. -Set KBUILD_MODULES to fix it. - -Signed-off-by: Masahiro Yamada -Reviewed-by: Matthias Maennich ---- - - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d456746da347..80ba8efd56bb 100644 ---- a/Makefile -+++ b/Makefile -@@ -616,7 +616,7 @@ endif - # in addition to whatever we do anyway. - # Just "make" or "make all" shall build modules as well - --ifneq ($(filter all _all modules,$(MAKECMDGOALS)),) -+ifneq ($(filter all _all modules nsdeps,$(MAKECMDGOALS)),) - KBUILD_MODULES := 1 - endif - - -From patchwork Fri Sep 27 09:36:02 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Masahiro Yamada -X-Patchwork-Id: 1131968 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 25162C4360C - for ; Fri, 27 Sep 2019 09:37:03 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id ECEED21848 - for ; Fri, 27 Sep 2019 09:37:02 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com - header.b="frbgdxeG" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726730AbfI0JhC (ORCPT - ); - Fri, 27 Sep 2019 05:37:02 -0400 -Received: from conuserg-07.nifty.com ([210.131.2.74]:33054 "EHLO - conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726385AbfI0JhB (ORCPT - ); - Fri, 27 Sep 2019 05:37:01 -0400 -Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp - [153.142.97.92]) (authenticated) - by conuserg-07.nifty.com with ESMTP id x8R9a5ug001372; - Fri, 27 Sep 2019 18:36:12 +0900 -DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5ug001372 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; - s=dec2015msa; t=1569576972; - bh=UQ6bH4/qZBZ6u3bYLv57zfd3f4RxEgvS4K1+jdI01bE=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=frbgdxeGGQj1AAOjEhqLFlCDcjeLt7cStOzPH2l82NztyjA71sxo14Zi/bXCzvh4P - 9kwGdlzThgqbZ5CzsQdWDHGtrdB9yVtVpy5U1E7UswRYGVcjPc0tI+RKVhIb6drVlP - ytCFvoZbIb64pCdDTruU+ag/LDUV+50pjhDetlTWyp8DFje/JNuoquAbcFNwlWw2GC - wiGq7O8KYRo0/d/OJBomxqPpMxuswzr450Tbaau6QB7nrV6HzL4rkxGg0xrB/NddBz - +gXUFIRw3MPzkk2lypyO98bt6neq0ofHuGCZqKUpFvH9K9bOSqQF+kDIgy6RdYXUfy - ELHedr+p7EVNQ== -X-Nifty-SrcIP: [153.142.97.92] -From: Masahiro Yamada -To: Jessica Yu -Cc: Matthias Maennich , - Greg Kroah-Hartman , - Joel Fernandes , - Martijn Coenen , - Will Deacon , - Masahiro Yamada , - linux-kernel@vger.kernel.org -Subject: [PATCH 6/7] nsdeps: fix hashbang of scripts/nsdeps -Date: Fri, 27 Sep 2019 18:36:02 +0900 -Message-Id: <20190927093603.9140-7-yamada.masahiro@socionext.com> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> -References: <20190927093603.9140-1-yamada.masahiro@socionext.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -This script does not use bash-extension. I am guessing this hashbang -was copied from scripts/coccicheck, which really uses bash-extension. - -/bin/sh is enough for this script. - -Signed-off-by: Masahiro Yamada -Reviewed-by: Matthias Maennich ---- - - scripts/nsdeps | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/nsdeps b/scripts/nsdeps -index ac2b6031dd13..964b7fb8c546 100644 ---- a/scripts/nsdeps -+++ b/scripts/nsdeps -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # SPDX-License-Identifier: GPL-2.0 - # Linux kernel symbol namespace import generator - # - -From patchwork Fri Sep 27 09:36:03 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Masahiro Yamada -X-Patchwork-Id: 1131973 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 18E37C4360C - for ; Fri, 27 Sep 2019 09:37:20 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id E582321906 - for ; Fri, 27 Sep 2019 09:37:19 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com - header.b="uoWzyLR7" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727135AbfI0JhT (ORCPT - ); - Fri, 27 Sep 2019 05:37:19 -0400 -Received: from conuserg-07.nifty.com ([210.131.2.74]:33055 "EHLO - conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726423AbfI0JhC (ORCPT - ); - Fri, 27 Sep 2019 05:37:02 -0400 -Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp - [153.142.97.92]) (authenticated) - by conuserg-07.nifty.com with ESMTP id x8R9a5uh001372; - Fri, 27 Sep 2019 18:36:13 +0900 -DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x8R9a5uh001372 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; - s=dec2015msa; t=1569576973; - bh=8Z1yZcx7lt82yK82hKDWaRuslS2lyBCS5/OQGziEcvs=; - h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=uoWzyLR7WPO97Yw+7t2zQ6Bn+mWJ4wLoAivcRWkOp71OIQ4a7nclOHfnfEZcMfLq2 - gsfADMWqfz6bC+Epby+QMFO9UMLLAPmaOoQiOYb4pN843ldf5QrkWkPYAZ6B4KFLrT - EHjvPttNsdP+0/CAKOdTvY3Xf4STusL1CBVtA2fcq1OK8Cg9yfWAdPAWeW/HbjcZ5n - OtN0uNov4PROdyIluCGO1s+S4YLwJN+stI+hpC18A8xDmwkxfwzvczxj5ajXXyzHRu - AYi7QmobHJr+rFXav0f1osZ59d0aD+l8SF0fF46Q3Cp3f7aXef+eMDSH6iHp7z5uGT - ekA/bWw/6OMew== -X-Nifty-SrcIP: [153.142.97.92] -From: Masahiro Yamada -To: Jessica Yu -Cc: Matthias Maennich , - Greg Kroah-Hartman , - Joel Fernandes , - Martijn Coenen , - Will Deacon , - Masahiro Yamada , - linux-kernel@vger.kernel.org -Subject: [PATCH 7/7] nsdeps: make generated patches independent of locale -Date: Fri, 27 Sep 2019 18:36:03 +0900 -Message-Id: <20190927093603.9140-8-yamada.masahiro@socionext.com> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190927093603.9140-1-yamada.masahiro@socionext.com> -References: <20190927093603.9140-1-yamada.masahiro@socionext.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -scripts/nsdeps automatically generates a patch to add MODULE_IMPORT_NS -tags, and what is nicer, it sorts the lines alphabetically with the -"sort" command. However, the output from the "sort" command depends -on locale. - -Especially when namespaces contain underscores, the result is -different depending on the locale. - -For example, I got this: - -$ { echo usbcommon; echo usb_common; } | LANG=en_US.UTF-8 sort -usbcommon -usb_common -$ { echo usbcommon; echo usb_common; } | LANG=C sort -usb_common -usbcommon - -So, this means people might potentially send different patches. - -This kind of issue was reported in the past, for example, -commit f55f2328bb28 ("kbuild: make sorting initramfs contents -independent of locale"). - -Adding "LANG=C" is a conventional way of fixing when a deterministic -result is desirable. - -Signed-off-by: Masahiro Yamada -Reviewed-by: Matthias Maennich ---- - - scripts/nsdeps | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/nsdeps b/scripts/nsdeps -index 964b7fb8c546..3754dac13b31 100644 ---- a/scripts/nsdeps -+++ b/scripts/nsdeps -@@ -41,7 +41,7 @@ generate_deps() { - for source_file in $mod_source_files; do - sed '/MODULE_IMPORT_NS/Q' $source_file > ${source_file}.tmp - offset=$(wc -l ${source_file}.tmp | awk '{print $1;}') -- cat $source_file | grep MODULE_IMPORT_NS | sort -u >> ${source_file}.tmp -+ cat $source_file | grep MODULE_IMPORT_NS | LANG=C sort -u >> ${source_file}.tmp - tail -n +$((offset +1)) ${source_file} | grep -v MODULE_IMPORT_NS >> ${source_file}.tmp - if ! diff -q ${source_file} ${source_file}.tmp; then - mv ${source_file}.tmp ${source_file} From 84d64404359d8528303f52d6c94fd78a56fee90c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 11/29] linux (Generic): update to linux-5.4-rc4 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index e18a6bb5bb..eebb77a20c 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,8 +37,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc3" - PKG_SHA256="c50d29a05e5d8deea6c6bd3478ca7f13170febe928436e1fad49a11bc359e9c2" + PKG_VERSION="5.4-rc4" + PKG_SHA256="b1f4856860c9ac423446324aec0090a8de73b2b7213baede062db7d0d3b41838" PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; From 6605e6e74a1d00d415475193c65a495c49e0c36e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 12/29] linux (Generic): config options for 5.4-rc4 --- projects/Generic/linux/linux.x86_64.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 88dc5e2310..5e9a593bf6 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.0-rc3 Kernel Configuration +# Linux/x86_64 5.4.0-rc4 Kernel Configuration # # @@ -5934,7 +5934,6 @@ CONFIG_NLATTR=y CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y -CONFIG_DIMLIB=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_HAVE_GENERIC_VDSO=y From 341dd81f9964f7bd66819b9deab315e4f52dfdb3 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 13/29] linux (Generic): update to linux-5.4-rc5 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index eebb77a20c..af5035795f 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,8 +37,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc4" - PKG_SHA256="b1f4856860c9ac423446324aec0090a8de73b2b7213baede062db7d0d3b41838" + PKG_VERSION="5.4-rc5" + PKG_SHA256="28644edf5498af6e32837919f63cf11d83c868b40d9402144e988d8477708700" PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; From e48fa837aef088d031915d5706ebf159b480e191 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 14/29] Generic: disable crazycat, dvb-latest - not building modules --- projects/Generic/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Generic/options b/projects/Generic/options index 5ffa1f33c4..4b55bcbba5 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -77,7 +77,7 @@ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta intel_nuc_led" # build and install driver addons (yes / no) - DRIVER_ADDONS_SUPPORT="yes" + DRIVER_ADDONS_SUPPORT="no" # driver addons to install: # for a list of additional drivers see packages/linux-driver-addons From 36527085340eedb6449cc3a2e59980fd6aa7fc36 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 15/29] linux (Generic): update to linux-5.4-rc6 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index af5035795f..24113660a3 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,8 +37,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc5" - PKG_SHA256="28644edf5498af6e32837919f63cf11d83c868b40d9402144e988d8477708700" + PKG_VERSION="5.4-rc6" + PKG_SHA256="b07532aa008438e0bce2b8f0253079a4f1654a048a75ae1477c8826f32feea7a" PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; From 737c1c94f88d8f10f4d674b396a64007d322e506 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 16/29] linux (RPi/RPi2/RPi4): update to linux-a70f823 (5.4-rc5) --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 24113660a3..b2cd269927 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -31,8 +31,8 @@ case "$LINUX" in PKG_BUILD_PERF="no" ;; raspberrypi) - PKG_VERSION="049b87a6ee327797129f818fcc0569fb9ad1e17b" # 5.3.13 - PKG_SHA256="fcbf126532409286b4a798059f2e34db47a2b61325ef2c75df7e4e2bcdc1c529" + PKG_VERSION="a70f82340e8a9da6ca91da34c43bb2f28c05990a" # 5.4-rc5 + PKG_SHA256="d6565838eac88f80b36cfaa8190c80c0a38fa482bf57717622eab7df7272cf8c" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From d59f246f98da8ae2f93300c97003c1fc4903f1c9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 17/29] linux (RPi/RPi2/RPi4): config options for 5.4-rc5 --- projects/RPi/devices/RPi/linux/linux.arm.conf | 78 ++++++++++++----- .../RPi/devices/RPi2/linux/linux.arm.conf | 79 ++++++++++++----- .../RPi/devices/RPi4/linux/linux.arm.conf | 87 +++++++++++++------ 3 files changed, 168 insertions(+), 76 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 4b068d04d8..664acd7d04 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.3.7 Kernel Configuration +# Linux/arm 5.4.0-rc5 Kernel Configuration # # @@ -245,19 +245,13 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_DOVE is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C24XX is not set -# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP1 is not set # @@ -537,6 +531,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y @@ -572,6 +567,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y @@ -584,6 +581,7 @@ CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set # CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_SED_OPAL is not set @@ -1200,6 +1198,7 @@ CONFIG_DMA_SHARED_BUFFER=y # Bus devices # # CONFIG_BRCMSTB_GISB_ARB is not set +# CONFIG_MOXTET is not set # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_VEXPRESS_CONFIG is not set # end of Bus devices @@ -1427,6 +1426,7 @@ CONFIG_SWPHY=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AMD_PHY is not set # CONFIG_AQUANTIA_PHY is not set # CONFIG_AX88796B_PHY is not set @@ -1730,6 +1730,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_PSXPAD_SPI_FF=y # CONFIG_JOYSTICK_PXRC is not set +# CONFIG_JOYSTICK_FSIA6B is not set # CONFIG_JOYSTICK_RPISENSE is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -1842,7 +1843,6 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_CMA3000 is not set -# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set @@ -1949,6 +1949,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_XILINX_PS_UART is not set # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set # CONFIG_SERIAL_ST_ASC is not set # end of Serial drivers @@ -1967,6 +1968,8 @@ CONFIG_HW_RANDOM_IPROC_RNG200=y # CONFIG_XILLYBUS is not set # end of Character devices +# CONFIG_RANDOM_TRUST_BOOTLOADER is not set + # # I2C support # @@ -2175,6 +2178,7 @@ CONFIG_W1=m # CONFIG_W1_MASTER_DS2482 is not set # CONFIG_W1_MASTER_DS1WM is not set CONFIG_W1_MASTER_GPIO=m +# CONFIG_W1_MASTER_SGI is not set # end of 1-wire Bus Masters # @@ -2191,6 +2195,7 @@ CONFIG_W1_SLAVE_THERM=m # CONFIG_W1_SLAVE_DS2431 is not set # CONFIG_W1_SLAVE_DS2433 is not set # CONFIG_W1_SLAVE_DS2438 is not set +# CONFIG_W1_SLAVE_DS250X is not set # CONFIG_W1_SLAVE_DS2780 is not set # CONFIG_W1_SLAVE_DS2781 is not set # CONFIG_W1_SLAVE_DS28E04 is not set @@ -2260,6 +2265,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set # CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set # CONFIG_SENSORS_ASPEED is not set # CONFIG_SENSORS_ATXP1 is not set @@ -2348,7 +2354,6 @@ CONFIG_SENSORS_RPI_POE_FAN=m # CONFIG_SENSORS_STTS751 is not set # CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_ADC128D818 is not set -# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set @@ -2460,7 +2465,6 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set -# CONFIG_MFD_CROS_EC is not set # CONFIG_MFD_MADERA is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_PMIC_DA903X is not set @@ -2595,6 +2599,7 @@ CONFIG_REGULATOR_ARIZONA_MICSUPP=m # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set +# CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -2654,6 +2659,7 @@ CONFIG_MEDIA_CONTROLLER_REQUEST_API=y CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L2_SUBDEV_API is not set CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2_I2C=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m @@ -3220,12 +3226,16 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set @@ -3236,9 +3246,13 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set +# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # end of Display Panels @@ -3274,7 +3288,14 @@ CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_TINYDRM is not set +# CONFIG_DRM_GM12U320 is not set +# CONFIG_TINYDRM_HX8357D is not set +# CONFIG_TINYDRM_ILI9225 is not set +# CONFIG_TINYDRM_ILI9341 is not set +# CONFIG_TINYDRM_MI0283QT is not set +# CONFIG_TINYDRM_REPAPER is not set +# CONFIG_TINYDRM_ST7586 is not set +# CONFIG_TINYDRM_ST7735R is not set # CONFIG_DRM_PL111 is not set # CONFIG_DRM_TVE200 is not set # CONFIG_DRM_LIMA is not set @@ -3604,6 +3625,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m # CONFIG_SND_SOC_TS3A227E is not set # CONFIG_SND_SOC_TSCS42XX is not set # CONFIG_SND_SOC_TSCS454 is not set +# CONFIG_SND_SOC_UDA1334 is not set CONFIG_SND_SOC_WM5102=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set @@ -3675,6 +3697,7 @@ CONFIG_HID_CHICONY=y # CONFIG_HID_PRODIKEYS is not set # CONFIG_HID_CMEDIA is not set # CONFIG_HID_CP2112 is not set +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=y CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y @@ -3773,6 +3796,9 @@ CONFIG_USB_HIDDEV=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y +# CONFIG_USB_LED_TRIG is not set +# CONFIG_USB_ULPI_BUS is not set +# CONFIG_USB_CONN_GPIO is not set CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -3788,7 +3814,6 @@ CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 CONFIG_USB_MON=m -# CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers @@ -3846,6 +3871,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USBIP_CORE is not set +# CONFIG_USB_CDNS3 is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set # CONFIG_USB_DWC2 is not set @@ -3948,9 +3974,6 @@ CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_GADGET is not set # CONFIG_TYPEC is not set # CONFIG_USB_ROLE_SWITCH is not set -# CONFIG_USB_LED_TRIG is not set -# CONFIG_USB_ULPI_BUS is not set -# CONFIG_UWB is not set CONFIG_MMC=y CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SIMPLE=y @@ -3971,6 +3994,7 @@ CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y # CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_ASPEED is not set # CONFIG_MMC_SDHCI_OF_AT91 is not set # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set # CONFIG_MMC_SDHCI_CADENCE is not set @@ -4214,6 +4238,7 @@ CONFIG_DMA_BCM2708=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set +# CONFIG_DMABUF_SELFTESTS is not set # end of DMABUF options # CONFIG_AUXDISPLAY is not set @@ -4226,6 +4251,7 @@ CONFIG_SYNC_FILE=y # # end of Microsoft Hyper-V guest support +# CONFIG_GREYBUS is not set CONFIG_STAGING=y # CONFIG_PRISM2_USB is not set # CONFIG_COMEDI is not set @@ -4262,7 +4288,6 @@ CONFIG_STAGING_MEDIA=y # CONFIG_WILC1000_SPI is not set # CONFIG_MOST is not set # CONFIG_KS7010 is not set -# CONFIG_GREYBUS is not set CONFIG_BCM_VIDEOCORE=y CONFIG_BCM2835_VCHIQ=y CONFIG_SND_BCM2835=m @@ -4278,9 +4303,12 @@ CONFIG_VIDEO_CODEC_BCM2835=m # end of Gasket devices # CONFIG_XIL_AXIS_FIFO is not set -# CONFIG_EROFS_FS is not set # CONFIG_FIELDBUS_DEV is not set +# CONFIG_USB_WUSB_CBAF is not set +# CONFIG_UWB is not set +# CONFIG_EXFAT_FS is not set # CONFIG_GOLDFISH is not set +# CONFIG_MFD_CROS_EC is not set # CONFIG_CHROME_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_CLKDEV_LOOKUP=y @@ -4533,6 +4561,7 @@ CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y # CONFIG_FS_ENCRYPTION is not set +# CONFIG_FS_VERITY is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -4542,6 +4571,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m # CONFIG_CUSE is not set +# CONFIG_VIRTIO_FS is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -4633,6 +4663,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_EROFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V2=y @@ -4672,6 +4703,7 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DFS_UPCALL is not set CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_ROOT is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y @@ -4811,10 +4843,6 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y # CONFIG_CRYPTO_CHACHA20POLY1305 is not set # CONFIG_CRYPTO_AEGIS128 is not set -# CONFIG_CRYPTO_AEGIS128L is not set -# CONFIG_CRYPTO_AEGIS256 is not set -# CONFIG_CRYPTO_MORUS640 is not set -# CONFIG_CRYPTO_MORUS1280 is not set CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m @@ -4832,6 +4860,7 @@ CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_XTS is not set # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_ADIANTUM is not set +# CONFIG_CRYPTO_ESSIV is not set # # Hash modes @@ -4858,6 +4887,7 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SHA3 is not set @@ -4869,6 +4899,7 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # +CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_ANUBIS is not set @@ -4878,6 +4909,7 @@ CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set @@ -5012,7 +5044,6 @@ CONFIG_NLATTR=y CONFIG_CLZ_TAB=y # CONFIG_IRQ_POLL is not set CONFIG_MPILIB=y -CONFIG_DIMLIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_FONT_SUPPORT=y @@ -5048,10 +5079,9 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_INSTALL is not set -# CONFIG_OPTIMIZE_INLINING is not set +CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_ARCH_WANT_FRAME_POINTERS=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index ac4ec12311..3128a1c0e6 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.3.7 Kernel Configuration +# Linux/arm 5.4.0-rc5 Kernel Configuration # # @@ -256,19 +256,13 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_DOVE is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C24XX is not set -# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP1 is not set # @@ -287,6 +281,7 @@ CONFIG_ARCH_MULTI_V6_V7=y # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_ARTPEC is not set +# CONFIG_ARCH_ASPEED is not set # CONFIG_ARCH_AT91 is not set CONFIG_ARCH_BCM=y @@ -648,6 +643,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y @@ -684,6 +680,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y @@ -696,6 +694,7 @@ CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set # CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_SED_OPAL is not set @@ -1319,6 +1318,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y # Bus devices # # CONFIG_BRCMSTB_GISB_ARB is not set +# CONFIG_MOXTET is not set # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_VEXPRESS_CONFIG is not set # end of Bus devices @@ -1546,6 +1546,7 @@ CONFIG_SWPHY=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AMD_PHY is not set # CONFIG_AQUANTIA_PHY is not set # CONFIG_AX88796B_PHY is not set @@ -1849,6 +1850,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_PSXPAD_SPI_FF=y # CONFIG_JOYSTICK_PXRC is not set +# CONFIG_JOYSTICK_FSIA6B is not set # CONFIG_JOYSTICK_RPISENSE is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -1961,7 +1963,6 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_CMA3000 is not set -# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set @@ -2068,6 +2069,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_XILINX_PS_UART is not set # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set # CONFIG_SERIAL_ST_ASC is not set # end of Serial drivers @@ -2086,6 +2088,8 @@ CONFIG_HW_RANDOM_IPROC_RNG200=y # CONFIG_XILLYBUS is not set # end of Character devices +# CONFIG_RANDOM_TRUST_BOOTLOADER is not set + # # I2C support # @@ -2296,6 +2300,7 @@ CONFIG_W1=m # CONFIG_W1_MASTER_DS2482 is not set # CONFIG_W1_MASTER_DS1WM is not set CONFIG_W1_MASTER_GPIO=m +# CONFIG_W1_MASTER_SGI is not set # end of 1-wire Bus Masters # @@ -2312,6 +2317,7 @@ CONFIG_W1_SLAVE_THERM=m # CONFIG_W1_SLAVE_DS2431 is not set # CONFIG_W1_SLAVE_DS2433 is not set # CONFIG_W1_SLAVE_DS2438 is not set +# CONFIG_W1_SLAVE_DS250X is not set # CONFIG_W1_SLAVE_DS2780 is not set # CONFIG_W1_SLAVE_DS2781 is not set # CONFIG_W1_SLAVE_DS28E04 is not set @@ -2384,6 +2390,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set # CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set # CONFIG_SENSORS_ASPEED is not set # CONFIG_SENSORS_ATXP1 is not set @@ -2472,7 +2479,6 @@ CONFIG_SENSORS_RPI_POE_FAN=m # CONFIG_SENSORS_STTS751 is not set # CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_ADC128D818 is not set -# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set @@ -2584,7 +2590,6 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set -# CONFIG_MFD_CROS_EC is not set # CONFIG_MFD_MADERA is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_PMIC_DA903X is not set @@ -2720,6 +2725,7 @@ CONFIG_REGULATOR_ARIZONA_MICSUPP=m # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set +# CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -2779,6 +2785,7 @@ CONFIG_MEDIA_CONTROLLER_REQUEST_API=y CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L2_SUBDEV_API is not set CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2_I2C=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m @@ -3346,12 +3353,16 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set @@ -3362,9 +3373,13 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set +# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # end of Display Panels @@ -3400,7 +3415,14 @@ CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_TINYDRM is not set +# CONFIG_DRM_GM12U320 is not set +# CONFIG_TINYDRM_HX8357D is not set +# CONFIG_TINYDRM_ILI9225 is not set +# CONFIG_TINYDRM_ILI9341 is not set +# CONFIG_TINYDRM_MI0283QT is not set +# CONFIG_TINYDRM_REPAPER is not set +# CONFIG_TINYDRM_ST7586 is not set +# CONFIG_TINYDRM_ST7735R is not set # CONFIG_DRM_PL111 is not set # CONFIG_DRM_TVE200 is not set # CONFIG_DRM_LIMA is not set @@ -3730,6 +3752,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m # CONFIG_SND_SOC_TS3A227E is not set # CONFIG_SND_SOC_TSCS42XX is not set # CONFIG_SND_SOC_TSCS454 is not set +# CONFIG_SND_SOC_UDA1334 is not set CONFIG_SND_SOC_WM5102=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set @@ -3801,6 +3824,7 @@ CONFIG_HID_CHICONY=y # CONFIG_HID_PRODIKEYS is not set # CONFIG_HID_CMEDIA is not set # CONFIG_HID_CP2112 is not set +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=y CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y @@ -3899,6 +3923,9 @@ CONFIG_USB_HIDDEV=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y +# CONFIG_USB_LED_TRIG is not set +# CONFIG_USB_ULPI_BUS is not set +# CONFIG_USB_CONN_GPIO is not set CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -3914,7 +3941,6 @@ CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 CONFIG_USB_MON=m -# CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers @@ -3972,6 +3998,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USBIP_CORE is not set +# CONFIG_USB_CDNS3 is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set # CONFIG_USB_DWC2 is not set @@ -4074,9 +4101,6 @@ CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_GADGET is not set # CONFIG_TYPEC is not set # CONFIG_USB_ROLE_SWITCH is not set -# CONFIG_USB_LED_TRIG is not set -# CONFIG_USB_ULPI_BUS is not set -# CONFIG_UWB is not set CONFIG_MMC=y CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SIMPLE=y @@ -4097,6 +4121,7 @@ CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y # CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_ASPEED is not set # CONFIG_MMC_SDHCI_OF_AT91 is not set # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set # CONFIG_MMC_SDHCI_CADENCE is not set @@ -4341,6 +4366,7 @@ CONFIG_DMA_BCM2708=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set +# CONFIG_DMABUF_SELFTESTS is not set # end of DMABUF options # CONFIG_AUXDISPLAY is not set @@ -4353,6 +4379,7 @@ CONFIG_SYNC_FILE=y # # end of Microsoft Hyper-V guest support +# CONFIG_GREYBUS is not set CONFIG_STAGING=y # CONFIG_PRISM2_USB is not set # CONFIG_COMEDI is not set @@ -4389,7 +4416,6 @@ CONFIG_STAGING_MEDIA=y # CONFIG_WILC1000_SPI is not set # CONFIG_MOST is not set # CONFIG_KS7010 is not set -# CONFIG_GREYBUS is not set CONFIG_BCM_VIDEOCORE=y CONFIG_BCM2835_VCHIQ=y CONFIG_SND_BCM2835=m @@ -4405,9 +4431,12 @@ CONFIG_VIDEO_CODEC_BCM2835=m # end of Gasket devices # CONFIG_XIL_AXIS_FIFO is not set -# CONFIG_EROFS_FS is not set # CONFIG_FIELDBUS_DEV is not set +# CONFIG_USB_WUSB_CBAF is not set +# CONFIG_UWB is not set +# CONFIG_EXFAT_FS is not set # CONFIG_GOLDFISH is not set +# CONFIG_MFD_CROS_EC is not set # CONFIG_CHROME_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_CLKDEV_LOOKUP=y @@ -4665,6 +4694,7 @@ CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y # CONFIG_FS_ENCRYPTION is not set +# CONFIG_FS_VERITY is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -4674,6 +4704,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m # CONFIG_CUSE is not set +# CONFIG_VIRTIO_FS is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -4765,6 +4796,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_EROFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V2=y @@ -4804,6 +4836,7 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DFS_UPCALL is not set CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_ROOT is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y @@ -4945,10 +4978,6 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y # CONFIG_CRYPTO_CHACHA20POLY1305 is not set # CONFIG_CRYPTO_AEGIS128 is not set -# CONFIG_CRYPTO_AEGIS128L is not set -# CONFIG_CRYPTO_AEGIS256 is not set -# CONFIG_CRYPTO_MORUS640 is not set -# CONFIG_CRYPTO_MORUS1280 is not set CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m @@ -4966,6 +4995,7 @@ CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_XTS is not set # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_ADIANTUM is not set +# CONFIG_CRYPTO_ESSIV is not set # # Hash modes @@ -4992,6 +5022,7 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SHA3 is not set @@ -5003,6 +5034,7 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # +CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_ANUBIS is not set @@ -5012,6 +5044,7 @@ CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set @@ -5148,7 +5181,6 @@ CONFIG_NLATTR=y CONFIG_CLZ_TAB=y # CONFIG_IRQ_POLL is not set CONFIG_MPILIB=y -CONFIG_DIMLIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_FONT_SUPPORT=y @@ -5184,10 +5216,9 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_INSTALL is not set -# CONFIG_OPTIMIZE_INLINING is not set +CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_ARCH_WANT_FRAME_POINTERS=y diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 32b6889746..2e0d7d41dc 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.3.7 Kernel Configuration +# Linux/arm 5.4.0-rc5 Kernel Configuration # # @@ -259,19 +259,13 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_DOVE is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C24XX is not set -# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP1 is not set # @@ -290,6 +284,7 @@ CONFIG_ARCH_MULTI_V6_V7=y # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_ARTPEC is not set +# CONFIG_ARCH_ASPEED is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_AXXIA is not set CONFIG_ARCH_BCM=y @@ -656,6 +651,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y @@ -692,6 +688,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y @@ -704,6 +702,7 @@ CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set # CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_SED_OPAL is not set @@ -1395,6 +1394,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y # Bus devices # # CONFIG_BRCMSTB_GISB_ARB is not set +# CONFIG_MOXTET is not set # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_VEXPRESS_CONFIG is not set # end of Bus devices @@ -1453,7 +1453,6 @@ CONFIG_BCM2835_SMI=m # CONFIG_AD525X_DPOT is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_PHANTOM is not set -# CONFIG_SGI_IOC4 is not set # CONFIG_TIFM_CORE is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set @@ -1816,10 +1815,10 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set +# CONFIG_NET_VENDOR_PENSANDO is not set CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set -# CONFIG_QLGE is not set # CONFIG_NETXEN_NIC is not set # CONFIG_QED is not set CONFIG_NET_VENDOR_QUALCOMM=y @@ -1893,6 +1892,7 @@ CONFIG_SWPHY=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AMD_PHY is not set # CONFIG_AQUANTIA_PHY is not set # CONFIG_AX88796B_PHY is not set @@ -2000,6 +2000,7 @@ CONFIG_ATH9K_AHB=y CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_CHANNEL_CONTEXT=y CONFIG_ATH9K_PCOEM=y +# CONFIG_ATH9K_PCI_NO_EEPROM is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_ATH9K_HWRNG=y @@ -2233,6 +2234,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_PSXPAD_SPI_FF=y # CONFIG_JOYSTICK_PXRC is not set +# CONFIG_JOYSTICK_FSIA6B is not set # CONFIG_JOYSTICK_RPISENSE is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -2345,7 +2347,6 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_CMA3000 is not set -# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set @@ -2432,7 +2433,6 @@ CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_8250_DW is not set # CONFIG_SERIAL_8250_EM is not set # CONFIG_SERIAL_8250_RT288X is not set -# CONFIG_SERIAL_8250_MOXA is not set CONFIG_SERIAL_OF_PLATFORM=y # @@ -2459,6 +2459,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set # CONFIG_SERIAL_ST_ASC is not set # end of Serial drivers @@ -2479,6 +2480,8 @@ CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set # end of Character devices +# CONFIG_RANDOM_TRUST_BOOTLOADER is not set + # # I2C support # @@ -2721,6 +2724,7 @@ CONFIG_W1=m # CONFIG_W1_MASTER_DS2482 is not set # CONFIG_W1_MASTER_DS1WM is not set CONFIG_W1_MASTER_GPIO=m +# CONFIG_W1_MASTER_SGI is not set # end of 1-wire Bus Masters # @@ -2737,6 +2741,7 @@ CONFIG_W1_SLAVE_THERM=m # CONFIG_W1_SLAVE_DS2431 is not set # CONFIG_W1_SLAVE_DS2433 is not set # CONFIG_W1_SLAVE_DS2438 is not set +# CONFIG_W1_SLAVE_DS250X is not set # CONFIG_W1_SLAVE_DS2780 is not set # CONFIG_W1_SLAVE_DS2781 is not set # CONFIG_W1_SLAVE_DS28E04 is not set @@ -2809,6 +2814,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set # CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set # CONFIG_SENSORS_ASPEED is not set # CONFIG_SENSORS_ATXP1 is not set @@ -2899,7 +2905,6 @@ CONFIG_SENSORS_RPI_POE_FAN=m # CONFIG_SENSORS_STTS751 is not set # CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_ADC128D818 is not set -# CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set @@ -3031,7 +3036,6 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set -# CONFIG_MFD_CROS_EC is not set # CONFIG_MFD_MADERA is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_PMIC_DA903X is not set @@ -3172,6 +3176,7 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set +# CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -3230,6 +3235,7 @@ CONFIG_MEDIA_CONTROLLER_DVB=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2_I2C=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m @@ -3478,6 +3484,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_OV5647 is not set # CONFIG_VIDEO_OV6650 is not set # CONFIG_VIDEO_OV5670 is not set +# CONFIG_VIDEO_OV5675 is not set # CONFIG_VIDEO_OV5695 is not set # CONFIG_VIDEO_OV7251 is not set # CONFIG_VIDEO_OV772X is not set @@ -3855,12 +3862,16 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set @@ -3871,9 +3882,13 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set +# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # end of Display Panels @@ -3908,9 +3923,15 @@ CONFIG_DRM_VC4=y # CONFIG_DRM_VC4_HDMI_CEC is not set # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_ARCPGU is not set -# CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_TINYDRM is not set +# CONFIG_DRM_GM12U320 is not set +# CONFIG_TINYDRM_HX8357D is not set +# CONFIG_TINYDRM_ILI9225 is not set +# CONFIG_TINYDRM_ILI9341 is not set +# CONFIG_TINYDRM_MI0283QT is not set +# CONFIG_TINYDRM_REPAPER is not set +# CONFIG_TINYDRM_ST7586 is not set +# CONFIG_TINYDRM_ST7735R is not set # CONFIG_DRM_PL111 is not set # CONFIG_DRM_TVE200 is not set # CONFIG_DRM_LIMA is not set @@ -4331,6 +4352,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m # CONFIG_SND_SOC_TS3A227E is not set # CONFIG_SND_SOC_TSCS42XX is not set # CONFIG_SND_SOC_TSCS454 is not set +# CONFIG_SND_SOC_UDA1334 is not set CONFIG_SND_SOC_WM5102=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set @@ -4402,6 +4424,7 @@ CONFIG_HID_CHICONY=y # CONFIG_HID_PRODIKEYS is not set # CONFIG_HID_CMEDIA is not set # CONFIG_HID_CP2112 is not set +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=y CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y @@ -4500,6 +4523,9 @@ CONFIG_USB_HIDDEV=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y +# CONFIG_USB_LED_TRIG is not set +# CONFIG_USB_ULPI_BUS is not set +# CONFIG_USB_CONN_GPIO is not set CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y @@ -4516,7 +4542,6 @@ CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 CONFIG_USB_MON=m -# CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers @@ -4578,6 +4603,7 @@ CONFIG_USB_UAS=y # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USBIP_CORE is not set +# CONFIG_USB_CDNS3 is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set # CONFIG_USB_DWC2 is not set @@ -4680,9 +4706,6 @@ CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_GADGET is not set # CONFIG_TYPEC is not set # CONFIG_USB_ROLE_SWITCH is not set -# CONFIG_USB_LED_TRIG is not set -# CONFIG_USB_ULPI_BUS is not set -# CONFIG_UWB is not set CONFIG_MMC=y CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SIMPLE=y @@ -4705,6 +4728,7 @@ CONFIG_MMC_SDHCI_IO_ACCESSORS=y # CONFIG_MMC_SDHCI_PCI is not set CONFIG_MMC_SDHCI_PLTFM=y # CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_ASPEED is not set # CONFIG_MMC_SDHCI_OF_AT91 is not set # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set # CONFIG_MMC_SDHCI_CADENCE is not set @@ -4957,6 +4981,7 @@ CONFIG_DMA_BCM2708=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set +# CONFIG_DMABUF_SELFTESTS is not set # end of DMABUF options # CONFIG_AUXDISPLAY is not set @@ -4969,6 +4994,7 @@ CONFIG_SYNC_FILE=y # # end of Microsoft Hyper-V guest support +# CONFIG_GREYBUS is not set CONFIG_STAGING=y # CONFIG_PRISM2_USB is not set # CONFIG_COMEDI is not set @@ -5009,7 +5035,6 @@ CONFIG_STAGING_MEDIA=y # CONFIG_WILC1000_SPI is not set # CONFIG_MOST is not set # CONFIG_KS7010 is not set -# CONFIG_GREYBUS is not set CONFIG_BCM_VIDEOCORE=y CONFIG_BCM2835_VCHIQ=y CONFIG_SND_BCM2835=m @@ -5025,9 +5050,13 @@ CONFIG_VIDEO_CODEC_BCM2835=m # end of Gasket devices # CONFIG_XIL_AXIS_FIFO is not set -# CONFIG_EROFS_FS is not set # CONFIG_FIELDBUS_DEV is not set +# CONFIG_USB_WUSB_CBAF is not set +# CONFIG_UWB is not set +# CONFIG_EXFAT_FS is not set +# CONFIG_QLGE is not set # CONFIG_GOLDFISH is not set +# CONFIG_MFD_CROS_EC is not set # CONFIG_CHROME_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_CLKDEV_LOOKUP=y @@ -5289,6 +5318,7 @@ CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y # CONFIG_FS_ENCRYPTION is not set +# CONFIG_FS_VERITY is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -5298,6 +5328,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m # CONFIG_CUSE is not set +# CONFIG_VIRTIO_FS is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -5390,6 +5421,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_EROFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V2=y @@ -5429,6 +5461,7 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DFS_UPCALL is not set CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_ROOT is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y @@ -5570,10 +5603,6 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y # CONFIG_CRYPTO_CHACHA20POLY1305 is not set # CONFIG_CRYPTO_AEGIS128 is not set -# CONFIG_CRYPTO_AEGIS128L is not set -# CONFIG_CRYPTO_AEGIS256 is not set -# CONFIG_CRYPTO_MORUS640 is not set -# CONFIG_CRYPTO_MORUS1280 is not set CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m @@ -5591,6 +5620,7 @@ CONFIG_CRYPTO_OFB=m # CONFIG_CRYPTO_XTS is not set # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_ADIANTUM is not set +# CONFIG_CRYPTO_ESSIV is not set # # Hash modes @@ -5617,6 +5647,7 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SHA3 is not set @@ -5628,6 +5659,7 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # +CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_ANUBIS is not set @@ -5637,6 +5669,7 @@ CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set @@ -5754,7 +5787,6 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y -CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y CONFIG_SWIOTLB=y CONFIG_DMA_REMAP=y CONFIG_DMA_CMA=y @@ -5814,10 +5846,9 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_INSTALL is not set -# CONFIG_OPTIMIZE_INLINING is not set +CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_ARCH_WANT_FRAME_POINTERS=y From 4f167ddb99dded015bd02dcb090fd621be916bdf Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 18/29] RPi: disable crazycat, dvb-latest - not building modules --- projects/RPi/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/RPi/options b/projects/RPi/options index da636e29c3..b1cacb2f01 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -118,7 +118,7 @@ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS rpi-cirrus-config bcm2835-driver" # build and install driver addons (yes / no) - DRIVER_ADDONS_SUPPORT="yes" + DRIVER_ADDONS_SUPPORT="no" # driver addons to install: # for a list of additional drivers see packages/linux-driver-addons From 2ed2e964eadda66dac0831fb8bf0f900e5a429dc Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 19/29] linux (RPi/RPi2/RPi4): update to linux-3bb79ad ((5.4-rc5 with pinctrl revert)) --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index b2cd269927..910e426c02 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -31,8 +31,8 @@ case "$LINUX" in PKG_BUILD_PERF="no" ;; raspberrypi) - PKG_VERSION="a70f82340e8a9da6ca91da34c43bb2f28c05990a" # 5.4-rc5 - PKG_SHA256="d6565838eac88f80b36cfaa8190c80c0a38fa482bf57717622eab7df7272cf8c" + PKG_VERSION="3bb79ad7800546ffe5efe6367d5c7e1a9f1274c0" # (5.4-rc5 with pinctrl revert) + PKG_SHA256="44d4c8591e36687001444969433e2bcddcd3fe5f88e533e1963aa762f8755c07" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From 73baf1003290616c3617b66e032f429ae2ba2c99 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 20/29] linux (Generic): update to linux-5.4-rc7 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 910e426c02..479a89f05b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,8 +37,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc6" - PKG_SHA256="b07532aa008438e0bce2b8f0253079a4f1654a048a75ae1477c8826f32feea7a" + PKG_VERSION="5.4-rc7" + PKG_SHA256="8d23a9f945d4871b69c175cc6f64346b110bd71d5a7f41f1e220fab41c9d23c6" PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; From cced4248b97c07c64086db89161860ed82ccc28b Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 12 Nov 2019 22:40:34 +0000 Subject: [PATCH 21/29] linux (RPi/RPi2/RPi4): update to linux-68fe209 (5.4-rc7) --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 479a89f05b..9550a5e204 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -31,8 +31,8 @@ case "$LINUX" in PKG_BUILD_PERF="no" ;; raspberrypi) - PKG_VERSION="3bb79ad7800546ffe5efe6367d5c7e1a9f1274c0" # (5.4-rc5 with pinctrl revert) - PKG_SHA256="44d4c8591e36687001444969433e2bcddcd3fe5f88e533e1963aa762f8755c07" + PKG_VERSION="68fe209d658b8195d81919d7ff35d6cd02d718df" # 5.4-rc7 + PKG_SHA256="b7f7fb6dd9a5fc90d07edf4247d3ffa1632da6c337be554b32e8ef5bc209bcce" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From 9011e4a5476dcbbc573ece8117de9e70094d3f9e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 15 Nov 2019 01:30:43 +0000 Subject: [PATCH 22/29] linux (Generic): add temporary patch to fix i915 frame buffer corruption --- ...restore-pysical-addesses-for-fb_mmap.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch diff --git a/packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch b/packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch new file mode 100644 index 0000000000..586f26c3cb --- /dev/null +++ b/packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch @@ -0,0 +1,57 @@ +From patchwork Wed Nov 13 18:06:33 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: drm/i915/fbdev: Restore physical addresses for fb_mmap() +From: Chris Wilson +X-Patchwork-Id: 340663 +Message-Id: <20191113180633.3947-1-chris@chris-wilson.co.uk> +To: intel-gfx@lists.freedesktop.org +Cc: Daniel Vetter +Date: Wed, 13 Nov 2019 18:06:33 +0000 + +fbdev uses the physical address of our framebuffer for its fb_mmap() +routine. While we need to adapt this address for the new io BAR, we have +to fix v5.4 first! The simplest fix is to restore the smem back to v5.4 +and we will then probably have to implement our fbops->fb_mmap() call +back to handle local memory. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112256 +Fixes: 5f889b9a61dd ("drm/i915: Disregard drm_mode_config.fb_base") +Signed-off-by: Chris Wilson +Cc: Daniel Vetter +Cc: Maarten Lankhorst +Reported-by: Neil MacLeod +Tested-by: Neil MacLeod +Reviewed-by: Ville Syrjälä +--- + drivers/gpu/drm/i915/display/intel_fbdev.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c +index 3d1061470e76..48c960ca12fb 100644 +--- a/drivers/gpu/drm/i915/display/intel_fbdev.c ++++ b/drivers/gpu/drm/i915/display/intel_fbdev.c +@@ -234,6 +234,11 @@ static int intelfb_create(struct drm_fb_helper *helper, + info->apertures->ranges[0].base = ggtt->gmadr.start; + info->apertures->ranges[0].size = ggtt->mappable_end; + ++ /* Our framebuffer is the entirety of fbdev's system memory */ ++ info->fix.smem_start = ++ (unsigned long)(ggtt->gmadr.start + vma->node.start); ++ info->fix.smem_len = vma->node.size; ++ + vaddr = i915_vma_pin_iomap(vma); + if (IS_ERR(vaddr)) { + DRM_ERROR("Failed to remap framebuffer into virtual memory\n"); +@@ -243,10 +248,6 @@ static int intelfb_create(struct drm_fb_helper *helper, + info->screen_base = vaddr; + info->screen_size = vma->node.size; + +- /* Our framebuffer is the entirety of fbdev's system memory */ +- info->fix.smem_start = (unsigned long)info->screen_base; +- info->fix.smem_len = info->screen_size; +- + drm_fb_helper_fill_info(info, &ifbdev->helper, sizes); + + /* If the object is shmemfs backed, it will have given us zeroed pages. From cbd6ecc6d07c2a3af80cebee82eb4d84d5ce2d3c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 17 Nov 2019 23:47:50 +0000 Subject: [PATCH 23/29] linux (Generic): update to linux-5.4-rc8 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 9550a5e204..f187885d3d 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,8 +37,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc7" - PKG_SHA256="8d23a9f945d4871b69c175cc6f64346b110bd71d5a7f41f1e220fab41c9d23c6" + PKG_VERSION="5.4-rc8" + PKG_SHA256="b310b110f06f297a617fedbd1c0bf2cfc07825c6ddbadb3aba7d8177184a0d4d" PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_PATCH_DIRS="default" ;; From 38577f29cf8cf18d47890a979d55150c1b2689ca Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 17 Nov 2019 23:55:16 +0000 Subject: [PATCH 24/29] linux (Generic): config options for 5.4-rc8 --- projects/Generic/linux/linux.x86_64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 5e9a593bf6..4674a984c8 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.0-rc4 Kernel Configuration +# Linux/x86_64 5.4.0-rc8 Kernel Configuration # # From 82edb4d83f76ff8e1e215af7b26a0df10dadec1a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 18 Nov 2019 19:29:20 +0000 Subject: [PATCH 25/29] linux (RPi/RPi2/RPi4): update to linux-9cde31b (5.4-rc8) --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index f187885d3d..05bde8f3c8 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -31,8 +31,8 @@ case "$LINUX" in PKG_BUILD_PERF="no" ;; raspberrypi) - PKG_VERSION="68fe209d658b8195d81919d7ff35d6cd02d718df" # 5.4-rc7 - PKG_SHA256="b7f7fb6dd9a5fc90d07edf4247d3ffa1632da6c337be554b32e8ef5bc209bcce" + PKG_VERSION="9cde31b02c247d6f1be02bc95d91e51ccf5c47d7" # 5.4-rc8 + PKG_SHA256="8c071220fb983d22a59af64ac7d441ce8822b18f55db71255cf2ea52fc237a5f" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From 11e08b24edcf72ab35535b3c99ef2d3f5965879a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 25 Nov 2019 03:11:54 +0000 Subject: [PATCH 26/29] linux (Generic): update to linux-5.4 --- packages/linux/package.mk | 6 +- ...restore-pysical-addesses-for-fb_mmap.patch | 57 ------------------- 2 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 05bde8f3c8..2c62f0bfb6 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,9 +37,9 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.4-rc8" - PKG_SHA256="b310b110f06f297a617fedbd1c0bf2cfc07825c6ddbadb3aba7d8177184a0d4d" - PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz" + PKG_VERSION="5.4" + PKG_SHA256="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491" + PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; esac diff --git a/packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch b/packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch deleted file mode 100644 index 586f26c3cb..0000000000 --- a/packages/linux/patches/default/linux-999-drm-i915-fbdev-restore-pysical-addesses-for-fb_mmap.patch +++ /dev/null @@ -1,57 +0,0 @@ -From patchwork Wed Nov 13 18:06:33 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: drm/i915/fbdev: Restore physical addresses for fb_mmap() -From: Chris Wilson -X-Patchwork-Id: 340663 -Message-Id: <20191113180633.3947-1-chris@chris-wilson.co.uk> -To: intel-gfx@lists.freedesktop.org -Cc: Daniel Vetter -Date: Wed, 13 Nov 2019 18:06:33 +0000 - -fbdev uses the physical address of our framebuffer for its fb_mmap() -routine. While we need to adapt this address for the new io BAR, we have -to fix v5.4 first! The simplest fix is to restore the smem back to v5.4 -and we will then probably have to implement our fbops->fb_mmap() call -back to handle local memory. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112256 -Fixes: 5f889b9a61dd ("drm/i915: Disregard drm_mode_config.fb_base") -Signed-off-by: Chris Wilson -Cc: Daniel Vetter -Cc: Maarten Lankhorst -Reported-by: Neil MacLeod -Tested-by: Neil MacLeod -Reviewed-by: Ville Syrjälä ---- - drivers/gpu/drm/i915/display/intel_fbdev.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c -index 3d1061470e76..48c960ca12fb 100644 ---- a/drivers/gpu/drm/i915/display/intel_fbdev.c -+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c -@@ -234,6 +234,11 @@ static int intelfb_create(struct drm_fb_helper *helper, - info->apertures->ranges[0].base = ggtt->gmadr.start; - info->apertures->ranges[0].size = ggtt->mappable_end; - -+ /* Our framebuffer is the entirety of fbdev's system memory */ -+ info->fix.smem_start = -+ (unsigned long)(ggtt->gmadr.start + vma->node.start); -+ info->fix.smem_len = vma->node.size; -+ - vaddr = i915_vma_pin_iomap(vma); - if (IS_ERR(vaddr)) { - DRM_ERROR("Failed to remap framebuffer into virtual memory\n"); -@@ -243,10 +248,6 @@ static int intelfb_create(struct drm_fb_helper *helper, - info->screen_base = vaddr; - info->screen_size = vma->node.size; - -- /* Our framebuffer is the entirety of fbdev's system memory */ -- info->fix.smem_start = (unsigned long)info->screen_base; -- info->fix.smem_len = info->screen_size; -- - drm_fb_helper_fill_info(info, &ifbdev->helper, sizes); - - /* If the object is shmemfs backed, it will have given us zeroed pages. From 30396688fae42725a59d06144a3c302281522851 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 25 Nov 2019 16:48:16 +0000 Subject: [PATCH 27/29] linux (Generic): config options for 5.4 --- projects/Generic/linux/linux.x86_64.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 4674a984c8..928c225517 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.0-rc8 Kernel Configuration +# Linux/x86_64 5.4.0 Kernel Configuration # # @@ -11,6 +11,7 @@ CONFIG_GCC_VERSION=70200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y From 68897e3a45d0525cf83839b199d9be9cafb3c8ee Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 26 Nov 2019 14:03:52 +0000 Subject: [PATCH 28/29] linux (RPi/RPi2/RPi4): update to linux-d09e02c (5.4.0) --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2c62f0bfb6..b104c1c519 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -31,8 +31,8 @@ case "$LINUX" in PKG_BUILD_PERF="no" ;; raspberrypi) - PKG_VERSION="9cde31b02c247d6f1be02bc95d91e51ccf5c47d7" # 5.4-rc8 - PKG_SHA256="8c071220fb983d22a59af64ac7d441ce8822b18f55db71255cf2ea52fc237a5f" + PKG_VERSION="d09e02c0ed86330168714b027c1669a80728d699" # 5.4.0 + PKG_SHA256="fae85fb4e995e190900b6719fb013568295e9154628847120983beb1fd8491b0" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From e9b2b2b2badd783ac412c099d0e2ce2a619bcbaa Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 26 Nov 2019 14:11:34 +0000 Subject: [PATCH 29/29] linux (RPi/RPi2/RPi4): config options for 5.4.0 --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi4/linux/linux.arm.conf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 664acd7d04..8c9bf20209 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.0-rc5 Kernel Configuration +# Linux/arm 5.4.0 Kernel Configuration # # @@ -11,6 +11,7 @@ CONFIG_GCC_VERSION=70200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 3128a1c0e6..857aaea4bb 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.0-rc5 Kernel Configuration +# Linux/arm 5.4.0 Kernel Configuration # # @@ -11,6 +11,7 @@ CONFIG_GCC_VERSION=70200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 2e0d7d41dc..c92902c4c0 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.0-rc5 Kernel Configuration +# Linux/arm 5.4.0 Kernel Configuration # # @@ -11,6 +11,7 @@ CONFIG_GCC_VERSION=70200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y