Commit graph

893,047 commits

Author SHA1 Message Date
qctecmdr
b60ed81b16 Merge "soc: qcom: Add rodata section dump in minidump" 2020-12-22 02:45:57 -08:00
qctecmdr
0bef0259bb Merge "qseecom: use legacy command for slateapp" 2020-12-22 02:45:57 -08:00
qctecmdr
aef7cdeb00 Merge "usb: dwc3: Prevent use after free of dwc_ipc_log_ctx" 2020-12-22 02:45:56 -08:00
qctecmdr
8dc3e3a211 Merge "usb: gadget: Avoid NULL pointer dereference during OS descriptors handling" 2020-12-22 02:45:56 -08:00
qctecmdr
45c6dd410b Merge "dt-bindings: msm: Add bindings for SHDR and IFE LITE fuse support" 2020-12-22 02:45:56 -08:00
qctecmdr
c1eb6d6a6d Merge "msm: kgsl: Disable SP clock before enabling HWCG for holi" 2020-12-22 02:45:56 -08:00
qctecmdr
732f200b59 Merge "icnss2: Add code to download BDF from device specific path" 2020-12-22 02:45:55 -08:00
qctecmdr
d85a15f459 Merge "pstore: Add buffer start check during init" 2020-12-21 22:00:28 -08:00
qctecmdr
71af17fbaa Merge "msm: kgsl: Add support for A635 GPU" 2020-12-21 22:00:28 -08:00
qctecmdr
51edbbb2d9 Merge "msm: ipa: Add support for IPA5.1" 2020-12-21 22:00:27 -08:00
qctecmdr
aaafd43e62 Merge "Merge android11-5.4.61+ (9c7cbdf) into msm-5.4" 2020-12-21 22:00:27 -08:00
qctecmdr
14ce87c1d1 Merge "msm: Add dataipa to SDXNIGHTJAR compilation" 2020-12-21 22:00:26 -08:00
qctecmdr
c63e38f24d Merge "usb: gadget: Fix crash on calling usb gadget activate/deactivate" 2020-12-21 22:00:26 -08:00
qctecmdr
41dc53c83f Merge "Revert "block: Fix use-after-free while iterating over requests"" 2020-12-21 22:00:25 -08:00
qctecmdr
ab6a8061f8 Merge "mmc: host: Fix build errors in cqhci-crypto.h" 2020-12-21 22:00:25 -08:00
qctecmdr
261ad0d8ae Merge "usb: gadget: Resolve NULL pointer dereference in composite_disconnect" 2020-12-21 16:11:24 -08:00
qctecmdr
3da7849b99 Merge "block: Fix the setting of same_page variable" 2020-12-21 16:11:24 -08:00
qctecmdr
5328bcf5f4 Merge "mtd: Collect bad block count for ecc stats lazily" 2020-12-21 16:11:23 -08:00
qctecmdr
7d6eefd864 Merge "arm64: defconfig: Enable minidump for ipc log buffers" 2020-12-21 16:11:23 -08:00
qctecmdr
03f0f258e0 Merge "clk: qcom: Add the debug mux information for SCSHRIKE" 2020-12-21 16:11:23 -08:00
qctecmdr
ef1348bf37 Merge "msm: kgsl: Allocate user_ctxt_record based on preemption feature flag" 2020-12-21 16:11:23 -08:00
qctecmdr
9961f44273 Merge "usb: dwc3: control redriver connect/disconnect" 2020-12-21 16:11:22 -08:00
Raghavendra Rao Ananta
d2b0a93576 mmc: host: Fix build errors in cqhci-crypto.h
The commit, <65ec3786aa> (mmc: host: Fix bootup issue with file
encryption with GKI) introduced build error- multiple definitions of
the same function'. Hence, make the stub definitions 'static inline'
to handle the errors.

Change-Id: I42fcc8e47d829fbfd545fe66673a637a2d71b861
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-12-21 15:17:34 -08:00
Raghavendra Rao Ananta
e33c8bf42b Revert "netfilter: Fix build error"
This reverts commit d416373239.

Change-Id: Ib10398ae0f214b08620a407fd53636a63903dfb2
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-12-21 09:52:00 -08:00
Pradeep P V K
30ed308e3c Revert "block: Fix use-after-free while iterating over requests"
commit 10ee57c29e ("block: Fix use-after-free while iterating over
requests")
This is needed to fix regression observed in suspend/resume
paths where the tag corresponds to static_rqs is becoming
NULL and observed a kernel panic due to NULL pointer access in
blk_mq_get_rq().

89.824342:   <2> Call trace:
89.824356:   <2>  blk_mq_get_request+0x200/0x3ec
89.824367:   <2>  blk_mq_alloc_request+0x5c/0xb4
89.824382:   <2>  blk_get_request+0x2c/0xa4
89.824398:   <2>  __scsi_execute+0x58/0x1a0
89.824413:   <2>  ufshcd_set_dev_pwr_mode+0x174/0x248
89.824425:   <2>  ufshcd_suspend+0x2e8/0x830
89.824436:   <2>  ufshcd_runtime_suspend+0x44/0x194
89.824452:   <2>  ufshcd_pltfrm_runtime_suspend+0x14/0x20
89.824468:   <2>  pm_generic_runtime_suspend+0x44/0x80
89.824481:   <2>  __rpm_callback+0x98/0x1d8
89.824493:   <2>  rpm_suspend+0x31c/0x634
89.824505:   <2>  rpm_idle+0x158/0x228.

Change-Id: I5bc3d75a9d891054dc926171b3ad90b701d776d6
Signed-off-by: Pradeep P V K <pragalla@codeaurora.org>
2020-12-21 21:27:07 +05:30
Sriharsha Allenki
074b871fb1 usb: gadget: Fix crash on calling usb gadget activate/deactivate
Currently the functions usb_gadget_activate and
usb_gadget_deactivate are being called with spinlock held.
The above functions calls gadget_pullup which invokes
pm_runtime_get_sync call, which might sleep.
This results in a crash. Fix this by releasing the
spinlock and acquiring it after the function call.

Change-Id: I17359e3c3227773a8ce269f8db93bc1d56771044
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
2020-12-21 06:46:05 -08:00
qctecmdr
6d2ebd766c Merge "ion: use correct section map size for LPAE" 2020-12-21 04:30:54 -08:00
qctecmdr
aa7da8afbd Merge "defconfig: Enable crypto modules on sdxlemur" 2020-12-21 04:30:54 -08:00
qctecmdr
1997d9e22c Merge "soc: qcom: Avoid race shutdown and receive data for mbox channel" 2020-12-21 04:30:54 -08:00
qctecmdr
37548b6bbc Merge "msm: kgsl: Disable BCL feature on A660" 2020-12-21 04:30:53 -08:00
qctecmdr
20499829a5 Merge "arm64: defconfig: Enable SCSHRIKE interconnect driver" 2020-12-21 04:30:53 -08:00
qctecmdr
eb6b695ebe Merge "mmc: host: Fix bootup issue with file encryption with GKI" 2020-12-21 04:30:53 -08:00
qctecmdr
af305c96f5 Merge "msm: kgsl: Fix IFPC abort due to preemption keepalive" 2020-12-20 23:19:53 -08:00
qctecmdr
82e4df171d Merge "defconfig: sdxlemur: Enable PMIC and thermal debug features" 2020-12-20 23:19:53 -08:00
qctecmdr
d2fe7ea3a5 Merge "clk: qcom: debugcc-holi: Remove the gcc_qup clocks" 2020-12-20 23:19:53 -08:00
qctecmdr
3c4e3eab3b Merge "msm: kgsl: Update HW CGC settings for A660" 2020-12-20 23:19:52 -08:00
qctecmdr
d99442f9e6 Merge "msm: kgsl: Dump HLSQ_DBG_CNTL in snapshot" 2020-12-20 23:19:52 -08:00
qctecmdr
0b05c9a855 Merge "Ignore -106 error while opening channel" 2020-12-20 23:19:52 -08:00
Sahitya Tummala
9e5e30aa0f block: Fix the setting of same_page variable
The same_page variable inside the function __bio_try_merge_page()
must be set to true if the merge happened within the same page.
As some the callers of this function take action based on that.

Change-Id: Iae4a7170aeaffcc0b9c424368c7d8127d51a177b
Fixes: 1bbb4bd9c3 ("block: disable multi-page bvec")
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2020-12-21 08:52:06 +05:30
qctecmdr
9feba1d5e3 Merge "xhci: Add tracing for xhci doorbell register writes" 2020-12-20 17:39:57 -08:00
qctecmdr
d584d85ede Merge "icnss2: Add code for SSR dump collection feature for moselle" 2020-12-20 17:39:57 -08:00
qctecmdr
0dfdb5863c Merge "pinctrl: qcom: Add flexibility to disable the wakeup capability" 2020-12-20 17:39:57 -08:00
qctecmdr
8826fdc91f Merge "coresight-etm3x: change ETM name to coresight-etm" 2020-12-20 17:39:57 -08:00
qctecmdr
5ce82d413e Merge "input: qcom-hv-haptics: toggle HAPTICS_EN bit before playing FIFO" 2020-12-20 17:39:56 -08:00
qctecmdr
d9014395e4 Merge "msm: kgsl: Log context information on ENOSPC" 2020-12-20 17:39:56 -08:00
qctecmdr
c11b1b0d8b Merge "soc: qcom: guestvm_loader: do cpu offline instead of isolate" 2020-12-20 17:39:56 -08:00
qctecmdr
55714de4a4 Merge "defconfig: Enable F2FS_FAULT_INJECTION" 2020-12-20 17:39:55 -08:00
qctecmdr
5627f0a110 Merge "arm64: defconfig: Add initial defconfig fragments for sa6155" 2020-12-20 17:39:55 -08:00
Jiten Patel
0c15225e85 qseecom: use legacy command for slateapp
use the legacy command for sending any data
to trusted application only if the app name
is slateapp.

Change-Id: Iecbe75c45b253ef87de3306b89b50c39008550fe
Signed-off-by: Jiten Patel <jitepate@codeaurora.org>
2020-12-20 07:44:17 -08:00
qctecmdr
f291b2fb17 Merge "defconfig: sdxlemur: Enable USB function remote wakeup functionality" 2020-12-20 00:48:55 -08:00