Commit graph

592135 commits

Author SHA1 Message Date
Linux Build Service Account
7d24b9b417 Merge "ARM: dts: msm: Add remote debugger device configuration for cdsp" 2017-07-21 20:15:23 -07:00
Linux Build Service Account
afcd879a6c Merge "diag: Add NULL pointer checks" 2017-07-21 20:15:22 -07:00
Linux Build Service Account
1ee0540f23 Merge "coresight-remote-etm: Removes lock in remote_etm_rcv_msg()" 2017-07-21 20:15:21 -07:00
Linux Build Service Account
e6ef63a8a8 Merge "msm: ais: sensor: actuator: add conditional check for ioctl" 2017-07-21 20:15:20 -07:00
Linux Build Service Account
150e8fab68 Merge "msm: ADSPRPC: Add exec permission for hyp_assign_phys" 2017-07-21 20:15:19 -07:00
Linux Build Service Account
44f9f08a04 Merge "ARM: dts: msm: Update bootargs with LPM disabled for msm8996pro" 2017-07-21 11:08:30 -07:00
Linux Build Service Account
f1f963ba1f Merge "ARM: dts: msm: Add support for MSM8996pro UFS based board" 2017-07-21 11:08:29 -07:00
Linux Build Service Account
86fe8aca46 Merge "power: smb-lib: Restart charging from soft JEITA" 2017-07-21 11:08:28 -07:00
Linux Build Service Account
6d6eae7214 Merge "net/packet: fix overflow in check for tp_reserve" 2017-07-21 11:08:26 -07:00
Linux Build Service Account
5b779ed898 Merge "msm: camera: Proper use of snprintf to avoid information leak" 2017-07-21 11:08:25 -07:00
Linux Build Service Account
be95399835 Merge "diag: mhi: Fix error handling for DCI channel failure" 2017-07-21 11:08:23 -07:00
Linux Build Service Account
e3ec219ea1 Merge "cnss2: Deinit MHI before device power on during SSR" 2017-07-21 11:08:22 -07:00
Linux Build Service Account
2221afb10d Merge "USB: f_accessory: Check for length before updating accessory string" 2017-07-21 11:08:21 -07:00
Linux Build Service Account
5d3a6dd49d Merge "drm/msm: add support for HDR playback control sequence" 2017-07-21 11:08:21 -07:00
Rahul Sharma
4151bedcbe msm: ais: sensor: actuator: add conditional check for ioctl
Add conditional check when sending VIDIOC_MSM_ACTUATOR_CFG32.

Change-Id: I8f47823a9f932fe9f3fa96560f16d7da755a781f
CRs-Fixed: 2060371
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-07-21 02:30:07 -07:00
Mukesh Ojha
560dd41dff coresight-remote-etm: Removes lock in remote_etm_rcv_msg()
'commit 9021973bac ("coresight-remote-etm: Adds missing lock to avoid
race condition")' adds lock inside remote_etm_rcv_msg() which is not
needed as we are waiting inside it for a response of request made
remote_etm_enable => qmi_send_req_wait() which already holds lock
'drvdata->mutex'.

So, adding 'drvdata->mutex' inside remote_etm_rcv_msg() adds wait for
the lock and due to which not able to ack the response got which results
in timeout error qmi_send_req_wait().

This patch fixes the above mentioned issue by removing the lock added in
above mentioned commit.

Change-Id: Ie47607722ff170e012d598a2347b1c0ec6913cdf
Signed-off-by: Mukesh Ojha <mojha@codeaurora.org>
2017-07-21 13:49:34 +05:30
Tharun Kumar Merugu
0c74826be7 ARM: dts: msm: Add remote debugger device configuration for cdsp
Adding remote debugger device configuration. The Remote Debugger driver
allows a debugger running on a host PC to communicate with a remote
stub running on peripheral subsystems.

Change-Id: I4aa40846efbf11739d81a9fbe22df811903d8eee
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-07-20 23:56:44 -07:00
Anirudh Ghayal
0dfa84e381 power: smb-lib: Restart charging from soft JEITA
In the scenario where the charging is terminated in the
JEITA soft condition, the HW is expected to restart
charging when battery temperature returns back to normal.

However, this does not work as expected and the charging
stays terminated. Fix this by disabling and re-enabling
charging CMD bit to restart charging.

CRs-Fixed: 2071261
Change-Id: I81d2a89c72ede840cc561b736ce1366c65da8c42
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-07-21 07:17:13 +05:30
Lei wang
2523349096 ARM: dts: msm: Add support for MSM8996pro UFS based board
Add board-id for UFS board which has a different board sub type.

Change-Id: Ic231784c46d4439944e403e26410515856fdc5fb
Signed-off-by: Lei wang <leiwan@codeaurora.org>
2017-07-20 18:28:51 -07:00
Andrey Konovalov
ad69147ee9 net/packet: fix overflow in check for tp_reserve
When calculating po->tp_hdrlen + po->tp_reserve the result can overflow.

Fix by checking that tp_reserve <= INT_MAX on assign.

Change-Id: If3b5fd73bd440de2a1050644b71ef7430f09810f
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: bcc5364bdcfe131e6379363f089e7b4108d35b70
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2017-07-20 18:26:39 -07:00
Andrey Konovalov
dfb157d7a1 net/packet: fix overflow in check for tp_frame_nr
When calculating rb->frames_per_block * req->tp_block_nr the result
can overflow.

Add a check that tp_block_size * tp_block_nr <= UINT_MAX.

Since frames_per_block <= tp_block_size, the expression would
never overflow.

Change-Id: I183d9adb8b90010f408b5e1d0785aa06814f4348
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: 8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2017-07-20 18:24:04 -07:00
Chris Lew
6af3c64ade diag: mhi: Fix error handling for DCI channel failure
Not all targets support the DCI channel over MHI. Fix
error handling to only cleanup the failing device if
MHI registration fails.

Change-Id: I5ba23d69bc1fa3c08468d930f5f50151bfcd5bc0
Signed-off-by: Chris Lew <clew@codeaurora.org>
2017-07-20 18:13:31 -07:00
Chris Lew
c94670590b diag: mhi: Remove unnecessary sanity check
On an MHI down notification, the enabled state is set to 0 before
flushing the workqueue and buffers. This sanity check conflicts
with the down notification. Remove unneeded sanity check.

Change-Id: I6bedc353187bee907775347009e0d4157b0e35e2
Signed-off-by: Chris Lew <clew@codeaurora.org>
2017-07-20 18:12:37 -07:00
Sujeev Dias
a828392297 diag: Convert diag bridge as a platform dev
In order to support DT on DIAG, convert diag
bridge driver to platform driver.

Change-Id: I0ddecc06d9b4845d822799f3cff942789d1441c6
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-07-20 18:11:39 -07:00
Yue Ma
0c5297200a cnss2: Deinit MHI before device power on during SSR
This can make sure MHI driver can safely free the memory which
is used by WLAN firmware since device is powered off.

Change-Id: If9d891eaf1ca7c28869448b3a0a42be713e16c2e
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-07-20 17:40:59 -07:00
John Zhao
4bd8dca550 ARM: dts: msm: Update bootargs with LPM disabled for msm8996pro
Update bootargs with configuration of lpm_levels.sleep_disabled.

CRs-Fixed: 2079671
Change-Id: Iced6d6fc8e571b342a77ce49b4fa54bf511d7dbc
Signed-off-by: John Zhao <yuankuiz@codeaurora.org>
2017-07-20 13:40:11 -07:00
Hardik Arya
eb54351e06 diag: Add NULL pointer checks
Currently, there is a possibility of NULL pointer dereference
while accessing diag master table. The patch adds proper check
for null pointer while iterating over the list.

CRs-Fixed: 2077525
Change-Id: I51075b7a7f3acce0cb27822ad1acd8a5894cdaa9
Signed-off-by: Hardik Arya <harya@codeaurora.org>
2017-07-20 16:41:54 +05:30
Linux Build Service Account
7aa065cbc4 Merge "msm: vdec: Allocate max internal buffers" 2017-07-20 02:56:46 -07:00
Linux Build Service Account
8ac7aa1695 Merge "ASoc: msm: qdspv2: Fix latency calculation in pcm offload path" 2017-07-20 02:56:45 -07:00
Linux Build Service Account
68284fc997 Merge "ASoC: msm8998: modify quat mi2s clock id in slave mode" 2017-07-20 02:56:44 -07:00
Linux Build Service Account
347dbf7277 Merge "msm: ipa3: Add spinlock to avoid deleting already deleted list" 2017-07-19 17:20:49 -07:00
Abhinav Kumar
033b9198d0 drm/msm: add support for HDR playback control sequence
HDR playback needs metadata to be sent to the sink
while the playback is ongoing and needs a proper
teardown sequence when the playback has ended with respect
to the infoframe being sent to the sink.

This needs a state machine to synchronize start/stop of
the playback with sending the right metadata along with
resetting the infoframe HDMI registers.

Add support for this HDR playback control state machine.

Change-Id: I229183531f7ccb48579e74d02e0a1dea1cb945ff
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-07-19 13:05:55 -07:00
Linux Build Service Account
8a9f65f16a Merge "msm: vdec: Updating DCVS buf count if thumbnail mode is enabled" 2017-07-19 09:10:37 -07:00
Linux Build Service Account
1882097f98 Merge "msm: vidc: Fix issue in cache operation range" 2017-07-19 09:10:36 -07:00
Linux Build Service Account
dce705e421 Merge "ARM: dts: msm: Add fixed regulator for WLAN_EN pin in MSM8996" 2017-07-19 09:10:35 -07:00
Linux Build Service Account
cfbf44c503 Merge "usb: dwc3-msm: Add sysfs node to enable SS host compliance" 2017-07-19 09:10:34 -07:00
Linux Build Service Account
56b24afda6 Merge "diag: Add protection while de-initializing clients" 2017-07-19 09:10:33 -07:00
Linux Build Service Account
cb08d85f02 Merge "usb: gadget: f_qdss: Add support for mdm qdss channel" 2017-07-19 09:10:32 -07:00
Linux Build Service Account
333b2311aa Merge "msm: mdss: Fix possible memory overwrite in pgc config" 2017-07-19 09:10:30 -07:00
Linux Build Service Account
e4fd571dd3 Merge "security: pfe: Synchronize the file key usage" 2017-07-19 09:10:29 -07:00
Linux Build Service Account
f40ff25a8f Merge "msm: ipa: fix to incorrect structure access" 2017-07-19 09:10:28 -07:00
Linux Build Service Account
8ee12d5cb2 Merge "msm: ADSPRPC: avoid sending new requests to dsp while device_release" 2017-07-19 09:10:27 -07:00
Linux Build Service Account
42029fbe8c Merge "msm: mdss: dp: fix watchdog reset with DP connected in AOD mode" 2017-07-19 09:10:27 -07:00
Tharun Kumar Merugu
8048977b41 msm: ADSPRPC: Add exec permission for hyp_assign_phys
Add execute permission for hyp_assign_phys for adsp shared
memory region to allow for the memory to be reused by other user
space processes when this is not used by the remote processor.

Change-Id: I4f593584f332f8dc775afb68e6bfae1ea8f803fa
Acked-by: Viswanatham Paduchuri <vpaduchu@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-07-19 00:56:19 -07:00
Mohammed Javid
b10627f358 msm: ipa3: Add spinlock to avoid deleting already deleted list
There is a chance of deleting, already deleted list
in ipa_cleanup_wlan_rx_common_cache API.

Protect the wlan_comm_desc_list,
with the spinlock to avoid this deletion.

Change-Id: I10161f71b92d6d5fe06af62b65bf3d92d0d4512a
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2017-07-19 00:53:47 -07:00
Vijayavardhan Vennapusa
a5eddc1f77 USB: f_accessory: Check for length before updating accessory string
It is possible that host sends SEND_STRING control request with zero
length and in that case, driver ends up setting string as NULL. This
results in CTS failure for accessory test. Hence add check for length
and update string only if length is nonzero.

Change-Id: I4594a46f830f45fc49f80a74ec6042383edf007d
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-07-19 11:20:48 +05:30
Yue Ma
33978c4cc4 ARM: dts: msm: Add fixed regulator for WLAN_EN pin in MSM8996
Since the PMIC GPIO runtime configuration is not feasible using
pinctrl framework, add it as fixed regulator for WLAN_EN pin.

Signed-off-by: Yue Ma <yuem@codeaurora.org>
CRs-fixed: 2071634
Change-Id: Ifd08bac34388389c6aced7e450cbf5c6ae37b36d
2017-07-18 12:44:34 -07:00
Linux Build Service Account
8069e32933 Merge "msm: sde: rotator: Enable traffic shaper for 4k@60fps layer" 2017-07-18 11:51:43 -07:00
Linux Build Service Account
d2783f3e57 Merge "msm: ais: Fix NULL pointer dereference in msm.c." 2017-07-18 11:51:42 -07:00
Linux Build Service Account
cd8e767d77 Merge "msm: ais: fix crash during dumping io register" 2017-07-18 11:51:41 -07:00