diff --git a/config/kernel/linux-meson64-dev.config b/config/kernel/linux-meson64-dev.config index f2ea36f8ca..14e1de2ebc 100644 --- a/config/kernel/linux-meson64-dev.config +++ b/config/kernel/linux-meson64-dev.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.7 Kernel Configuration +# Linux/arm64 4.20.1 Kernel Configuration # # @@ -87,6 +87,7 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y +# CONFIG_PSI is not set CONFIG_CPU_ISOLATION=y # @@ -261,11 +262,11 @@ CONFIG_ARCH_MESON=y # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_QCOM is not set # CONFIG_ARCH_REALTEK is not set +# CONFIG_ARCH_RENESAS is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_SEATTLE is not set -# CONFIG_ARCH_SYNQUACER is not set -# CONFIG_ARCH_RENESAS is not set # CONFIG_ARCH_STRATIX10 is not set +# CONFIG_ARCH_SYNQUACER is not set # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_SPRD is not set # CONFIG_ARCH_THUNDER is not set @@ -302,11 +303,14 @@ CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y +CONFIG_ARM64_ERRATUM_1188873=y +CONFIG_ARM64_ERRATUM_1286807=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y # CONFIG_CAVIUM_ERRATUM_30115 is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set +CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y # CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set # CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set CONFIG_SOCIONEXT_SYNQUACER_PREITS=y @@ -334,7 +338,6 @@ CONFIG_HZ_250=y CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -373,6 +376,7 @@ CONFIG_ARM64_VHE=y CONFIG_ARM64_UAO=y # CONFIG_ARM64_PMEM is not set CONFIG_ARM64_RAS_EXTN=y +CONFIG_ARM64_CNP=y CONFIG_ARM64_SVE=y CONFIG_ARM64_MODULE_PLTS=y # CONFIG_RANDOMIZE_BASE is not set @@ -454,8 +458,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -# CONFIG_ARM_DT_BL_CPUFREQ is not set CONFIG_ARM_SCPI_CPUFREQ=y # CONFIG_QORIQ_CPUFREQ is not set @@ -509,7 +511,6 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y # CONFIG_CRYPTO_SM4_ARM64_CE is not set CONFIG_CRYPTO_GHASH_ARM64_CE=y # CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set -# CONFIG_CRYPTO_CRC32_ARM64_CE is not set CONFIG_CRYPTO_AES_ARM64=y CONFIG_CRYPTO_AES_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y @@ -544,7 +545,9 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -552,6 +555,7 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_CC_HAS_STACKPROTECTOR_NONE=y CONFIG_STACKPROTECTOR=y @@ -624,6 +628,7 @@ CONFIG_MSDOS_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_PM=y # # IO Schedulers @@ -677,8 +682,6 @@ CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_NO_BOOTMEM=y CONFIG_MEMORY_ISOLATION=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y @@ -914,6 +917,7 @@ CONFIG_NFT_QUEUE=m CONFIG_NFT_REJECT=m CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m +# CONFIG_NFT_XFRM is not set # CONFIG_NFT_SOCKET is not set # CONFIG_NFT_OSF is not set # CONFIG_NFT_TPROXY is not set @@ -1280,6 +1284,7 @@ CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_CBS=m # CONFIG_NET_SCH_ETF is not set +# CONFIG_NET_SCH_TAPRIO is not set CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m @@ -1520,8 +1525,6 @@ CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_RC_MINSTREL_VHT=y CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y @@ -1727,6 +1730,7 @@ CONFIG_EEPROM_AT25=m CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set # CONFIG_EEPROM_IDT_89HPESX is not set +# CONFIG_EEPROM_EE1004 is not set # # Texas Instruments shared transport line discipline @@ -1833,7 +1837,6 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m -# CONFIG_DM_MQ_DEFAULT is not set # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set @@ -1901,6 +1904,7 @@ CONFIG_ATM_DRIVERS=y # CONFIG_B53 is not set # CONFIG_NET_DSA_BCM_SF2 is not set # CONFIG_NET_DSA_LOOP is not set +# CONFIG_NET_DSA_LANTIQ_GSWIP is not set # CONFIG_NET_DSA_MT7530 is not set # CONFIG_NET_DSA_MV88E6060 is not set # CONFIG_MICROCHIP_KSZ is not set @@ -1940,6 +1944,7 @@ CONFIG_NET_VENDOR_MICROSEMI=y # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NETRONOME is not set CONFIG_NET_VENDOR_NI=y +# CONFIG_NI_XGE_MANAGEMENT_ENET is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_QUALCOMM is not set # CONFIG_NET_VENDOR_RENESAS is not set @@ -2238,6 +2243,7 @@ CONFIG_IEEE802154_MCR20A=m CONFIG_NETDEVSIM=m CONFIG_NET_FAILOVER=y # CONFIG_ISDN is not set +# CONFIG_NVM is not set # # Input device support @@ -2603,6 +2609,7 @@ CONFIG_PINCTRL_MESON_GXL=y CONFIG_PINCTRL_MESON8_PMX=y CONFIG_PINCTRL_MESON_AXG=y CONFIG_PINCTRL_MESON_AXG_PMX=y +CONFIG_PINCTRL_MESON_G12A=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_OF_GPIO=y @@ -2951,6 +2958,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_AS3722 is not set # CONFIG_PMIC_ADP5520 is not set # CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_AT91_USART is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_ATMEL_HLCDC is not set # CONFIG_MFD_BCM590XX is not set @@ -3584,12 +3592,14 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DEBUG_SELFTEST is not set CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_GEM_CMA_HELPER=y @@ -3627,10 +3637,21 @@ CONFIG_DRM_PANEL_ARM_VERSATILE=m # CONFIG_DRM_PANEL_LVDS is not set # CONFIG_DRM_PANEL_SIMPLE is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set +# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # 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_LS043T1LE01 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set CONFIG_DRM_BRIDGE=y CONFIG_DRM_PANEL_BRIDGE=y @@ -3649,8 +3670,10 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_SII902X is not set # CONFIG_DRM_SII9234 is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set +CONFIG_DRM_TOSHIBA_TC358764=m # CONFIG_DRM_TOSHIBA_TC358767 is not set # CONFIG_DRM_TI_TFP410 is not set +# CONFIG_DRM_TI_SN65DSI86 is not set # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_DW_HDMI=m # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set @@ -3670,10 +3693,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y @@ -3700,7 +3723,6 @@ CONFIG_FB_UVESA=m # CONFIG_FB_VIRTUAL is not set CONFIG_XEN_FBDEV_FRONTEND=y # CONFIG_FB_METRONOME is not set -# CONFIG_FB_BROADSHEET is not set # CONFIG_FB_SIMPLE is not set # CONFIG_FB_SSD1307 is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y @@ -3713,8 +3735,6 @@ CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set # CONFIG_LCD_PLATFORM is not set -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_LD9040 is not set # CONFIG_LCD_AMS369FG06 is not set # CONFIG_LCD_LMS501KF03 is not set # CONFIG_LCD_HX8357 is not set @@ -3838,6 +3858,7 @@ CONFIG_SND_MESON_AXG_TDMIN=m CONFIG_SND_MESON_AXG_TDMOUT=m CONFIG_SND_MESON_AXG_SOUND_CARD=m CONFIG_SND_MESON_AXG_SPDIFOUT=m +CONFIG_SND_MESON_AXG_PDM=m CONFIG_SND_SOC_MESON=m CONFIG_SND_SOC_MESON_I2S=m CONFIG_SND_SOC_MESON_SPDIF=m @@ -3890,6 +3911,7 @@ CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_CS43130=m CONFIG_SND_SOC_CS4349=m CONFIG_SND_SOC_CS53L30=m +CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_ES7134=m # CONFIG_SND_SOC_ES7241 is not set @@ -3899,6 +3921,7 @@ CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328_SPI=m CONFIG_SND_SOC_GTM601=m CONFIG_SND_SOC_INNO_RK3036=m +# CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98504=m CONFIG_SND_SOC_MAX9867=m CONFIG_SND_SOC_MAX98927=m @@ -3914,6 +3937,8 @@ CONFIG_SND_SOC_PCM179X_SPI=m CONFIG_SND_SOC_PCM186X=m CONFIG_SND_SOC_PCM186X_I2C=m CONFIG_SND_SOC_PCM186X_SPI=m +# CONFIG_SND_SOC_PCM3060_I2C is not set +# CONFIG_SND_SOC_PCM3060_SPI is not set CONFIG_SND_SOC_PCM3168A=m CONFIG_SND_SOC_PCM3168A_I2C=m CONFIG_SND_SOC_PCM3168A_SPI=m @@ -3984,6 +4009,7 @@ CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MT6351=m CONFIG_SND_SOC_NAU8540=m CONFIG_SND_SOC_NAU8810=m +# CONFIG_SND_SOC_NAU8822 is not set CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_TPA6130A2=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -4015,6 +4041,7 @@ CONFIG_HID_APPLEIR=m CONFIG_HID_AUREAL=m CONFIG_HID_BELKIN=m CONFIG_HID_BETOP_FF=m +# CONFIG_HID_BIGBEN_FF is not set CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CORSAIR=m @@ -4357,6 +4384,7 @@ CONFIG_USB_SNP_UDC_PLAT=m # CONFIG_USB_DUMMY_HCD is not set # CONFIG_USB_CONFIGFS is not set # CONFIG_TYPEC is not set +CONFIG_USB_ROLE_SWITCH=m # CONFIG_USB_LED_TRIG is not set CONFIG_USB_ULPI_BUS=y # CONFIG_UWB is not set @@ -4374,6 +4402,7 @@ CONFIG_MMC_BLOCK_MINORS=32 # # CONFIG_MMC_DEBUG is not set CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_STM32_SDMMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ARASAN=y @@ -4407,6 +4436,7 @@ CONFIG_LEDS_CLASS=y # # LED drivers # +# CONFIG_LEDS_AN30259A is not set # CONFIG_LEDS_BCM6328 is not set # CONFIG_LEDS_BCM6358 is not set # CONFIG_LEDS_CR0014114 is not set @@ -4463,6 +4493,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # CONFIG_LEDS_TRIGGER_CAMERA is not set # CONFIG_LEDS_TRIGGER_PANIC is not set CONFIG_LEDS_TRIGGER_NETDEV=m +# CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_SUPPORT=y @@ -4611,6 +4642,7 @@ CONFIG_QCOM_HIDMA=y # CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set +# CONFIG_UDMABUF is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set # CONFIG_VIRT_DRIVERS is not set @@ -4907,6 +4939,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_ADIS16209 is not set # CONFIG_ADXL345_I2C is not set # CONFIG_ADXL345_SPI is not set +# CONFIG_ADXL372_SPI is not set +# CONFIG_ADXL372_I2C is not set # CONFIG_BMA180 is not set # CONFIG_BMA220 is not set # CONFIG_BMC150_ACCEL is not set @@ -4961,6 +4995,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m # CONFIG_MAX9611 is not set # CONFIG_MCP320X is not set # CONFIG_MCP3422 is not set +# CONFIG_MCP3911 is not set CONFIG_MESON_SARADC=y # CONFIG_NAU7802 is not set # CONFIG_SD_ADC_MODULATOR is not set @@ -5025,6 +5060,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_AD5593R is not set # CONFIG_AD5504 is not set # CONFIG_AD5624R_SPI is not set +# CONFIG_LTC1660 is not set # CONFIG_LTC2632 is not set # CONFIG_AD5686_SPI is not set # CONFIG_AD5696_I2C is not set @@ -5237,6 +5273,7 @@ CONFIG_AD5272=m # CONFIG_SRF04 is not set # CONFIG_SX9500 is not set # CONFIG_SRF08 is not set +# CONFIG_VL53L0X_I2C is not set # # Resolver to digital converters @@ -5287,10 +5324,12 @@ CONFIG_PHY_MESON8B_USB2=y CONFIG_PHY_MESON_GXL_USB2=y CONFIG_PHY_MESON_GXL_USB3=y # CONFIG_BCM_KONA_USB2_PHY is not set +# CONFIG_PHY_CADENCE_DP is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_CPCAP_USB is not set # CONFIG_PHY_MAPPHONE_MDM6600 is not set +# CONFIG_PHY_OCELOT_SERDES is not set # CONFIG_PHY_QCOM_USB_HS is not set # CONFIG_PHY_QCOM_USB_HSIC is not set CONFIG_PHY_SAMSUNG_USB2=y @@ -5706,7 +5745,6 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=y -CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_AUTHENC=y # CONFIG_CRYPTO_TEST is not set CONFIG_CRYPTO_SIMD=y @@ -5735,6 +5773,7 @@ CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=m +# CONFIG_CRYPTO_OFB is not set CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_KEYWRAP=m @@ -5829,6 +5868,7 @@ CONFIG_CRYPTO_DEV_CCREE=m CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y +# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set CONFIG_PKCS7_MESSAGE_PARSER=y CONFIG_PKCS7_TEST_KEY=m # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set @@ -5907,7 +5947,7 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m -CONFIG_RADIX_TREE_MULTIORDER=y +CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y @@ -5915,6 +5955,10 @@ CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_HAVE_GENERIC_DMA_COHERENT=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_DMA_DIRECT_OPS=y CONFIG_SWIOTLB=y CONFIG_SGL_ALLOC=y @@ -6087,6 +6131,7 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITFIELD is not set # CONFIG_TEST_UUID is not set +# CONFIG_TEST_XARRAY is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_HASH is not set @@ -6100,6 +6145,7 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_KMOD is not set +# CONFIG_TEST_MEMCAT_P is not set CONFIG_MEMTEST=y # CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_SAMPLES is not set diff --git a/config/sources/meson64.conf b/config/sources/meson64.conf index d106aef40e..4051805b51 100644 --- a/config/sources/meson64.conf +++ b/config/sources/meson64.conf @@ -43,7 +43,7 @@ case $BRANCH in dev) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH='branch:linux-4.19.y' + KERNELBRANCH='branch:linux-4.20.y' KERNELDIR=$MAINLINE_KERNEL_DIR SERIALCON='ttyAML0' KERNEL_USE_GCC='> 7.0' diff --git a/patch/kernel/meson64-dev/0017-soc-amlogic-add-meson-canvas-driver.patch b/patch/kernel/meson64-dev/0017-soc-amlogic-add-meson-canvas-driver.patch deleted file mode 100644 index 4bb5731f30..0000000000 --- a/patch/kernel/meson64-dev/0017-soc-amlogic-add-meson-canvas-driver.patch +++ /dev/null @@ -1,314 +0,0 @@ -From 47756c823298bef3895fa2837c4b3e97062e9842 Mon Sep 17 00:00:00 2001 -From: Maxime Jourdan -Date: Fri, 20 Apr 2018 13:17:07 +0200 -Subject: [PATCH] soc: amlogic: add meson-canvas driver - -Amlogic SoCs have a repository of 256 canvas which they use to -describe pixel buffers. - -They contain metadata like width, height, block mode, endianness [..] - -Many IPs within those SoCs like vdec/vpu rely on those canvas to read/write -pixels. - -Reviewed-by: Jerome Brunet -Tested-by: Neil Armstrong -Signed-off-by: Maxime Jourdan - ---- - drivers/soc/amlogic/Kconfig | 7 ++ - drivers/soc/amlogic/Makefile | 1 + - drivers/soc/amlogic/meson-canvas.c | 185 +++++++++++++++++++++++++++++++ - include/linux/soc/amlogic/meson-canvas.h | 65 +++++++++++ - 4 files changed, 258 insertions(+) - create mode 100644 drivers/soc/amlogic/meson-canvas.c - create mode 100644 include/linux/soc/amlogic/meson-canvas.h - -diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig -index b04f6e4..2f282b4 100644 ---- a/drivers/soc/amlogic/Kconfig -+++ b/drivers/soc/amlogic/Kconfig -@@ -1,5 +1,12 @@ - menu "Amlogic SoC drivers" - -+config MESON_CANVAS -+ tristate "Amlogic Meson Canvas driver" -+ depends on ARCH_MESON || COMPILE_TEST -+ default n -+ help -+ Say yes to support the canvas IP for Amlogic SoCs. -+ - config MESON_GX_SOCINFO - bool "Amlogic Meson GX SoC Information driver" - depends on ARCH_MESON || COMPILE_TEST -diff --git a/drivers/soc/amlogic/Makefile b/drivers/soc/amlogic/Makefile -index 8fa3218..0ab16d3 100644 ---- a/drivers/soc/amlogic/Makefile -+++ b/drivers/soc/amlogic/Makefile -@@ -1,3 +1,4 @@ -+obj-$(CONFIG_MESON_CANVAS) += meson-canvas.o - obj-$(CONFIG_MESON_GX_SOCINFO) += meson-gx-socinfo.o - obj-$(CONFIG_MESON_GX_PM_DOMAINS) += meson-gx-pwrc-vpu.o - obj-$(CONFIG_MESON_MX_SOCINFO) += meson-mx-socinfo.o -diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c -new file mode 100644 -index 0000000..fce33ca ---- /dev/null -+++ b/drivers/soc/amlogic/meson-canvas.c -@@ -0,0 +1,185 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2018 BayLibre, SAS -+ * Copyright (C) 2015 Amlogic, Inc. All rights reserved. -+ * Copyright (C) 2014 Endless Mobile -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define NUM_CANVAS 256 -+ -+/* DMC Registers */ -+#define DMC_CAV_LUT_DATAL 0x00 -+ #define CANVAS_WIDTH_LBIT 29 -+ #define CANVAS_WIDTH_LWID 3 -+#define DMC_CAV_LUT_DATAH 0x04 -+ #define CANVAS_WIDTH_HBIT 0 -+ #define CANVAS_HEIGHT_BIT 9 -+ #define CANVAS_WRAP_BIT 22 -+ #define CANVAS_BLKMODE_BIT 24 -+ #define CANVAS_ENDIAN_BIT 26 -+#define DMC_CAV_LUT_ADDR 0x08 -+ #define CANVAS_LUT_WR_EN BIT(9) -+ #define CANVAS_LUT_RD_EN BIT(8) -+ -+struct meson_canvas { -+ struct device *dev; -+ void __iomem *reg_base; -+ spinlock_t lock; /* canvas device lock */ -+ u8 used[NUM_CANVAS]; -+}; -+ -+static void canvas_write(struct meson_canvas *canvas, u32 reg, u32 val) -+{ -+ writel_relaxed(val, canvas->reg_base + reg); -+} -+ -+static u32 canvas_read(struct meson_canvas *canvas, u32 reg) -+{ -+ return readl_relaxed(canvas->reg_base + reg); -+} -+ -+struct meson_canvas *meson_canvas_get(struct device *dev) -+{ -+ struct device_node *canvas_node; -+ struct platform_device *canvas_pdev; -+ -+ canvas_node = of_parse_phandle(dev->of_node, "amlogic,canvas", 0); -+ if (!canvas_node) -+ return ERR_PTR(-ENODEV); -+ -+ canvas_pdev = of_find_device_by_node(canvas_node); -+ if (!canvas_pdev) -+ return ERR_PTR(-EPROBE_DEFER); -+ -+ return dev_get_drvdata(&canvas_pdev->dev); -+} -+EXPORT_SYMBOL_GPL(meson_canvas_get); -+ -+int meson_canvas_config(struct meson_canvas *canvas, u8 canvas_index, -+ u32 addr, u32 stride, u32 height, -+ unsigned int wrap, -+ unsigned int blkmode, -+ unsigned int endian) -+{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&canvas->lock, flags); -+ if (!canvas->used[canvas_index]) { -+ dev_err(canvas->dev, -+ "Trying to setup non allocated canvas %u\n", -+ canvas_index); -+ spin_unlock_irqrestore(&canvas->lock, flags); -+ return -EINVAL; -+ } -+ -+ canvas_write(canvas, DMC_CAV_LUT_DATAL, -+ ((addr + 7) >> 3) | -+ (((stride + 7) >> 3) << CANVAS_WIDTH_LBIT)); -+ -+ canvas_write(canvas, DMC_CAV_LUT_DATAH, -+ ((((stride + 7) >> 3) >> CANVAS_WIDTH_LWID) << -+ CANVAS_WIDTH_HBIT) | -+ (height << CANVAS_HEIGHT_BIT) | -+ (wrap << CANVAS_WRAP_BIT) | -+ (blkmode << CANVAS_BLKMODE_BIT) | -+ (endian << CANVAS_ENDIAN_BIT)); -+ -+ canvas_write(canvas, DMC_CAV_LUT_ADDR, -+ CANVAS_LUT_WR_EN | canvas_index); -+ -+ /* Force a read-back to make sure everything is flushed. */ -+ canvas_read(canvas, DMC_CAV_LUT_DATAH); -+ spin_unlock_irqrestore(&canvas->lock, flags); -+ -+ return 0; -+} -+EXPORT_SYMBOL_GPL(meson_canvas_config); -+ -+int meson_canvas_alloc(struct meson_canvas *canvas, u8 *canvas_index) -+{ -+ int i; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&canvas->lock, flags); -+ for (i = 0; i < NUM_CANVAS; ++i) { -+ if (!canvas->used[i]) { -+ canvas->used[i] = 1; -+ spin_unlock_irqrestore(&canvas->lock, flags); -+ *canvas_index = i; -+ return 0; -+ } -+ } -+ spin_unlock_irqrestore(&canvas->lock, flags); -+ -+ dev_err(canvas->dev, "No more canvas available\n"); -+ return -ENODEV; -+} -+EXPORT_SYMBOL_GPL(meson_canvas_alloc); -+ -+int meson_canvas_free(struct meson_canvas *canvas, u8 canvas_index) -+{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&canvas->lock, flags); -+ if (!canvas->used[canvas_index]) { -+ dev_err(canvas->dev, -+ "Trying to free unused canvas %u\n", canvas_index); -+ spin_unlock_irqrestore(&canvas->lock, flags); -+ return -EINVAL; -+ } -+ canvas->used[canvas_index] = 0; -+ spin_unlock_irqrestore(&canvas->lock, flags); -+ -+ return 0; -+} -+EXPORT_SYMBOL_GPL(meson_canvas_free); -+ -+static int meson_canvas_probe(struct platform_device *pdev) -+{ -+ struct resource *res; -+ struct meson_canvas *canvas; -+ struct device *dev = &pdev->dev; -+ -+ canvas = devm_kzalloc(dev, sizeof(*canvas), GFP_KERNEL); -+ if (!canvas) -+ return -ENOMEM; -+ -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ canvas->reg_base = devm_ioremap_resource(dev, res); -+ if (IS_ERR(canvas->reg_base)) -+ return PTR_ERR(canvas->reg_base); -+ -+ canvas->dev = dev; -+ spin_lock_init(&canvas->lock); -+ dev_set_drvdata(dev, canvas); -+ -+ return 0; -+} -+ -+static const struct of_device_id canvas_dt_match[] = { -+ { .compatible = "amlogic,canvas" }, -+ {} -+}; -+MODULE_DEVICE_TABLE(of, canvas_dt_match); -+ -+static struct platform_driver meson_canvas_driver = { -+ .probe = meson_canvas_probe, -+ .driver = { -+ .name = "amlogic-canvas", -+ .of_match_table = canvas_dt_match, -+ }, -+}; -+module_platform_driver(meson_canvas_driver); -+ -+MODULE_DESCRIPTION("Amlogic Canvas driver"); -+MODULE_AUTHOR("Maxime Jourdan "); -+MODULE_LICENSE("GPL"); -diff --git a/include/linux/soc/amlogic/meson-canvas.h b/include/linux/soc/amlogic/meson-canvas.h -new file mode 100644 -index 0000000..b4dde2f ---- /dev/null -+++ b/include/linux/soc/amlogic/meson-canvas.h -@@ -0,0 +1,65 @@ -+/* SPDX-License-Identifier: GPL-2.0+ */ -+/* -+ * Copyright (C) 2018 BayLibre, SAS -+ */ -+#ifndef __SOC_MESON_CANVAS_H -+#define __SOC_MESON_CANVAS_H -+ -+#include -+ -+#define MESON_CANVAS_WRAP_NONE 0x00 -+#define MESON_CANVAS_WRAP_X 0x01 -+#define MESON_CANVAS_WRAP_Y 0x02 -+ -+#define MESON_CANVAS_BLKMODE_LINEAR 0x00 -+#define MESON_CANVAS_BLKMODE_32x32 0x01 -+#define MESON_CANVAS_BLKMODE_64x64 0x02 -+ -+#define MESON_CANVAS_ENDIAN_SWAP16 0x1 -+#define MESON_CANVAS_ENDIAN_SWAP32 0x3 -+#define MESON_CANVAS_ENDIAN_SWAP64 0x7 -+#define MESON_CANVAS_ENDIAN_SWAP128 0xf -+ -+struct meson_canvas; -+ -+/** -+ * meson_canvas_get() - get a canvas provider instance -+ * -+ * @dev: consumer device pointer -+ */ -+struct meson_canvas *meson_canvas_get(struct device *dev); -+ -+/** -+ * meson_canvas_alloc() - take ownership of a canvas -+ * -+ * @canvas: canvas provider instance retrieved from meson_canvas_get() -+ * @canvas_index: will be filled with the canvas ID -+ */ -+int meson_canvas_alloc(struct meson_canvas *canvas, u8 *canvas_index); -+ -+/** -+ * meson_canvas_free() - remove ownership from a canvas -+ * -+ * @canvas: canvas provider instance retrieved from meson_canvas_get() -+ * @canvas_index: canvas ID that was obtained via meson_canvas_alloc() -+ */ -+int meson_canvas_free(struct meson_canvas *canvas, u8 canvas_index); -+ -+/** -+ * meson_canvas_config() - configure a canvas -+ * -+ * @canvas: canvas provider instance retrieved from meson_canvas_get() -+ * @canvas_index: canvas ID that was obtained via meson_canvas_alloc() -+ * @addr: physical address to the pixel buffer -+ * @stride: width of the buffer -+ * @height: height of the buffer -+ * @wrap: undocumented -+ * @blkmode: block mode (linear, 32x32, 64x64) -+ * @endian: byte swapping (swap16, swap32, swap64, swap128) -+ */ -+int meson_canvas_config(struct meson_canvas *canvas, u8 canvas_index, -+ u32 addr, u32 stride, u32 height, -+ unsigned int wrap, unsigned int blkmode, -+ unsigned int endian); -+ -+#endif diff --git a/patch/kernel/meson64-dev/0018-ARM64-dts-meson-gx-add-dmcbus-and-canvas-nodes.patch b/patch/kernel/meson64-dev/0018-ARM64-dts-meson-gx-add-dmcbus-and-canvas-nodes.patch deleted file mode 100644 index b09c7c8488..0000000000 --- a/patch/kernel/meson64-dev/0018-ARM64-dts-meson-gx-add-dmcbus-and-canvas-nodes.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b2b84d801a2e8145b2a08e0d310682fc5e88b0ad Mon Sep 17 00:00:00 2001 -From: Maxime Jourdan -Date: Fri, 20 Apr 2018 16:09:09 +0200 -Subject: [PATCH] ARM64: dts: meson-gx: add dmcbus and canvas nodes. - -DMC is a small memory region with various registers, -including the ones needed for the canvas module. - -Reviewed-by: Jerome Brunet -Signed-off-by: Maxime Jourdan - ---- - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index 6b64b63..fb64354 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -458,6 +458,19 @@ - }; - }; - -+ dmcbus: bus@c8838000 { -+ compatible = "simple-bus"; -+ reg = <0x0 0xc8838000 0x0 0x400>; -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges = <0x0 0x0 0x0 0xc8838000 0x0 0x400>; -+ -+ canvas: video-lut@48 { -+ compatible = "amlogic,canvas"; -+ reg = <0x0 0x48 0x0 0x14>; -+ }; -+ }; -+ - hiubus: bus@c883c000 { - compatible = "simple-bus"; - reg = <0x0 0xc883c000 0x0 0x2000>; diff --git a/patch/kernel/meson64-dev/0029-arm64-dts-meson-gxbb-nanopi-k2-fix-GPIO-lines-names.patch b/patch/kernel/meson64-dev/0029-arm64-dts-meson-gxbb-nanopi-k2-fix-GPIO-lines-names.patch deleted file mode 100644 index 4ee05f01f1..0000000000 --- a/patch/kernel/meson64-dev/0029-arm64-dts-meson-gxbb-nanopi-k2-fix-GPIO-lines-names.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 29cf4c3c228fd4cea4f46db9fa5e9386b3e794e6 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Wed, 7 Nov 2018 11:45:48 +0100 -Subject: [PATCH] arm64: dts: meson-gxbb-nanopi-k2: fix GPIO lines names - -The gpio line names were set in the pinctrl node instead of the gpio node, -at the time it was merged, it worked, but was obviously wrong. -This patch moves the properties to the gpio nodes. - -Fixes: 12ada0513d7a ("ARM64: dts: meson-gxbb-nanopi-k2: Add GPIO lines names") -Signed-off-by: Neil Armstrong - ---- - arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -index 5b10de9..8ea5ed5 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -@@ -236,7 +236,7 @@ - pinctrl-names = "default"; - }; - --&pinctrl_aobus { -+&gpio_ao { - gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In", - "VCCK En", "CON1 Header Pin31", - "I2S Header Pin6", "IR In", "I2S Header Pin7", -@@ -246,7 +246,7 @@ - ""; - }; - --&pinctrl_periphs { -+&gpio { - gpio-line-names = /* Bank GPIOZ */ - "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", - "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2", diff --git a/patch/kernel/meson64-dev/timekeeping32-tweaks-for-4.20.y.patch.disabled b/patch/kernel/meson64-dev/timekeeping32-tweaks-for-4.20.y.patch.disabled deleted file mode 100644 index 55e4838992..0000000000 --- a/patch/kernel/meson64-dev/timekeeping32-tweaks-for-4.20.y.patch.disabled +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h -index a502616..43a3837 100644 ---- a/include/linux/timekeeping32.h -+++ b/include/linux/timekeeping32.h -@@ -53,6 +53,19 @@ static inline void getboottime(struct timespec *ts) - } - - /* -+ * Timespec interfaces utilizing the ktime based ones -+ */ -+static inline void get_monotonic_boottime(struct timespec *ts) -+{ -+ *ts = ktime_to_timespec(ktime_get_boottime()); -+} -+ -+static inline void timekeeping_clocktai(struct timespec *ts) -+{ -+ *ts = ktime_to_timespec(ktime_get_clocktai()); -+} -+ -+/* - * Persistent clock related interfaces - */ - extern void read_persistent_clock(struct timespec *ts);