Commit graph

591178 commits

Author SHA1 Message Date
Linux Build Service Account
af39cfe11e Merge "sched: avoid migrating when softint on tgt cpu should be short" 2017-06-22 14:00:20 -07:00
Linux Build Service Account
47f3f67114 Merge "arm64: dma-mapping: fix aliasing issues with non-CMA alloc" 2017-06-22 14:00:19 -07:00
Linux Build Service Account
146cbfce78 Merge "mmc: sdhci-msm: Don't turnoff Vcc during initialization" 2017-06-22 14:00:18 -07:00
Linux Build Service Account
1cbfeeaf0d Merge "power: smb-lib: Add support to detect weak charger" 2017-06-22 14:00:17 -07:00
Linux Build Service Account
01cff86d50 Merge "soc: qcom: glink: Move tx_wakeup_worker to rx tasklet" 2017-06-22 14:00:16 -07:00
Linux Build Service Account
356730a45b Merge "diag: Update msg mask tables for new SSID" 2017-06-22 14:00:14 -07:00
Linux Build Service Account
9419a8a284 Merge "drm/msm: Move memptrs to msm_gpu and reorganize" 2017-06-22 14:00:12 -07:00
Linux Build Service Account
17ca958bf3 Merge "icnss: fix the memory and kernel info leak due to the race condition" 2017-06-22 07:40:35 -07:00
Linux Build Service Account
fb2390c8b1 Merge "msm: kgsl: convert some workqueues to use kthreads." 2017-06-22 07:40:34 -07:00
Linux Build Service Account
e26d095a21 Merge "power: smb-lib: Rearrange BOOST_BACK voting logic" 2017-06-22 07:40:33 -07:00
Linux Build Service Account
4f317411a4 Merge "msm: vidc: Recompute extradata address of buffers with ref 2" 2017-06-22 07:40:31 -07:00
Linux Build Service Account
d9cc5d555c Merge "msm: vidc: Renaming the AU-Delimiter params/extens" 2017-06-22 07:40:30 -07:00
Linux Build Service Account
c515c98cc0 Merge "msm: camera: validate num_streams in stream_cfg_cmd before using it" 2017-06-22 07:40:29 -07:00
Linux Build Service Account
86d96e09c2 Merge "ARM: dts: msm: Update sensor device node for SDM660 QRD" 2017-06-22 07:40:28 -07:00
Linux Build Service Account
4bdee99442 Merge "ath10k: Increase peer delete response wait to 500msec" 2017-06-22 07:40:27 -07:00
Linux Build Service Account
0ae9c77a8c Merge "msm📷 correct stats query out of boundary" 2017-06-22 07:40:26 -07:00
Linux Build Service Account
d519bfb9c1 Merge "clk: qcom: osm: Initialize ACD when the cluster is online" 2017-06-22 07:40:25 -07:00
Linux Build Service Account
f8499f2b5e Merge "ais: refine some code style issues" 2017-06-22 07:40:24 -07:00
Linux Build Service Account
3b2de2e798 Merge "ARM: dts: msm: override initial pwrlevel for MSM8996ProAU" 2017-06-22 07:40:23 -07:00
Linux Build Service Account
4dcf7a50c5 Merge "Merge branch 'android-4.4@6fc0573' into branch 'msm-4.4'" 2017-06-22 07:40:22 -07:00
Linux Build Service Account
a367cb43e4 Merge "wil6210: protect against invalid length of tx management frame" 2017-06-22 07:40:21 -07:00
Linux Build Service Account
b944e8d1e6 Merge "msm: camera: Add error check for cmd in IOCTL." 2017-06-22 07:40:20 -07:00
Linux Build Service Account
7c14b62c88 Merge "drivers: soc: qcom: rpm_stats: Add mutex lock for shared data" 2017-06-22 07:40:19 -07:00
Linux Build Service Account
77a019931a Merge "msm: camera: fix untrusted pointer for power down setting" 2017-06-22 07:40:18 -07:00
Linux Build Service Account
46e4ca524d Merge "msm: ipa3: fix compatibility with ipa_nat driver" 2017-06-22 07:40:17 -07:00
Linux Build Service Account
1184e3d0c4 Merge "msm: sps: Fix race condition in SPS debugfs APIs" 2017-06-22 07:40:16 -07:00
Linux Build Service Account
dcb27d45f0 Merge "msm: camera: fix untrusted pointer for power down setting" 2017-06-22 07:40:15 -07:00
Linux Build Service Account
870d3e21b3 Merge "msm: camera: Use mutex lock to avoid race condition" 2017-06-22 07:40:15 -07:00
Vinayak Menon
1c6a9c9721 arm64: dma-mapping: fix aliasing issues with non-CMA alloc
Cache flush and clearing of logical mapping is done right now
only when the allocation is from CMA, for allocation requests
with DMA_ATTR_STRONGLY_ORDERED or DMA_ATTR_NO_KERNEL_MAPPING
set. Extend this to non-CMA allocations too, to avoid cache
aliasing issues.

Change-Id: I133d34d79665ee7159fe384121e933d7768748c2
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-06-22 16:51:33 +05:30
Sarada Prasanna Garnayak
470cbd2aea icnss: fix the memory and kernel info leak due to the race condition
The icnss register read/write debugfs entry can be  accessed by
multiple user space thread. Memory allocation and deallocation
in the register read/write file operation leads to potential memory
leak during concurrency access of debugfs device file.

Add protection to avoid the memory leak and kernel information
leak due to the race condition in the register read/write ops.

CRs-Fixed: 2012572
Change-Id: I22c6af9a396c0df4e68f75702fc68a5dff5af032
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-06-22 00:35:59 -07:00
Tim Murray
7412403004 msm: kgsl: convert some workqueues to use kthreads.
adreno_dispatch_work and _kgsl_event_worker are both low-latency
low-runtime functions that are in the critical path of GPU
rendering. Moving them out of workqueues and into a dedicated FIFO
kthread avoids significant jitter.

bug 30342017

Git-commit: 1a7a93bd33f48a369de29f6f2b56251127bf6ab4
Git-repo: https://android.googlesource.com/kernel/msm

Change-Id: I83562f488c34c2ab001c8ea79e7f09b633c658bd
Signed-off-by: Tim Murray <timmurray@google.com>
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-06-21 22:56:18 -07:00
Veerabhadrarao Badiganti
7ffd15f63d mmc: sdhci-msm: Don't turnoff Vcc during initialization
As per emmc specification, device should be notified either with
power-off or sleep notification before turning off the Vcc.
Failing to do so might affect the device longevity.

In mmc driver initialization phase even before device probing
gets completed, Vcc is getting turned off without these notifications.
Since it can't send commands at this stage, So just ensure that Vcc
is not turned off till initialization gets completed.

Change-Id: I0bbf0077357d66c888147be40a0c5d312b9ce063
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-06-22 10:55:19 +05:30
Chris Lew
f6c2b18d1b soc: qcom: glink: Move tx_wakeup_worker to rx tasklet
Do tx wakeup worker functionality in rx worker tasklet instead
of scheduling the work to be done in worker context to improve
performance.

CRs-Fixed: 2050701
Change-Id: Iba620e7e264805ed02a35603da1fb6c985de7d43
Signed-off-by: Chris Lew <clew@codeaurora.org>
2017-06-21 16:33:01 -07:00
Ashay Jaiswal
7a071fadb1 power: smb-lib: Add support to detect weak charger
A weak charger might trigger switcher_power_ok interrupt storm
which gets incorrectly detected as a boost_back condition and
input gets suspended. Add a logic to distinguish a weak charger
and the boost_back condition by first reducing the ICL current
to a lower value (500mA by default) on detecting a
switcher_power_ok storm. If the switcher_ok storm disappears
then its indeed a weak charger and if the storm continues its
possibly a boost_back condition.

Change-Id: I46b406e403aa16a502e6da149b180545848fc906
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-06-21 19:22:08 +05:30
Anirudh Ghayal
f11fd649ff power: smb-lib: Rearrange BOOST_BACK voting logic
The BOOST_BACK USB-ICL voter needs to be removed in the
following conditions -

1. VBUS falling path during PD hard-reset
2. typeC removal
3. False boost-back detected

For (1) and (2) - remove the boost_back vote in the usbin_handler
and typec_removal path. For (3) add a worker which removes the
boost_back vote after the boost-back condition is detected. The
delay is sufficient to recover from both a valid and an incorrectly
detected boost-back condition.

CRs-Fixed: 2051908
Change-Id: I9d1d04f392bb6040b0565510ff7d1032bb036de2
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-06-21 18:36:11 +05:30
Terence Ho
e53f2adc3f msm: camera: validate num_streams in stream_cfg_cmd before using it
stream_cfg_cmd->num_streams is from userspace,
need to check it against MSM_ISP_STATS_MAX before using it.

CRs-Fixed: 2029867
Change-Id: I02a71b983947981806470454654d712bcc732077
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
2017-06-21 17:12:27 +08:00
Rakesh Pillai
2f74c5032f ath10k: Increase peer delete response wait to 500msec
Peer creation in firmware fails if last peer deletion is still
in progress. Need to wait for peer delete response from firmware
after deleting peer from host driver.

Increase the peer delete response wait time to 500msec.

CRs-Fixed: 2063832
Change-Id: I1c1c2500ae7f8ff1448f6b726d30dbbe3334957c
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-06-21 01:39:28 -07:00
Depeng Shao
3dc4455f64 ARM: dts: msm: Update sensor device node for SDM660 QRD
Update main and aux camera sensor dvdd configuration
to enable the vreg and ldo together.

Change-Id: Iacc79799d1c06a3385a8cfd9ef80d707f8fa8d69
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2017-06-21 00:14:06 -07:00
Fei Zhang
b38f9aca3c msm📷 correct stats query out of boundary
Fix a potential out of boundary query of stats info.

CRs-Fixed: 2041066
Change-Id: I76d4aa8c8ddd523fde007bfb6fa387a17930c2ba
Signed-off-by: Fei Zhang <feizhang@codeaurora.org>
2017-06-20 23:10:52 -07:00
Andy Sun
182ec0b2bc ais: refine some code style issues
1. function/variable static declare;
2. dereference of noderef expression;
3. cast removes address space of expression;
4. using plain integer as NULL pointer;

Change-Id: If11a29aca93380de68a323880d55597bf320470f
Signed-off-by: Andy Sun <bins@codeaurora.org>
2017-06-21 09:43:11 +08:00
Terence Ho
206a79a7fa msm: camera: Add error check for cmd in IOCTL.
Return EINVAL if cmd is not v4l2 PRIVATE_IOCTL_CMD.

CRs-Fixed: 2016416
Change-Id: I6758bc9d6b159b2e2e4eba5a9d9a3882de320041
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
2017-06-20 09:33:42 -07:00
Hamad Kadmany
7041944896 wil6210: protect against invalid length of tx management frame
Validate buffer length has the minimum needed size
when sending management frame to protect against
possible buffer overrun.

Change-Id: Ib5aed79694100597d7f71a9e8d4e8dba91be538a
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2017-06-20 13:55:07 +03:00
Kasin Li
af803bcd66 ARM: dts: msm: override initial pwrlevel for MSM8996ProAU
Current DRM driver set GPU clock rate with initial pwrlevel and use it
all the time. This value is too low and couldn't cover many computing
tasks. Change to a higher value for automotive system.

Change-Id: I348f187bfb8c0c2a3936a132bc0142fd5553226c
Signed-off-by: Kasin Li <donglil@codeaurora.org>
2017-06-20 18:38:37 +08:00
Linux Build Service Account
560a996da5 Merge "soc: qcom: rpm-smd-debug: initialize variables and check for return value" 2017-06-20 03:20:41 -07:00
Linux Build Service Account
2305f01fc2 Merge "msm: vidc: Addition of VIDIOC_QUERY_EXT_CTRL ioctl" 2017-06-20 03:20:40 -07:00
Linux Build Service Account
3f302a6640 Merge "qpnp-fg-gen3: Move getting battery id and profile to profile_load_work" 2017-06-20 03:20:39 -07:00
Linux Build Service Account
5f0a789229 Merge "drm/msm: use 13-bit mask for h_total and v_total" 2017-06-20 03:20:31 -07:00
Linux Build Service Account
d00b4e6e09 Merge "drm/msm: start secure domain va from non-zero address" 2017-06-20 03:20:30 -07:00
Linux Build Service Account
296e2f3d7e Merge "drm/msm: Remove superfluous hang check message" 2017-06-20 03:20:28 -07:00
Linux Build Service Account
c9e6118965 Merge "drm/msm: Add a submit queue flag to disable the QoS timer" 2017-06-20 03:20:27 -07:00