Commit graph

592125 commits

Author SHA1 Message Date
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
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
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
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
Linux Build Service Account
ae8ba0547c Merge "msm: camera: sensor:validating the flash initialization parameters" 2017-07-18 11:51:40 -07:00
Linux Build Service Account
95cc997128 Merge "msm: camera: sensor: Fix a bug in CCI with I2C write" 2017-07-18 11:51:39 -07:00
Linux Build Service Account
32c410413b Merge "msm: camera: isp: Store the user ahb vote" 2017-07-18 11:51:38 -07:00
Neeraj Soni
2b364203d6 security: pfe: Synchronize the file key usage
Reference count is maintained to track the usage
of file key. This is required to avoid invalidate
operation while a file key is in active usage.

Change-Id: I8f6f562ec9a006e585503413c2196685535a5098
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-07-18 16:33:31 +05:30
Linux Build Service Account
95dbfdb0a5 Merge "msm: sensor: actuator: add conditional check for ioctl" 2017-07-18 03:06:57 -07:00
Linux Build Service Account
1f14d5b785 Merge "usb: pd: policy_engine: Add support to handle floating charger" 2017-07-18 03:06:55 -07:00
Linux Build Service Account
b52f6435ab Merge "qseecom: update on smcinvoke-aware listeners operations" 2017-07-18 03:06:54 -07:00
tharun kumar
86ad5044c3 msm: ADSPRPC: avoid sending new requests to dsp while device_release
When fastrpc_device_release is in progress, don't send any new
requets to DSP

Change-Id: I4d9e2f06485cde6dbd3d7aef402e3e853e0be998
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-07-18 02:47:45 -07:00
Mohammed Javid
17ecb3776a msm: ipa: fix to incorrect structure access
Accessing of incorrect structure pointer is causing
memory out of bound access, fixed issue by accessing
the correct structure pointer.Missed changes in previous
commit I3c2f5f7a97ca ("msm:ipa: Fix to incorrect structure access")
for proc header table cookie variable.Added missing changes.

Change-Id: I9260b8a4d4db0e76eb3849f64174e33e075d3736
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2017-07-18 12:01:26 +05:30
kaiwang
379e41427b msm: camera: sensor:validating the flash initialization parameters
Copying the flash initialization parameters from userspace memory to
kernel memory and in turn checking for the validity of the flash
initialization parameters pointer sent from userspace

CRs-Fixed: 2059812
Change-Id: I957c10959108eb08b263d439a9a449b90338b6db
Signed-off-by: kaiwang <kaiwang@codeaurora.org>
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
2017-07-17 23:14:14 -07:00