Commit graph

879,747 commits

Author SHA1 Message Date
qctecmdr
dcd4256817 Merge "usb: gadget: Add super speed plus desc for midi function" 2020-04-09 04:56:31 -07:00
qctecmdr
8fb9f1ddac Merge "msm: cvp: Validate buffer config in HFI packet" 2020-04-09 04:56:31 -07:00
qctecmdr
9d71f78e4e Merge "mm: slub: reinitialize random sequence cache on slab object update" 2020-04-09 04:56:31 -07:00
qctecmdr
7277cd9276 Merge "i2c: i2c-msm-geni: Add support in I2C driver for Trusted VM" 2020-04-09 04:56:30 -07:00
qctecmdr
ecb0e8b8fd Merge "tmc-etr: Remove the duplicated cti map" 2020-04-09 04:56:29 -07:00
Mao Jinlong
d199fb4508 tmc-etr: Remove the duplicated cti map
Remove the duplicated cti map for tmc-etr as only memory mode needs
the cti map.

Change-Id: I5264a41e718924cd2febb8c0e7de03623fbd7c90
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
2020-04-09 02:28:50 -07:00
qctecmdr
91553bb268 Merge "coresight: tmc-etr: fix null ptr dereferencing in usb_qdss_close" 2020-04-08 23:18:57 -07:00
qctecmdr
c3d28bf044 Merge "regulator: qpnp-amoled: Add set_load() callback for IBB regulator" 2020-04-08 19:18:58 -07:00
qctecmdr
090d1e5c45 Merge "clk: qcom: rpmh: Add support for RPMH clocks for Shima" 2020-04-08 19:18:57 -07:00
qctecmdr
6d117752a7 Merge "msm: cvp: avoid checking read_idx again" 2020-04-08 19:18:57 -07:00
qctecmdr
43ee6abd3f Merge "msm: adsprpc: Handle hyp assign errors properly for dsp" 2020-04-08 19:18:57 -07:00
qctecmdr
acb07c14f3 Merge "cnss2: Ignore ramdump init failure" 2020-04-08 19:18:56 -07:00
qctecmdr
2f4b3f0cd2 Merge "drivers: llcc: Add LLCC driver for Shima" 2020-04-08 19:18:56 -07:00
qctecmdr
a31ad760a4 Merge "smcinvoke: Return proper error in process_accept_req" 2020-04-08 03:42:50 -07:00
qctecmdr
adeddcb4f7 Merge "leds: qti-flash: Update camera flash client interface options" 2020-04-08 03:42:49 -07:00
qctecmdr
e58a8227d9 Merge "drm/msm: make msm_drm.h uapi header safe for C++" 2020-04-08 03:42:49 -07:00
qctecmdr
9261aacbb1 Merge "mem-buf: Replace *_TRUSTED_UI with *_TRUSTED_VM" 2020-04-08 03:42:49 -07:00
qctecmdr
c8879e200b Merge "ion: Remove ION_HEAP_FLAG_DEFER_FREE for dynamic carveout heaps" 2020-04-08 03:42:48 -07:00
qctecmdr
b87e49551e Merge "arm64: defconfig: Enable Buses configs for trusted VM" 2020-04-08 03:42:48 -07:00
qctecmdr
fdc33ffd2f Merge "tty: hvc_haven: Use thread worker to send characters" 2020-04-07 18:49:52 -07:00
qctecmdr
ce077090d2 Merge "usb: dwc3: Avoid resume_work flush in pm_suspend/pm_resume" 2020-04-07 18:49:52 -07:00
qctecmdr
651126b74a Merge "dwc3: Handle USB spoof disconnect when EUD is enabled" 2020-04-07 18:49:51 -07:00
qctecmdr
688bf453ba Merge "soc: qcom: msm_perf: fix invalid usuage of cpumask" 2020-04-07 18:49:51 -07:00
qctecmdr
301179af27 Merge "soc: qcom: msm_perf: add null policy checks for cpufreq policy" 2020-04-07 18:49:51 -07:00
qctecmdr
3a52cb3e65 Merge "msm: ADSPRPC: Embed job type in context identifier" 2020-04-07 18:49:50 -07:00
qctecmdr
cd94f627a4 Merge "msm: adsprpc: store process specific info in GETINFO ioctl call" 2020-04-07 18:49:50 -07:00
qctecmdr
8a1a1972f7 Merge "AOSP change: Add fscrypt-provisioning to keyring" 2020-04-07 18:49:50 -07:00
qctecmdr
98044d2486 Merge "ALSA: core: set private data for snd_info_entry" 2020-04-07 18:49:49 -07:00
qctecmdr
740a0a482d Merge "Fix GKI compilation for inline encryption modules" 2020-04-07 18:49:49 -07:00
qctecmdr
6ae860ef15 Merge "defconfig: lahaina-qgki: Enable QTI clk debugfs features for QGKI variant" 2020-04-07 18:49:49 -07:00
qctecmdr
086bdc3531 Merge "clk: qcom: gcc-lahaina: Keep ice core memory retained across gdsc collapse" 2020-04-07 18:49:48 -07:00
Vijayanand Jitta
6b4e340af6 mm: slub: reinitialize random sequence cache on slab object update
Random sequence cache is precomputed during slab object creation
based up on the object size and no of objects per slab. These could
be changed when flags like SLAB_STORE_USER, SLAB_POISON are updated
from sysfs. So when shuffle_freelist is called during slab_alloc it
uses updated object count to access the precomputed random sequence
cache. This could result in incorrect access of the random sequence
cache which could further result in slab corruption. Fix this by
reinitializing the random sequence cache up on slab object update.

A sample panic trace when write to slab_store_user was attempted.

Call trace0:
 exception
 set_freepointer(inline)
 shuffle_freelist(inline)
 new_slab+0x688/0x690
 ___slab_alloc+0x548/0x6f8
 kmem_cache_alloc+0x3dc/0x418
 zs_malloc+0x60/0x578
 zram_bvec_rw+0x66c/0xaa0
 zram_make_request+0x190/0x2c8
 generic_make_request+0x1f8/0x420
 submit_bio+0x140/0x1d8
 submit_bh_wbc+0x1a0/0x1e0
 __block_write_full_page+0x3a0/0x5e8
 block_write_full_page+0xec/0x108
 blkdev_writepage+0x2c/0x38
 __writepage+0x34/0x98
 write_cache_pages+0x33c/0x598
 generic_writepages+0x54/0x98
 blkdev_writepages+0x24/0x30
 do_writepages+0x90/0x138
 __filemap_fdatawrite_range+0xc0/0x128
 file_write_and_wait_range+0x44/0xa0
 blkdev_fsync+0x38/0x68
 __arm64_sys_fsync+0x6c/0xb8.

Change-Id: Ia87ff808d23ff8dbb721d3cc3e3b29771200ec5a
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
2020-04-06 23:49:53 -07:00
Isaac J. Manjarres
979014b341 ion: Remove ION_HEAP_FLAG_DEFER_FREE for dynamic carveout heaps
Dynamic carveout heaps can have their memory removed immediately
after all of its memory is no longer in use. However, the
deferred free mechanism that carveout heaps use can cause immediate
removal of heap memory to fail. Thus, do not use the
ION_HEAP_FLAG_DEFER_FREE flag for dynamic carveout heaps.

Change-Id: I2e4edd130cad9f1361b88210e69cf24cb0f271bb
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-04-06 13:35:50 -07:00
Kishore Sri venkata Ganesh Bolisetty
24a315ee3c soc: qcom: msm_perf: fix invalid usuage of cpumask
set/get API used for freq updates are using an invalid cpumask
variables which may potentially lead to stack corruption.

Change-Id: I25fdc5dc25550c39bc81a2efbd55d16679d37e19
Signed-off-by: Kishore Sri venkata Ganesh Bolisetty <bsrivenk@codeaurora.org>
2020-04-06 12:45:35 -07:00
Vivek Aknurwar
37bb69cca2 defconfig: lahaina-qgki: Enable QTI clk debugfs features for QGKI variant
Enable CONFIG_COMMON_CLK_QCOM_DEBUG so that clocks can be controlled
from debugfs for testing/verification purposes.

Change-Id: Ie19434018eca57b0b99b7ef677c603e98914e471
Signed-off-by: Vivek Aknurwar <viveka@codeaurora.org>
2020-04-06 11:22:41 -07:00
Chris Lew
f864ac15ce arm64: defconfig: Enable QRTR for genericarmv8
Enable QRTR and QRTR Haven transport for virtual machine communication
using the IPC-Router protocol.

Change-Id: I4fa6361ee7d82336988247e4cd2294463ab81eea
Signed-off-by: Chris Lew <clew@codeaurora.org>
2020-04-06 11:11:03 -07:00
Chris Lew
bde9c50b27 arm64: defconfig: Enable QRTR Haven for lahaina-gki
Enable the QRTR Haven transport to enable virtual machine communication
using the IPC-Router protocol.

Change-Id: I15e01dd7bc527b81208632979c1fe3862b304f17
Signed-off-by: Chris Lew <clew@codeaurora.org>
2020-04-06 11:10:17 -07:00
Gaurav Kashyap
93a12be974 AOSP change: Add fscrypt-provisioning to keyring
Add fscrypt provisioning functionality to kernel
as it is already present in userspace.

Change-Id: Ie567a73bf0afb761a7cd1ba9cf4a0735fce96bbb
Signed-off-by: Gaurav Kashyap <gaurkash@codeaurora.org>
2020-04-06 10:14:14 -07:00
Elson Roy Serrao
39cb120666 usb: dwc3: Avoid resume_work flush in pm_suspend/pm_resume
dwc3_resume_work is dependent on sm_work which is a freezable task.
When control reaches pm_suspend or pm_resume sm_work is frozen at
that point as part of freeze_processes() api which is called for
system-wide suspend. If there is any pending work on sm_work and we
try to flush when it is frozen we end up in a deadlock as the
suspend/resume thread cannot progress. Avoid flushing this wq in
pm_suspend/resume.

Change-Id: I5eada1c3d11085fcd1b424a1bdb7e0c949f7ef42
Signed-off-by: Elson Roy Serrao <eserrao@codeaurora.org>
2020-04-06 09:39:18 -07:00
Elliot Berman
f56b018e3d tty: hvc_haven: Use thread worker to send characters
hh_hvc_put_chars may be called with interrupts disabled.
hh_rm_console_write is a blocking call (to wait for the response to come
back). Use a FIFO and workqueue to send characters so that console_write
may sleep.

Change-Id: I7060b3604cb112caf00ecc1d94a5b2d543e7956e
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-04-06 09:16:04 -07:00
Elliot Berman
aff0badb4f haven: rm: Clean VM Services - Console APIs
Standard replies are handled by hh_rm_call() and not by client driver.
Thus, clean console APIs to handle hh_rm_call() response accordingly.

Change-Id: I9bc49f15e33260a5fe539b141e311fa071e49211
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-04-06 09:16:04 -07:00
Elliot Berman
51047f5ec8 arch: arm64: hh: Clobber x18 if SCS isn't enabled
If SCS isn't enabled, then x18 should be considered clobbered by a Haven
hypercall.

Change-Id: I885e44a8bacc7f045f45df4e88fd04626e0baf41
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-04-06 09:16:04 -07:00
Raghavendra Rao Ananta
6bdb50ad99 haven: hh_msgq: Let clients manage the buffers for hh_msgq_recv
Currently, the hh_msgq driver allocates the receive-buffer on behalf
of the clients and it's the clients' responsibility to free it.
However, this creates asymmetry in the buffer management and may lead
to confusion. Hence, let the clients take full control of the buffers-
allocation and freeing.

Also make changes to the client driver to adapt to the new hh_msgq_recv
interface.

Change-Id: I95b72621ede5e62411e78e45c36d8a7ff3686bd4
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2020-04-06 09:16:04 -07:00
Taniya Das
ba282ce65f clk: qcom: rpmh: Add support for RPMH clocks for Shima
Add clock rpmh data to communicate with RPMH clocks for Shima.

Change-Id: Ic4e0f8689e7fe86efacbfa87ed3aa29128c9352e
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2020-04-06 02:37:15 -07:00
Chandra Sai Chidipudi
6c9166325a drivers: llcc: Add LLCC driver for Shima
Add Last Level Cache Controller (LLCC) driver for Shima.

Change-Id: I83e5fd3a030f798920435d3170df9aa3bf7e2886
Signed-off-by: Chandra Sai Chidipudi <cchidipu@codeaurora.org>
2020-04-05 23:28:24 -07:00
Manoj Kumar AVM
f6484fe286 drm/msm: make msm_drm.h uapi header safe for C++
fixes the C++ related compilation issues.

CRs-Fixed: 2038080
Change-Id: If6b4f379eb27f3de6153b8666f733c0b8245851f
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2020-04-05 17:03:06 -07:00
qctecmdr
b38b5109bf Merge "net: qrtr: Add haven transport" 2020-04-05 07:27:28 -07:00
qctecmdr
f3d61754e3 Merge "haven: hh_msgq: Let clients manage the buffers for hh_msgq_send" 2020-04-05 07:27:27 -07:00
qctecmdr
9a45aede3b Merge "usb: dwc3: Add tuning support for Gen2 Tx compliance parameters" 2020-04-05 07:27:27 -07:00
qctecmdr
a92f470781 Merge "msm: pcie: fix user info in client's event callback" 2020-04-05 07:27:27 -07:00