Steps on the way to 5.10-rc1
Resolves conflicts in:
include/linux/blk-crypto.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4012850c2e4b804d9e87e90b8e03a3b9ce21b5e7
Export tick_nohz_get_sleep_length() so idle drivers may use this to
determine the available idle time before the next timer wakeup.
Bug: 169136276
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
Change-Id: I0d18638d63c032862ae048bc2c3d49fa1bd90291
Commit 83788c0cae ("cpuidle: remove unused exports") removed
capability of registering cpuidle governors, which was unused at that
time. By exporting the symbol, let's allow platform specific modules to
register cpuidle governors and use cpuidle_governor_latency_req() to get
the QoS for the CPU.
Bug: 169136276
Link: https://lore.kernel.org/linux-pm/010101746fc98add-45e77496-d2d6-4bc1-a1ce-0692599a9a7a-000000@us-west-2.amazonses.com/
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
Change-Id: Ifa91576af0a3ae92ce9b216cb67728f037546c5b
A line from commit b19f0cc3fe ("ANDROID: power: wakeup_reason: wake
reason enhancements") got dropped.
Fixes: eb87047f08 ("Merge c457cc800e ("Merge tag 'irq-core-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline")
Bug: 120445600
Change-Id: I2ac07946b60adb42114d8322b44806dce0ffc407
Signed-off-by: Eric Biggers <ebiggers@google.com>
To build an EP driver which is based on PCIe designware as module, we
need to get some symbols from pcie-designware_ep.c. To select the
source from GKI kernel, we should enable PCIE_DW_PLAT_EP driver as
prebuilt.
Bug: 167931570
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Change-Id: Iffc1d90419378e1f3cf13c3e5ecddadd84dc1540
Send uevent when received control request 51 and 52
to help debug and recover when the handshake not finished.
Description about control request 51 and 52
control_request 51 :
Send a 51 control request ("Get Protocol") to figure out
if the device supports the Android accessory protocol.
A non-zero number is returned if the protocol is supported,
which represents the version of the protocol that
the device supports (currently, only version 1 exists).
control_request 52 :
If the device returns a proper protocol version,
send identifying string information to the device.
This information allows the device to figure out
an appropriate application for this accessory and
also present the user with a URL if
an appropriate application does not exist.
The detail description could reference below link.
https://tool.oschina.net/uploads/apidocs/android/tools/adk/aoa.html
Bug: 139264038
Change-Id: Ie80302321b58d247a5faa83dc3cabba316743c87
Signed-off-by: rickyniu <rickyniu@google.com>
Print out informational messages when a user connects a USB device.
Bug: 170928377
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I9838d5aff51fe9c6cfa3b5e7c46cbe84ee878090
When submitting a cherry-picked version of commit c700bdd223
("ANDROID: dma-heap: Add proper kref handling on dma-buf heaps")
from the android-mainline tree, Greg had some feedback that
tracking the minor number wasn't necessary as it was already
stored in the heap_devt:
https://android-review.googlesource.com/c/kernel/common/+/1433176/4#message-b07e73548e082ae85b97c3f3ff889ae4ab6ab09d
So this patch reworks those changes so we don't need an extra
minor field in the dma_heap struct.
Fixes: c700bdd223 ("ANDROID: dma-heap: Add proper kref handling on dma-buf heaps")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I5f12e2249a6a02ee02dc19049b7b3577e094b0ce
Bug: 154341375
This reverts commit ff0771e5f8.
ANDROID_VENDOR_HOOKS was temporarily disabled since it needed
refactoring to work with commit d25e37d89d ("tracepoint: Optimize
using static_call()"). It can be enabled again now.
Change-Id: Id4920fe20cf07736679f22228d192a251467bbb2
Signed-off-by: Todd Kjos <tkjos@google.com>
commit d25e37d89d ("tracepoint: Optimize using static_call()")
refactored tracepoints to use static_call(). Add the same
optimization for restricted vendor hooks.
Fixes: d25e37d89d ("tracepoint: Optimize using static_call()")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I336db7e90b733ac4098ce342001cc31fd215d137
Commit d25e37d89d ("tracepoint: Optimize using static_call()") changed
the format of DEFINE_TRACE() and other tracepoint logic, which broke the
ANDROID_VENDOR_HOOKS logic.
As I can't figure out how to unwind the build traces for the errors,
disable this for now so the merge can continue.
Bug: 156285741
Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6794bdec76ba25370891747b296ea30a51812982
