Commit graph

893,016 commits

Author SHA1 Message Date
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
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
qctecmdr
f291b2fb17 Merge "defconfig: sdxlemur: Enable USB function remote wakeup functionality" 2020-12-20 00:48:55 -08:00
qctecmdr
c6bb501a23 Merge "block: Fix use-after-free while iterating over requests" 2020-12-20 00:48:54 -08:00
qctecmdr
9c4ab1cf74 Merge "usb: misc: nb7vpq904m: allow USB control connect and disconnect" 2020-12-20 00:48:54 -08:00
qctecmdr
cf5c2893b6 Merge "usb: dwc3-msm: Rectify 64 bit dma address programming for GSI" 2020-12-20 00:48:54 -08:00
qctecmdr
763611e06c Merge "scsi: ufs: Fix IOCTL error checking for input buffer" 2020-12-20 00:48:53 -08:00
qctecmdr
b3226a5b62 Merge "usb: gadget: Fix issue in config_desc with OS descriptor handling" 2020-12-20 00:48:53 -08:00
qctecmdr
be6199f64a Merge "usb: gadget: Send BRK signal to host on flow disable ioctl" 2020-12-19 19:40:00 -08:00
qctecmdr
4f69528a64 Merge "soc: qcom: mem-buf: Ensure dma-bufs are freed when refcount is 0" 2020-12-19 19:40:00 -08:00
qctecmdr
f2013ec1a6 Merge "defconfig: Enable MHI device for sdxlemur" 2020-12-19 19:39:59 -08:00
qctecmdr
1a3c408f61 Merge "kernel_headers: Explicitly run headers_install under 'sh'" 2020-12-19 19:39:59 -08:00
qctecmdr
aeed5e92e5 Merge "dwc3: Add usb_get_remote_wakeup_status() API()" 2020-12-19 19:39:58 -08:00
Veera Vegivada
d956b0910d clk: qcom: Add the debug mux information for SCSHRIKE
Add the debug mux structure with inputs for measuring the
HLOS controlled clocks on SCSHRIKE.

Change-Id: Ie7a7206d90395a7ed2a87de5d3b466bd44452558
Signed-off-by: Veera Vegivada <vvegivad@codeaurora.org>
2020-12-19 19:05:27 +05:30
Veera Vegivada
5d90d41c95 clk: qcom: Add the display clock driver for SCSHRIKE
Add the display clock definitions and driver support for SCSHRIKE.

Change-Id: If9f0f6ada0d61895e242e733a6414c5c6bafe322
Signed-off-by: Veera Vegivada <vvegivad@codeaurora.org>
2020-12-19 19:05:26 +05:30
Veera Vegivada
91dde1f206 clk: qcom: Add the Camera clock driver for SCSHRIKE
Add the camera clock definitions and driver support for SCSHRIKE.

Change-Id: I006e51c7b04f028682ba363dbacab6955f91f23b
Signed-off-by: Veera Vegivada <vvegivad@codeaurora.org>
2020-12-19 19:05:26 +05:30
Veera Vegivada
f205006605 clk: qcom: Add the GCC clock driver for SCSHRIKE
Add the peripheral clock driver support for SCSHRIKE.

Change-Id: Ica2f59ccbc1a07557108c07e361acabec90d4c01
Signed-off-by: Veera Vegivada <vvegivad@codeaurora.org>
2020-12-19 19:05:26 +05:30
Veera Vegivada
38148af58a arm64: defconfig: Enable SCSHRIKE interconnect driver
Enable the SCSHRIKE interconnect driver so that consumers are
able to obtain their path handles properly.

Change-Id: I7375ae6afeebdfb1f5b8d872bc191f1accc3654b
Signed-off-by: Veera Vegivada <vvegivad@codeaurora.org>
2020-12-19 19:05:25 +05:30