Commit graph

892,914 commits

Author SHA1 Message Date
qctecmdr
c55f25ccd9 Merge "arch: arm: Handle quirk structure after secure call return" 2020-09-21 11:51:05 -07:00
qctecmdr
646b042e70 Merge "mmc: sdhci-msm: Add SD card's err_stat sysfs entry" 2020-09-21 11:51:05 -07:00
qctecmdr
b6a3995c15 Merge "defconfig: msm: Enable minidump feature configs on holi" 2020-09-21 11:51:04 -07:00
qctecmdr
a9dae49894 Merge "msm: kgsl: Add support for GMU log streaming" 2020-09-21 11:51:04 -07:00
Liam Mark
0838b6c739 dma-buf: Handle dentry->d_fsdata being NULL
Since the dma_buf_dentry_ops ops are set on the dma-buf dentry, in
alloc_file_pseudo, and this is before the dma-buf is assigned to
dentry->d_fsdata, in dma_buf_getfile, it is possible for the
dma_buf_dentry_ops functions to be called with dentry->d_fsdata == NULL.

For example:

BUG: KASAN: null-ptr-deref in dma_buf_release+0x2c/0x254 drivers/dma-buf/dma-buf.c:88
Call trace:
dump_backtrace+0x0/0x2c8 arch/arm64/kernel/time.c:50
show_stack+0x20/0x2c arch/arm64/kernel/traps.c:140
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x154/0x1f4 lib/dump_stack.c:118
__kasan_report+0x1ac/0x218 mm/kasan/report.c:510
kasan_report+0x10/0x18 mm/kasan/common.c:634
check_memory_region_inline mm/kasan/generic.c:181 [inline]
__asan_load4+0x90/0x98 mm/kasan/generic.c:250
dma_buf_release+0x2c/0x254 drivers/dma-buf/dma-buf.c:88
__dentry_kill+0x294/0x31c fs/dcache.c:584
dentry_kill fs/dcache.c:673 [inline]
dput+0x250/0x380 fs/dcache.c:859
path_put+0x24/0x40 fs/namei.c:485
alloc_file_pseudo+0x1a4/0x200 fs/file_table.c:235
dma_buf_getfile drivers/dma-buf/dma-buf.c:473 [inline]
dma_buf_export+0x25c/0x3ec drivers/dma-buf/dma-buf.c:585
ion_dmabuf_alloc+0x168/0x1d4 drivers/staging/android/ion/ion_dma_buf.c:394
ion_alloc_fd drivers/staging/android/ion/ion.c:54 [inline]
ion_ioctl+0x24c/0x5c8 drivers/staging/android/ion/ion.c:194
vfs_ioctl fs/ioctl.c:47 [inline]
do_vfs_ioctl+0x55c/0xcb4 fs/ioctl.c:699
ksys_ioctl fs/ioctl.c:714 [inline]
__do_sys_ioctl fs/ioctl.c:721 [inline]
__se_sys_ioctl fs/ioctl.c:719 [inline]
__arm64_sys_ioctl+0xa0/0xe4 fs/ioctl.c:719
__invoke_syscall arch/arm64/kernel/syscall.c:36 [inline]
invoke_syscall arch/arm64/kernel/syscall.c:48 [inline]
el0_svc_common+0x130/0x294 arch/arm64/kernel/syscall.c:117
el0_svc_handler+0xdc/0xec arch/arm64/kernel/syscall.c:163
el0_svc+0x8/0xc arch/arm64/kernel/entry.S:1031

Ideally we would change the dma-buf code to ensure that the
dma_buf_dentry_ops ops are set on the dma-buf dentry after the dentry's
d_fsdata has been set, however there does not appear to be a clean way to
do this.
For example if the dma_buf_fs_type was changed so that it's dops weren't
configured the alloc_file_pseudo function would still assign the anon_ops
to the dma-buf dentry, and if we then tried to configure the dma-buf
dentry's dentry_operations later on, using d_set_d_op, the function would
WARN since the dma-buf's dentry already has its dentry_operations
configured.

So instead change the dma_buf_dentry_ops functions to handle the case
where the dma-buf dentry's d_fsdata may be NULL.

Change-Id: Idb1ef749c623b17fb8b7ce90f0c472a5ba298297
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2020-09-21 09:20:34 -07:00
qctecmdr
423554d65f Merge "cnss2: Release qmi handle after server exit" 2020-09-21 09:03:13 -07:00
qctecmdr
5949b2625e Merge "msm: kgsl: Add timeline traces" 2020-09-21 09:03:13 -07:00
Mayank Grover
2839e6cbe4
defconfig: msm: Enable minidump feature configs on holi
Enabling minidump feature configs for holi target.

Change-Id: I41022790f952fea70600fe4d22cd458873312070
Signed-off-by: Mayank Grover <groverm@codeaurora.org>
2020-09-21 20:32:16 +05:30
Ashish Bhimanpalliwar
3347f238c8
defconfig: msm: Enable QCOM_INITIAL_LOGBUF for holi
Enable CONFIG_QCOM_INITIAL_LOGBUF for Holi. This enables
copying of dmesg logs into separate buffer at 100 sec from
bootup.

Change-Id: I36b7addc6060fc6cea03cc2cf006d454c9a1a6d6
Signed-off-by: Ashish Bhimanpalliwar <abhiman@codeaurora.org>
2020-09-21 20:31:38 +05:30
Gaurav Kohli
15911b869f trace: Fix race in trace_open and buffer resize call
Below race can come, if trace_open and resize of
cpu buffer is running parallely on different cpus

CPUX                                CPUY
				    ring_buffer_resize
				    atomic_read(&buffer->resize_disabled)
tracing_open
tracing_reset_online_cpus
ring_buffer_reset_cpu

rb_reset_cpu
				    rb_update_pages
				    remove/insert pages

resetting pointer

This race can cause data abort or some times infine loop in rb_remove_pages
and rb_insert_pages while checking pages for sanity.

Take ring buffer lock in rb reset to avoid resetting of cpu buffer.

Change-Id: I1d3344cca99e936d4e04a0e430e0ef9a975404c8
Signed-off-by: Gaurav Kohli <gkohli@codeaurora.org>
2020-09-21 07:51:38 -07:00
qctecmdr
04dae11da1 Merge "msm: kgsl: Fix DMA API warnings" 2020-09-21 06:03:02 -07:00
qctecmdr
cbd5b7fafc Merge "usb: dwc3: Drive a pulse on DP on CDP detection" 2020-09-21 06:03:01 -07:00
qctecmdr
c9879ecde9 Merge "dt-bindings: msm: Add bindings for MP limit fuse support" 2020-09-21 06:03:01 -07:00
Pavankumar Kondeti
ce9e2f4ffd sched/walt: Improve the scheduler
This change is for general scheduler improvement.

Change-Id: I7a9b4008cdf7082f8ce3645bf5459b4afff1ff8a
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2020-09-21 17:18:19 +05:30
Paras Singh Jain
384bf8b4cf usb: gadget: increase the buffer size to 1 MB for tty ports
To support LTE peak data rates of 150MBPS Uplink for DUN+SoftAP usecases

Change-Id: I947b6338661cab3d3346d280b3ec4ccbac6b2f94
Signed-off-by: Paras Singh Jain <parassin@codeaurora.org>
2020-09-21 16:56:56 +05:30
Fenglin Wu
cd3230bf33 hwmon: amoled-ecm: add support to re-enable ECM dynamically
When ECM is enabled, disable ECM if display goes blank, and reenable
ECM once display restores to unblank. This helps in keeping ECM HW
enabled only when display is active.

Meanwhile, update the logic a little bit on calculating the average
current. When any of the accumulated values is invalid, just ignore
the calculation instead of disabling the ECM.

Change-Id: Ibfe973df4dabd1b1cd48927ce567a094da6382a3
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2020-09-21 19:14:23 +08:00
Prateek Sood
2894bfa77c edac: improve gold CPU cache way parsing
Improve gold CPU cache way parsing. Gold cores uses
bit[31:28] of ERR0MISC0.

Change-Id: I24bd9f1e78829fc37eceb1a09871dab38ec8eacb
Signed-off-by: Prateek Sood <prsood@codeaurora.org>
2020-09-21 13:20:49 +05:30
qctecmdr
c55c540878 Merge "soc: qcom: Add a die notifier for qcom watchdog" 2020-09-21 00:15:06 -07:00
qctecmdr
c0c76e1d77 Merge "dt-bindings: input: touchscren: add description for synaptics_dsx" 2020-09-21 00:15:06 -07:00
qctecmdr
b44e32c8f5 Merge "rpmsg: glink: Append glink irq name with remote edge name" 2020-09-21 00:15:06 -07:00
Sujeet Kumar
a4c534819e USB: f_fs: Fix epfile crash during composition switch
epfile's ep pointer may be NULL during adb transfer
and composition switch happening in parallel. As part
of composition switch, first it is set to NONE. Setting
sys.usb.config to NONE stops adb and disables the composition.
stop adb is not blocking call and adb still might be doing
epfile read/write for some time when function unbind is
ongoing making the data structures NULL.

To fix this crash, call usb_ep_dequeue only if ep->ep is
valid. Similarly in success case, return ep->status only
if ep->ep is valid otherwise return -ENODEV.

Change-Id: Ic152fc1db31cad6f97b8d16d91350dad857a4bf9
Signed-off-by: Sujeet Kumar <ksujeet@codeaurora.org>
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2020-09-20 23:25:57 -07:00
Deepak Kumar Singh
4ad4c3678c rpmsg: glink: Append glink irq name with remote edge name
Glink irq for all the remote edges are registered with same name
glink-native. It is difficult to distinguish each irq in logs.

Appending remote edge name to generic irq name.

Change-Id: I6ead87e0e4adae204535b599d07d9471387c861b
Signed-off-by: Deepak Kumar Singh <deesin@codeaurora.org>
2020-09-20 21:39:26 -07:00
Ravikanth Tuniki
9fed4d8bdd dt-bindings: input: touchscren: add description for synaptics_dsx
Add new file for synaptics_dsx touchscreen drive IC.

Change-Id: I92e089bfad8736e286fd308e98b5b5daf5fefeed
Signed-off-by: Ravikanth Tuniki <rtunik@codeaurora.org>
2020-09-20 20:51:28 -07:00
Linyu Yuan
a95ce1f890 usb: misc: nb7vpq904m: remove panic operation
it is an empty function.

Change-Id: I6b34ea0280f30169e93c819d037c323dcf1f8bee
Signed-off-by: Linyu Yuan <linyyuan@codeaurora.org>
2020-09-21 11:34:22 +08:00
qctecmdr
febeb7a60c Merge "cnss2: Remove 0 MSI data check" 2020-09-20 08:04:09 -07:00
qctecmdr
12ac06dbe2 Merge "usb: misc: nb7vpq904m: remove register read operation" 2020-09-20 08:04:08 -07:00
qctecmdr
fe8c0cb810 Merge "usb: dwc3-msm: Clean up gsi_prepare_trbs()" 2020-09-20 08:04:07 -07:00
qctecmdr
cc6e26a7fe Merge "defconfig: msm: Enable pinctrl-yupik driver" 2020-09-20 08:04:06 -07:00
qctecmdr
2395f4189c Merge "input: touchscreen: synaptics_dsx: Fix Propagation" 2020-09-20 02:12:31 -07:00
qctecmdr
662c5c0839 Merge "input: touchscreen: Enable Synaptics DSX touch driver" 2020-09-20 02:12:30 -07:00
qctecmdr
5ccc883e1d Merge "ANDROID: lkdtm/usercopy: Use __va_function to find proper vm_mmap address" 2020-09-20 02:12:30 -07:00
qctecmdr
c9e3e8d236 Merge "msm: kgsl: Fix DMA API warning while dma_buf_map_attachment()" 2020-09-20 02:12:30 -07:00
qctecmdr
94186423ce Merge "icnss2: Add vbatt feature code for holi" 2020-09-20 02:12:29 -07:00
qctecmdr
5e862167df Merge "cpuidle: lpm-levels: Core isolation check to get PM QoS latency" 2020-09-20 02:12:29 -07:00
qctecmdr
f2918b8a6e Merge "drivers: thermal: qmi_sensors: Add MSM_SKIN_THERM qmi sensors" 2020-09-20 02:12:29 -07:00
qctecmdr
bba4d8f645 Merge "msm: kgsl: Skip DTCM and NMI if SMMU is stalled" 2020-09-20 02:12:28 -07:00
Naveen Yadav
68840cf253 clk: qcom: Update parent map to use parent_map struct
Add support to use parent_map structure for mux clk parent.

Change-Id: I3f3655387bd8a7a3046a801ece921576d4e69e4b
Signed-off-by: Naveen Yadav <naveenky@codeaurora.org>
2020-09-20 12:45:09 +05:30
Amit Nischal
203a3ea2cd clk: qcom: Check for errors during RCG read
There could be instances where the RCG configuration update or readback
could fail. Notify the caller of the failure. Add support to change
scope of mux_div_get_src_div() in order to use it globally.

Change-Id: Ica07c28cede695785db81697effcb40ab6b717d4
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Signed-off-by: Naveen Yadav <naveenky@codeaurora.org>
2020-09-20 12:29:11 +05:30
qctecmdr
aab4a9f9c3 Merge "arm: defconfig: Enable RPMH clock driver for sdxlemur" 2020-09-19 23:25:49 -07:00
qctecmdr
8c40d56db2 Merge "msm: adsprpc: remove redundant check for static PDR handle" 2020-09-19 23:25:48 -07:00
qctecmdr
8290f255fc Merge "aarch64: defconfig: Cleanup the lahaina_GKI.config" 2020-09-19 23:25:48 -07:00
qctecmdr
e28ee47706 Merge "cnss2: Initialize params for error path" 2020-09-19 23:25:48 -07:00
qctecmdr
f81e2b21f7 Merge "kernel: time: Restore original wheel index calculation" 2020-09-19 23:25:48 -07:00
qctecmdr
1ba8da95ea Merge "soc: qcom: msm_glink_ssr: Notify on powerup failure" 2020-09-19 23:25:47 -07:00
qctecmdr
a88dee55bd Merge "Revert "iommu/arm-smmu: Add support to disable page-table coherency"" 2020-09-19 23:25:47 -07:00
qctecmdr
7d2d40a830 Merge "defconfig: lahaina-gki: disable the fixed regulator driver" 2020-09-19 20:35:23 -07:00
qctecmdr
d8a075511d Merge "iio: qcom-spmi-adc5: Handle EOC properly" 2020-09-19 20:35:23 -07:00
qctecmdr
e7d08db3d3 Merge "power: supply: qti_battery_charger: Handle probe failure gracefully" 2020-09-19 20:35:23 -07:00
qctecmdr
df9d0dbc9a Merge "leds: qti-flash: Enable zero brightness symmetry distribution" 2020-09-19 20:35:22 -07:00
qctecmdr
498879b848 Merge "cnss2: Avoid dereferencing pointer before NULL check" 2020-09-19 20:35:22 -07:00