Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5195b463 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'update' into 'v1-pie' 

Update kernel source with upstream

Closes e/backlog#1245

See merge request !2
parents 9c0764fd 0e810be6

arch/arm64/boot/dts/qcom/pmi632.dtsi

+50 −0
Original line number Diff line number Diff line
@@ -581,30 +581,80 @@ 
			nvmem = <&pmi632_sdam7>;

			qcom,pbs-client = <&pmi632_pbs_client3>;

			qcom,lut-sdam-base = <0x80>;

		//<2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][]Modified for breath ramp and timing.

		#if 1

			qcom,lut-patterns = <0 0 0 0 0 0 0 0 0 0 2 16 30 44 58 72 86 100 100

						100 100 86 72 58 44 30 16 2 0 0 0 0 0 0 0 0 0 0>;

		#else

			/* Code default */

			qcom,lut-patterns = <0 0 0 14 28 42 56 70 84 100

						100 84 70 56 42 28 14 0 0 0>;

		#endif

		//>2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][].

			lpg@1 {

				qcom,lpg-chan-id = <1>;

		//<2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][]Modified for breath ramp and timing.

		#if 1

				qcom,ramp-step-ms = <80>;

				qcom,ramp-pause-hi-count = <80>;

				qcom,ramp-pause-lo-count = <80>;

				qcom,ramp-low-index = <0>;

				qcom,ramp-high-index = <37>;

				//qcom,ramp-toggle; /* ramp from high to low */

				//qcom,ramp-from-low-to-high;

				qcom,ramp-pattern-repeat;

		#else

			/* Code default */

				qcom,ramp-step-ms = <200>;

				qcom,ramp-low-index = <0>;

				qcom,ramp-high-index = <19>;

				qcom,ramp-pattern-repeat;

		#endif

		//>2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][].

				qcom,lpg-sdam-base = <0x48>;

			};

			lpg@2 {

				qcom,lpg-chan-id = <2>;

		//<2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][]Modified for breath ramp and timing.

		#if 1

				qcom,ramp-step-ms = <80>;

				qcom,ramp-pause-hi-count = <80>;

				qcom,ramp-pause-lo-count = <80>;

				qcom,ramp-low-index = <0>;

				qcom,ramp-high-index = <37>;

				//qcom,ramp-toggle; /* ramp from high to low */

				//qcom,ramp-from-low-to-high;

				qcom,ramp-pattern-repeat;

		#else

			/* Code default */

				qcom,ramp-step-ms = <200>;

				qcom,ramp-low-index = <0>;

				qcom,ramp-high-index = <19>;

				qcom,ramp-pattern-repeat;

		#endif

		//>2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][].

				qcom,lpg-sdam-base = <0x56>;

			};

			lpg@3 {

				qcom,lpg-chan-id = <3>;

		//<2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][]Modified for breath ramp and timing.

		#if 1

				qcom,ramp-step-ms = <80>;

				qcom,ramp-pause-hi-count = <80>;

				qcom,ramp-pause-lo-count = <80>;

				qcom,ramp-low-index = <0>;

				qcom,ramp-high-index = <37>;

				//qcom,ramp-toggle; /* ramp from high to low */

				//qcom,ramp-from-low-to-high;

				qcom,ramp-pattern-repeat;

		#else

			/* Code default */

				qcom,ramp-step-ms = <200>;

				qcom,ramp-low-index = <0>;

				qcom,ramp-high-index = <19>;

				qcom,ramp-pattern-repeat;

		#endif

		//>2019/10/25-Yuting Shih.[FAIRPHONE][MISC][COMMON][LED][][].

				qcom,lpg-sdam-base = <0x64>;

			};

		};

arch/arm64/configs/lineageos_FP3_defconfig

+78 −127
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ CONFIG_THREAD_INFO_IN_TASK=y 
CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_CROSS_COMPILE=""

# CONFIG_COMPILE_TEST is not set

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION="-perf"

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_DEFAULT_HOSTNAME="(none)"

CONFIG_SWAP=y
@@ -99,7 +99,7 @@ CONFIG_IRQ_TIME_ACCOUNTING=y 
CONFIG_SCHED_WALT=y

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

# CONFIG_TASK_DELAY_ACCT is not set

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y
@@ -130,7 +130,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=17 
CONFIG_GENERIC_SCHED_CLOCK=y

CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_DEBUG=y

# CONFIG_CGROUP_DEBUG is not set

CONFIG_CGROUP_FREEZER=y

# CONFIG_CGROUP_PIDS is not set

# CONFIG_CGROUP_DEVICE is not set
@@ -159,7 +159,7 @@ CONFIG_SCHED_AUTOGROUP=y 
CONFIG_SCHED_TUNE=y

CONFIG_DEFAULT_USE_ENERGY_AWARE=y

# CONFIG_SYSFS_DEPRECATED is not set

CONFIG_RELAY=y

# CONFIG_RELAY is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y
@@ -347,6 +347,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" 
CONFIG_ASN1=y

CONFIG_UNINLINE_SPIN_UNLOCK=y

CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y

CONFIG_MUTEX_SPIN_ON_OWNER=y

CONFIG_RWSEM_SPIN_ON_OWNER=y

CONFIG_LOCK_SPIN_ON_OWNER=y

CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
@@ -441,11 +442,11 @@ CONFIG_ARCH_NR_GPIO=1280 
# CONFIG_PREEMPT_VOLUNTARY is not set

CONFIG_PREEMPT=y

CONFIG_PREEMPT_COUNT=y

CONFIG_HZ_100=y

# CONFIG_HZ_100 is not set

# CONFIG_HZ_250 is not set

# CONFIG_HZ_300 is not set

CONFIG_HZ_300=y

# CONFIG_HZ_1000 is not set

CONFIG_HZ=100

CONFIG_HZ=300

CONFIG_SCHED_HRTICK=y

CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
@@ -476,11 +477,11 @@ CONFIG_BOUNCE=y 
# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

# CONFIG_TRANSPARENT_HUGEPAGE is not set

CONFIG_CLEANCACHE=y

# CONFIG_CLEANCACHE is not set

# CONFIG_FRONTSWAP is not set

CONFIG_CMA=y

# CONFIG_CMA_DEBUG is not set

CONFIG_CMA_DEBUGFS=y

# CONFIG_CMA_DEBUGFS is not set

CONFIG_CMA_AREAS=7

# CONFIG_ZPOOL is not set

# CONFIG_ZBUD is not set
@@ -528,6 +529,7 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y 
CONFIG_ARM64_MODULE_PLTS=y

CONFIG_RELOCATABLE=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_RANDOMIZE_MODULE_REGION_FULL=y



#

# Boot options
@@ -572,10 +574,7 @@ CONFIG_PM_WAKELOCKS=y 
CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_PM=y

CONFIG_PM_DEBUG=y

# CONFIG_PM_ADVANCED_DEBUG is not set

# CONFIG_PM_TEST_SUSPEND is not set

CONFIG_PM_SLEEP_DEBUG=y

# CONFIG_PM_DEBUG is not set

CONFIG_PM_OPP=y

CONFIG_PM_CLK=y

# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
@@ -962,7 +961,7 @@ CONFIG_INET_SCTP_DIAG=y 
# CONFIG_TIPC is not set

# CONFIG_ATM is not set

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

# CONFIG_L2TP_DEBUGFS is not set

CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=y

CONFIG_L2TP_ETH=y
@@ -1056,7 +1055,7 @@ CONFIG_NET_CLS_ACT=y 
# CONFIG_NET_CLS_IND is not set

CONFIG_NET_SCH_FIFO=y

# CONFIG_DCB is not set

CONFIG_DNS_RESOLVER=y

# CONFIG_DNS_RESOLVER is not set

# CONFIG_BATMAN_ADV is not set

# CONFIG_OPENVSWITCH is not set

# CONFIG_VSOCKETS is not set
@@ -1460,13 +1459,12 @@ CONFIG_NET_VENDOR_BROADCOM=y 
# CONFIG_BCMGENET is not set

# CONFIG_SYSTEMPORT is not set

# CONFIG_DNET is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

CONFIG_NET_VENDOR_EZCHIP=y

# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set

# CONFIG_NET_VENDOR_HISILICON is not set

CONFIG_NET_VENDOR_INTEL=y

CONFIG_NET_VENDOR_I825XX=y

CONFIG_NET_VENDOR_MARVELL=y

# CONFIG_MVMDIO is not set

# CONFIG_MVNETA_BM is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_NET_VENDOR_MICREL=y

# CONFIG_KS8842 is not set

# CONFIG_KS8851 is not set
@@ -1481,7 +1479,7 @@ CONFIG_NET_VENDOR_8390=y 
CONFIG_NET_VENDOR_QUALCOMM=y

# CONFIG_QCA7000 is not set

# CONFIG_QCOM_EMAC is not set

# CONFIG_NET_VENDOR_RENESAS is not set

CONFIG_NET_VENDOR_RENESAS=y

# CONFIG_NET_VENDOR_ROCKER is not set

CONFIG_NET_VENDOR_SAMSUNG=y

# CONFIG_SXGBE_ETH is not set
@@ -1854,7 +1852,6 @@ CONFIG_UNIX98_PTYS=y 
#

# Serial drivers

#

CONFIG_SERIAL_EARLYCON=y

# CONFIG_SERIAL_8250 is not set



#
@@ -1867,10 +1864,8 @@ CONFIG_SERIAL_EARLYCON=y 
# CONFIG_SERIAL_MAX310X is not set

# CONFIG_SERIAL_UARTLITE is not set

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_MSM=y

# CONFIG_SERIAL_MSM is not set

# CONFIG_SERIAL_MSM_GENI is not set

CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_SERIAL_MSM_HS=y

# CONFIG_SERIAL_SCCNXP is not set

# CONFIG_SERIAL_SC16IS7XX is not set
@@ -2739,11 +2734,11 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

CONFIG_FB_SYS_FILLRECT=y

CONFIG_FB_SYS_COPYAREA=y

CONFIG_FB_SYS_IMAGEBLIT=y

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_FOREIGN_ENDIAN is not set

CONFIG_FB_SYS_FOPS=y

# CONFIG_FB_SYS_FOPS is not set

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set
@@ -2760,7 +2755,7 @@ CONFIG_FB_SYS_FOPS=y 
# CONFIG_FB_SMSCUFX is not set

# CONFIG_FB_UDL is not set

# CONFIG_FB_IBM_GXT4500 is not set

CONFIG_FB_VIRTUAL=y

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

CONFIG_FB_MSM=y

# CONFIG_FB_BROADSHEET is not set
@@ -3331,7 +3326,7 @@ CONFIG_MMC=y 
CONFIG_MMC_PERF_PROFILING=y

# CONFIG_PWRSEQ_EMMC is not set

# CONFIG_PWRSEQ_SIMPLE is not set

CONFIG_MMC_RING_BUFFER=y

# CONFIG_MMC_RING_BUFFER is not set

# CONFIG_MMC_EMBEDDED_SDIO is not set

CONFIG_MMC_PARANOID_SD_INIT=y

CONFIG_MMC_CLKGATE=y
@@ -3797,9 +3792,7 @@ CONFIG_IOMMU_DMA=y 
CONFIG_ARM_SMMU=y

# CONFIG_ARM_SMMU_V3 is not set

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_TESTS=y

# CONFIG_IOMMU_DEBUG is not set



#

# Remoteproc drivers
@@ -3817,7 +3810,7 @@ CONFIG_IOMMU_TESTS=y 
#

# Broadcom SoC drivers

#

CONFIG_QCOM_CPUSS_DUMP=y

# CONFIG_QCOM_CPUSS_DUMP is not set

CONFIG_QCOM_RUN_QUEUE_STATS=y

# CONFIG_QCOM_GSBI is not set

# CONFIG_QCOM_LLCC is not set
@@ -3828,7 +3821,7 @@ CONFIG_MSM_L2_SPM=y 
CONFIG_QCOM_SCM=y

# CONFIG_SETUP_SSR_NOTIF_TIMEOUTS is not set

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_CORE_HANG_DETECT=y

# CONFIG_MSM_CORE_HANG_DETECT is not set

# CONFIG_MSM_GLADIATOR_HANG_DETECT is not set

# CONFIG_MSM_GLADIATOR_ERP is not set

# CONFIG_QCOM_EUD is not set
@@ -3836,8 +3829,7 @@ CONFIG_QCOM_WATCHDOG_V2=y 
# CONFIG_QCOM_WDOG_IPI_ENABLE is not set

CONFIG_QPNP_PBS=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_MSM_DEBUG_LAR_UNLOCK=y

# CONFIG_QCOM_MINIDUMP is not set

# CONFIG_MSM_DEBUG_LAR_UNLOCK is not set

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_BUS_SCALING=y

# CONFIG_QCOM_BUS_CONFIG_RPMH is not set
@@ -3850,7 +3842,7 @@ CONFIG_MSM_SMD_DEBUG=y 
CONFIG_MSM_TZ_SMMU=y

# CONFIG_MSM_GLINK_LOOPBACK_SERVER is not set

# CONFIG_MSM_SPSS_UTILS is not set

CONFIG_TRACER_PKT=y

# CONFIG_TRACER_PKT is not set

# CONFIG_QTI_RPMH_API is not set

CONFIG_MSM_SMP2P=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
@@ -3877,14 +3869,14 @@ CONFIG_MSM_IDLE_STATS_BUCKET_SHIFT=2 
CONFIG_MSM_IDLE_STATS_BUCKET_COUNT=10

CONFIG_MSM_SUSPEND_STATS_FIRST_BUCKET=1000000000

# CONFIG_QCOM_DCC_V2 is not set

CONFIG_QCOM_DCC=y

# CONFIG_QCOM_DCC is not set

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

# CONFIG_QMP_DEBUGFS_CLIENT is not set

CONFIG_MEM_SHARE_QMI_SERVICE=y

# CONFIG_MSM_REMOTEQDSS is not set

# CONFIG_QSEE_IPC_IRQ_BRIDGE is not set

CONFIG_MSM_JTAGV8=y

# CONFIG_MSM_JTAGV8 is not set

CONFIG_MSM_BAM_DMUX=y

# CONFIG_MSM_PIL_SSR_BG is not set

# CONFIG_MSM_BGCOM is not set
@@ -4329,7 +4321,14 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

# CONFIG_NILFS2_FS is not set

# CONFIG_F2FS_FS is not set

CONFIG_F2FS_FS=y

CONFIG_F2FS_STAT_FS=y

CONFIG_F2FS_FS_XATTR=y

CONFIG_F2FS_FS_POSIX_ACL=y

CONFIG_F2FS_FS_SECURITY=y

# CONFIG_F2FS_CHECK_FS is not set

CONFIG_F2FS_FS_ENCRYPTION=y

# CONFIG_F2FS_FAULT_INJECTION is not set

# CONFIG_FS_DAX is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -4368,7 +4367,7 @@ CONFIG_FUSE_FS=y 
# DOS/FAT/NT Filesystems

#

CONFIG_FAT_FS=y

CONFIG_MSDOS_FS=y

# CONFIG_MSDOS_FS is not set

CONFIG_VFAT_FS=y

CONFIG_FAT_DEFAULT_CODEPAGE=437

CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -4483,7 +4482,7 @@ CONFIG_NLS_ISO8859_1=y 
CONFIG_PRINTK_TIME=y

CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4

# CONFIG_BOOT_PRINTK_DELAY is not set

CONFIG_DYNAMIC_DEBUG=y

# CONFIG_DYNAMIC_DEBUG is not set

# CONFIG_DEBUG_MODULE_LOAD_INFO is not set



#
@@ -4515,33 +4514,19 @@ CONFIG_DEBUG_KERNEL=y 
#

# Memory Debugging

#

CONFIG_PAGE_EXTENSION=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_SLUB_DEBUG_PANIC_ON=y

CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y

CONFIG_PAGE_POISONING=y

# CONFIG_PAGE_POISONING_ENABLE_DEFAULT is not set

# CONFIG_PAGE_POISONING_NO_SANITY is not set

# CONFIG_PAGE_POISONING_ZERO is not set

# CONFIG_PAGE_EXTENSION is not set

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_SLUB_DEBUG_PANIC_ON is not set

# CONFIG_PAGE_POISONING is not set

# CONFIG_DEBUG_PAGE_REF is not set

CONFIG_DEBUG_OBJECTS=y

# CONFIG_DEBUG_OBJECTS_SELFTEST is not set

CONFIG_DEBUG_OBJECTS_FREE=y

CONFIG_DEBUG_OBJECTS_TIMERS=y

CONFIG_DEBUG_OBJECTS_WORK=y

CONFIG_DEBUG_OBJECTS_RCU_HEAD=y

CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y

CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1

# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

CONFIG_HAVE_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=4000

# CONFIG_DEBUG_KMEMLEAK_TEST is not set

CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y

CONFIG_DEBUG_STACK_USAGE=y

# CONFIG_DEBUG_KMEMLEAK is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_VM is not set

CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_DEBUG_MEMORY_INIT is not set

# CONFIG_DEBUG_PER_CPU_MAPS is not set

CONFIG_HAVE_ARCH_KASAN=y

# CONFIG_KASAN is not set
@@ -4553,54 +4538,40 @@ CONFIG_ARCH_HAS_KCOV=y 
#

# Debug Lockups and Hangs

#

CONFIG_LOCKUP_DETECTOR=y

CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU=y

CONFIG_HARDLOCKUP_DETECTOR=y

# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1

# CONFIG_LOCKUP_DETECTOR is not set

# CONFIG_PANIC_ON_RECURSIVE_FAULT is not set

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120

# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set

CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0

CONFIG_WQ_WATCHDOG=y

# CONFIG_DETECT_HUNG_TASK is not set

# CONFIG_WQ_WATCHDOG is not set

# CONFIG_PANIC_ON_OOPS is not set

CONFIG_PANIC_ON_OOPS_VALUE=0

CONFIG_PANIC_TIMEOUT=5

CONFIG_SCHED_DEBUG=y

CONFIG_SCHED_INFO=y

CONFIG_PANIC_ON_SCHED_BUG=y

CONFIG_PANIC_ON_RT_THROTTLING=y

# CONFIG_PANIC_ON_SCHED_BUG is not set

# CONFIG_PANIC_ON_RT_THROTTLING is not set

CONFIG_SCHEDSTATS=y

CONFIG_SCHED_STACK_END_CHECK=y

# CONFIG_SCHED_STACK_END_CHECK is not set

# CONFIG_DEBUG_TIMEKEEPING is not set

# CONFIG_DEBUG_TASK_STACK_SCAN_OFF is not set

# CONFIG_DEBUG_PREEMPT is not set



#

# Lock Debugging (spinlocks, mutexes, etc...)

#

# CONFIG_DEBUG_RT_MUTEXES is not set

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_SPINLOCK_BITE_ON_BUG=y

# CONFIG_DEBUG_SPINLOCK_PANIC_ON_BUG is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set

# CONFIG_DEBUG_LOCK_ALLOC is not set

# CONFIG_PROVE_LOCKING is not set

# CONFIG_LOCK_STAT is not set

CONFIG_DEBUG_ATOMIC_SLEEP=y

# CONFIG_DEBUG_ATOMIC_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_LOCK_TORTURE_TEST is not set

CONFIG_TRACE_IRQFLAGS=y

CONFIG_STACKTRACE=y

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_KOBJECT_RELEASE is not set

CONFIG_HAVE_DEBUG_BUGVERBOSE=y

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_DEBUG_LIST=y

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_PI_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_DEBUG_NOTIFIERS is not set
@@ -4622,16 +4593,7 @@ CONFIG_RCU_PANIC_ON_STALL=0 
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set

# CONFIG_NOTIFIER_ERROR_INJECTION is not set

CONFIG_FAULT_INJECTION=y

# CONFIG_FAILSLAB is not set

CONFIG_FAIL_PAGE_ALLOC=y

# CONFIG_FAIL_MAKE_REQUEST is not set

# CONFIG_FAIL_IO_TIMEOUT is not set

# CONFIG_FAIL_MMC_REQUEST is not set

# CONFIG_UFS_FAULT_INJECTION is not set

# CONFIG_FAIL_FUTEX is not set

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y
@@ -4640,39 +4602,31 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y 
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_HAVE_SYSCALL_TRACEPOINTS=y

CONFIG_HAVE_C_RECORDMCOUNT=y

CONFIG_TRACER_MAX_TRACE=y

CONFIG_TRACE_CLOCK=y

CONFIG_RING_BUFFER=y

CONFIG_EVENT_TRACING=y

CONFIG_CONTEXT_SWITCH_TRACER=y

CONFIG_RING_BUFFER_ALLOW_SWAP=y

CONFIG_IPC_LOGGING=y

CONFIG_QCOM_RTB=y

CONFIG_QCOM_RTB_SEPARATE_CPUS=y

# CONFIG_QCOM_RTB is not set

CONFIG_TRACING=y

CONFIG_GENERIC_TRACER=y

CONFIG_TRACING_SUPPORT=y

CONFIG_FTRACE=y

CONFIG_FUNCTION_TRACER=y

CONFIG_FUNCTION_GRAPH_TRACER=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_PREEMPTIRQ_EVENTS is not set

CONFIG_IRQSOFF_TRACER=y

CONFIG_PREEMPT_TRACER=y

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_HWLAT_TRACER is not set

# CONFIG_FTRACE_SYSCALLS is not set

CONFIG_TRACER_SNAPSHOT=y

CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y

# CONFIG_TRACER_SNAPSHOT is not set

CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set

# CONFIG_PROFILE_ALL_BRANCHES is not set

# CONFIG_STACK_TRACER is not set

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_PROBE_EVENTS is not set

CONFIG_DYNAMIC_FTRACE=y

# CONFIG_FUNCTION_PROFILER is not set

CONFIG_CPU_FREQ_SWITCH_PROFILER=y

CONFIG_FTRACE_MCOUNT_RECORD=y

# CONFIG_FTRACE_STARTUP_TEST is not set

# CONFIG_TRACEPOINT_BENCHMARK is not set

# CONFIG_RING_BUFFER_BENCHMARK is not set
@@ -4683,7 +4637,7 @@ CONFIG_TRACING_EVENTS_GPIO=y 
#

# Runtime Testing

#

CONFIG_LKDTM=y

# CONFIG_LKDTM is not set

# CONFIG_TEST_LIST_SORT is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_RBTREE_TEST is not set
@@ -4704,10 +4658,9 @@ CONFIG_LKDTM=y 
# CONFIG_TEST_BPF is not set

# CONFIG_TEST_FIRMWARE is not set

# CONFIG_TEST_UDELAY is not set

CONFIG_MEMTEST=y

CONFIG_MEMTEST_ENABLE_DEFAULT=0

# CONFIG_MEMTEST is not set

# CONFIG_TEST_STATIC_KEYS is not set

CONFIG_PANIC_ON_DATA_CORRUPTION=y

# CONFIG_PANIC_ON_DATA_CORRUPTION is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set
@@ -4716,22 +4669,21 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y 
# CONFIG_UBSAN is not set

CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y

# CONFIG_STRICT_DEVMEM is not set

CONFIG_ARM64_PTDUMP=y

CONFIG_PID_IN_CONTEXTIDR=y

# CONFIG_ARM64_PTDUMP is not set

# CONFIG_PID_IN_CONTEXTIDR is not set

# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set

CONFIG_DEBUG_SET_MODULE_RONX=y

# CONFIG_DEBUG_ALIGN_RODATA is not set

CONFIG_DEBUG_ALIGN_RODATA=y

# CONFIG_ARM64_STRICT_BREAK_BEFORE_MAKE is not set

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_LINKS_AND_SINKS=y

CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

# CONFIG_CORESIGHT_SINK_TPIU is not set

# CONFIG_CORESIGHT_SINK_ETBV10 is not set

CONFIG_CORESIGHT_SOURCE_ETM4X=y

CONFIG_CORESIGHT_REMOTE_ETM=y

CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

# CONFIG_CORESIGHT_SOURCE_ETM4X is not set

# CONFIG_CORESIGHT_REMOTE_ETM is not set

CONFIG_CORESIGHT_QCOM_REPLICATOR=y

CONFIG_CORESIGHT_DBGUI=y

# CONFIG_CORESIGHT_DBGUI is not set

CONFIG_CORESIGHT_STM=y

CONFIG_CORESIGHT_OST=y

CONFIG_CORESIGHT_TPDA=y
@@ -4866,7 +4818,7 @@ CONFIG_CRYPTO_XCBC=y 
# Digest

#

CONFIG_CRYPTO_CRC32C=y

# CONFIG_CRYPTO_CRC32 is not set

CONFIG_CRYPTO_CRC32=y

# CONFIG_CRYPTO_CRCT10DIF is not set

CONFIG_CRYPTO_GHASH=y

# CONFIG_CRYPTO_POLY1305 is not set
@@ -5025,7 +4977,6 @@ CONFIG_UCS2_STRING=y 
# CONFIG_SG_SPLIT is not set

CONFIG_SG_POOL=y

CONFIG_ARCH_HAS_SG_CHAIN=y

CONFIG_STACKDEPOT=y

CONFIG_SBITMAP=y

CONFIG_QMI_ENCDEC=y

# CONFIG_QMI_ENCDEC_DEBUG is not set

drivers/android/binder_alloc.c

+5 −0
Original line number Diff line number Diff line
@@ -218,6 +218,11 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, 


	if (mm) {

		down_write(&mm->mmap_sem);

		if (!mmget_still_valid(mm)) {

			if (allocate == 0)

				goto free_range;

			goto err_no_vma;

		}

		vma = alloc->vma;

	}

drivers/gpu/msm/adreno_dispatch.c

+17 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1411,6 +1411,22 @@ int adreno_dispatcher_queue_cmds(struct kgsl_device_private *dev_priv, 


	user_ts = *timestamp;



	/*

	 * If there is only one drawobj in the array and it is of

	 * type SYNCOBJ_TYPE, skip comparing user_ts as it can be 0

	 */

	if (!(count == 1 && drawobj[0]->type == SYNCOBJ_TYPE) &&

		(drawctxt->base.flags & KGSL_CONTEXT_USER_GENERATED_TS)) {

		/*

		 * User specified timestamps need to be greater than the last

		 * issued timestamp in the context

		 */

		if (timestamp_cmp(drawctxt->timestamp, user_ts) >= 0) {

			spin_unlock(&drawctxt->lock);

			return -ERANGE;

		}

	}



	for (i = 0; i < count; i++) {



		switch (drawobj[i]->type) {

drivers/gpu/msm/adreno_ringbuffer.c

+45 −12
Original line number Diff line number Diff line 
/* Copyright (c) 2002,2007-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2002,2007-2018,2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -299,6 +299,11 @@ static int _adreno_ringbuffer_probe(struct adreno_device *adreno_dev, 
		PAGE_SIZE, 0, KGSL_MEMDESC_PRIVILEGED, "pagetable_desc");

	if (ret)

		return ret;



	/* allocate a chunk of memory to create user profiling IB1s */

	kgsl_allocate_global(KGSL_DEVICE(adreno_dev), &rb->profile_desc,

		PAGE_SIZE, KGSL_MEMFLAGS_GPUREADONLY, 0, "profile_desc");



	return kgsl_allocate_global(KGSL_DEVICE(adreno_dev), &rb->buffer_desc,

			KGSL_RB_SIZE, KGSL_MEMFLAGS_GPUREADONLY,

			0, "ringbuffer");
@@ -344,7 +349,7 @@ static void _adreno_ringbuffer_close(struct adreno_device *adreno_dev, 


	kgsl_free_global(device, &rb->pagetable_desc);

	kgsl_free_global(device, &rb->preemption_desc);



	kgsl_free_global(device, &rb->profile_desc);

	kgsl_free_global(device, &rb->buffer_desc);

	kgsl_del_event_group(&rb->events);

	memset(rb, 0, sizeof(struct adreno_ringbuffer));
@@ -837,6 +842,37 @@ static inline int _get_alwayson_counter(struct adreno_device *adreno_dev, 
	return (unsigned int)(p - cmds);

}



/* This is the maximum possible size for 64 bit targets */

#define PROFILE_IB_DWORDS 4

#define PROFILE_IB_SLOTS (PAGE_SIZE / (PROFILE_IB_DWORDS << 2))



static int set_user_profiling(struct adreno_device *adreno_dev,

		struct adreno_ringbuffer *rb, u32 *cmds, u64 gpuaddr)

{

	int dwords, index = 0;

	u64 ib_gpuaddr;

	u32 *ib;



	if (!rb->profile_desc.hostptr)

		return 0;



	ib = ((u32 *) rb->profile_desc.hostptr) +

		(rb->profile_index * PROFILE_IB_DWORDS);

	ib_gpuaddr = rb->profile_desc.gpuaddr +

		(rb->profile_index * (PROFILE_IB_DWORDS << 2));



	dwords = _get_alwayson_counter(adreno_dev, ib, gpuaddr);



	/* Make an indirect buffer for the request */

	cmds[index++] = cp_mem_packet(adreno_dev, CP_INDIRECT_BUFFER_PFE, 2, 1);

	index += cp_gpuaddr(adreno_dev, &cmds[index], ib_gpuaddr);

	cmds[index++] = dwords;



	rb->profile_index = (rb->profile_index + 1) % PROFILE_IB_SLOTS;



	return index;

}



/* adreno_rindbuffer_submitcmd - submit userspace IBs to the GPU */

int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,

		struct kgsl_drawobj_cmd *cmdobj,
@@ -937,14 +973,11 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
		!adreno_is_a3xx(adreno_dev) &&

		(cmdobj->profiling_buf_entry != NULL)) {

		user_profiling = true;

		dwords += 6;



		/*

		 * REG_TO_MEM packet on A5xx and above needs another ordinal.

		 * Add 2 more dwords since we do profiling before and after.

		 * User side profiling uses two IB1s, one before with 4 dwords

		 * per INDIRECT_BUFFER_PFE call

		 */

		if (!ADRENO_LEGACY_PM4(adreno_dev))

			dwords += 2;

		dwords += 8;



		/*

		 * we want to use an adreno_submit_time struct to get the
@@ -1003,11 +1036,11 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
	}



	/*

	 * Add cmds to read the GPU ticks at the start of command obj and

	 * Add IB1 to read the GPU ticks at the start of command obj and

	 * write it into the appropriate command obj profiling buffer offset

	 */

	if (user_profiling) {

		cmds += _get_alwayson_counter(adreno_dev, cmds,

		cmds += set_user_profiling(adreno_dev, rb, cmds,

			cmdobj->profiling_buffer_gpuaddr +

			offsetof(struct kgsl_drawobj_profiling_buffer,

			gpu_ticks_submitted));
@@ -1055,11 +1088,11 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
	}



	/*

	 * Add cmds to read the GPU ticks at the end of command obj and

	 * Add IB1 to read the GPU ticks at the end of command obj and

	 * write it into the appropriate command obj profiling buffer offset

	 */

	if (user_profiling) {

		cmds += _get_alwayson_counter(adreno_dev, cmds,

		cmds += set_user_profiling(adreno_dev, rb, cmds,

			cmdobj->profiling_buffer_gpuaddr +

			offsetof(struct kgsl_drawobj_profiling_buffer,

			gpu_ticks_retired));