A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 04:12:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge android11-5.4.58+ (33cc3e7) into msm-5.4

Browse source 
* refs/heads/tmp-33cc3e7:
  ANDROID: db845c: set BUILD_INITRAMFS=1
  ANDROID: GKI: Build CEC_{CORE,NOTIFIER,PIN} in
  ANDROID: GKI: Enable CEC support
  ANDROID: ABI: Update ABI snapshot after additions to struct io_pgtable_cfg
  ANDROID: iommu/io-pgtable: Allow IOMMU drivers to allocate/free page-table memory
  ANDROID: update ABI
  UPSTREAM: update to latest version of scripts/checkpatch.pl
  FROMLIST: ufs: change the way to complete fDeviceInit
  ANDROID: GKI: add built-in BCM Bluetooth driver
  Revert "Revert "genetlink: remove genl_bind""
  ANDROID: GKI: enable CONFIG_LEDS_TRIGGER_TIMER
  ANDROID: GKI: add abi_gki_aarch64_oplus
  ANDROID: GKI: fix up abi .xml file due to previous changes.
  ANDROID: GKI: add some padding to some driver core structures
  ANDROID: vendor_hooks: add waiting information for blocked tasks
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  ANDROID: include/linux: add low power mode and fps to notifier
  BACKPORT: scsi: ufs: Fix and simplify setup_xfer_req variant operation
  ANDROID: GKI: enable USB UVC drivers
  ANDROID: GKI: enabled CONFIG_USB_CONFIGFS_NCM=y
  ANDROID: GKI: enable LEDS_CLASS_FLASH

Conflicts:
	drivers/iommu/io-pgtable-arm.c
	drivers/iommu/io-pgtable.c
	include/linux/io-pgtable.h
	scripts/checkpatch.pl

Change-Id: I6cbac7d913653388280a4c58f4f98e6f8b6b29f7
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
This commit is contained in:
Blagovest Kolenichev 2020-08-28 10:35:08 -07:00
commit 7546983cd7
28 changed files with 11643 additions and 10076 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/locking/mutex.c
View file

@ -36,6 +36,8 @@
# include "mutex.h"
#endif
#include <trace/hooks/dtask.h>
void
__mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key)
{
@ -1002,6 +1004,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
waiter.task = current;
trace_android_vh_mutex_wait_start(lock);
set_current_state(state);
for (;;) {
/*
@ -1057,6 +1060,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
spin_lock(&lock->wait_lock);
acquired:
__set_current_state(TASK_RUNNING);
trace_android_vh_mutex_wait_finish(lock);
if (use_ww_ctx && ww_ctx) {
/*
@ -1087,6 +1091,7 @@ skip_wait:
err:
__set_current_state(TASK_RUNNING);
trace_android_vh_mutex_wait_finish(lock);
mutex_remove_waiter(lock, &waiter, current);
err_early_kill:
spin_unlock(&lock->wait_lock);

8
kernel/locking/rwsem.c
View file

@ -31,6 +31,8 @@
#include "rwsem.h"
#include "lock_events.h"
#include <trace/hooks/dtask.h>
/*
* The least significant 3 bits of the owner value has the following
* meanings when set.
@ -1085,6 +1087,7 @@ queue:
wake_up_q(&wake_q);
/* wait to be given the lock */
trace_android_vh_rwsem_read_wait_start(sem);
for (;;) {
set_current_state(state);
if (!smp_load_acquire(&waiter.task)) {
@ -1104,6 +1107,7 @@ queue:
}
__set_current_state(TASK_RUNNING);
trace_android_vh_rwsem_read_wait_finish(sem);
lockevent_inc(rwsem_rlock);
return sem;
@ -1115,6 +1119,7 @@ out_nolock:
}
raw_spin_unlock_irq(&sem->wait_lock);
__set_current_state(TASK_RUNNING);
trace_android_vh_rwsem_read_wait_finish(sem);
lockevent_inc(rwsem_rlock_fail);
return ERR_PTR(-EINTR);
}
@ -1209,6 +1214,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state)
wait:
/* wait until we successfully acquire the lock */
trace_android_vh_rwsem_write_wait_start(sem);
set_current_state(state);
for (;;) {
if (rwsem_try_write_lock(sem, wstate)) {
@ -1268,6 +1274,7 @@ trylock_again:
raw_spin_lock_irq(&sem->wait_lock);
}
__set_current_state(TASK_RUNNING);
trace_android_vh_rwsem_write_wait_finish(sem);
list_del(&waiter.list);
rwsem_disable_reader_optspin(sem, disable_rspin);
raw_spin_unlock_irq(&sem->wait_lock);
@ -1277,6 +1284,7 @@ trylock_again:
out_nolock:
__set_current_state(TASK_RUNNING);
trace_android_vh_rwsem_write_wait_finish(sem);
raw_spin_lock_irq(&sem->wait_lock);
list_del(&waiter.list);