Commit graph

592339 commits

Author SHA1 Message Date
Linux Build Service Account
e85a3cbb06 Merge "crypto: ice: Remove redundant checks" 2017-07-22 04:08:02 -07:00
Linux Build Service Account
2b487d2603 Merge "ath10k: wait for peer delete resp after every peer delete" 2017-07-21 20:15:27 -07:00
Linux Build Service Account
61f5287f13 Merge "ath10k: skip vdev down command before vdev restart for wcn3990" 2017-07-21 20:15:26 -07:00
Linux Build Service Account
2c1e981c40 Merge "msm: thermal: fix return value check for scm_is_secure_device() API" 2017-07-21 20:15:25 -07:00
Linux Build Service Account
b7cd152c17 Merge "mmc: sdhci: Enable CDR for cmdq mode" 2017-07-21 20:15:24 -07:00
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
Yuanyuan Liu
2e16671480 icnss: Consolidate logging message
Currently the code makes liberal use of macros that print a log message
(with pr_err or pr_debug) and then passes the same string on to the
IPC logging mechanism. The problem is that it doesn't actually end up
being the same string in the binary. Using pr_err or one of its friends
appends the KERN_* code to the front of the string with the pre-processor
and the IPC logger just uses the passed in string. Every string used by
the macros ends up appearing twice in the binary, once with KERN_*
prepended and the other not.

This change fix this duplication issue by appending KERN_* to the front
of the IPC logger.

Change-Id: Ibfdf9edf6e243d13cacf1a45838a88e287a684be
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2017-07-21 15:06:46 -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
Clarence Ip
7477f5db6e drm/msm/sde: disable vblank ref power on crtc disable
Update vblank reference counts via the exposed sde_crtc_vblank
function, rather than attempting to zero it on the side during
CRTC disable operations. This allows the power voting to be
updated correctly based on the vblank reference count value.

CRs-Fixed: 2037677
Change-Id: I7026a1b239503a2b1d97ad7bb61fbc0a4a38d7ea
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-07-21 11:26:54 -04:00
Clarence Ip
e67107812d drm/msm/sde: output black frame during resume operation
This patch provides a module parameter to control whether each
plane outputs the previously configured content or a black frame
during the resume operation. The default is set to output a
black frame.

CRs-Fixed: 2019307
Change-Id: I48c1a8edfa1e85252a070bda51228ef67dea041c
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-07-21 11:26:47 -04:00
Clarence Ip
081178b8fd drm/msm/sde: dispatch suspend/resume notification to cp
This change enables the appropriate callbacks to the color
processing component on suspend/resume transitions.

CRs-Fixed: 2019307
Change-Id: I7b8c9eb2b32da42e36d32e9d88e74e0c0c7b1ecb
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-07-21 10:59:20 -04:00
Clarence Ip
864edc591c drm/msm/sde: move power resource handling for vblank to crtcs
Move the power resource request/release from the sde kms layer
into the CRTCs so that proper accounting for suspend/resume
operations may be done. A single power resource request is
made as long while the CRTC's vblank request ref count is not
zero and the driver is not in a suspended state.

CRs-Fixed: 2019307
Change-Id: I2d47567ec3dded72faed8bd5441d8d4653d5ef25
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-07-21 10:51:14 -04:00
Clarence Ip
4fc53f0d46 drm/msm/sde: reset drm state on suspend/resume
Explicitly disable connector DPMS and CRTC active states on
system suspend, and restore the previous state during a
system resume. This allows the underlying drivers to trigger
a DPMS callback for handling any panel related power disables
while still preserving the DRM atomic state.

CRs-Fixed: 2019307
Change-Id: Ib9933e4bc8b43c64def777b081d4315e5dbb7365
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-07-21 10:50:13 -04:00
Clarence Ip
1331c9a856 drm/msm/sde: allow forcing of kernel scaler calculation
This patch adds a debugfs entry to the planes to force the driver
to ignore any custom scaler configuration from the user space.

CRs-Fixed: 2019305
Change-Id: I98596a1aaa0629ca1bfe81ab5c01a0d7854859e3
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-07-21 10:50:12 -04:00
Clarence Ip
e9e11292d7 drm/msm/sde: add null checks to scaler3 lut setup
Plane state is set to NULL during color fill operations.
This patch adds checks to gracefully handle NULL plane
state during the scaler3 setup path.

CRs-Fixed: 2019301
Change-Id: I3ac5bd8f26e68afe559bf7c815da904392d3de13
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-07-21 10:50:11 -04:00
Tharun Kumar Merugu
bcd8434f47 msm: ADSPRPC: Handle SMD event signal
Handle multiple sessions properly for given channel.

Change-Id: I3061fd883794da0465bfdae2b1c19d425ede7470
Acked-by: Krishnaiah Tadakamalla <ktadakam@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-07-21 07:17:52 -07:00
Neeraj Soni
c1ab2e8a1a crypto: ice: Remove redundant checks
Check is implemented in required function as part of
new implementation.

Change-Id: I346cd27cb254abe7d9706f01a9b463750614245e
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-07-21 19:19:53 +05:30
Ashutosh Kumar
15eb4216a4 ath10k: skip vdev down command before vdev restart for wcn3990
Vdev restart command triggers a vdev down and vdev stop in the
firmware. We do not need to send vdev down before sending vdev
restart to the firmware.

Skip vdev down command before we send the vdev restart command
for wcn3990 in the case of change in the channel context.

CRs-Fixed: 2079703
Change-Id: Idb611ec9ae8d40c7f7c3fe6efe853bf4c60d3123
Signed-off-by: Ashutosh Kumar <askuma@codeaurora.org>
2017-07-21 19:16:27 +05:30
Manaf Meethalavalappu Pallikunhi
a72f768c6b msm: thermal: fix return value check for scm_is_secure_device() API
KTM ignores software secure watchdog bite if it is a secure device
since this call support is not there in secure device. But API
scm_is_secure_device() returns false if it is secure device,
true otherwise. But KTM return value check is wrong and leads to
no secure watchdog bite call from KTM for all targets.
Fix return value check properly in KTM to resolve this issue.

Change-Id: I1612fee3f57f6c2d27c4329abc2c563b7b1d8102
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2017-07-21 17:21:53 +05:30
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
Rakesh Pillai
f056b1e528 ath10k: wait for peer delete resp after every peer delete
Peer create fails if the same peer has not been
properly deleted earlier.

Peer delete response indicates the successful deletion
of a peer. Wait for peer delete resp after every peer
delete cmd.

CRs-Fixed: 2079668
Change-Id: I48d6787a42f79d3ce1225c885ca9fa159ef6df77
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-07-20 23:34:50 -07:00
Abhilash Kumar
9b0026e54f msm: kgsl: Update total time at right place for accurate GPU busy
For calculation of busy time and total time, KGSL relies on perf
counters and CPU clock. These can be a bit out of sync and may
give GPU busy greater than 100 percent. Updating time at the right
place will give more accurate total time and will avoid crossing
100% in GPU busy calculation.

Change-Id: I3cc702492325b9dc44ea2b705e4d9014d95abd33
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-07-21 10:49:25 +05:30
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
Badhri Jagan Sridharan
ba29279a5a ANDROID: android-verity: mark dev as rw for linear target
Mark as rw when adding as linear target to allow changes
to the underlying filesystem through adb disable verity
and adb remount.

(Cherry-picked from
https://partner-android-review.googlesource.com/#/c/613573/
79a3032bb62da65a5d724eb70c8bdc662945d475)

BUG: 28845874
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: If41e9cad8e0f054f4778c09a6e2f0cb8af6fddaf
Git-commit: 492a6047e7
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-07-20 17:22:02 -07:00
Derek Chen
c429531427 ASoC: msm: Add FE dai for MultiMedia21 for ASM Loopback
Adding ASM Loopback FE Dai, MultiMedia21, for HFP call
downlink.

CRs-fixed: 2069348
Signed-off-by: Derek Chen <chenche@codeaurora.org>
Change-Id: I38f0c1ea71568eff2ba789cbe2d41b950c77f232
2017-07-20 14:11:18 -07:00
Derek Chen
778f131a01 ASoC: msm: qdsp6v2: Add MultiMedia21 capture and routing
Add MultiMedia21 capture and routing support for ASM
loopback from AUX PCM TX to QUAT TDM RX.

CRs-fixed: 2069348
Signed-off-by: Derek Chen <chenche@codeaurora.org>
Change-Id: I632392d98092ff31fa9bdb13c02eef8c2a0a54a3
2017-07-20 14:08:05 -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
Haynes Mathew George
7357058c09 ASoC: msm: qdsp6v2: Reserve MultiMedia16 for NOIRQ
Reserve MultiMedia16 for second instance of NOIRQ

CRs-Fixed: 2071838
Change-Id: I6a75d9a5e85585f65262ce486c992402ac58bf5f
Signed-off-by: Haynes Mathew George <hgeorge@codeaurora.org>
2017-07-20 12:42:13 -07:00
Mukesh Kumar Savaliya
4807405523 serial: msm_serial_hs: Modify wakeup handler disablement and processing
Make sure to disable wakeup irq synchronously as in an aggressive
scheduling system if it's asynchronous then unserved interrupt can
get scheduled later. In addition remove the threaded handler and
configure as an ISR to not have scheduler impact on functionalities.

Change-Id: Id525d5295834b73c2f42d52f0e363f0bdec1d22a
Signed-off-by: Mukesh Kumar Savaliya <msavaliy@codeaurora.org>
2017-07-20 16:42:28 +05:30