Commit graph

891,902 commits

Author SHA1 Message Date
qctecmdr
e6c07194da Merge "msm: kgsl: Store power_interval_timeout in msec" 2020-11-02 02:18:43 -08:00
qctecmdr
b3a0fafb1c Merge "clk: qcom: Add sync-state callback for clk-aop-qmp" 2020-11-02 02:18:43 -08:00
qctecmdr
4059648ed9 Merge "coresight: tmc: Configure cti trigger number in device tree" 2020-11-01 20:06:46 -08:00
qctecmdr
878a2ef45f Merge "coresight: tmc: fix spinlock bad magic/usb_qdss_close" 2020-11-01 20:06:46 -08:00
qctecmdr
3064610aa0 Merge "soc/qcom/hyp_core_ctl: Track VPM Group state for VM" 2020-11-01 20:06:45 -08:00
qctecmdr
8efb1e6396 Merge "qbt_handler: Memset userspace struct to zero" 2020-11-01 20:06:45 -08:00
qctecmdr
c19cc3d79e Merge "kernel: arch: Enable qcedev as gki module" 2020-10-30 01:02:18 -07:00
qctecmdr
1e8e6c8d2b Merge "icnss2: Send power save enter/exit via SMP2P" 2020-10-30 01:02:18 -07:00
qctecmdr
6665615cc3 Merge "msm: kgsl: Disable gpu_llc flags by default" 2020-10-30 01:02:18 -07:00
qctecmdr
43626c0ab3 Merge "f2fs: Fix double free issue for s_encoding" 2020-10-30 01:02:17 -07:00
qctecmdr
b20ec664b6 Merge "defconfig: sdxlemur: Enable CONFIG_QPNP_SMB5" 2020-10-29 10:12:28 -07:00
qctecmdr
365f0b4c06 Merge "input: qcom-hv-haptics: correct register values when toggling RC_CLK_CAL" 2020-10-29 10:12:28 -07:00
qctecmdr
489010dce7 Merge "mmc: cqhci: Port two trivial fixes in cqhci from earlier kernels" 2020-10-29 10:12:28 -07:00
qctecmdr
ab12fbd666 Merge "rtc: Disable alarm irq if alarm time is in the past" 2020-10-29 10:12:27 -07:00
qctecmdr
a7c4fa6f46 Merge "soc: qcom: Conditional compile page/slub minidumps" 2020-10-29 10:12:27 -07:00
qctecmdr
79e5a6f4c3 Merge "msm: ipa3: Enable dynamic switch between WDI2 and WDI3" 2020-10-29 10:12:27 -07:00
qctecmdr
fa744a0fbd Merge "iommu: arm-smmu: Fail device attach when SMR write fails" 2020-10-29 10:12:27 -07:00
qctecmdr
71c6027501 Merge "cpuidle: lpm-levels: Store per core next hrtimer wakeup" 2020-10-29 10:12:26 -07:00
Sayali Lokhande
9bc7ed61dc f2fs: Fix double free issue for s_encoding
In case of error in fsync data recovery during mount,
sb->s_encoding is freed but not set to NULL, resulting
in double free issue in f2fs_put_super during unmount.

Log: Object already free
[ 1447.382542] INFO: Allocated in kvmalloc_node+0x58/0x9c
   age=351740 cpu=7 pid=695
[ 1447.382544] kvmalloc_node+0x58/0x9c
[ 1447.382549] f2fs_build_node_manager+0x244/0x4f0
[ 1447.382554] f2fs_fill_super+0x14f4/0x1c04
[ 1447.382557] mount_bdev+0x178/0x1d8
[ 1447.382558] f2fs_mount+0x18/0x24
[ 1447.382562] legacy_get_tree+0x4c/0xac
[ 1447.382563] vfs_get_tree+0x4c/0x118
[ 1447.382566] do_mount+0x678/0xcc4
[ 1447.382568] ksys_mount+0x98/0xdc
<>
[ 1447.382580] INFO: Freed in kvfree+0x38/0x44
  age=16 cpu=7 pid=1
[ 1447.382582] kvfree+0x38/0x44
[ 1447.382584] f2fs_destroy_node_manager+0x2f4/0x38c
[ 1447.382585] f2fs_put_super+0x198/0x2b4
[ 1447.382588] generic_shutdown_super+0x8c/0x140
[ 1447.382589] kill_block_super+0x20/0x50
[ 1447.382591] kill_f2fs_super+0xc0/0x108
[ 1447.382593] deactivate_locked_super+0x78/0x11c
[ 1447.382595] deactivate_super+0x80/0xa4
[ 1447.382596] cleanup_mnt+0x11c/0x158
[ 1447.382598] __cleanup_mnt+0x14/0x20

This change sets s_encoding to NULL after its freed
to avoid double free issue.

Change-Id: I017ba5386e76c81d7e545d3eefc2ed02dc6522cc
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2020-10-29 19:08:00 +05:30
Rohan Sethi
4cc9960429 msm: kgsl: Disable gpu_llc flags by default
Set default value of flags gpu_llc_slice_enable and
gpuhtw_llc_slice_enable to false and disable change
via sysfs nodes.

Change-Id: I1446a04b25a793cdebf5428de2e84870a6b33b7c
Signed-off-by: Rohan Sethi <rohsethi@codeaurora.org>
2020-10-29 12:07:53 +05:30
Naman Padhiar
70e9a936d4 icnss2: Send power save enter/exit via SMP2P
Send power save enter/exit via SMP2P instead of QMI.

Change-Id: I8aeeab3efd2f7c39e4e7ac134af98c58827ff6d5
Signed-off-by: Naman Padhiar <npadhiar@codeaurora.org>
2020-10-28 23:02:22 -07:00
Sai Harshini Nimmala
f89f67ece0 soc/qcom/hyp_core_ctl: Track VPM Group state for VM
VM has to go into suspend state outside of use case boundary. Delay in
transitioning to system suspend or spurious wake-ups after the use case
is completed will result in a system regression.
Adding a mechanism to track both the scenarios of delay in system
suspend and spurious wake-ups of the VM by checking the VPM Group state
associated with the VM.

Change-Id: I2a5990989033ffd3cc57ae1cba93b8ba6b63a3c7
Signed-off-by: Sai Harshini Nimmala <snimmala@codeaurora.org>
2020-10-28 20:58:26 -07:00
Abir Ghosh
3511d06529 qbt_handler: Memset userspace struct to zero
Explicitly memset struct to zero before sending
to userspace. This is to prevent padded bytes
from possibly leaking kernel memory contents to
userspace.

Change-Id: Id3e873164430c34195344884b2899e61aa060dfc
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2020-10-28 07:33:00 -07:00
Sarthak Garg
d3028e1ef5 mmc: cqhci: Port two trivial fixes in cqhci from earlier kernels
This is a squash of below two minor fixes:

8fec754f57a8 mmc: cmdq: trigger get queue status after dcmd
327fd3225911 mmc: cqhci: CQ Register changes for v5.0 onwards.

Change-Id: I1bb6cae5a647c4ea189a992d5ace7b6c1e3a1c87
Signed-off-by: Sarthak Garg <sartgarg@codeaurora.org>
2020-10-28 18:48:24 +05:30
Yuanfang Zhang
837d016628 coresight: tmc: fix spinlock bad magic/usb_qdss_close
Modify the sequence of ETR disable,drvdata->mode is set to
CS_MODE_DISABLE before calling usb_qdss_close().

Change-Id: I575867cee95f4db5ba155a2619ab1eca954d6387
Signed-off-by: Yuanfang Zhang <zhangyuanfang@codeaurora.org>
2020-10-28 17:49:09 +08:00
Guixiong Wei
381424fcbb rtc: Disable alarm irq if alarm time is in the past
If device is boot up by rtc alarm, the alarm irq will still be
enabled and the alarm time is smaller than current rtc time before
any alarm is set or canceled. If device is powered off now, it will
boot up automatically as the alarm irq is enabled.

So disable alarm irq if alarm is enabled and alarm time is in the
past.

Change-Id: I53dc7cdb1fa7c56eea07ed01d1f6cb63f0bb8a8d
Signed-off-by: Guixiong Wei <guixiong@codeaurora.org>
2020-10-27 20:43:15 -07:00
Tao,Zhang
4700692ee8 coresight: tmc: Configure cti trigger number in device tree
Configure flush and reset cti trigger number in device tree.
Replace configuring cti trigger number by hard code since some
platforms don't have same cti trigger number.

Change-Id: Ib26802b3bd3449566954752b100d6ea188e98e13
Signed-off-by: Tao,Zhang <taozha@codeaurora.org>
2020-10-28 11:06:55 +08:00
qctecmdr
5b47848843 Merge "msm: ipa4: Add changes to support PCIe addr for WDI2 over GSI" 2020-10-27 18:33:27 -07:00
qctecmdr
e988a4dce1 Merge "trace: f2fs: Fix kasan slab-out-of-bounds" 2020-10-27 18:33:27 -07:00
qctecmdr
804651c838 Merge "usb: phy: Add snapshot of USB QUSB PHY driver" 2020-10-27 18:33:27 -07:00
qctecmdr
116de19c62 Merge "arm64: defconfig: Add initial defconfig fragments for gen3auto" 2020-10-27 18:33:27 -07:00
qctecmdr
7f4ee4ba8b Merge "dt-bindings: clock: Update clock ids of GCC for YUPIK" 2020-10-27 18:33:26 -07:00
qctecmdr
10adaac106 Merge "haven: irq_lend: handle irq accept failure case" 2020-10-27 18:33:26 -07:00
qctecmdr
69f2bb9251 Merge "msm: pcie: update with link power on check for user PCIe resume" 2020-10-27 18:33:26 -07:00
qctecmdr
13851368ba Merge "ANDROID: scs: use vmapped shadow stacks by default" 2020-10-27 18:33:25 -07:00
Mike Tipton
62df61cdac clk: qcom: Add sync-state callback for clk-aop-qmp
Add sync-state callback for the clk-aop-qmp driver to ensure its clocks
don't turn off before all consumers probe. This also addresses
performance issues during boot since a large number of amba devices
toggle the QDSS clock in their probe function. Keeping the clock enabled
until all consumers probe means we don't make multiple expensive
round-trips to AOP.

Change-Id: Ic8ae6e563c4083c5cb7bfa9d5e18e17d58a3bb24
Signed-off-by: Mike Tipton <mdtipton@codeaurora.org>
2020-10-27 17:53:17 -07:00
Guru Das Srinagesh
8d707dbbb2 defconfig: sdxlemur: Enable CONFIG_QPNP_SMB5
Enable CONFIG_QPNP_SMB5 to enable the charger peripheral present in
PM7250B.

Change-Id: I7e60a792e298a208e4361ac65d9ae995008aec49
Signed-off-by: Guru Das Srinagesh <gurus@codeaurora.org>
2020-10-27 11:00:30 -07:00
Sami Tolvanen
bd3954f0a7 ANDROID: scs: use vmapped shadow stacks by default
Enable CONFIG_SHADOW_CALL_STACK_VMAP by default, and as we allocate
a full page for the stack, allow the kernel use all of it.

Bug: 169781940
Change-Id: Ie8eaa7f24e9bf10ff28a302ac98ad843b71c9c2a
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Git-commit: 1eb128820e
Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android11-5.4
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Signed-off-by: Gaurav Kohli <gkohli@codeaurora.org>
2020-10-27 13:23:45 +05:30
Sayali Lokhande
047fdb727d trace: f2fs: Fix kasan slab-out-of-bounds
This patch fixes the following KASAN report:

KASAN: slab-out-of-bounds in string+0xb4/0x120
Read of size 1 at addr fffffffbf2f3b510 by task atrace/9219

Call trace:
dump_backtrace+0x0/0x3e8
show_stack+0x20/0x30
dump_stack+0x13c/0x198
print_address_description+0x80/0x2e0
kasan_report_error+0x1ac/0x210
__asan_report_load2_noabort+0x0/0xb8
string+0xb4/0x120
vsnprintf+0x5f4/0x1658
seq_buf_vprintf+0x11c/0x200
trace_seq_printf+0x1a8/0x320
trace_raw_output_f2fs_lookup_start+0xe8/0x158
print_trace_line+0x3cc/0xeb0
s_show+0x154/0x248
seq_read+0x8a8/0x1378
__vfs_read+0xfc/0x550
vfs_read+0x108/0x268
ksys_read+0x124/0x2b0

Correctly assign name string for f2fs trace.

Change-Id: I8ed0cf7c542ead06479fb4fde65b01b5e739e6db
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2020-10-27 00:06:59 -07:00
Pooja Kumari
759bd95c83 msm: ipa3: Enable dynamic switch between WDI2 and WDI3
Enable WDI2 and dynamic switching between WDI3
and WDI2 based on wlan input.

Change-Id: Iaa23c78d8852fe12d9f9bc1133ee7c53f6755779
Signed-off-by: Pooja Kumari <kumarip@codeaurora.org>
2020-10-26 23:42:02 -07:00
qctecmdr
7bac0bc013 Merge "soc: qcom: proxy_consumer: Add support for amba_driver" 2020-10-26 20:50:59 -07:00
Murali Nalajala
eb84f8329c haven: irq_lend: handle irq accept failure case
When PVM lend an IRQ, a notification is given to SVM. Later SVM can
accept the IRQ that is lend by PVM. If the SVM do not accept an IRQ,
PVM can reclaim it back and lend again to SVM. This scenario is not
handled correctly and notification for lend from PVM to SVM is not
happening. Do an extra check in the callback handler whether previous
lend succeeded or not.

Change-Id: I9a6d335b6c11c8aea956fa1535b093c385e4cde1
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2020-10-26 14:28:26 -07:00
Tanwee Kausar
1979d9ac16 kernel: arch: Enable qcedev as gki module
Enabling qcedev and msm_qce modules as gki module.

Change-Id: Ie6c0f0f9399a2bf7a25baf4e93b8c5118c57206c
Signed-off-by: Tanwee Kausar <tkausar@codeaurora.org>
2020-10-26 11:32:46 -07:00
Sai Harshini Nimmala
fa2c926449 soc/qcom/hyp_core_ctl: Add new VM resource type
Virtual PM Group resource type has been added to the list of
hypervisor resource types that can be queried for by a VM.
This addition is in preparation for the hyp core ctl driver to store and
utilize the information related to VPM group such as cap_id and
VPM group state in relevant hypervisor features.

Change-Id: I4ec9b4dca5f095980b8ce9134c7cac695562f101
Signed-off-by: Sai Harshini Nimmala <snimmala@codeaurora.org>
2020-10-26 11:01:35 -07:00
Raghavendra Rao Ananta
74672e6b27 soc: qcom: proxy_consumer: Add support for amba_driver
The proxy consumer driver currently only supports proxy
probing for platform bus. However, there's a need to
proxy-probe coresight devices, which falls under ABMA bus.
Hence, extend the driver to support proxy probing for
"struct amba_driver" and add coresight-etm ids to the list.

Change-Id: I48da20ea18f61b5cc82ae0616a75c23af32481a2
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-10-26 11:01:10 -07:00
Raghavendra Rao Ananta
873068025a ANDROID: ABI: Update allowed list for QCOM
Add the following symbols to QCOM allowed-list:
-- amba_driver_register
-- amba_driver_unregister

Bug: 171409550
Change-Id: Iab997df4f8ebb2c39b993b60ee4eb0fa3100fbcd
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Git-commit: 95bd9e26f2
Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android11-5.4
[rananta@codeaurora.org: Generate and add an internal ABI snapshot]
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-10-26 11:01:10 -07:00
Raghavendra Rao Ananta
f908c1019e soc: qcom: of_proxy_consumer: Add "qcom,jtagv8-mm"
Add "qcom,jtagv8-mm" to the list of proxy consumers, such that
the sync-state logic need not wait for the probe from the actual
driver if it's disabled.

Change-Id: I580a865ba3c4c298d76e29552eec854b33faea24
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-10-26 11:01:09 -07:00
qctecmdr
f4e98f0cf5 Merge "mmc: sdhci-msm: Update to enhanced SDCC5 DLL power up sequence" 2020-10-26 09:53:31 -07:00
qctecmdr
4b196d63cf Merge "Merge android11-5.4.61+ (8540985) into msm-5.4" 2020-10-26 07:17:41 -07:00
qctecmdr
a2e07b7fb8 Merge "msm: kgsl: Make clear_pending_transactions target specific" 2020-10-26 07:17:40 -07:00