[ rockchip64 default and dev ] Attaching to latest Ayufan branch, patches adjustement, disabled CEC due to issues @darinatoda and briefly tested on both kernels

config/kernel/linux-rockchip64-default.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.176 Kernel Configuration
+# Linux/arm64 4.4.178 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -374,6 +374,8 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 #
 # PCI host controller drivers
 #
+# CONFIG_PCIE_DW_ROCKCHIP is not set
+# CONFIG_ROCKCHIP_PCIE_DMA_OBJ is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 # CONFIG_PCIE_IPROC is not set
 # CONFIG_PCI_HISI is not set
@@ -490,6 +492,7 @@ CONFIG_SETEND_EMULATION=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
 # CONFIG_ARM64_LSE_ATOMICS is not set
+CONFIG_KEYS_COMPAT=y
 CONFIG_ARM64_UAO=y
 CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 # CONFIG_RANDOMIZE_BASE is not set
@@ -513,7 +516,6 @@ CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
 
 #
 # Power management options
@@ -527,7 +529,9 @@ CONFIG_WAKELOCK=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
@@ -1424,7 +1428,8 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
-CONFIG_ZRAM_LZ4_COMPRESS=y
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -1537,7 +1542,7 @@ CONFIG_EEPROM_93CX6=m
 # SCSI device support
 #
 CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_NETLINK is not set
@@ -1564,7 +1569,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
-# CONFIG_SCSI_SAS_ATTRS is not set
+CONFIG_SCSI_SAS_ATTRS=m
 # CONFIG_SCSI_SAS_LIBSAS is not set
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -1591,8 +1596,10 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_SNIC is not set
@@ -2108,6 +2115,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 # CONFIG_MAC80211_HWSIM is not set
+# CONFIG_VIRT_WIFI is not set
 # CONFIG_MWL8K is not set
 CONFIG_ATH_COMMON=m
 CONFIG_ATH_CARDS=m
@@ -2226,8 +2234,8 @@ CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8XXXU=m
 CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_WL_ROCKCHIP=y
-# CONFIG_WIFI_BUILD_MODULE is not set
-# CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+CONFIG_WIFI_BUILD_MODULE=y
+CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP=y
 # CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 CONFIG_AP6XXX=m
 CONFIG_CYW_BCMDHD=m
@@ -2444,7 +2452,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_VTL_CT36X is not set
-# CONFIG_TOUCHSCREEN_GT1X is not set
+CONFIG_TOUCHSCREEN_GT1X=y
 CONFIG_ROCKCHIP_REMOTECTL=y
 CONFIG_ROCKCHIP_REMOTECTL_PWM=y
 
@@ -2852,8 +2860,8 @@ CONFIG_CHARGER_UNIVERSAL=m
 # CONFIG_BATTERY_EC is not set
 # CONFIG_BATTERY_CW2015 is not set
 # CONFIG_BATTERY_RK816 is not set
-# CONFIG_BATTERY_RK817 is not set
-# CONFIG_CHARGER_RK817 is not set
+CONFIG_BATTERY_RK817=y
+CONFIG_CHARGER_RK817=y
 # CONFIG_BATTERY_RK818 is not set
 # CONFIG_CHARGER_RK818 is not set
 # CONFIG_CHARGER_RT9455 is not set
@@ -3215,6 +3223,7 @@ CONFIG_REGULATOR_TPS549B22=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_TPS6586X=y
 CONFIG_REGULATOR_XZ3216=y
@@ -3232,7 +3241,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_CEC_RC=y
+# CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
@@ -3247,6 +3256,7 @@ CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEOBUF2_CORE=y
 CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
 CONFIG_VIDEOBUF2_VMALLOC=y
 CONFIG_VIDEOBUF2_DMA_SG=y
 CONFIG_DVB_CORE=y
@@ -3259,10 +3269,9 @@ CONFIG_DVB_MAX_ADAPTERS=8
 # Media drivers
 #
 CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
+CONFIG_RC_MAP=m
+# CONFIG_LIRC is not set
 CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=y
 CONFIG_IR_RC5_DECODER=y
 CONFIG_IR_RC6_DECODER=y
@@ -3272,18 +3281,8 @@ CONFIG_IR_SANYO_DECODER=y
 CONFIG_IR_SHARP_DECODER=y
 CONFIG_IR_MCE_KBD_DECODER=y
 CONFIG_IR_XMP_DECODER=y
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_REDRAT3=y
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=y
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_IMON_DECODER is not set
+# CONFIG_RC_DEVICES is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -3360,9 +3359,7 @@ CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
+# CONFIG_VIDEO_TM6000 is not set
 
 #
 # Digital TV USB devices
@@ -3373,7 +3370,7 @@ CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
+# CONFIG_DVB_USB_DIB0700 is not set
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_M920X=m
@@ -3403,7 +3400,7 @@ CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
+# CONFIG_DVB_USB_LME2510 is not set
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_DVBSKY=m
@@ -3417,11 +3414,7 @@ CONFIG_DVB_AS102=m
 #
 # Webcam, TV (analog/digital) USB devices
 #
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
+# CONFIG_VIDEO_EM28XX is not set
 
 #
 # Software defined radio USB devices
@@ -3429,12 +3422,6 @@ CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_USB_AIRSPY=m
 CONFIG_USB_HACKRF=m
 CONFIG_USB_MSI2500=m
-
-#
-# USB HDMI CEC adapters
-#
-CONFIG_USB_PULSE8_CEC=m
-CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_MEDIA_PCI_SUPPORT is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CAFE_CCIC is not set
@@ -3443,13 +3430,12 @@ CONFIG_SOC_CAMERA=y
 # CONFIG_VIDEO_XILINX is not set
 CONFIG_VIDEO_RK_CIF_ISP10=y
 # CONFIG_VIDEO_ROCKCHIP_CIF is not set
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
-CONFIG_VIDEO_ROCKCHIP_ISP_DPHY_SY=m
+CONFIG_VIDEO_ROCKCHIP_ISP1=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 # CONFIG_VIDEO_SH_VEU is not set
 CONFIG_VIDEO_ROCKCHIP_RGA=y
-# CONFIG_VIDEO_ROCKCHIP_VPU is not set
+CONFIG_VIDEO_ROCKCHIP_VPU=y
 CONFIG_V4L_TEST_DRIVERS=y
 # CONFIG_VIDEO_VIVID is not set
 # CONFIG_VIDEO_VIM2M is not set
@@ -3473,14 +3459,14 @@ CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 
 #
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
 #
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_MEDIA_ATTACH=y
-# CONFIG_VIDEO_IR_I2C is not set
+CONFIG_VIDEO_IR_I2C=y
 
 #
-# Encoders, decoders, sensors and other helper chips
+# I2C Encoders, decoders, sensors and other helper chips
 #
 
 #
@@ -3521,7 +3507,7 @@ CONFIG_VIDEO_ADV7181D=m
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_SAA7110 is not set
 # CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_TC35874X is not set
+CONFIG_VIDEO_TC35874X=y
 # CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_TVP7002 is not set
@@ -3554,13 +3540,20 @@ CONFIG_VIDEO_CX25840=m
 # Camera sensor devices
 #
 # CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX323 is not set
+# CONFIG_VIDEO_VIRT_CAMERA is not set
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV2718 is not set
+# CONFIG_VIDEO_OV2735 is not set
 CONFIG_VIDEO_OV4689=y
 # CONFIG_VIDEO_OV5647 is not set
 # CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV7640 is not set
 # CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV7725 is not set
+CONFIG_VIDEO_OV7750=y
 # CONFIG_VIDEO_OV9650 is not set
 CONFIG_VIDEO_OV13850=y
 # CONFIG_VIDEO_VS6624 is not set
@@ -3581,6 +3574,8 @@ CONFIG_VIDEO_OV13850=y
 # CONFIG_VIDEO_GC2155 is not set
 # CONFIG_VIDEO_GC0312 is not set
 # CONFIG_VIDEO_GC2145 is not set
+CONFIG_VIDEO_GC2355=y
+CONFIG_VIDEO_SC031GS=y
 # CONFIG_VIDEO_GC0329 is not set
 # CONFIG_VIDEO_GC2035 is not set
 
@@ -3637,13 +3632,20 @@ CONFIG_VIDEO_OV13850=y
 # CONFIG_SOC_CAMERA_TW9910 is not set
 # CONFIG_VIDEO_OV8858 is not set
 # CONFIG_VIDEO_OV2710 is not set
-# CONFIG_VIDEO_IMX323 is not set
-CONFIG_VIDEO_OV7750=y
 # CONFIG_VIDEO_TC358749XBG is not set
 CONFIG_VIDEO_ADV7181=y
 # CONFIG_VIDEO_OV7675 is not set
 # CONFIG_VIDEO_NT99230 is not set
+# CONFIG_VIDEO_OV9281 is not set
 # CONFIG_VIDEO_OV9750 is not set
+# CONFIG_VIDEO_ov5640 is not set
+# CONFIG_VIDEO_SC2232 is not set
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# CONFIG_VIDEO_ROCKCHIP_PREISP is not set
 CONFIG_MEDIA_TUNER=y
 
 #
@@ -3852,6 +3854,7 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=y
 # CONFIG_DRM_SCDC_HELPER is not set
 CONFIG_DRM_DMA_SYNC=y
 
@@ -3873,18 +3876,20 @@ CONFIG_DRM_DMA_SYNC=y
 # CONFIG_DRM_VGEM is not set
 CONFIG_DRM_ROCKCHIP=y
 # CONFIG_ROCKCHIP_DRM_DEBUG is not set
+CONFIG_ROCKCHIP_DRM_RGA=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+# CONFIG_ROCKCHIP_MIPI_CSI_TX is not set
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_DRM_TVE=y
-# CONFIG_ROCKCHIP_RGB is not set
-# CONFIG_ROCKCHIP_DRM_BACKLIGHT is not set
+CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_DRM_BACKLIGHT=y
 # CONFIG_ROCKCHIP_RK3066_HDMI is not set
 CONFIG_DRM_UDL=y
-# CONFIG_DRM_AST is not set
+CONFIG_DRM_AST=y
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_QXL is not set
@@ -3909,7 +3914,10 @@ CONFIG_DRM_BRIDGE=y
 # CONFIG_DRM_RK1000 is not set
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_LONTIUM_LT8912 is not set
+# CONFIG_DRM_CHIPONE_ICN6211 is not set
 CONFIG_DRM_ANALOGIX_DP=y
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_ANALOGIX_ANX6345 is not set
 CONFIG_DRM_DW_HDMI=y
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
@@ -3927,6 +3935,8 @@ CONFIG_MALI_SHARED_INTERRUPTS=y
 CONFIG_MALI_DT=y
 CONFIG_MALI_DEVFREQ=y
 # CONFIG_MALI_QUIET is not set
+CONFIG_MALI_MIDGARD_FOR_ANDROID=y
+# CONFIG_MALI_MIDGARD_FOR_LINUX is not set
 # CONFIG_MALI_MIDGARD is not set
 # CONFIG_MALI_KUTF is not set
 CONFIG_MALI_BIFROST_FOR_ANDROID=y
@@ -4221,10 +4231,10 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
 CONFIG_SND_SOC_ROCKCHIP_HDMI_ANALOG=m
 CONFIG_SND_SOC_ROCKCHIP_HDMI_DP=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
-# CONFIG_SND_SOC_ROCKCHIP_MULTICODECS is not set
+CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y
 CONFIG_SND_SOC_ROCKCHIP_RT5645=y
 # CONFIG_SND_SOC_ROCKCHIP_RT5651_TC358749 is not set
-# CONFIG_SND_SOC_ROCKCHIP_CDNDP is not set
+CONFIG_SND_SOC_ROCKCHIP_CDNDP=y
 
 #
 # Allwinner SoC Audio support
@@ -4262,8 +4272,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_SND_SOC_ES8316=y
 CONFIG_SND_SOC_ES8323=y
 CONFIG_SND_SOC_HDMI_CODEC=y
-# CONFIG_SND_SOC_ES8328 is not set
-# CONFIG_SND_SOC_ES8328_I2C is not set
+CONFIG_SND_SOC_ES8328=y
+CONFIG_SND_SOC_ES8328_I2C=y
 # CONFIG_SND_SOC_ES8396 is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_GVA_CODEC is not set
@@ -4276,8 +4286,8 @@ CONFIG_SND_SOC_MAX98090=y
 # CONFIG_SND_SOC_RK312X is not set
 # CONFIG_SND_SOC_RK3228 is not set
 # CONFIG_SND_SOC_RK3308 is not set
-# CONFIG_SND_SOC_RK3328 is not set
-# CONFIG_SND_SOC_RK817 is not set
+CONFIG_SND_SOC_RK3328=y
+CONFIG_SND_SOC_RK817=y
 CONFIG_SND_SOC_RL6231=y
 CONFIG_SND_SOC_RT5616=y
 # CONFIG_SND_SOC_RT5631 is not set
@@ -4337,38 +4347,41 @@ CONFIG_HID_GENERIC=y
 #
 # Special HID drivers
 #
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX is not set
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+# CONFIG_HID_ACRUX_FF is not set
 CONFIG_HID_APPLE=m
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
 CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_TWINHAN is not set
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+# CONFIG_DRAGONRISE_FF is not set
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_HOLTEK=m
+# CONFIG_HOLTEK_FF is not set
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO is not set
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_LOGITECH_HIDPP=m
@@ -4378,39 +4391,49 @@ CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGIWHEELS_FF is not set
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
-# CONFIG_HID_MONTEREY is not set
+CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+# CONFIG_HID_PICOLCD_FB is not set
+# CONFIG_HID_PICOLCD_BACKLIGHT is not set
+# CONFIG_HID_PICOLCD_LEDS is not set
+# CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
 # CONFIG_SONY_FF is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_WACOM is not set
+CONFIG_HID_GREENASIA=m
+# CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=m
+# CONFIG_SMARTJOYPLUS_FF is not set
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+# CONFIG_ZEROPLUS_FF is not set
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_RKVR is not set
-# CONFIG_HID_ALPS is not set
+CONFIG_HID_ALPS=m
 
 #
 # USB HID support
@@ -4673,14 +4696,17 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_EG20T is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=y
-CONFIG_USB_U_SERIAL=y
-CONFIG_USB_U_ETHER=y
-CONFIG_USB_F_EEM=y
-CONFIG_USB_F_MASS_STORAGE=y
-CONFIG_USB_F_FS=y
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
@@ -4707,8 +4733,8 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_G_NCM is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
@@ -4716,7 +4742,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
+CONFIG_USB_G_WEBCAM=m
 
 #
 # ROCKCHIP USB Support
@@ -5128,6 +5154,7 @@ CONFIG_COMMON_CLK_XGENE=y
 #
 # Hardware Spinlock drivers
 #
+# CONFIG_HWSPINLOCK_ROCKCHIP is not set
 
 #
 # Clock Source drivers
@@ -5182,6 +5209,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CPU selection
 #
 CONFIG_CPU_PX30=y
+# CONFIG_CPU_RK1808 is not set
 CONFIG_CPU_RK3308=y
 CONFIG_CPU_RK3328=y
 CONFIG_CPU_RK3366=y
@@ -5190,6 +5218,7 @@ CONFIG_CPU_RK3399=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_IPA=y
 CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
@@ -5241,6 +5270,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # CONFIG_BMA180 is not set
 # CONFIG_BMC150_ACCEL is not set
+# CONFIG_HID_SENSOR_ACCEL_3D is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_KXCJK1013 is not set
@@ -5264,6 +5294,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
 # CONFIG_CC10001_ADC is not set
+# CONFIG_GPIO_MUXADC is not set
 # CONFIG_HI8435 is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
@@ -5288,6 +5319,7 @@ CONFIG_ROCKCHIP_SARADC=y
 #
 # Hid Sensor IIO Common
 #
+# CONFIG_HID_SENSOR_IIO_COMMON is not set
 
 #
 # SSP Sensor Common
@@ -5339,6 +5371,7 @@ CONFIG_ROCKCHIP_SARADC=y
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
+# CONFIG_HID_SENSOR_GYRO_3D is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
 
@@ -5373,6 +5406,8 @@ CONFIG_ROCKCHIP_SARADC=y
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_ISL29125 is not set
+# CONFIG_HID_SENSOR_ALS is not set
+# CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
 # CONFIG_RPR0521 is not set
 # CONFIG_LTR501 is not set
@@ -5394,12 +5429,15 @@ CONFIG_VL6180=m
 # CONFIG_AK09911 is not set
 # CONFIG_BMC150_MAGN is not set
 # CONFIG_MAG3110 is not set
+# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
 
 #
 # Inclinometer sensors
 #
+# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
+# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
 
 #
 # Triggers - standalone
@@ -5416,6 +5454,7 @@ CONFIG_IIO_SYSFS_TRIGGER=y
 # Pressure sensors
 #
 # CONFIG_BMP280 is not set
+# CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_MPL115 is not set
 # CONFIG_MPL3115 is not set
 # CONFIG_MS5611 is not set
@@ -5432,6 +5471,7 @@ CONFIG_IIO_SYSFS_TRIGGER=y
 # Proximity sensors
 #
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_SRF04 is not set
 # CONFIG_SX9500 is not set
 
 #
@@ -5472,14 +5512,18 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_SAMSUNG_USB2 is not set
 # CONFIG_PHY_XGENE is not set
 CONFIG_PHY_ROCKCHIP_USB=y
+# CONFIG_PHY_ROCKCHIP_INNO_COMBPHY is not set
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_INNO_USB3=y
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_DP=y
-CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY=m
+CONFIG_PHY_ROCKCHIP_MIPI_RX=y
+CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY=y
 CONFIG_PHY_ROCKCHIP_INNO_HDMI_PHY=y
+# CONFIG_PHY_ROCKCHIP_INNO_VIDEO_PHY is not set
+CONFIG_PHY_ROCKCHIP_INNO_VIDEO_COMBO_PHY=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
-CONFIG_PHY_ROCKCHIP_PCIE=y
+CONFIG_PHY_ROCKCHIP_PCIE=m
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
@@ -5498,7 +5542,7 @@ CONFIG_ANDROID=y
 # CONFIG_LIBNVDIMM is not set
 CONFIG_NVMEM=y
 CONFIG_ROCKCHIP_EFUSE=y
-# CONFIG_ROCKCHIP_OTP is not set
+CONFIG_ROCKCHIP_OTP=m
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
 
@@ -5992,6 +6036,7 @@ CONFIG_LKDTM=y
 CONFIG_TEST_UDELAY=y
 CONFIG_MEMTEST=y
 # CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
@@ -6162,7 +6207,6 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SPECK=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
@@ -6176,6 +6220,7 @@ CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
+# CONFIG_CRYPTO_ZSTD is not set
 
 #
 # Random Number Generation
@@ -6219,7 +6264,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 # CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
 CONFIG_CRYPTO_CRC32_ARM64=y
-CONFIG_CRYPTO_SPECK_NEON=m
 CONFIG_BINARY_PRINTF=y
 
 #

config/kernel/linux-rockchip64-dev.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.20.0 Kernel Configuration
+# Linux/arm64 5.0.0 Kernel Configuration
 #
 
 #
@@ -9,6 +9,7 @@
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=70201
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -32,8 +33,6 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -223,6 +222,7 @@ CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA32=y
 CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
@@ -248,6 +248,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -265,75 +266,6 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
 
-#
-# Bus support
-#
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_PTM is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
-CONFIG_PCI_LABEL=y
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCIE_CADENCE_HOST is not set
-# CONFIG_PCIE_CADENCE_EP is not set
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCIE_XILINX is not set
-# CONFIG_PCI_XGENE is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
-CONFIG_PCIE_ROCKCHIP=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
-CONFIG_PCIE_ROCKCHIP_EP=y
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCIE_DW_PLAT_EP is not set
-# CONFIG_PCI_HISI is not set
-# CONFIG_PCIE_KIRIN is not set
-
-#
-# PCI Endpoint
-#
-CONFIG_PCI_ENDPOINT=y
-CONFIG_PCI_ENDPOINT_CONFIGFS=y
-# CONFIG_PCI_EPF_TEST is not set
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-
 #
 # Kernel Features
 #
@@ -341,6 +273,7 @@ CONFIG_PCI_ENDPOINT_CONFIGFS=y
 #
 # ARM errata workarounds via the alternatives framework
 #
+CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
 CONFIG_ARM64_ERRATUM_826319=y
 CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
@@ -351,6 +284,7 @@ CONFIG_ARM64_ERRATUM_819472=y
 # CONFIG_ARM64_ERRATUM_843419 is not set
 CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1188873=y
+CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1286807=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23144 is not set
@@ -402,6 +336,7 @@ CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
+# CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
@@ -410,6 +345,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARMV8_DEPRECATED is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 
@@ -428,6 +364,11 @@ CONFIG_ARM64_UAO=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
+
+#
+# ARMv8.3 architectural features
+#
+CONFIG_ARM64_PTR_AUTH=y
 CONFIG_ARM64_SVE=y
 # CONFIG_RANDOMIZE_BASE is not set
 
@@ -460,6 +401,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
+# CONFIG_ENERGY_MODEL is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
@@ -521,6 +463,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 # CONFIG_FW_CFG_SYSFS is not set
+# CONFIG_INTEL_STRATIX10_SERVICE is not set
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 
@@ -579,6 +522,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 # CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_CHACHA20_NEON is not set
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
 # CONFIG_CRYPTO_AES_ARM64_BS is not set
 
 #
@@ -693,14 +637,6 @@ CONFIG_BLK_PM=y
 #
 # IO Schedulers
 #
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
@@ -793,6 +729,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -831,6 +768,7 @@ CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
 
 #
 # Networking options
@@ -853,8 +791,6 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
-CONFIG_WIREGUARD=m
-# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_TRIE_STATS=y
@@ -992,9 +928,6 @@ CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1212,7 +1145,6 @@ CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_IP_NF_IPTABLES=m
@@ -1552,6 +1484,75 @@ CONFIG_HAVE_EBPF_JIT=y
 # Device Drivers
 #
 CONFIG_ARM_AMBA=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+# CONFIG_PCIEASPM_DEFAULT is not set
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+CONFIG_PCIEASPM_PERFORMANCE=y
+CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_LABEL=y
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence PCIe controllers support
+#
+# CONFIG_PCIE_CADENCE_HOST is not set
+# CONFIG_PCIE_CADENCE_EP is not set
+# CONFIG_PCI_FTPCI100 is not set
+# CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCIE_XILINX is not set
+# CONFIG_PCI_XGENE is not set
+# CONFIG_PCI_HOST_THUNDER_PEM is not set
+# CONFIG_PCI_HOST_THUNDER_ECAM is not set
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_ROCKCHIP_EP=y
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCIE_DW_PLAT_EP is not set
+# CONFIG_PCI_HISI is not set
+# CONFIG_PCIE_KIRIN is not set
+# CONFIG_PCI_MESON is not set
+
+#
+# PCI Endpoint
+#
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_EPF_TEST is not set
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# CONFIG_PCCARD is not set
+# CONFIG_RAPIDIO is not set
 
 #
 # Generic Driver Options
@@ -1607,7 +1608,6 @@ CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_GNSS is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
@@ -1616,6 +1616,7 @@ CONFIG_MTD_OF_PARTS=y
 #
 # Partition parsers
 #
+# CONFIG_MTD_REDBOOT_PARTS is not set
 
 #
 # User Modules And Translation Layers
@@ -1745,10 +1746,12 @@ CONFIG_BLK_DEV_NVME=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
+# CONFIG_NVME_TCP is not set
 CONFIG_NVME_TARGET=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_FC=m
 # CONFIG_NVME_TARGET_FCLOOP is not set
+# CONFIG_NVME_TARGET_TCP is not set
 
 #
 # Misc devices
@@ -1774,6 +1777,7 @@ CONFIG_NVME_TARGET_FC=m
 CONFIG_SRAM=y
 CONFIG_VEXPRESS_SYSCFG=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_PVPANIC is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -1834,6 +1838,7 @@ CONFIG_EEPROM_93CX6=m
 #
 # CONFIG_GENWQE is not set
 # CONFIG_ECHO is not set
+# CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
 
@@ -1844,7 +1849,6 @@ CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
 # CONFIG_SCSI_PROC_FS is not set
 
 #
@@ -1922,7 +1926,6 @@ CONFIG_SCSI_HISI_SAS=y
 # CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_VIRTIO is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_HAVE_PATA_PLATFORM=y
@@ -2332,10 +2335,8 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
 CONFIG_PPPOE=m
 CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_SLIP=m
@@ -2386,6 +2387,7 @@ CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_SIERRA_NET is not set
 # CONFIG_USB_VL600 is not set
 # CONFIG_USB_NET_CH9200 is not set
+# CONFIG_USB_NET_AQC111 is not set
 CONFIG_WLAN=y
 CONFIG_WLAN_VENDOR_ADMTEK=y
 # CONFIG_ADM8211 is not set
@@ -2485,9 +2487,10 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_ZD1211RW is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
-# CONFIG_QTNFMAC_PEARL_PCIE is not set
+# CONFIG_QTNFMAC_PCIE is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_VIRT_WIFI is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -2713,6 +2716,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_OLPC_APSP is not set
 # CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set
@@ -2799,10 +2803,6 @@ CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_CAVIUM=m
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# PCMCIA character devices
-#
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
@@ -2894,6 +2894,7 @@ CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I3C is not set
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
@@ -2913,6 +2914,7 @@ CONFIG_SPI_PL022=y
 # CONFIG_SPI_PXA2XX is not set
 CONFIG_SPI_ROCKCHIP=y
 # CONFIG_SPI_SC18IS602 is not set
+CONFIG_SPI_MXIC=m
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
@@ -2962,6 +2964,7 @@ CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_MAX77620=y
 CONFIG_PINCTRL_RK805=m
+# CONFIG_PINCTRL_OCELOT is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
@@ -2974,6 +2977,7 @@ CONFIG_GPIO_GENERIC=y
 #
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_DWAPB=y
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2983,6 +2987,7 @@ CONFIG_GPIO_HLWD=m
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MOCKUP is not set
 CONFIG_GPIO_PL061=y
+CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SYSCON=y
 CONFIG_GPIO_XGENE=y
 # CONFIG_GPIO_XILINX is not set
@@ -3195,6 +3200,8 @@ CONFIG_SENSORS_LM90=m
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
 CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC=y
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
 # CONFIG_SENSORS_PWM_FAN is not set
@@ -3265,11 +3272,6 @@ CONFIG_THERMAL_EMULATION=y
 # CONFIG_MAX77620_THERMAL is not set
 # CONFIG_QORIQ_THERMAL is not set
 CONFIG_ROCKCHIP_THERMAL=m
-
-#
-# ACPI INT340X thermal drivers
-#
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
@@ -3324,7 +3326,6 @@ 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
@@ -3443,6 +3444,7 @@ CONFIG_REGULATOR_MAX77620=y
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
+CONFIG_REGULATOR_MCP16502=m
 # CONFIG_REGULATOR_MT6311 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
@@ -3493,6 +3495,7 @@ CONFIG_IR_IMON_RAW=m
 # CONFIG_IR_GPIO_CIR is not set
 # CONFIG_IR_SERIAL is not set
 # CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
 CONFIG_MEDIA_SUPPORT=m
 
 #
@@ -3888,6 +3891,7 @@ CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
 CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
 CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
@@ -4031,10 +4035,12 @@ CONFIG_DRM_PANEL_SIMPLE=m
 # 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_OLIMEX_LCD_OLINUXINO=m
 # 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=m
+CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -4042,6 +4048,7 @@ CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
 # 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_PANEL_TRULY_NT35597_WQXGA=m
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -4072,6 +4079,7 @@ CONFIG_DRM_DW_HDMI=m
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_CEC is not set
+CONFIG_DRM_DW_MIPI_DSI=m
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_HISI_KIRIN=m
@@ -4316,6 +4324,7 @@ CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 #
 # STMicroelectronics STM32 SOC audio support
 #
+CONFIG_SND_SOC_XILINX_I2S=m
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
@@ -4329,6 +4338,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
+CONFIG_SND_SOC_AK4118=m
 CONFIG_SND_SOC_AK4458=m
 # CONFIG_SND_SOC_AK4554 is not set
 CONFIG_SND_SOC_AK4613=y
@@ -4833,9 +4843,9 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
 # CONFIG_USB_LED_TRIG is not set
 CONFIG_USB_ULPI_BUS=y
-CONFIG_USB_ROLE_SWITCH=m
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
@@ -4879,6 +4889,7 @@ CONFIG_MMC_CQHCI=y
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_SDHCI_XENON=y
 # CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -4948,6 +4959,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
+CONFIG_LEDS_TRIGGER_AUDIO=m
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -5148,6 +5160,7 @@ CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_PRIVCMD=y
 CONFIG_XEN_EFI=y
 CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
@@ -5212,7 +5225,6 @@ CONFIG_88EU_AP_MODE=y
 #
 # Resolver to digital converters
 #
-# CONFIG_AD2S90 is not set
 # CONFIG_AD2S1210 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
@@ -5228,7 +5240,6 @@ CONFIG_88EU_AP_MODE=y
 #
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
-# CONFIG_MTD_SPINAND_MT29F is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -5446,6 +5457,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # Analog to digital converters
 #
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
 # CONFIG_AD7266 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7298 is not set
@@ -5455,6 +5468,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
+CONFIG_AD7949=m
 # CONFIG_AD799X is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
@@ -5557,6 +5571,7 @@ CONFIG_ROCKCHIP_SARADC=m
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC7311=m
 # CONFIG_VF610_DAC is not set
 
 #
@@ -5662,6 +5677,7 @@ CONFIG_SI1133=m
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
+CONFIG_VCNL4035=m
 # CONFIG_VEML6070 is not set
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
@@ -5679,6 +5695,9 @@ CONFIG_SI1133=m
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
 
 #
 # Multiplexers
@@ -5705,6 +5724,7 @@ CONFIG_AD5272=m
 CONFIG_MCP4018=m
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
+CONFIG_MCP41010=m
 # CONFIG_TPL0102 is not set
 
 #
@@ -5747,6 +5767,7 @@ CONFIG_ISL29501=m
 #
 # Resolver to digital converters
 #
+# CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set
 
 #
@@ -5792,6 +5813,8 @@ CONFIG_GENERIC_PHY=y
 CONFIG_PHY_XGENE=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_DP is not set
+CONFIG_PHY_CADENCE_SIERRA=m
+CONFIG_PHY_FSL_IMX8MQ_USB=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
@@ -6210,6 +6233,8 @@ CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=m
 # CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
 
 #
 # Hash modes
@@ -6226,7 +6251,7 @@ CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
+CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -6239,6 +6264,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_WP512 is not set
 
@@ -6257,7 +6283,7 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_CHACHA20=m
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
 CONFIG_CRYPTO_SM4=m
@@ -6318,6 +6344,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # Library routines
 #
 CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_BITREVERSE=y
 CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_RATIONAL=y
@@ -6328,7 +6355,7 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_INDIRECT_PIO is not set
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
@@ -6343,7 +6370,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
 # CONFIG_CRC8 is not set
-CONFIG_XXHASH=m
+CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
@@ -6390,8 +6417,9 @@ 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_DMA_REMAP=y
+CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@@ -6412,7 +6440,6 @@ CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
 
@@ -6459,7 +6486,10 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
+CONFIG_KASAN_STACK=1
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set

config/sources/rk3399.conf

@@ -40,7 +40,7 @@ case $BRANCH in
 
 	dev)
 	KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
-	KERNELBRANCH='tag:tag:5.0.0-1092-ayufan'
+	KERNELBRANCH='tag:5.0.0-1103-ayufan'
 	KERNELDIR='linux-rockchip64'
 	KERNELPATCHDIR='rockchip64-dev'
 	LINUXCONFIG='linux-rockchip64-dev'

config/sources/rockchip64.conf

@@ -46,13 +46,14 @@ case $BRANCH in
 	default)
 		KERNELSOURCE='https://github.com/ayufan-rock64/linux-kernel'
 		KERNELBRANCH='tag:4.4.154-1134-rockchip-ayufan'
+		KERNELBRANCH='tag:4.4.167-1173-rockchip-ayufan'
 		KERNELDIR='linux-rockchip64'
 		KERNEL_USE_GCC='> 7.0'
 	;;
 
 	dev)
 		KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
-		KERNELBRANCH='tag:5.0.0-1092-ayufan'
+		KERNELBRANCH='tag:5.0.0-1103-ayufan'
 		KERNELDIR='linux-rockchip64'
 		KERNEL_USE_GCC='> 7.0'
 	;;

patch/kernel/rockchip64-default/04-patch-4.4.158-159.patch

@@ -1,636 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d07a6283b67e..06d5c6a6a0f6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 4
- PATCHLEVEL = 4
--SUBLEVEL = 158
-+SUBLEVEL = 159
- EXTRAVERSION =
- NAME = Blurry Fish Butt
- 
-diff --git a/arch/x86/xen/pmu.c b/arch/x86/xen/pmu.c
-index 724a08740a04..9c7358110d32 100644
---- a/arch/x86/xen/pmu.c
-+++ b/arch/x86/xen/pmu.c
-@@ -477,7 +477,7 @@ static void xen_convert_regs(const struct xen_pmu_regs *xen_regs,
- irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id)
- {
- 	int err, ret = IRQ_NONE;
--	struct pt_regs regs;
-+	struct pt_regs regs = {0};
- 	const struct xen_pmu_data *xenpmu_data = get_xenpmu_data();
- 	uint8_t xenpmu_flags = get_xenpmu_flags();
- 
-diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
-index ababdaabe870..1855b475cc0b 100644
---- a/drivers/gpu/drm/nouveau/nouveau_connector.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -253,12 +253,16 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
- 		nv_connector->edid = NULL;
- 	}
- 
--	/* Outputs are only polled while runtime active, so acquiring a
--	 * runtime PM ref here is unnecessary (and would deadlock upon
--	 * runtime suspend because it waits for polling to finish).
-+	/* Outputs are only polled while runtime active, so resuming the
-+	 * device here is unnecessary (and would deadlock upon runtime suspend
-+	 * because it waits for polling to finish). We do however, want to
-+	 * prevent the autosuspend timer from elapsing during this operation
-+	 * if possible.
- 	 */
--	if (!drm_kms_helper_is_poll_worker()) {
--		ret = pm_runtime_get_sync(connector->dev->dev);
-+	if (drm_kms_helper_is_poll_worker()) {
-+		pm_runtime_get_noresume(dev->dev);
-+	} else {
-+		ret = pm_runtime_get_sync(dev->dev);
- 		if (ret < 0 && ret != -EACCES)
- 			return conn_status;
- 	}
-@@ -329,10 +333,8 @@ detect_analog:
- 
-  out:
- 
--	if (!drm_kms_helper_is_poll_worker()) {
--		pm_runtime_mark_last_busy(connector->dev->dev);
--		pm_runtime_put_autosuspend(connector->dev->dev);
--	}
-+	pm_runtime_mark_last_busy(dev->dev);
-+	pm_runtime_put_autosuspend(dev->dev);
- 
- 	return conn_status;
- }
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index e4541c6bf3d3..4564ecf71181 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -2011,6 +2011,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
-+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 60e2c9faa95f..00d8366a614e 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -879,6 +879,8 @@
- #define USB_DEVICE_ID_SONY_PS3_BDREMOTE		0x0306
- #define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268
- #define USB_DEVICE_ID_SONY_PS4_CONTROLLER	0x05c4
-+#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2	0x09cc
-+#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE	0x0ba0
- #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER	0x03d5
- #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER	0x042f
- #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER		0x0002
-diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
-index 21febbb0d84e..6f3d47185bf0 100644
---- a/drivers/hid/hid-sony.c
-+++ b/drivers/hid/hid-sony.c
-@@ -2460,6 +2460,12 @@ static const struct hid_device_id sony_devices[] = {
- 		.driver_data = DUALSHOCK4_CONTROLLER_USB },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
- 		.driver_data = DUALSHOCK4_CONTROLLER_BT },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
-+		.driver_data = DUALSHOCK4_CONTROLLER_USB },
-+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
-+		.driver_data = DUALSHOCK4_CONTROLLER_BT },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE),
-+		.driver_data = DUALSHOCK4_CONTROLLER_USB },
- 	{ }
- };
- MODULE_DEVICE_TABLE(hid, sony_devices);
-diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
-index 53aa7515f542..04206c600098 100644
---- a/drivers/infiniband/hw/cxgb4/qp.c
-+++ b/drivers/infiniband/hw/cxgb4/qp.c
-@@ -1183,6 +1183,12 @@ static void flush_qp(struct c4iw_qp *qhp)
- 
- 	t4_set_wq_in_error(&qhp->wq);
- 	if (qhp->ibqp.uobject) {
-+
-+		/* for user qps, qhp->wq.flushed is protected by qhp->mutex */
-+		if (qhp->wq.flushed)
-+			return;
-+
-+		qhp->wq.flushed = 1;
- 		t4_set_cq_in_error(&rchp->cq);
- 		spin_lock_irqsave(&rchp->comp_handler_lock, flag);
- 		(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
-diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
-index 2e4649655181..4e98e5aff7c5 100644
---- a/drivers/net/appletalk/ipddp.c
-+++ b/drivers/net/appletalk/ipddp.c
-@@ -284,8 +284,12 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-                 case SIOCFINDIPDDPRT:
- 			spin_lock_bh(&ipddp_route_lock);
- 			rp = __ipddp_find_route(&rcp);
--			if (rp)
--				memcpy(&rcp2, rp, sizeof(rcp2));
-+			if (rp) {
-+				memset(&rcp2, 0, sizeof(rcp2));
-+				rcp2.ip    = rp->ip;
-+				rcp2.at    = rp->at;
-+				rcp2.flags = rp->flags;
-+			}
- 			spin_unlock_bh(&ipddp_route_lock);
- 
- 			if (rp) {
-diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
-index 3daf2d4a7ca0..884aa809baac 100644
---- a/drivers/net/ethernet/hp/hp100.c
-+++ b/drivers/net/ethernet/hp/hp100.c
-@@ -2636,7 +2636,7 @@ static int hp100_login_to_vg_hub(struct net_device *dev, u_short force_relogin)
- 		/* Wait for link to drop */
- 		time = jiffies + (HZ / 10);
- 		do {
--			if (~(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST))
-+			if (!(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST))
- 				break;
- 			if (!in_interrupt())
- 				schedule_timeout_interruptible(1);
-diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 3270b4333668..0a4bd73caae5 100644
---- a/drivers/net/xen-netfront.c
-+++ b/drivers/net/xen-netfront.c
-@@ -892,7 +892,11 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
- 			BUG_ON(pull_to <= skb_headlen(skb));
- 			__pskb_pull_tail(skb, pull_to - skb_headlen(skb));
- 		}
--		BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
-+		if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {
-+			queue->rx.rsp_cons = ++cons;
-+			kfree_skb(nskb);
-+			return ~0U;
-+		}
- 
- 		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
- 				skb_frag_page(nfrag),
-@@ -1029,6 +1033,8 @@ err:
- 		skb->len += rx->status;
- 
- 		i = xennet_fill_frags(queue, skb, &tmpq);
-+		if (unlikely(i == ~0U))
-+			goto err;
- 
- 		if (rx->flags & XEN_NETRXF_csum_blank)
- 			skb->ip_summed = CHECKSUM_PARTIAL;
-diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
-index 1e1e59423889..3df47c1b04ec 100644
---- a/drivers/platform/x86/alienware-wmi.c
-+++ b/drivers/platform/x86/alienware-wmi.c
-@@ -463,6 +463,7 @@ static acpi_status alienware_hdmi_command(struct hdmi_args *in_args,
- 		if (obj && obj->type == ACPI_TYPE_INTEGER)
- 			*out_data = (u32) obj->integer.value;
- 	}
-+	kfree(output.pointer);
- 	return status;
- 
- }
-diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
-index 47e249dccb5f..b380bc7ee10a 100644
---- a/drivers/target/iscsi/iscsi_target_auth.c
-+++ b/drivers/target/iscsi/iscsi_target_auth.c
-@@ -26,18 +26,6 @@
- #include "iscsi_target_nego.h"
- #include "iscsi_target_auth.h"
- 
--static int chap_string_to_hex(unsigned char *dst, unsigned char *src, int len)
--{
--	int j = DIV_ROUND_UP(len, 2), rc;
--
--	rc = hex2bin(dst, src, j);
--	if (rc < 0)
--		pr_debug("CHAP string contains non hex digit symbols\n");
--
--	dst[j] = '\0';
--	return j;
--}
--
- static void chap_binaryhex_to_asciihex(char *dst, char *src, int src_len)
- {
- 	int i;
-@@ -241,9 +229,16 @@ static int chap_server_compute_md5(
- 		pr_err("Could not find CHAP_R.\n");
- 		goto out;
- 	}
-+	if (strlen(chap_r) != MD5_SIGNATURE_SIZE * 2) {
-+		pr_err("Malformed CHAP_R\n");
-+		goto out;
-+	}
-+	if (hex2bin(client_digest, chap_r, MD5_SIGNATURE_SIZE) < 0) {
-+		pr_err("Malformed CHAP_R\n");
-+		goto out;
-+	}
- 
- 	pr_debug("[server] Got CHAP_R=%s\n", chap_r);
--	chap_string_to_hex(client_digest, chap_r, strlen(chap_r));
- 
- 	tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
- 	if (IS_ERR(tfm)) {
-@@ -348,9 +343,7 @@ static int chap_server_compute_md5(
- 		pr_err("Could not find CHAP_C.\n");
- 		goto out;
- 	}
--	pr_debug("[server] Got CHAP_C=%s\n", challenge);
--	challenge_len = chap_string_to_hex(challenge_binhex, challenge,
--				strlen(challenge));
-+	challenge_len = DIV_ROUND_UP(strlen(challenge), 2);
- 	if (!challenge_len) {
- 		pr_err("Unable to convert incoming challenge\n");
- 		goto out;
-@@ -359,6 +352,11 @@ static int chap_server_compute_md5(
- 		pr_err("CHAP_C exceeds maximum binary size of 1024 bytes\n");
- 		goto out;
- 	}
-+	if (hex2bin(challenge_binhex, challenge, challenge_len) < 0) {
-+		pr_err("Malformed CHAP_C\n");
-+		goto out;
-+	}
-+	pr_debug("[server] Got CHAP_C=%s\n", challenge);
- 	/*
- 	 * During mutual authentication, the CHAP_C generated by the
- 	 * initiator must not match the original CHAP_C generated by
-diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
-index 97d5a74558a3..a86bc7afb3b2 100644
---- a/drivers/tty/vt/vt_ioctl.c
-+++ b/drivers/tty/vt/vt_ioctl.c
-@@ -31,6 +31,8 @@
- #include <asm/io.h>
- #include <asm/uaccess.h>
- 
-+#include <linux/nospec.h>
-+
- #include <linux/kbd_kern.h>
- #include <linux/vt_kern.h>
- #include <linux/kbd_diacr.h>
-@@ -703,6 +705,8 @@ int vt_ioctl(struct tty_struct *tty,
- 		if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
- 			ret = -ENXIO;
- 		else {
-+			vsa.console = array_index_nospec(vsa.console,
-+							 MAX_NR_CONSOLES + 1);
- 			vsa.console--;
- 			console_lock();
- 			ret = vc_allocate(vsa.console);
-diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
-index 6d17f31a31d7..8eb768bbf5b5 100644
---- a/fs/ext4/dir.c
-+++ b/fs/ext4/dir.c
-@@ -74,7 +74,7 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,
- 	else if (unlikely(rlen < EXT4_DIR_REC_LEN(de->name_len)))
- 		error_msg = "rec_len is too small for name_len";
- 	else if (unlikely(((char *) de - buf) + rlen > size))
--		error_msg = "directory entry across range";
-+		error_msg = "directory entry overrun";
- 	else if (unlikely(le32_to_cpu(de->inode) >
- 			le32_to_cpu(EXT4_SB(dir->i_sb)->s_es->s_inodes_count)))
- 		error_msg = "inode out of bounds";
-@@ -83,18 +83,16 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,
- 
- 	if (filp)
- 		ext4_error_file(filp, function, line, bh->b_blocknr,
--				"bad entry in directory: %s - offset=%u(%u), "
--				"inode=%u, rec_len=%d, name_len=%d",
--				error_msg, (unsigned) (offset % size),
--				offset, le32_to_cpu(de->inode),
--				rlen, de->name_len);
-+				"bad entry in directory: %s - offset=%u, "
-+				"inode=%u, rec_len=%d, name_len=%d, size=%d",
-+				error_msg, offset, le32_to_cpu(de->inode),
-+				rlen, de->name_len, size);
- 	else
- 		ext4_error_inode(dir, function, line, bh->b_blocknr,
--				"bad entry in directory: %s - offset=%u(%u), "
--				"inode=%u, rec_len=%d, name_len=%d",
--				error_msg, (unsigned) (offset % size),
--				offset, le32_to_cpu(de->inode),
--				rlen, de->name_len);
-+				"bad entry in directory: %s - offset=%u, "
-+				"inode=%u, rec_len=%d, name_len=%d, size=%d",
-+				 error_msg, offset, le32_to_cpu(de->inode),
-+				 rlen, de->name_len, size);
- 
- 	return 1;
- }
-diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
-index c449bc089c94..1e7a9774119c 100644
---- a/fs/ext4/inline.c
-+++ b/fs/ext4/inline.c
-@@ -1756,6 +1756,7 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
- {
- 	int err, inline_size;
- 	struct ext4_iloc iloc;
-+	size_t inline_len;
- 	void *inline_pos;
- 	unsigned int offset;
- 	struct ext4_dir_entry_2 *de;
-@@ -1783,8 +1784,9 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
- 		goto out;
- 	}
- 
-+	inline_len = ext4_get_inline_size(dir);
- 	offset = EXT4_INLINE_DOTDOT_SIZE;
--	while (offset < dir->i_size) {
-+	while (offset < inline_len) {
- 		de = ext4_get_inline_entry(dir, &iloc, offset,
- 					   &inline_pos, &inline_size);
- 		if (ext4_check_dir_entry(dir, NULL, de,
-diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
-index 0a512aa81bf7..4c9d799955d1 100644
---- a/fs/ext4/mmp.c
-+++ b/fs/ext4/mmp.c
-@@ -48,7 +48,6 @@ static int write_mmp_block(struct super_block *sb, struct buffer_head *bh)
- 	 */
- 	sb_start_write(sb);
- 	ext4_mmp_csum_set(sb, mmp);
--	mark_buffer_dirty(bh);
- 	lock_buffer(bh);
- 	bh->b_end_io = end_buffer_write_sync;
- 	get_bh(bh);
-diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
-index d2421fd38833..783280ebc2fe 100644
---- a/fs/ext4/resize.c
-+++ b/fs/ext4/resize.c
-@@ -18,6 +18,7 @@
- 
- int ext4_resize_begin(struct super_block *sb)
- {
-+	struct ext4_sb_info *sbi = EXT4_SB(sb);
- 	int ret = 0;
- 
- 	if (!capable(CAP_SYS_RESOURCE))
-@@ -28,7 +29,7 @@ int ext4_resize_begin(struct super_block *sb)
-          * because the user tools have no way of handling this.  Probably a
-          * bad time to do it anyways.
-          */
--	if (EXT4_SB(sb)->s_sbh->b_blocknr !=
-+	if (EXT4_B2C(sbi, sbi->s_sbh->b_blocknr) !=
- 	    le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block)) {
- 		ext4_warning(sb, "won't resize using backup superblock at %llu",
- 			(unsigned long long)EXT4_SB(sb)->s_sbh->b_blocknr);
-@@ -1954,6 +1955,26 @@ retry:
- 		}
- 	}
- 
-+	/*
-+	 * Make sure the last group has enough space so that it's
-+	 * guaranteed to have enough space for all metadata blocks
-+	 * that it might need to hold.  (We might not need to store
-+	 * the inode table blocks in the last block group, but there
-+	 * will be cases where this might be needed.)
-+	 */
-+	if ((ext4_group_first_block_no(sb, n_group) +
-+	     ext4_group_overhead_blocks(sb, n_group) + 2 +
-+	     sbi->s_itb_per_group + sbi->s_cluster_ratio) >= n_blocks_count) {
-+		n_blocks_count = ext4_group_first_block_no(sb, n_group);
-+		n_group--;
-+		n_blocks_count_retry = 0;
-+		if (resize_inode) {
-+			iput(resize_inode);
-+			resize_inode = NULL;
-+		}
-+		goto retry;
-+	}
-+
- 	/* extend the last group */
- 	if (n_group == o_group)
- 		add = n_blocks_count - o_blocks_count;
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 8d18f6142da5..a3d905abbaa9 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -4024,11 +4024,13 @@ no_journal:
- 	block = ext4_count_free_clusters(sb);
- 	ext4_free_blocks_count_set(sbi->s_es, 
- 				   EXT4_C2B(sbi, block));
-+	ext4_superblock_csum_set(sb);
- 	err = percpu_counter_init(&sbi->s_freeclusters_counter, block,
- 				  GFP_KERNEL);
- 	if (!err) {
- 		unsigned long freei = ext4_count_free_inodes(sb);
- 		sbi->s_es->s_free_inodes_count = cpu_to_le32(freei);
-+		ext4_superblock_csum_set(sb);
- 		err = percpu_counter_init(&sbi->s_freeinodes_counter, freei,
- 					  GFP_KERNEL);
- 	}
-diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
-index fe50ded1b4ce..272269f1c310 100644
---- a/fs/ocfs2/buffer_head_io.c
-+++ b/fs/ocfs2/buffer_head_io.c
-@@ -336,6 +336,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
- 				 * for this bh as it's not marked locally
- 				 * uptodate. */
- 				status = -EIO;
-+				clear_buffer_needs_validate(bh);
- 				put_bh(bh);
- 				bhs[i] = NULL;
- 				continue;
-diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
-index 316694dafa5b..008f466d1da7 100644
---- a/include/net/nfc/hci.h
-+++ b/include/net/nfc/hci.h
-@@ -87,7 +87,7 @@ struct nfc_hci_pipe {
-  * According to specification 102 622 chapter 4.4 Pipes,
-  * the pipe identifier is 7 bits long.
-  */
--#define NFC_HCI_MAX_PIPES		127
-+#define NFC_HCI_MAX_PIPES		128
- struct nfc_hci_init_data {
- 	u8 gate_count;
- 	struct nfc_hci_gate gates[NFC_HCI_MAX_CUSTOM_GATES];
-diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index fdaa88f38aec..74b20e3ab8c6 100644
---- a/kernel/trace/ring_buffer.c
-+++ b/kernel/trace/ring_buffer.c
-@@ -1513,6 +1513,8 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages)
- 	tmp_iter_page = first_page;
- 
- 	do {
-+		cond_resched();
-+
- 		to_remove_page = tmp_iter_page;
- 		rb_inc_page(cpu_buffer, &tmp_iter_page);
- 
-diff --git a/mm/shmem.c b/mm/shmem.c
-index 1b11ccc0a3b7..8e506a45a6ef 100644
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -1464,6 +1464,8 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
- 			mpol_shared_policy_init(&info->policy, NULL);
- 			break;
- 		}
-+
-+		lockdep_annotate_inode_mutex_key(inode);
- 	} else
- 		shmem_free_inode(sb);
- 	return inode;
-diff --git a/net/core/neighbour.c b/net/core/neighbour.c
-index f60b93627876..78dc184072e8 100644
---- a/net/core/neighbour.c
-+++ b/net/core/neighbour.c
-@@ -1140,6 +1140,12 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
- 		lladdr = neigh->ha;
- 	}
- 
-+	/* Update confirmed timestamp for neighbour entry after we
-+	 * received ARP packet even if it doesn't change IP to MAC binding.
-+	 */
-+	if (new & NUD_CONNECTED)
-+		neigh->confirmed = jiffies;
-+
- 	/* If entry was valid and address is not changed,
- 	   do not change entry state, if new one is STALE.
- 	 */
-@@ -1163,15 +1169,12 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
- 		}
- 	}
- 
--	/* Update timestamps only once we know we will make a change to the
-+	/* Update timestamp only once we know we will make a change to the
- 	 * neighbour entry. Otherwise we risk to move the locktime window with
- 	 * noop updates and ignore relevant ARP updates.
- 	 */
--	if (new != old || lladdr != neigh->ha) {
--		if (new & NUD_CONNECTED)
--			neigh->confirmed = jiffies;
-+	if (new != old || lladdr != neigh->ha)
- 		neigh->updated = jiffies;
--	}
- 
- 	if (new != old) {
- 		neigh_del_timer(neigh);
-diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
-index 967a47ff78a4..b12721ecb0b6 100644
---- a/net/ipv4/af_inet.c
-+++ b/net/ipv4/af_inet.c
-@@ -1280,6 +1280,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
- 		if (encap)
- 			skb_reset_inner_headers(skb);
- 		skb->network_header = (u8 *)iph - skb->head;
-+		skb_reset_mac_len(skb);
- 	} while ((skb = skb->next));
- 
- out:
-diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
-index 9e2ea4ae840d..244b9fec9d4d 100644
---- a/net/ipv6/ip6_offload.c
-+++ b/net/ipv6/ip6_offload.c
-@@ -118,6 +118,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
- 		ipv6h = (struct ipv6hdr *)(skb_mac_header(skb) + nhoff);
- 		ipv6h->payload_len = htons(skb->len - nhoff - sizeof(*ipv6h));
- 		skb->network_header = (u8 *)ipv6h - skb->head;
-+		skb_reset_mac_len(skb);
- 
- 		if (udpfrag) {
- 			int err = ip6_find_1stfragopt(skb, &prevhdr);
-diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
-index 0feede45bd28..530b62fd6b64 100644
---- a/net/ipv6/ip6_output.c
-+++ b/net/ipv6/ip6_output.c
-@@ -193,12 +193,10 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
- 				kfree_skb(skb);
- 				return -ENOBUFS;
- 			}
-+			if (skb->sk)
-+				skb_set_owner_w(skb2, skb->sk);
- 			consume_skb(skb);
- 			skb = skb2;
--			/* skb_set_owner_w() changes sk->sk_wmem_alloc atomically,
--			 * it is safe to call in our context (socket lock not held)
--			 */
--			skb_set_owner_w(skb, (struct sock *)sk);
- 		}
- 		if (opt->opt_flen)
- 			ipv6_push_frag_opts(skb, opt, &proto);
-diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c
-index 07e5abdbceb5..0a576ccca3dc 100644
---- a/sound/firewire/bebob/bebob_maudio.c
-+++ b/sound/firewire/bebob/bebob_maudio.c
-@@ -96,17 +96,13 @@ int snd_bebob_maudio_load_firmware(struct fw_unit *unit)
- 	struct fw_device *device = fw_parent_device(unit);
- 	int err, rcode;
- 	u64 date;
--	__le32 cues[3] = {
--		cpu_to_le32(MAUDIO_BOOTLOADER_CUE1),
--		cpu_to_le32(MAUDIO_BOOTLOADER_CUE2),
--		cpu_to_le32(MAUDIO_BOOTLOADER_CUE3)
--	};
-+	__le32 *cues;
- 
- 	/* check date of software used to build */
- 	err = snd_bebob_read_block(unit, INFO_OFFSET_SW_DATE,
- 				   &date, sizeof(u64));
- 	if (err < 0)
--		goto end;
-+		return err;
- 	/*
- 	 * firmware version 5058 or later has date later than "20070401", but
- 	 * 'date' is not null-terminated.
-@@ -114,20 +110,28 @@ int snd_bebob_maudio_load_firmware(struct fw_unit *unit)
- 	if (date < 0x3230303730343031LL) {
- 		dev_err(&unit->device,
- 			"Use firmware version 5058 or later\n");
--		err = -ENOSYS;
--		goto end;
-+		return -ENXIO;
- 	}
- 
-+	cues = kmalloc_array(3, sizeof(*cues), GFP_KERNEL);
-+	if (!cues)
-+		return -ENOMEM;
-+
-+	cues[0] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE1);
-+	cues[1] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE2);
-+	cues[2] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE3);
-+
- 	rcode = fw_run_transaction(device->card, TCODE_WRITE_BLOCK_REQUEST,
- 				   device->node_id, device->generation,
- 				   device->max_speed, BEBOB_ADDR_REG_REQ,
--				   cues, sizeof(cues));
-+				   cues, 3 * sizeof(*cues));
-+	kfree(cues);
- 	if (rcode != RCODE_COMPLETE) {
- 		dev_err(&unit->device,
- 			"Failed to send a cue to load firmware\n");
- 		err = -EIO;
- 	}
--end:
-+
- 	return err;
- }
- 
-diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
-index 56fc47bd6dba..50b216fc369f 100644
---- a/sound/pci/emu10k1/emufx.c
-+++ b/sound/pci/emu10k1/emufx.c
-@@ -2520,7 +2520,7 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un
- 		emu->support_tlv = 1;
- 		return put_user(SNDRV_EMU10K1_VERSION, (int __user *)argp);
- 	case SNDRV_EMU10K1_IOCTL_INFO:
--		info = kmalloc(sizeof(*info), GFP_KERNEL);
-+		info = kzalloc(sizeof(*info), GFP_KERNEL);
- 		if (!info)
- 			return -ENOMEM;
- 		snd_emu10k1_fx8010_info(emu, info);
-diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c
-index 55db19ddc5ff..93b02be3a90e 100644
---- a/sound/soc/codecs/cs4265.c
-+++ b/sound/soc/codecs/cs4265.c
-@@ -157,8 +157,8 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = {
- 	SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2,
- 				3, 1, 0),
- 	SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum),
--	SOC_SINGLE("MMTLR Data Switch", 0,
--				1, 1, 0),
-+	SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2,
-+				0, 1, 0),
- 	SOC_ENUM("Mono Channel Select", spdif_mono_select_enum),
- 	SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24),
- };

patch/kernel/rockchip64-default/04-patch-4.4.164-165.patch

@@ -1,958 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9382e7e4e750..441a760dc5a4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 4
- PATCHLEVEL = 4
--SUBLEVEL = 164
-+SUBLEVEL = 165
- EXTRAVERSION =
- NAME = Blurry Fish Butt
-
-@@ -612,6 +607,22 @@ endif # $(dot-config)
- # Defaults to vmlinux, but the arch makefile usually adds further targets
- all: vmlinux
-
-+ifeq ($(cc-name),clang)
-+ifneq ($(CROSS_COMPILE),)
-+CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))
-+GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
-+CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)
-+GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)
-+endif
-+ifneq ($(GCC_TOOLCHAIN),)
-+CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)
-+endif
-+KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
-+KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
-+KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
-+KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
-+endif
-+
- # The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
- # values of the respective KBUILD_* variables
- ARCH_CPPFLAGS :=
-@@ -713,11 +723,11 @@ KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
- else
-
- # These warnings generated too much noise in a regular build.
--# Use make W=1 to enable them (see scripts/Makefile.build)
-+# Use make W=1 to enable them (see scripts/Makefile.extrawarn)
- KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
--KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
- endif
-
-+KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
- ifdef CONFIG_FRAME_POINTER
- KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls
- else
-@@ -1575,6 +1588,8 @@ endif
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.symtypes: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-+%.ll: %.c prepare scripts FORCE
-+	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-
- # Modules
- /: prepare scripts FORCE
-diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
-index 8a336852eeba..aea904713d0f 100644
---- a/arch/arm64/include/asm/percpu.h
-+++ b/arch/arm64/include/asm/percpu.h
-@@ -84,6 +84,7 @@ static inline unsigned long __percpu_##op(void *ptr,			\
- 		: [val] "Ir" (val));					\
- 		break;							\
- 	default:							\
-+		ret = 0;						\
- 		BUILD_BUG();						\
- 	}								\
- 									\
-@@ -113,6 +114,7 @@ static inline unsigned long __percpu_read(void *ptr, int size)
- 		ret = ACCESS_ONCE(*(u64 *)ptr);
- 		break;
- 	default:
-+		ret = 0;
- 		BUILD_BUG();
- 	}
-
-@@ -182,6 +184,7 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val,
- 		: [val] "r" (val));
- 		break;
- 	default:
-+		ret = 0;
- 		BUILD_BUG();
- 	}
-
-diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile
-index ee8a18e50a25..29b72c46284d 100644
---- a/arch/s390/kernel/vdso32/Makefile
-+++ b/arch/s390/kernel/vdso32/Makefile
-@@ -29,7 +29,7 @@ GCOV_PROFILE := n
- $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so
-
- # link rule for the .so file, .lds has to be first
--$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32)
-+$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE
- 	$(call if_changed,vdso32ld)
-
- # strip rule for the .so file
-@@ -38,12 +38,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
- 	$(call if_changed,objcopy)
-
- # assembly rules for the .S files
--$(obj-vdso32): %.o: %.S
-+$(obj-vdso32): %.o: %.S FORCE
- 	$(call if_changed_dep,vdso32as)
-
- # actual build commands
- quiet_cmd_vdso32ld = VDSO32L $@
--      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@
-+      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@
- quiet_cmd_vdso32as = VDSO32A $@
-       cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<
-
-diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile
-index c4b03f9ed228..1b083d80de50 100644
---- a/arch/s390/kernel/vdso64/Makefile
-+++ b/arch/s390/kernel/vdso64/Makefile
-@@ -29,7 +29,7 @@ GCOV_PROFILE := n
- $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so
-
- # link rule for the .so file, .lds has to be first
--$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64)
-+$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE
- 	$(call if_changed,vdso64ld)
-
- # strip rule for the .so file
-@@ -38,12 +38,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
- 	$(call if_changed,objcopy)
-
- # assembly rules for the .S files
--$(obj-vdso64): %.o: %.S
-+$(obj-vdso64): %.o: %.S FORCE
- 	$(call if_changed_dep,vdso64as)
-
- # actual build commands
- quiet_cmd_vdso64ld = VDSO64L $@
--      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@
-+      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@
- quiet_cmd_vdso64as = VDSO64A $@
-       cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
-
-diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
-index 43f32ce60aa3..734f56d774bb 100644
---- a/arch/s390/numa/numa.c
-+++ b/arch/s390/numa/numa.c
-@@ -47,6 +47,7 @@ int __node_distance(int a, int b)
- {
- 	return mode->distance ? mode->distance(a, b) : 0;
- }
-+EXPORT_SYMBOL(__node_distance);
-
- int numa_debug_enabled;
-
-diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
-index b856c66ebd3a..6dbf27ffafc8 100644
---- a/arch/um/os-Linux/skas/process.c
-+++ b/arch/um/os-Linux/skas/process.c
-@@ -585,6 +585,11 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf)
- 		fatal_sigsegv();
- 	}
- 	longjmp(*switch_buf, 1);
-+
-+	/* unreachable */
-+	printk(UM_KERN_ERR "impossible long jump!");
-+	fatal_sigsegv();
-+	return 0;
- }
-
- void initial_thread_cb_skas(void (*proc)(void *), void *arg)
-diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
-index 5365ff6e69c1..ee565b23795b 100644
---- a/drivers/acpi/acpi_platform.c
-+++ b/drivers/acpi/acpi_platform.c
-@@ -29,6 +29,7 @@ static const struct acpi_device_id forbidden_id_list[] = {
- 	{"PNP0200",  0},	/* AT DMA Controller */
- 	{"ACPI0009", 0},	/* IOxAPIC */
- 	{"ACPI000A", 0},	/* IOAPIC */
-+	{"SMB0001",  0},	/* ACPI SMBUS virtual device */
- 	{"", 0},
- };
-
-diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
-index 502406c9e6e1..616ee4f9c233 100644
---- a/drivers/block/zram/zram_drv.c
-+++ b/drivers/block/zram/zram_drv.c
-@@ -1184,6 +1184,11 @@ static struct attribute_group zram_disk_attr_group = {
- 	.attrs = zram_disk_attrs,
- };
-
-+static const struct attribute_group *zram_disk_attr_groups[] = {
-+	&zram_disk_attr_group,
-+	NULL,
-+};
-+
- /*
-  * Allocate and initialize new zram device. the function returns
-  * '>= 0' device_id upon success, and negative value otherwise.
-@@ -1264,15 +1269,9 @@ static int zram_add(void)
- 		zram->disk->queue->limits.discard_zeroes_data = 0;
- 	queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zram->disk->queue);
-
-+	disk_to_dev(zram->disk)->groups = zram_disk_attr_groups;
- 	add_disk(zram->disk);
-
--	ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
--				&zram_disk_attr_group);
--	if (ret < 0) {
--		pr_err("Error creating sysfs group for device %d\n",
--				device_id);
--		goto out_free_disk;
--	}
- 	strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
- 	zram->meta = NULL;
- 	zram->max_comp_streams = 1;
-@@ -1280,9 +1279,6 @@ static int zram_add(void)
- 	pr_info("Added device: %s\n", zram->disk->disk_name);
- 	return device_id;
-
--out_free_disk:
--	del_gendisk(zram->disk);
--	put_disk(zram->disk);
- out_free_queue:
- 	blk_cleanup_queue(queue);
- out_free_idr:
-@@ -1310,16 +1306,6 @@ static int zram_remove(struct zram *zram)
- 	zram->claim = true;
- 	mutex_unlock(&bdev->bd_mutex);
-
--	/*
--	 * Remove sysfs first, so no one will perform a disksize
--	 * store while we destroy the devices. This also helps during
--	 * hot_remove -- zram_reset_device() is the last holder of
--	 * ->init_lock, no later/concurrent disksize_store() or any
--	 * other sysfs handlers are possible.
--	 */
--	sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
--			&zram_disk_attr_group);
--
- 	/* Make sure all the pending I/O are finished */
- 	fsync_bdev(bdev);
- 	zram_reset_device(zram);
-diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
-index 389af3c15ec4..bde71b07f15e 100644
---- a/drivers/clk/samsung/clk-exynos5420.c
-+++ b/drivers/clk/samsung/clk-exynos5420.c
-@@ -273,6 +273,7 @@ static const struct samsung_clk_reg_dump exynos5420_set_clksrc[] = {
- 	{ .offset = GATE_BUS_TOP,		.value = 0xffffffff, },
- 	{ .offset = GATE_BUS_DISP1,		.value = 0xffffffff, },
- 	{ .offset = GATE_IP_PERIC,		.value = 0xffffffff, },
-+	{ .offset = GATE_IP_PERIS,		.value = 0xffffffff, },
- };
-
- static int exynos5420_clk_suspend(void)
-diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
-index 1a2032c2c1fb..f6863adc15ad 100644
---- a/drivers/hid/uhid.c
-+++ b/drivers/hid/uhid.c
-@@ -12,6 +12,7 @@
-
- #include <linux/atomic.h>
- #include <linux/compat.h>
-+#include <linux/cred.h>
- #include <linux/device.h>
- #include <linux/fs.h>
- #include <linux/hid.h>
-@@ -24,6 +25,7 @@
- #include <linux/spinlock.h>
- #include <linux/uhid.h>
- #include <linux/wait.h>
-+#include <linux/uaccess.h>
-
- #define UHID_NAME	"uhid"
- #define UHID_BUFSIZE	32
-@@ -721,6 +723,17 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,
-
- 	switch (uhid->input_buf.type) {
- 	case UHID_CREATE:
-+		/*
-+		 * 'struct uhid_create_req' contains a __user pointer which is
-+		 * copied from, so it's unsafe to allow this with elevated
-+		 * privileges (e.g. from a setuid binary) or via kernel_write().
-+		 */
-+		if (file->f_cred != current_cred() || uaccess_kernel()) {
-+			pr_err_once("UHID_CREATE from different security context by process %d (%s), this is not allowed.\n",
-+				    task_tgid_vnr(current), current->comm);
-+			ret = -EACCES;
-+			goto unlock;
-+		}
- 		ret = uhid_dev_create(uhid, &uhid->input_buf);
- 		break;
- 	case UHID_CREATE2:
-diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
-index 55b5a8ff1cfe..ca3aa28977bc 100644
---- a/drivers/hwmon/ibmpowernv.c
-+++ b/drivers/hwmon/ibmpowernv.c
-@@ -114,7 +114,7 @@ static ssize_t show_label(struct device *dev, struct device_attribute *devattr,
- 	return sprintf(buf, "%s\n", sdata->label);
- }
-
--static int __init get_logical_cpu(int hwcpu)
-+static int get_logical_cpu(int hwcpu)
- {
- 	int cpu;
-
-@@ -125,9 +125,8 @@ static int __init get_logical_cpu(int hwcpu)
- 	return -ENOENT;
- }
-
--static void __init make_sensor_label(struct device_node *np,
--				     struct sensor_data *sdata,
--				     const char *label)
-+static void make_sensor_label(struct device_node *np,
-+			      struct sensor_data *sdata, const char *label)
- {
- 	u32 id;
- 	size_t n;
-diff --git a/drivers/media/v4l2-core/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c
-index b47ac4e053d0..f5c8a952f0aa 100644
---- a/drivers/media/v4l2-core/v4l2-event.c
-+++ b/drivers/media/v4l2-core/v4l2-event.c
-@@ -197,6 +197,22 @@ int v4l2_event_pending(struct v4l2_fh *fh)
- }
- EXPORT_SYMBOL_GPL(v4l2_event_pending);
-
-+static void __v4l2_event_unsubscribe(struct v4l2_subscribed_event *sev)
-+{
-+	struct v4l2_fh *fh = sev->fh;
-+	unsigned int i;
-+
-+	lockdep_assert_held(&fh->subscribe_lock);
-+	assert_spin_locked(&fh->vdev->fh_lock);
-+
-+	/* Remove any pending events for this subscription */
-+	for (i = 0; i < sev->in_use; i++) {
-+		list_del(&sev->events[sev_pos(sev, i)].list);
-+		fh->navailable--;
-+	}
-+	list_del(&sev->list);
-+}
-+
- int v4l2_event_subscribe(struct v4l2_fh *fh,
- 			 const struct v4l2_event_subscription *sub, unsigned elems,
- 			 const struct v4l2_subscribed_event_ops *ops)
-@@ -228,27 +244,23 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
-
- 	spin_lock_irqsave(&fh->vdev->fh_lock, flags);
- 	found_ev = v4l2_event_subscribed(fh, sub->type, sub->id);
-+	if (!found_ev)
-+		list_add(&sev->list, &fh->subscribed);
- 	spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
-
- 	if (found_ev) {
- 		/* Already listening */
- 		kfree(sev);
--		goto out_unlock;
--	}
--
--	if (sev->ops && sev->ops->add) {
-+	} else if (sev->ops && sev->ops->add) {
- 		ret = sev->ops->add(sev, elems);
- 		if (ret) {
-+			spin_lock_irqsave(&fh->vdev->fh_lock, flags);
-+			__v4l2_event_unsubscribe(sev);
-+			spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
- 			kfree(sev);
--			goto out_unlock;
- 		}
- 	}
-
--	spin_lock_irqsave(&fh->vdev->fh_lock, flags);
--	list_add(&sev->list, &fh->subscribed);
--	spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
--
--out_unlock:
- 	mutex_unlock(&fh->subscribe_lock);
-
- 	return ret;
-@@ -283,7 +295,6 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,
- {
- 	struct v4l2_subscribed_event *sev;
- 	unsigned long flags;
--	int i;
-
- 	if (sub->type == V4L2_EVENT_ALL) {
- 		v4l2_event_unsubscribe_all(fh);
-@@ -295,14 +306,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,
- 	spin_lock_irqsave(&fh->vdev->fh_lock, flags);
-
- 	sev = v4l2_event_subscribed(fh, sub->type, sub->id);
--	if (sev != NULL) {
--		/* Remove any pending events for this subscription */
--		for (i = 0; i < sev->in_use; i++) {
--			list_del(&sev->events[sev_pos(sev, i)].list);
--			fh->navailable--;
--		}
--		list_del(&sev->list);
--	}
-+	if (sev != NULL)
-+		__v4l2_event_unsubscribe(sev);
-
- 	spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
-
-diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
-index 1c37d5a78822..8ce9c63dfc59 100644
---- a/drivers/media/v4l2-core/videobuf2-core.c
-+++ b/drivers/media/v4l2-core/videobuf2-core.c
-@@ -870,12 +870,9 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
- 	dprintk(4, "done processing on buffer %d, state: %d\n",
- 			vb->index, state);
-
--	if (state != VB2_BUF_STATE_QUEUED &&
--	    state != VB2_BUF_STATE_REQUEUEING) {
--		/* sync buffers */
--		for (plane = 0; plane < vb->num_planes; ++plane)
--			call_void_memop(vb, finish, vb->planes[plane].mem_priv);
--	}
-+	/* sync buffers */
-+	for (plane = 0; plane < vb->num_planes; ++plane)
-+		call_void_memop(vb, finish, vb->planes[plane].mem_priv);
-
- 	spin_lock_irqsave(&q->done_lock, flags);
- 	if (state == VB2_BUF_STATE_QUEUED ||
-diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
-index e11a0bd6c66e..e2474af7386a 100644
---- a/drivers/misc/atmel-ssc.c
-+++ b/drivers/misc/atmel-ssc.c
-@@ -129,7 +129,7 @@ static const struct of_device_id atmel_ssc_dt_ids[] = {
- MODULE_DEVICE_TABLE(of, atmel_ssc_dt_ids);
- #endif
-
--static inline const struct atmel_ssc_platform_data * __init
-+static inline const struct atmel_ssc_platform_data *
- 	atmel_ssc_get_driver_data(struct platform_device *pdev)
- {
- 	if (pdev->dev.of_node) {
-diff --git a/drivers/misc/sgi-gru/grukdump.c b/drivers/misc/sgi-gru/grukdump.c
-index 313da3150262..1540a7785e14 100644
---- a/drivers/misc/sgi-gru/grukdump.c
-+++ b/drivers/misc/sgi-gru/grukdump.c
-@@ -27,6 +27,9 @@
- #include <linux/delay.h>
- #include <linux/bitops.h>
- #include <asm/uv/uv_hub.h>
-+
-+#include <linux/nospec.h>
-+
- #include "gru.h"
- #include "grutables.h"
- #include "gruhandles.h"
-@@ -196,6 +199,7 @@ int gru_dump_chiplet_request(unsigned long arg)
- 	/* Currently, only dump by gid is implemented */
- 	if (req.gid >= gru_max_gids)
- 		return -EINVAL;
-+	req.gid = array_index_nospec(req.gid, gru_max_gids);
-
- 	gru = GID_TO_GRU(req.gid);
- 	ubuf = req.buf;
-diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
-index ce3a56bea6e6..58102e96ac5c 100644
---- a/drivers/net/ethernet/broadcom/tg3.c
-+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -12379,6 +12379,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
- {
- 	struct tg3 *tp = netdev_priv(dev);
- 	int i, irq_sync = 0, err = 0;
-+	bool reset_phy = false;
-
- 	if ((ering->rx_pending > tp->rx_std_ring_mask) ||
- 	    (ering->rx_jumbo_pending > tp->rx_jmb_ring_mask) ||
-@@ -12410,7 +12411,13 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
-
- 	if (netif_running(dev)) {
- 		tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
--		err = tg3_restart_hw(tp, false);
-+		/* Reset PHY to avoid PHY lock up */
-+		if (tg3_asic_rev(tp) == ASIC_REV_5717 ||
-+		    tg3_asic_rev(tp) == ASIC_REV_5719 ||
-+		    tg3_asic_rev(tp) == ASIC_REV_5720)
-+			reset_phy = true;
-+
-+		err = tg3_restart_hw(tp, reset_phy);
- 		if (!err)
- 			tg3_netif_start(tp);
- 	}
-@@ -12444,6 +12451,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
- {
- 	struct tg3 *tp = netdev_priv(dev);
- 	int err = 0;
-+	bool reset_phy = false;
-
- 	if (tp->link_config.autoneg == AUTONEG_ENABLE)
- 		tg3_warn_mgmt_link_flap(tp);
-@@ -12534,7 +12542,13 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
-
- 		if (netif_running(dev)) {
- 			tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
--			err = tg3_restart_hw(tp, false);
-+			/* Reset PHY to avoid PHY lock up */
-+			if (tg3_asic_rev(tp) == ASIC_REV_5717 ||
-+			    tg3_asic_rev(tp) == ASIC_REV_5719 ||
-+			    tg3_asic_rev(tp) == ASIC_REV_5720)
-+				reset_phy = true;
-+
-+			err = tg3_restart_hw(tp, reset_phy);
- 			if (!err)
- 				tg3_netif_start(tp);
- 		}
-diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
-index 460fa6708bfc..3c4b107aba78 100644
---- a/drivers/platform/x86/acerhdf.c
-+++ b/drivers/platform/x86/acerhdf.c
-@@ -233,6 +233,7 @@ static const struct bios_settings bios_tbl[] = {
- 	{"Gateway", "LT31",   "v1.3201",  0x55, 0x58, {0x9e, 0x00}, 0},
- 	{"Gateway", "LT31",   "v1.3302",  0x55, 0x58, {0x9e, 0x00}, 0},
- 	{"Gateway", "LT31",   "v1.3303t", 0x55, 0x58, {0x9e, 0x00}, 0},
-+	{"Gateway", "LT31",   "v1.3307",  0x55, 0x58, {0x9e, 0x00}, 0},
- 	/* Packard Bell */
- 	{"Packard Bell", "DOA150",  "v0.3104",  0x55, 0x58, {0x21, 0x00}, 0},
- 	{"Packard Bell", "DOA150",  "v0.3105",  0x55, 0x58, {0x20, 0x00}, 0},
-diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
-index 0ab15d833d1b..50fe1f76ea42 100644
---- a/drivers/uio/uio.c
-+++ b/drivers/uio/uio.c
-@@ -842,6 +842,8 @@ int __uio_register_device(struct module *owner,
- 	if (ret)
- 		goto err_uio_dev_add_attributes;
-
-+	info->uio_dev = idev;
-+
- 	if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) {
- 		/*
- 		 * Note that we deliberately don't use devm_request_irq
-@@ -853,11 +855,12 @@ int __uio_register_device(struct module *owner,
- 		 */
- 		ret = request_irq(info->irq, uio_interrupt,
- 				  info->irq_flags, info->name, idev);
--		if (ret)
-+		if (ret) {
-+			info->uio_dev = NULL;
- 			goto err_request_irq;
-+		}
- 	}
-
--	info->uio_dev = idev;
- 	return 0;
-
- err_request_irq:
-diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
-index 3cbf6aa10f2c..0a8e5ac891d4 100644
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -1716,6 +1716,9 @@ static const struct usb_device_id acm_ids[] = {
- 	{ USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */
- 	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
- 	},
-+	{ USB_DEVICE(0x0572, 0x1349), /* Hiro (Conexant) USB MODEM H50228 */
-+	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
-+	},
- 	{ USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */
- 	.driver_info = QUIRK_CONTROL_LINE_STATE, },
- 	{ USB_DEVICE(0x2184, 0x001c) },	/* GW Instek AFG-2225 */
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 37a5e07b3488..1e8f68960014 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -243,6 +243,9 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	{ USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT |
- 	  USB_QUIRK_DELAY_CTRL_MSG },
-
-+	/* Corsair K70 LUX RGB */
-+	{ USB_DEVICE(0x1b1c, 0x1b33), .driver_info = USB_QUIRK_DELAY_INIT },
-+
- 	/* Corsair K70 LUX */
- 	{ USB_DEVICE(0x1b1c, 0x1b36), .driver_info = USB_QUIRK_DELAY_INIT },
-
-@@ -263,6 +266,11 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	{ USB_DEVICE(0x2040, 0x7200), .driver_info =
- 			USB_QUIRK_CONFIG_INTF_STRINGS },
-
-+	/* Raydium Touchscreen */
-+	{ USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM },
-+
-+	{ USB_DEVICE(0x2386, 0x3119), .driver_info = USB_QUIRK_NO_LPM },
-+
- 	/* DJI CineSSD */
- 	{ USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },
-
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index f788f80fe1aa..aee29604bd79 100644
---- a/drivers/usb/host/xhci-hub.c
-+++ b/drivers/usb/host/xhci-hub.c
-@@ -348,7 +348,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,
-
- 	slot_id = 0;
- 	for (i = 0; i < MAX_HC_SLOTS; i++) {
--		if (!xhci->devs[i])
-+		if (!xhci->devs[i] || !xhci->devs[i]->udev)
- 			continue;
- 		speed = xhci->devs[i]->udev->speed;
- 		if (((speed >= USB_SPEED_SUPER) == (hcd->speed >= HCD_USB3))
-diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
-index a0a3827b4aff..b15842c6f916 100644
---- a/drivers/usb/misc/appledisplay.c
-+++ b/drivers/usb/misc/appledisplay.c
-@@ -63,6 +63,7 @@ static const struct usb_device_id appledisplay_table[] = {
- 	{ APPLEDISPLAY_DEVICE(0x9219) },
- 	{ APPLEDISPLAY_DEVICE(0x921c) },
- 	{ APPLEDISPLAY_DEVICE(0x921d) },
-+	{ APPLEDISPLAY_DEVICE(0x9222) },
- 	{ APPLEDISPLAY_DEVICE(0x9236) },
-
- 	/* Terminating entry */
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index 8dbb00fbb00b..b0875ef48522 100644
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -4333,6 +4333,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
- static int btrfs_destroy_pinned_extent(struct btrfs_root *root,
- 				       struct extent_io_tree *pinned_extents)
- {
-+	struct btrfs_fs_info *fs_info = root->fs_info;
- 	struct extent_io_tree *unpin;
- 	u64 start;
- 	u64 end;
-@@ -4342,21 +4343,31 @@ static int btrfs_destroy_pinned_extent(struct btrfs_root *root,
- 	unpin = pinned_extents;
- again:
- 	while (1) {
-+		/*
-+		 * The btrfs_finish_extent_commit() may get the same range as
-+		 * ours between find_first_extent_bit and clear_extent_dirty.
-+		 * Hence, hold the unused_bg_unpin_mutex to avoid double unpin
-+		 * the same extent range.
-+		 */
-+		mutex_lock(&fs_info->unused_bg_unpin_mutex);
- 		ret = find_first_extent_bit(unpin, 0, &start, &end,
- 					    EXTENT_DIRTY, NULL);
--		if (ret)
-+		if (ret) {
-+			mutex_unlock(&fs_info->unused_bg_unpin_mutex);
- 			break;
-+		}
-
- 		clear_extent_dirty(unpin, start, end, GFP_NOFS);
- 		btrfs_error_unpin_extent_range(root, start, end);
-+		mutex_unlock(&fs_info->unused_bg_unpin_mutex);
- 		cond_resched();
- 	}
-
- 	if (loop) {
--		if (unpin == &root->fs_info->freed_extents[0])
--			unpin = &root->fs_info->freed_extents[1];
-+		if (unpin == &fs_info->freed_extents[0])
-+			unpin = &fs_info->freed_extents[1];
- 		else
--			unpin = &root->fs_info->freed_extents[0];
-+			unpin = &fs_info->freed_extents[0];
- 		loop = false;
- 		goto again;
- 	}
-diff --git a/fs/exofs/super.c b/fs/exofs/super.c
-index b795c567b5e1..360ba74e04e6 100644
---- a/fs/exofs/super.c
-+++ b/fs/exofs/super.c
-@@ -100,6 +100,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts)
- 		token = match_token(p, tokens, args);
- 		switch (token) {
- 		case Opt_name:
-+			kfree(opts->dev_name);
- 			opts->dev_name = match_strdup(&args[0]);
- 			if (unlikely(!opts->dev_name)) {
- 				EXOFS_ERR("Error allocating dev_name");
-@@ -868,8 +869,10 @@ static struct dentry *exofs_mount(struct file_system_type *type,
- 	int ret;
-
- 	ret = parse_options(data, &opts);
--	if (ret)
-+	if (ret) {
-+		kfree(opts.dev_name);
- 		return ERR_PTR(ret);
-+	}
-
- 	if (!opts.dev_name)
- 		opts.dev_name = dev_name;
-diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
-index c134c0462cee..ef24894edecc 100644
---- a/fs/gfs2/rgrp.c
-+++ b/fs/gfs2/rgrp.c
-@@ -732,6 +732,7 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)
- 			spin_lock(&gl->gl_lockref.lock);
- 			gl->gl_object = NULL;
- 			spin_unlock(&gl->gl_lockref.lock);
-+			gfs2_rgrp_brelse(rgd);
- 			gfs2_glock_add_to_lru(gl);
- 			gfs2_glock_put(gl);
- 		}
-@@ -1139,7 +1140,7 @@ static u32 count_unlinked(struct gfs2_rgrpd *rgd)
-  * @rgd: the struct gfs2_rgrpd describing the RG to read in
-  *
-  * Read in all of a Resource Group's header and bitmap blocks.
-- * Caller must eventually call gfs2_rgrp_relse() to free the bitmaps.
-+ * Caller must eventually call gfs2_rgrp_brelse() to free the bitmaps.
-  *
-  * Returns: errno
-  */
-diff --git a/fs/hfs/brec.c b/fs/hfs/brec.c
-index 2a6f3c67cb3f..2e713673df42 100644
---- a/fs/hfs/brec.c
-+++ b/fs/hfs/brec.c
-@@ -424,6 +424,10 @@ skip:
- 	if (new_node) {
- 		__be32 cnid;
-
-+		if (!new_node->parent) {
-+			hfs_btree_inc_height(tree);
-+			new_node->parent = tree->root;
-+		}
- 		fd->bnode = hfs_bnode_find(tree, new_node->parent);
- 		/* create index key and entry */
- 		hfs_bnode_read_key(new_node, fd->search_key, 14);
-diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c
-index 754fdf8c6356..1002a0c08319 100644
---- a/fs/hfsplus/brec.c
-+++ b/fs/hfsplus/brec.c
-@@ -427,6 +427,10 @@ skip:
- 	if (new_node) {
- 		__be32 cnid;
-
-+		if (!new_node->parent) {
-+			hfs_btree_inc_height(tree);
-+			new_node->parent = tree->root;
-+		}
- 		fd->bnode = hfs_bnode_find(tree, new_node->parent);
- 		/* create index key and entry */
- 		hfs_bnode_read_key(new_node, fd->search_key, 14);
-diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
-index 8b32fdaad468..d424b3d4bf3b 100644
---- a/fs/reiserfs/xattr.c
-+++ b/fs/reiserfs/xattr.c
-@@ -184,6 +184,7 @@ struct reiserfs_dentry_buf {
- 	struct dir_context ctx;
- 	struct dentry *xadir;
- 	int count;
-+	int err;
- 	struct dentry *dentries[8];
- };
-
-@@ -206,6 +207,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen,
-
- 	dentry = lookup_one_len(name, dbuf->xadir, namelen);
- 	if (IS_ERR(dentry)) {
-+		dbuf->err = PTR_ERR(dentry);
- 		return PTR_ERR(dentry);
- 	} else if (d_really_is_negative(dentry)) {
- 		/* A directory entry exists, but no file? */
-@@ -214,6 +216,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen,
- 			       "not found for file %pd.\n",
- 			       dentry, dbuf->xadir);
- 		dput(dentry);
-+		dbuf->err = -EIO;
- 		return -EIO;
- 	}
-
-@@ -261,6 +264,10 @@ static int reiserfs_for_each_xattr(struct inode *inode,
- 		err = reiserfs_readdir_inode(d_inode(dir), &buf.ctx);
- 		if (err)
- 			break;
-+		if (buf.err) {
-+			err = buf.err;
-+			break;
-+		}
- 		if (!buf.count)
- 			break;
- 		for (i = 0; !err && i < buf.count && buf.dentries[i]; i++) {
-diff --git a/include/linux/netfilter/ipset/ip_set_comment.h b/include/linux/netfilter/ipset/ip_set_comment.h
-index 8d0248525957..9f34204978e4 100644
---- a/include/linux/netfilter/ipset/ip_set_comment.h
-+++ b/include/linux/netfilter/ipset/ip_set_comment.h
-@@ -41,11 +41,11 @@ ip_set_init_comment(struct ip_set_comment *comment,
- 	rcu_assign_pointer(comment->c, c);
- }
-
--/* Used only when dumping a set, protected by rcu_read_lock_bh() */
-+/* Used only when dumping a set, protected by rcu_read_lock() */
- static inline int
- ip_set_put_comment(struct sk_buff *skb, struct ip_set_comment *comment)
- {
--	struct ip_set_comment_rcu *c = rcu_dereference_bh(comment->c);
-+	struct ip_set_comment_rcu *c = rcu_dereference(comment->c);
-
- 	if (!c)
- 		return 0;
-diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
-index 558129af828a..15c7b5420d8a 100644
---- a/include/linux/uaccess.h
-+++ b/include/linux/uaccess.h
-@@ -2,6 +2,9 @@
- #define __LINUX_UACCESS_H__
-
- #include <linux/sched.h>
-+
-+#define uaccess_kernel() segment_eq(get_fs(), KERNEL_DS)
-+
- #include <asm/uaccess.h>
-
- static __always_inline void pagefault_disabled_inc(void)
-diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile
-index 29090f3db677..28c089cb13f1 100644
---- a/lib/raid6/test/Makefile
-+++ b/lib/raid6/test/Makefile
-@@ -26,7 +26,7 @@ ifeq ($(ARCH),arm)
-         CFLAGS += -I../../../arch/arm/include -mfpu=neon
-         HAS_NEON = yes
- endif
--ifeq ($(ARCH),arm64)
-+ifeq ($(ARCH),aarch64)
-         CFLAGS += -I../../../arch/arm64/include
-         HAS_NEON = yes
- endif
-@@ -37,7 +37,7 @@ ifeq ($(IS_X86),yes)
-                     gcc -c -x assembler - >&/dev/null &&	\
-                     rm ./-.o && echo -DCONFIG_AS_AVX2=1)
- else ifeq ($(HAS_NEON),yes)
--        OBJS   += neon.o neon1.o neon2.o neon4.o neon8.o
-+        OBJS   += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
-         CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1
- else
-         HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 7366feb8b5b3..e03c1d2f6707 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -4481,6 +4481,10 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
- 	skb->vlan_tci = 0;
- 	skb->dev = napi->dev;
- 	skb->skb_iif = 0;
-+
-+	/* eth_type_trans() assumes pkt_type is PACKET_HOST */
-+	skb->pkt_type = PACKET_HOST;
-+
- 	skb->encapsulation = 0;
- 	skb_shinfo(skb)->gso_type = 0;
- 	skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));
-diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
-index 4d14908afaec..697c4212129a 100644
---- a/net/core/flow_dissector.c
-+++ b/net/core/flow_dissector.c
-@@ -480,8 +480,8 @@ ip_proto_again:
- 		break;
- 	}
-
--	if (dissector_uses_key(flow_dissector,
--			       FLOW_DISSECTOR_KEY_PORTS)) {
-+	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS) &&
-+	    !(key_control->flags & FLOW_DIS_IS_FRAGMENT)) {
- 		key_ports = skb_flow_dissector_target(flow_dissector,
- 						      FLOW_DISSECTOR_KEY_PORTS,
- 						      target_container);
-diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
-index dbda0565781c..4916d1857b75 100644
---- a/net/ipv4/ip_tunnel_core.c
-+++ b/net/ipv4/ip_tunnel_core.c
-@@ -71,7 +71,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
-
- 	iph->version	=	4;
- 	iph->ihl	=	sizeof(struct iphdr) >> 2;
--	iph->frag_off	=	df;
-+	iph->frag_off	=	ip_mtu_locked(&rt->dst) ? 0 : df;
- 	iph->protocol	=	proto;
- 	iph->tos	=	tos;
- 	iph->daddr	=	dst;
-diff --git a/net/netfilter/ipset/ip_set_hash_netportnet.c b/net/netfilter/ipset/ip_set_hash_netportnet.c
-index 9a14c237830f..b259a5814965 100644
---- a/net/netfilter/ipset/ip_set_hash_netportnet.c
-+++ b/net/netfilter/ipset/ip_set_hash_netportnet.c
-@@ -213,13 +213,13 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[],
-
- 	if (tb[IPSET_ATTR_CIDR]) {
- 		e.cidr[0] = nla_get_u8(tb[IPSET_ATTR_CIDR]);
--		if (!e.cidr[0] || e.cidr[0] > HOST_MASK)
-+		if (e.cidr[0] > HOST_MASK)
- 			return -IPSET_ERR_INVALID_CIDR;
- 	}
-
- 	if (tb[IPSET_ATTR_CIDR2]) {
- 		e.cidr[1] = nla_get_u8(tb[IPSET_ATTR_CIDR2]);
--		if (!e.cidr[1] || e.cidr[1] > HOST_MASK)
-+		if (e.cidr[1] > HOST_MASK)
- 			return -IPSET_ERR_INVALID_CIDR;
- 	}
-
-@@ -492,13 +492,13 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[],
-
- 	if (tb[IPSET_ATTR_CIDR]) {
- 		e.cidr[0] = nla_get_u8(tb[IPSET_ATTR_CIDR]);
--		if (!e.cidr[0] || e.cidr[0] > HOST_MASK)
-+		if (e.cidr[0] > HOST_MASK)
- 			return -IPSET_ERR_INVALID_CIDR;
- 	}
-
- 	if (tb[IPSET_ATTR_CIDR2]) {
- 		e.cidr[1] = nla_get_u8(tb[IPSET_ATTR_CIDR2]);
--		if (!e.cidr[1] || e.cidr[1] > HOST_MASK)
-+		if (e.cidr[1] > HOST_MASK)
- 			return -IPSET_ERR_INVALID_CIDR;
- 	}
-
-diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
-index 1718f536689f..8a1d2af3eed0 100644
---- a/net/netfilter/xt_IDLETIMER.c
-+++ b/net/netfilter/xt_IDLETIMER.c
-@@ -116,6 +116,22 @@ static void idletimer_tg_expired(unsigned long data)
- 	schedule_work(&timer->work);
- }
-
-+static int idletimer_check_sysfs_name(const char *name, unsigned int size)
-+{
-+	int ret;
-+
-+	ret = xt_check_proc_name(name, size);
-+	if (ret < 0)
-+		return ret;
-+
-+	if (!strcmp(name, "power") ||
-+	    !strcmp(name, "subsystem") ||
-+	    !strcmp(name, "uevent"))
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
- static int idletimer_tg_create(struct idletimer_tg_info *info)
- {
- 	int ret;
-@@ -126,6 +142,10 @@ static int idletimer_tg_create(struct idletimer_tg_info *info)
- 		goto out;
- 	}
-
-+	ret = idletimer_check_sysfs_name(info->label, sizeof(info->label));
-+	if (ret < 0)
-+		goto out_free_timer;
-+
- 	sysfs_attr_init(&info->timer->attr.attr);
- 	info->timer->attr.attr.name = kstrdup(info->label, GFP_KERNEL);
- 	if (!info->timer->attr.attr.name) {
-diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
-index 9b8d855e4a87..ed9bbd383f7d 100644
---- a/net/sunrpc/xdr.c
-+++ b/net/sunrpc/xdr.c
-@@ -512,7 +512,7 @@ EXPORT_SYMBOL_GPL(xdr_commit_encode);
- static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
- 		size_t nbytes)
- {
--	static __be32 *p;
-+	__be32 *p;
- 	int space_left;
- 	int frag1bytes, frag2bytes;

patch/kernel/rockchip64-default/04-patch-4.4.171-172.patch

@@ -1024,15 +1024,15 @@ diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek
 index 93543e176829..8f40e121f7d4 100644
 --- a/drivers/net/ethernet/realtek/r8169.c
 +++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -324,6 +324,8 @@ enum cfg_version {
+@@@ -324,6 +324,8 @@ enum cfg_version {
  };
  
  static const struct pci_device_id rtl8169_pci_tbl[] = {
 +	{ PCI_VDEVICE(REALTEK,	0x2502), RTL_CFG_1 },
 +	{ PCI_VDEVICE(REALTEK,	0x2600), RTL_CFG_1 },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x0000), 0, 0, RTL_CFG_1 },
  	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8129), 0, 0, RTL_CFG_0 },
  	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8136), 0, 0, RTL_CFG_2 },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8161), 0, 0, RTL_CFG_1 },
 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
 index f96f7b865267..7c1defaef3f5 100644
 --- a/drivers/platform/x86/asus-wmi.c

patch/kernel/rockchip64-default/04-patch-4.4.172-173.patch

@@ -893,31 +893,6 @@ index 141651b0c766..9ffe60702299 100644
  		shrink_dentry_list(&dispose);
  		cond_resched();
  	} while (list_lru_count(&sb->s_dentry_lru) > 0);
-diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
-index 3685fea62333..582373849332 100644
---- a/fs/f2fs/node.c
-+++ b/fs/f2fs/node.c
-@@ -590,6 +590,7 @@ static void truncate_node(struct dnode_of_data *dn)
- {
- 	struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
- 	struct node_info ni;
-+	pgoff_t index;
- 
- 	get_node_info(sbi, dn->nid, &ni);
- 	if (dn->inode->i_blocks == 0) {
-@@ -613,10 +614,11 @@ invalidate:
- 	clear_node_page_dirty(dn->node_page);
- 	set_sbi_flag(sbi, SBI_IS_DIRTY);
- 
-+	index = dn->node_page->index;
- 	f2fs_put_page(dn->node_page, 1);
- 
- 	invalidate_mapping_pages(NODE_MAPPING(sbi),
--			dn->node_page->index, dn->node_page->index);
-+			index, index);
- 
- 	dn->node_page = NULL;
- 	trace_f2fs_truncate_node(dn->inode, dn->nid, ni.blk_addr);
 diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
 index 763fe7737065..ef24894edecc 100644
 --- a/fs/gfs2/rgrp.c

patch/kernel/rockchip64-default/50-fix_drm.patch

@@ -1,23 +0,0 @@
-From 06d1099d7f4cece7af7793ff68fabc08eb55935d Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Wed, 14 Nov 2018 06:08:01 +0100
-Subject: [PATCH] drm: workaround for crash when trying to open render node
-
----
- drivers/gpu/drm/drm_ioctl.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index 34757168ffaa..0914c886277f 100644
---- a/drivers/gpu/drm/drm_ioctl.c
-+++ b/drivers/gpu/drm/drm_ioctl.c
-@@ -57,6 +57,9 @@ static int drm_getunique(struct drm_device *dev, void *data,
- 	struct drm_unique *u = data;
- 	struct drm_master *master = file_priv->master;
- 
-+	if (!master)
-+		return -EINVAL;
-+
- 	if (u->unique_len >= master->unique_len) {
- 		if (copy_to_user(u->unique, master->unique, master->unique_len))
- 			return -EFAULT;

patch/kernel/rockchip64-default/Add_dts_rk3328-roc-cc.patch

@@ -7,9 +7,9 @@ index f610d40..53efcd4 100644
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-videostrong-linux.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-vr-android.dtb
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
- 
- always		:= $(dtb-y)
- subdir-y	:= $(dts-dirs)
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v10.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v10-linux.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11.dtb
 diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi
 new file mode 100644
 index 0000000..59cae37

patch/kernel/rockchip64-default/add-rockpi4b.patch

@@ -3,9 +3,9 @@ index 02a344399..ad91dd192 100644
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
 @@ -76,6 +76,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-disvr.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-edp-android-6.0.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-edp.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-linux.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-linux-for-rk1808-cascade.dtb
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpi4b.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-tve1030g.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-tve1205g.dtb

patch/kernel/rockchip64-default/overclock-rockpro-to-1.5-2.0.patch

@@ -1,20 +0,0 @@
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
-index e9119fcc..d5643ad8 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
-@@ -1104,7 +1104,6 @@
- 		opp-hz = /bits/ 64 <1512000000>;
- 		opp-microvolt = <1200000>;
- 		clock-latency-ns = <40000>;
--		status = "disabled";
- 	};
- };
- 
-@@ -1113,7 +1112,6 @@
- 		opp-hz = /bits/ 64 <1992000000>;
- 		opp-microvolt = <1300000>;
- 		clock-latency-ns = <40000>;
--		status = "disabled";
- 	};
- };
- 

patch/kernel/rockchip64-default/z28pro_8822bs.patch

@@ -3,9 +3,9 @@ index 92981d8..1dbe50c 100644
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
 @@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb-android.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64-android.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64-android-avb.dtb
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-z28pro.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3366-fpga.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3366-sheep.dtb