Commit graph

891,112 commits

Author SHA1 Message Date
qctecmdr
11cd834e3c Merge "cnss2: Log a message after assert/de-assert WLAN_EN GPIO" 2020-09-25 10:11:37 -07:00
qctecmdr
4e16ed70f3 Merge "power: qpnp-smb5: Modify the usage of INPUT_CURRENT_LIMIT in batt_psy" 2020-09-25 10:11:37 -07:00
qctecmdr
0d177e5dc6 Merge "dma-buf: Handle dentry->d_fsdata being NULL" 2020-09-25 10:11:36 -07:00
Yue Ma
a3c77b62e8 cnss2: Log a message after assert/de-assert WLAN_EN GPIO
Print after successfully assert/de-assert WLAN_EN GPIO for
debug purpose.

Change-Id: I3094252cf2f14d7a5e438ea8a8983b9b30fc75ed
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2020-09-23 11:49:16 -07:00
qctecmdr
6a91a7d54b Merge "msm: pcie: Add additional logging in msm_pcie_drv_resume" 2020-09-22 21:18:49 -07:00
qctecmdr
c112c25edc Merge "cnss2: change for fixed link speed" 2020-09-22 21:18:48 -07:00
Hemant Kumar
0211a911fe msm: pcie: Add additional logging in msm_pcie_drv_resume
Add pcie logs to identify any possible latency in enabling
regulators, clks and icc as part of DRV resume.

Change-Id: I3cb72ce22773f0b6b52c9e704c9ec9a3a1de3d8c
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2020-09-22 16:25:36 -07:00
Manikandan Mohan
baa52351d2 cnss2: change for fixed link speed
Change for fixed link speed.

Change-Id: If2584bd534b868171d53b0b880d65cc2eeb74410
Signed-off-by: Mohammed Siddiq <msiddiq@codeaurora.org>
Signed-off-by: Manikandan Mohan <manikand@codeaurora.org>
2020-09-22 15:35:39 -07:00
qctecmdr
b3e8514aef Merge "cnss2: Correct platform driver state for cnss2" 2020-09-22 11:24:20 -07:00
qctecmdr
603419fc7b Merge "defconfig: Enable smb1355 in defconfig" 2020-09-22 11:24:20 -07:00
qctecmdr
5a3cf79c1a Merge "clk: qcom: Add enable/disable to clk_regmap_mux_div_ops" 2020-09-22 11:24:20 -07:00
qctecmdr
d95a0da22f Merge "defconfig: sdxlemur: Enable EXTCON_QCOM_SPMI_MISC" 2020-09-22 11:24:19 -07:00
Anirudh Ghayal
679e0a56d3 power: qpnp-smb5: Modify the usage of INPUT_CURRENT_LIMIT in batt_psy
Use the property INPUT_CURRENT_LIMIT to suspend and un-suspend
USB and DC paths.

Change-Id: Id0636e7c792c63156597d5db4e9087bd5fdc262f
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2020-09-22 23:07:09 +05:30
Guru Das Srinagesh
a1f3e11e0d defconfig: sdxlemur: Enable EXTCON_QCOM_SPMI_MISC
This enables the detection of VBUS going high or low on sdxlemur
platforms where USB peripheral uses VBUS_DET peripheral from PMX65.

Change-Id: I0a30944de02403ed7b777380c3e75708f033a5bc
Signed-off-by: Guru Das Srinagesh <gurus@codeaurora.org>
2020-09-22 09:58:13 -07:00
qctecmdr
75a9b99eb8 Merge "block: Fix use-after-free issue while accessing ioscheduler lock" 2020-09-22 05:18:15 -07:00
qctecmdr
19776fc1aa Merge "mmc: core: Fix issue of no clk scaling upon previous scaling failure" 2020-09-22 05:18:15 -07:00
Naveen Yadav
c7546e1c9d clk: qcom: Add enable/disable to clk_regmap_mux_div_ops
Add support for and enable and disable ops for regmap_mux_div clk, also
support for safe source for regmap_mux_div clock to park the clk to safe
source while disabling and restore to active rate when clk is enabled.

Change-Id: Ida765ec1853c2bdd17b6fce3e8012e294f4324fe
Signed-off-by: Naveen Yadav <naveenky@codeaurora.org>
2020-09-22 15:46:05 +05:30
Ashish Chavan
6126aff064 defconfig: Enable smb1355 in defconfig
Enable SMB1355 driver which controls the smb1355 parellel
charger.

Change-Id: I4b627c4fbed545d185a1b3de69738337d23dbdb0
Signed-off-by: Ashish Chavan <ashichav@codeaurora.org>
2020-09-22 02:45:31 -07:00
Shyam Kumar Thella
69966162ef power: supply: smb1355: Add support to make SMB1355 driver GKI compliant
Add support for "parallel" power supply which is not present in 5.4
kernel through IIO device and properties under it through IIO channels
under the IIO device.

Change-Id: I2f7fe8d96080ea927f1349a6742cd4e0a6ffc290
Signed-off-by: Shyam Kumar Thella <sthella@codeaurora.org>
Signed-off-by: Ashish Chavan <ashichav@codeaurora.org>
2020-09-22 15:11:08 +05:30
Shyam Kumar Thella
8bfdbcbc36 dt-bindings: iio: add IIO channels for smb1355 parallel charger
Add IIO channels required by smb1355 parallel charger device.

Change-Id: If13e445dd2d1ed8f90e17a43432858348b3c1c00
Signed-off-by: Shyam Kumar Thella <sthella@codeaurora.org>
Signed-off-by: Ashish Chavan <ashichav@codeaurora.org>
2020-09-22 15:11:07 +05:30
Ashish Chavan
6166aaf062 power: battery: Fix parallel charger iio-channel names
Get IIO failure may occur due to parallel charger's iio-channel
names conflicting with main-charger/qg channels. Fix this by adding
"pl_" prefix for all parallel charger's iio-channels name.

Change-Id: I20cb8f984b38d7053890380ea024a2ef15cf5789
Signed-off-by: Ashish Chavan <ashichav@codeaurora.org>
2020-09-22 15:10:58 +05:30
Ziqi Chen
ca56714204 mmc: core: Fix issue of no clk scaling upon previous scaling failure
If the current partition type is RPMB, clock switching may not
work properly. In this case, clk scaling up would be skipped but
clk_scaling->target_freq has been changed and then discard sub-
sequent clk scaling up requests till meet scaling down. Changing
judgement condition clk_scaling->target_freq == *freq to clk_scaling
->curr_freq == *freq in mmc_devfreq_set_target to avoid this issue.

Change-Id: Id0636e7c792c63156597d5db4e9087bd5fdc2621
Signed-off-by: Ziqi Chen <ziqichen@codeaurora.org>
2020-09-22 16:40:44 +08:00
qctecmdr
0e13e74f0c Merge "trace: Fix race in trace_open and buffer resize call" 2020-09-21 23:57:21 -07:00
qctecmdr
74fea8b624 Merge "clk: qcom: gpucc-shima: Keep POR enabled gpu_cc_cb_clk always ON" 2020-09-21 23:57:20 -07:00
qctecmdr
175ef591a8 Merge "msm: synx: handle callback deregistration failure" 2020-09-21 23:57:20 -07:00
qctecmdr
590a7b16ba Merge "fsa4480 : support Ananlog Audio over Type-c USB on holi" 2020-09-21 23:57:19 -07:00
Sandeep Singh
f1a76b8578 cnss2: Correct platform driver state for cnss2
Correct platform driver state for cnss2.

Change-Id: I5dda8b2737533cd3927a3178029b465ebe89fc64
Signed-off-by: Sandeep Singh <sandsing@codeaurora.org>
2020-09-22 11:57:27 +05:30
qctecmdr
804a2d5b22 Merge "cnss2: Notify MHI to use already allocated images" 2020-09-21 21:02:51 -07:00
qctecmdr
88dd3569e6 Merge "clk: qcom: Update parent map to use parent_map struct" 2020-09-21 21:02:50 -07:00
qctecmdr
38df3556eb Merge "extcon: qcom-spmi: Add support for VBUS detection" 2020-09-21 18:12:27 -07:00
qctecmdr
2cb49d5ea4 Merge "hwmon: amoled-ecm: add support to re-enable ECM dynamically" 2020-09-21 18:12:26 -07:00
qctecmdr
838c5fc505 Merge "haven: irq_lend: add support for IRQ notifications" 2020-09-21 18:12:26 -07:00
Murali Nalajala
e98e9702f5 haven: irq_lend: add support for IRQ notifications
Currently IRQ APIs are combined with notifications to VMs for sharing the
handles. This limit the clients for managing the error handling from the
drivers. Hence separate the notifications from the actual APIs so that
clients manage the error handling better. Add support for notifications
like IRQ_LEND/ACCEPT/RELEASE from SVM to PVM when SVM accept the irq
handle shared by PVM.

Change-Id: I49999c2d9494c68b1542680e521c012a25e3f6a8
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2020-09-21 15:14:37 -07:00
Yue Ma
fbef9467c3 cnss2: Notify MHI to use already allocated images
For firmware and RDDM images, notify MHI driver not to free them after
successful allocation. This can help avoid future memory allocation
failure.

Change-Id: Ic19d42c6d56707200099969e36da91f4afed0163
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2020-09-21 15:08:57 -07:00
qctecmdr
ac50d9af8d Merge "dt-bindings: clock: Add support for clock ids for YUPIK" 2020-09-21 15:06:35 -07:00
qctecmdr
96d58914d1 Merge "msm: kgsl: Update the mailbox message and length for ACD QMP message" 2020-09-21 15:06:35 -07:00
qctecmdr
f0421cce01 Merge "msm: kgsl: Re-define maximum number of cmds for hwscheduling" 2020-09-21 15:06:34 -07:00
qctecmdr
1f6a7259ef Merge "ANDROID: cpufreq/schedutil: add up/down frequency transition rate limits" 2020-09-21 15:06:34 -07:00
qctecmdr
7a4254dd0a Merge "msm: cvp: Make CVP SMMU fault non-fatal error" 2020-09-21 15:06:33 -07:00
qctecmdr
17f803bda2 Merge "dt-bindings: iio: Add PMX65 PMIC7 ADC support" 2020-09-21 15:06:33 -07:00
qctecmdr
b9d5927b35 Merge "power: supply: qti_battery_charger: add support for wireless FW CRC check" 2020-09-21 15:06:32 -07:00
Hemant Kumar
407257c305 mhi: core: Add support to pre allocate image buffers
This allows controller to keep the memory allocated for bhi
vector table for rddm and fbc images. Memory remains allocated
after controller powers down. Add a controller flag to make the
decision for memory allocation.

Change-Id: Ic8aee54ae57f5f9351158b18cd96faf7eeb81429
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2020-09-21 12:36:13 -07:00
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