Commit graph

593133 commits

Author SHA1 Message Date
Linux Build Service Account
af6102c60e Merge "msm: sensor: Add mutex lock during ois power down operations" 2017-08-22 04:11:35 -07:00
Linux Build Service Account
a39227b922 Merge "tracing: Revert commits improving handling of saved_tgids" 2017-08-22 04:11:33 -07:00
Linux Build Service Account
9e200511bc Merge "ARM: dts: msm: Enable laser sensor on sdm630 MTP" 2017-08-22 04:11:32 -07:00
Linux Build Service Account
c0ee484da1 Merge "ion: Convert allocation counters to long" 2017-08-22 04:11:31 -07:00
Linux Build Service Account
0d782ac54b Merge "dwc3: Add required support to get lfps_rxterm interrupt from SS_PHY" 2017-08-22 04:11:24 -07:00
yidongh
76870985af ASoC: msm: qdspv2: initialize struct member before being used
Initialize member value of struct audio_aio_write_param after declaration.

CRs-Fixed: 2091953
Change-Id: Iaf3ff1232e85ae8d26e9d97ce4c2aa3408da7a80
Signed-off-by: Yidong Huang <yidongh@codeaurora.org>
2017-08-22 02:15:34 -07:00
yidongh
4c78ad9740 ASoC: APR: initialize struct member before being used
Initialize member value of struct apr_client_data after declaration.

CRs-Fixed: 2091948
Change-Id: I8a185ebd4126f7d064de90bf652bc96c2ab7b408
Signed-off-by: Yidong Huang <yidongh@codeaurora.org>
2017-08-22 01:36:18 -07:00
Meng Wang
214496cb3d ASoC: core: Fix possible NULL pointer dereference
When SSR is triggered when the system does not have a sound card
registered, but has codecs. The pointer card sent from codec driver
to snd_soc_card_change_online_state is NULL. Add null check for soc_card
before dereferencing.

Change-Id: I23342a6cbd9d53e62b2ea11dfe79aad3759df6f0
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-08-21 23:05:03 -07:00
Linux Build Service Account
47b13c41e7 Merge "usb: pd: simplify pd_phy_write() and pd_phy_signal() usage" 2017-08-21 20:01:19 -07:00
Linux Build Service Account
5f76ac9d86 Merge "msm: ADSPRPC: validate user buffers after copying from user" 2017-08-21 20:01:11 -07:00
Linux Build Service Account
fc59d81f3e Merge "leds: leds-qpnp: Set PWM channel operational mode explicitly" 2017-08-21 20:01:10 -07:00
Linux Build Service Account
a11dada42d Merge "usb: pd: force disconnect upon unexpected SRC->SNK transition" 2017-08-21 20:01:08 -07:00
Adrian Salido
761ef1a0a0 tracing: fix race condition reading saved tgids
Commit 939c7a4f04 ("tracing: Introduce saved_cmdlines_size file")
introduced ability to change saved cmdlines size. This resized saved
command lines but missed resizing tgid mapping as well.

Another issue is that when the resize happens, it removes saved command
lines and reallocates new memory for it. This introduced a race
condition when reading the global savecmd as this can be freed in the
middle of accessing it causing a use after free access. Fix this by
implementing locking.

Signed-off-by: Adrian Salido <salidoa@google.com>
Bug: 36007735
Change-Id: I334791ac35f8bcbd34362ed112aa624275a46947
Git-repo: https://android.googlesource.com/kernel/common
Git-commit: 7116d306da66de0de21e982024b4d3a3056f4461
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2017-08-21 16:02:39 -07:00
Dennis Cagle
3fe1011f7e tracing: Revert commits improving handling of saved_tgids
This reverts commit 7005c6eec7 ("tracing: Free saved_tgids memory
in free_saved_cmdlines_buffer") and commit be0b454d52 ("tracing:
Modify saved_tgids size for change in saved_cmdline_size")

An upstream patch is now available that does the same thing and
handles additional cases as well.

Change-Id: I05cf2dc566a6425e58076ae2e9698335b6d738cc
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2017-08-21 16:00:52 -07:00
Linux Build Service Account
cb1c821645 Merge "ARM: dts: msm: Remove configuration of the 2nd ADV7533 chip on ADP Lite" 2017-08-21 12:16:36 -07:00
Linux Build Service Account
afd2fd3441 Merge "ASoC: msm: qdsp6v2: Do not reset backend pass-through mode" 2017-08-21 12:16:35 -07:00
Linux Build Service Account
da4c2cf3b3 Merge "qcom: smb138x: supsend USBIN and disable OTG before shutdown" 2017-08-21 12:16:28 -07:00
Linux Build Service Account
22b849b8f3 Merge "clk: osm: Check for valid acd offset for input from debugfs" 2017-08-21 12:16:27 -07:00
Vidyakumar Athota
e4faef1e35 ASoC: msm: qdspv2: add an API to destroy ion client
Currently ion fd is used to extract ion handle to free ion client.
ION FD is not valid if user-space application is crashed so ion handle
is returned to the client during msm_audio_ion_phys_assign() API which
is used to destroy ion client in msm_audio_ion_phys_free() API.

Change-Id: Idcc4ca838741aac26662a679117af9d9c935e630
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2017-08-21 10:56:56 -07:00
Tharun Kumar Merugu
d78cfa2316 msm: ADSPRPC: Queue one more intent to avoid race condition
Queue 2 intents for adsprpc glink channel to avoid remote
processor failure for glink.
One intent for threads responding back of size 16,
another intent for IST failure responding without intent
request of size 64.

Change-Id: I85444cb0283c57ddf15cf7d1d50b827fe5339d4c
Acked-by: Viswanatham Paduchuri <vpaduchu@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-21 10:00:02 -07:00
Rahul Sharma
d16420b459 msm: sensor: Add mutex lock during ois power down operations
Protecting operations performed during ois powerdown
from race condition by adding mutex locks.

CRs-Fixed: 2081806
Change-Id: I8a918dc306e639d50a896c8d77f8eb7a72fcb195
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-08-21 07:06:15 -07:00
Yujun Zhang
71348bdb76 ARM: dts: msm: Remove configuration of the 2nd ADV7533 chip on ADP Lite
On APQ8096 ADP Lite board, the secondary ADV7533 bridge chip is
removed and its instance is already disabled in current DTS hence
related sde_kms should also remove it. Otherwise, component master
could not find the component for the display instance and causes
drm driver probe failure.

Change-Id: I0fd694cf33eaf8b29ca86efd2ea105ac565bdba1
CRs-Fixed: 2091671
Signed-off-by: Yujun Zhang <yujunzhang@codeaurora.org>
2017-08-21 18:16:09 +08:00
Linux Build Service Account
468ba7b8f9 Merge "Merge android-4.4@9f764bb (v4.4.80) into msm-4.4" 2017-08-21 00:20:14 -07:00
Linux Build Service Account
5883338fd9 Merge "wcnss: modularize wcnss power up sequence and debug logs" 2017-08-21 00:20:13 -07:00
Linux Build Service Account
d3b34dae57 Merge "wcnss: update MAC address generate logic from the serial number" 2017-08-21 00:20:12 -07:00
Linux Build Service Account
e235763c9f Merge "icnss: Add support to validate the result and error code" 2017-08-21 00:20:11 -07:00
Linux Build Service Account
50203f7fec Merge "msm: ipa3: Fix to avoid accessing of uninitialized structure" 2017-08-21 00:20:10 -07:00
Linux Build Service Account
2a003c6ab4 Merge "soc: qcom: glink_smem_native_xprt: Fix memory leak during qos init" 2017-08-21 00:20:09 -07:00
Linux Build Service Account
b9b46f3610 Merge "drm/msm: Disable clocks when GPU is inactive" 2017-08-21 00:20:08 -07:00
Linux Build Service Account
1067bf088e Merge "ASoC: wcd-dsp-mgr: fix race during subsystem restart" 2017-08-21 00:20:00 -07:00
Linux Build Service Account
6afe3a8c3b Merge "ASoc: wcd934x-dsp-cntl: notify online event after clocks are disabled" 2017-08-21 00:19:59 -07:00
Linux Build Service Account
ba41092462 Merge "ARM: dts: msm: Add Primary TDM Node for msm8996 Hypervisor" 2017-08-21 00:19:57 -07:00
Linux Build Service Account
b897137030 Merge "msm: sensor: Add mutex lock during ois power down operations" 2017-08-21 00:19:56 -07:00
Linux Build Service Account
025604fd4e Merge "ARM: dts: msm: Update boot option for PCIe on APQ8098" 2017-08-21 00:19:56 -07:00
Linux Build Service Account
dd5490df50 Merge "msm: vidc: Fix possible out of bound array access" 2017-08-21 00:19:55 -07:00
Linux Build Service Account
95b505dfc6 Merge "power: pmic-voter: make debug status more parsable" 2017-08-21 00:19:53 -07:00
Linux Build Service Account
3d4a252808 Merge "msm: adsprpc: Avoid leak info of pointers addresses to dmesg" 2017-08-21 00:19:52 -07:00
Linux Build Service Account
19987eecbf Merge "msm: sde: remove boot warning of drm AD properties" 2017-08-21 00:19:51 -07:00
Linux Build Service Account
3403db6eab Merge "msm: mdss: do not set sink max TMDS clock for DVI device" 2017-08-21 00:19:50 -07:00
Linux Build Service Account
300a5df270 Merge "msm: sde: fix page freeing error when handing off early display" 2017-08-21 00:19:49 -07:00
Linux Build Service Account
2d27540111 Merge "soc: qcom: Modify scm_qcpe to comply with new hab API" 2017-08-21 00:19:48 -07:00
Linux Build Service Account
42be98d03f Merge "ARM: dts: msm: Enable early camera on msm8996 auto" 2017-08-21 00:19:47 -07:00
Linux Build Service Account
40bd639075 Merge "ARM: dts: msm: add support for QBT1000 on SDM660" 2017-08-21 00:19:45 -07:00
Linux Build Service Account
5cd00ff15b Merge "qbt1000: Add changes to support VOLUMEDOWN and CBGE" 2017-08-21 00:19:44 -07:00
Linux Build Service Account
f01c603a50 Merge "power: smb2: Update the charger buck frequencies for PM660" 2017-08-21 00:19:43 -07:00
Linux Build Service Account
fe66215fd0 Merge "power: qpnp-smb2: expose CHARGE_COUNTER prop via batt psy" 2017-08-21 00:19:42 -07:00
Linux Build Service Account
b8646eb8a5 Merge "usb: dwc3: msm: clear resource on dwc3_msm_probe defer" 2017-08-21 00:19:41 -07:00
Linux Build Service Account
445f7922e4 Merge "msm: ipa3: fix usb statuses exception path" 2017-08-21 00:19:40 -07:00
Wei Ding
1cc2028b25 ARM: dts: msm: Enable laser sensor on sdm630 MTP
Add the laser device with the required GPIO and
regulator configuration for sdm630 MTP.

Change-Id: I8800d870c41dfc7a74ab2adcf4f0349af8e5f87d
Signed-off-by: Wei Ding <weiding@codeaurora.org>
2017-08-21 14:28:34 +08:00
Manish Dewangan
aa91dc149f ASoC: msm: qdsp6v2: Do not reset backend pass-through mode
Backend pass-through mode is reset to LEGACY_PCM during routing close.
This results in opening of adm with non pass-through path type for
pass-through session if device switch is done during pass-through
session.
Fix this by avoid resetting Backend passthrough-mode.

Change-Id: Ia1ea10ce68ba04a72416827661b6fdc2abd48b3c
Signed-off-by: Manish Dewangan <manish@codeaurora.org>
2017-08-20 21:05:13 -07:00