Commit graph

593085 commits

Author SHA1 Message Date
Linux Build Service Account
a5665f1625 Merge "ARM: dts: msm: Align to published memory map for sdm636" 2017-08-23 09:30:04 -07:00
Linux Build Service Account
d4c70706b7 Merge "diag: Fix possible usage of freed resource issue" 2017-08-23 09:30:03 -07:00
Jitendra Sharma
f58b8337c2 ARM: dts: msm: Align to published memory map for sdm636
Remove cdsp pil node and corresponding carveout region,
also add 1MB buffer at MBA boundary for sdm636.

Change-Id: I6adb0f2ed37559b91d0b607c729e66142f49e86f
Signed-off-by: Jitendra Sharma <shajit@codeaurora.org>
2017-08-22 22:44:02 -07:00
Srinivas Ramana
6f062b7e60 socinfo: Add support for SDM/A 636 SOCs
Add socinfo support and CPU IDs for SDM636
and SDA636 SOCs.

Change-Id: If14654c3fb93a52e4db0270e60cb6e6371ef077f
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2017-08-22 22:43:13 -07:00
Srinivas Ramana
3e59abb4d5 ARM: dts: msm: Add device tree support for SDM/A 636
Add the required device tree files to support all the platforms
with SDM636 and SDA636.

Change-Id: Iff673b1626acb2bb83c0b7706b118e24919c3934
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2017-08-22 22:39:32 -07:00
Linux Build Service Account
e243bb8502 Merge "drm/msm: fix hdcp 1x module for repeater test cases" 2017-08-22 18:56:14 -07:00
Linux Build Service Account
1633cf74a4 Merge "cnss2: Add debugfs entries for register read/write" 2017-08-22 18:56:13 -07:00
Linux Build Service Account
853dc76799 Merge "tracing: fix race condition reading saved tgids" 2017-08-22 18:56:12 -07:00
Linux Build Service Account
f74e83da80 Merge "msm: sensor: Fix crash when ioctl VIDIOC_MSM_SENSOR_INIT_CFG" 2017-08-22 18:56:11 -07:00
Haibin Liu
22c9c625bd msm: sensor: Fix crash when ioctl VIDIOC_MSM_SENSOR_INIT_CFG
the invalid data of sensor_init_cfg_data, is used by
msm_sensor_driver_probe. This cause crash when ioctl
VIDIOC_MSM_SENSOR_INIT_CFG repeatedly and aggressively.

Change-Id: Idffcd3b82b9590dbfdcaf14b80668cc894178f54
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
2017-08-22 06:46:50 -07:00
Linux Build Service Account
232b0f15cc Merge "ASoC: core: Fix possible NULL pointer dereference" 2017-08-22 04:11:35 -07:00
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
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
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