Commit graph

575401 commits

Author SHA1 Message Date
Linux Build Service Account
8bd9feafb1 Merge "drivers: GICv3: remove the rtb logs of gic write and read" 2016-09-10 06:39:14 -07:00
Linux Build Service Account
a2d7b195ec Merge "usb: dwc3-msm: Only set vbus_draw for SDP type" 2016-09-10 06:39:13 -07:00
Linux Build Service Account
5c5e16573d Merge "sched: Move data structures under CONFIG_SCHED_HMP" 2016-09-10 06:39:12 -07:00
Linux Build Service Account
6595d9c1cd Merge "usb: pd: Fix unbalanced vconn regulator disable" 2016-09-10 06:39:12 -07:00
Linux Build Service Account
1acb54a652 Merge "video: adf: zero out mapping data on adf_buffer_map() failure" 2016-09-10 06:39:11 -07:00
Linux Build Service Account
d2286074f3 Merge "soc: qcom: pil: allow to set subsystem firmware name" 2016-09-10 06:39:10 -07:00
Linux Build Service Account
50ad11fb8b Merge "icnss: Add IO reset logic" 2016-09-10 06:39:05 -07:00
Linux Build Service Account
d2f9d1e0e5 Merge "usb: gadget: u_ether: Add missing rx work initialization" 2016-09-10 06:39:04 -07:00
Karthik Reddy Katta
287879c3be ASoC: msm: Add Buffer overflow check
The overflow check is required to ensure that user space data
in kernel may not go beyond buffer boundary.

CRs-Fixed: 1064411
Change-Id: I54c28a8942cf1a6a47a4e8272f3159b35d753ead
Signed-off-by: Karthik Reddy Katta <a_katta@codeaurora.org>
2016-09-10 04:49:15 -07:00
Runmin Wang
2a2c4f8bd9 drivers: GICv3: remove the rtb logs of gic write and read
gic_write/read use write/read_relaxed function which will create
lots of RTB logging. Change the API to no_log version to remove
those RTB logs.

Change-Id: Ide59d8c2753364840f8a2b304ef0c169870c8509
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-09-09 17:46:16 -07:00
Ingrid Gallardo
6cd1a4abd9 ARM: dts: reduce on/off time for nt35597 dsc panels
Reduce the wait on each of the commands for the
on/off sequences of the nt35587 dsc command and
video mode panels. This optimizes the suspend/resume
delays on these panels.

CRs-Fixed: 1048778
Change-Id: Ia5602cd4c612b8aacbdf27206a0a28cb50858911
Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>
2016-09-09 17:30:45 -07:00
Greg Hackmann
6cced823ba video: adf: zero out mapping data on adf_buffer_map() failure
If the following call chain fails

adf_device_post_nocopy() ->
  adf_buffer_map() ->
    dma_buf_attach(); dma_buf_map_attachment()

then the attachment returned by dma_buf_attach() will get cleaned up
twice: first during the error-handling path inside adf_buffer_map(), and
again during the error-handling path inside adf_device_post_nocopy().

Fix this by zeroing out the mapping data inside adf_buffer_map()'s
error-handling path.  When adf_device_post_nocopy() hands it back to
adf_buffer_mapping_cleanup(), it will deliberately skip over zeroed-out
data.

(The second adf_buffer_mapping_cleanup() call inside
adf_device_post_nocopy() is not a bug; it's intended to clean up after
any *other* buffers we handled as part of this request.)

CVE:CVE-2016-3811

Bug: 28025945
Bug: 28279077

Change-Id: I824d980b208da3a15d35f74970755c8f18500263
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Git-repo: https://android.googlesource.com/kernel/msm.git
Git-commit: 4436de7a92d037599e0d217f16f9c391b6ad866a
Signed-off-by: Ravi Kumar Siddojigari <rsiddoji@codeaurora.org>
2016-09-09 16:56:27 -07:00
Bhalchandra Gajare
fe66f73cea ASoC: wcd_cpe_core: add arch_setup_dma_ops call
Change adds call to arch_setup_dma_ops to make sure the dma ops
are initialized before dma allocations are done.

CRs-fixed: 1065339
Change-Id: I5658598032f151c9293b3c4f6cf2311df8d3a634
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2016-09-09 16:52:02 -07:00
Abhijeet Dharmapurikar
819032fadd iio: rradc: Add a format string in log prints
Currently it is hard to decipher the logs coming from the RRADC driver.
Add a pr_fmt define to help with this

Change-Id: Ifd70ca3071a7305ba064de7409090ce487c56968
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2016-09-09 16:14:26 -07:00
Abhijeet Dharmapurikar
0d84417358 qcom-charger: smb-lib: support input limited state property
Add support to indicate if the switcher is acting in input limited state.
Switcher running in high duty cycle (HDC) mode should also be indicated as
input limited condition.
HDC is a 5uS pulse and sw reading the real time status register may not
indicate that it is active. Basically the presence of the pulses and the
interrupts indicate HDC and conversely their absence indicates no
HDC. Set a flag in the interrupt and clear it in a delayed work queue in
20mS. As long as the interrupts happen this flag will remain set,
indicating HDC.

Change-Id: Ia2e2d02240c36ba982f9e190b88b822b5f1b90f1
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2016-09-09 16:12:55 -07:00
Jack Pham
0057979436 ARM: dts: msm: Fix vconn-supply typo in PMICOBALT
The 'vconn' regulator is spelled with two n's, not one.

Change-Id: I118d4e1dbd1aa26c2637e5ea4f4ba5b6006bebff
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2016-09-09 15:40:54 -07:00
Jack Pham
abc22dbb35 usb: pd: Fix unbalanced vconn regulator disable
Make sure to only call regulator_disable() on VCONN only if
it was previously enabled, else it could result in an
unbalanced disable state. Subsequent enables would then be
no-ops and the regulator would not actually turn on.

Change-Id: I67a6ad6d2bc036a63714403e2eed8c0577ef0246
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2016-09-09 15:40:54 -07:00
Syed Rameez Mustafa
1389927146 sched: Move data structures under CONFIG_SCHED_HMP
Frequency-demand conversion data structures are only used under
CONFIG_SCHED_HMP. Move them out of sched.h into hmp.c to where they
actually belong after the recent refactor.

Change-Id: I3c3eebca86062f11b80af93ba3716695eb787376
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
2016-09-09 15:35:38 -07:00
Tejun Heo
beb35bfaa5 cgroup: make sure a parent css isn't freed before its children
commit 8bb5ef79bc0f4016ecf79e8dce6096a3c63603e4 upstream.

There are three subsystem callbacks in css shutdown path -
css_offline(), css_released() and css_free().  Except for
css_released(), cgroup core didn't guarantee the order of invocation.
css_offline() or css_free() could be called on a parent css before its
children.  This behavior is unexpected and led to bugs in cpu and
memory controller.

The previous patch updated ordering for css_offline() which fixes the
cpu controller issue.  While there currently isn't a known bug caused
by misordering of css_free() invocations, let's fix it too for
consistency.

css_free() ordering can be trivially fixed by moving putting of the
parent css below css_free() invocation.

Change-Id: I97febdd414ef5cd57490ce2746650dde7fdda28f
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>i
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 8bb5ef79bc0f4016ecf79e8dce6096a3c63603e4
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-09-09 15:01:53 -07:00
Prashanth Bhatta
39e464dffc icnss: Add IO reset logic
Add IO reset logic without which hardware IO freezes.

CRs-fixed: 1062502
Change-Id: I58b05ae64706865a16cc52a1f81e484c396cc6f0
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-09-09 14:34:27 -07:00
Prashanth Bhatta
b0aac0da3d icnss: Enhance debugging capabilities
There are instances of QMI message timeout and because of this
stability issues are seen way after the QMI message failure. To
aid the debugging, enhance the debug capabilities by adding
ASSERT in case of failure.
Also update the logs properly to indicate which message really
failed.

CRs-fixed: 1060274
Change-Id: Ie817970cb10c879d04ffe5e2a853ada8bf8a1f88
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-09-09 14:34:09 -07:00
Amir Samuelov
5a5b5183aa soc: qcom: pil: allow to set subsystem firmware name
Allow the PIL client to set the firmware file name
for a specific subsystem.

Change-Id: Ib410cae212afb067f5df2e5d25f4f23f583ed1f2
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2016-09-09 12:54:32 -07:00
Puja Gupta
d672fbc329 ARM: dts: msm: Add bus scaling for venus PIL for MSMCOBALT
Add bus scaling support for venus PIL for MSMCOBALT. Also reduce
proxy-timeout value so that video can start playing sooner.

CRs-Fixed: 1063752
Change-Id: Icb72c488c30ee7c2414409b93fd40f3862b11f77
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2016-09-09 12:29:14 -07:00
Linux Build Service Account
2590d5faf4 Merge "ARM: dts: msm: update corner switch delay time for msmcobalt v2" 2016-09-09 11:53:18 -07:00
Linux Build Service Account
5ea20de3a5 Merge "clk: msm: clock-osm: update register initialization for msmcobalt v2" 2016-09-09 11:53:17 -07:00
Linux Build Service Account
8aca8d3631 Merge "ARM: dts: msm: Add stub regulator devices for msmfalcon" 2016-09-09 11:53:16 -07:00
Linux Build Service Account
e454f66b6b Merge "diag: Clear masks upon logging exit" 2016-09-09 11:53:16 -07:00
Linux Build Service Account
b4d91ec2d2 Merge "msm-core: debug: Update the number of supported pstates" 2016-09-09 11:53:14 -07:00
Linux Build Service Account
1a563680c4 Merge "msm-core: debug: Fix the number of arguments for sysfs nodes" 2016-09-09 11:53:14 -07:00
Linux Build Service Account
a2fa0f0d22 Merge "input: ft5x06: check return value of kobject_create_and_add" 2016-09-09 11:53:12 -07:00
Linux Build Service Account
272c3ee99c Merge "input: ft5x06: create secure touch sysfs files" 2016-09-09 11:53:11 -07:00
Linux Build Service Account
f479b5032c Merge "clk: msm: clock-osm: Add measurement support for CPU clocks" 2016-09-09 11:53:10 -07:00
Linux Build Service Account
04eb468f0a Merge "defconfig: msm: Enable CONFIG_QCOM_REMOTEQDSS for 32-bit" 2016-09-09 11:53:08 -07:00
Linux Build Service Account
08223d34ed Merge "soc: qcom: glink: Reduce code under spinlock" 2016-09-09 11:53:08 -07:00
Nicholas Troast
3a412d4b6b ARM: dts: msm: add parallel charger io channels for MSMCOBALT
Add temperature io channels to enable temperature monitoring of the
parallel charger.

Change-Id: I6ebea0fb935dc8fb0fdce11e9c9a19213da2685c
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2016-09-09 11:08:01 -07:00
Nicholas Troast
2e8f65595a smb138x-charger: expose charger temperature
Expose the charger temperature in both standalone and parallel mode via
the battery and parallel power supplies.

Change-Id: I43e73b3056386cf97b37652eeed3a4761e248711
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2016-09-09 11:07:53 -07:00
Benjamin Chan
786f16f377 defconfig: msm: sde: Add config for SDE rotator EVTLOG debug
Enable event log debugging and register dump during panic for SDE rotator.

CRs-Fixed: 1063582
Change-Id: Icc11117c34c3c45bdaa6a05444c933e6fba4f6b8
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2016-09-09 10:20:05 -07:00
Benjamin Chan
0d6c14d893 msm: sde: Add EVTLOG and REG dump support for SDE rotator
EVTLOG is a memory logging method for reducing logging overhead.
REG dump is used when a fatal error or SMMU fault is happening within
the SDE rotator driver. Both tools are used for crash dump analysis
in SDE rotator.

CRs-Fixed: 1063582
Change-Id: I5ad406187ba590d2fa57d998e9ad79b8a32810ee
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2016-09-09 10:19:59 -07:00
Sagar Dharia
e92e3b2194 slim: msm: Avoid registration with notifier if service is not located
Service locator framework may call callback with LOCATOR_UP even if
service is not located. Avoid registering with service-notifier in
that case.

Change-Id: Ib73570d1703803dbe0d769d9d43f9d7d2b257770
Signed-off-by: Sagar Dharia <sdharia@codeaurora.org>
2016-09-09 11:02:56 -06:00
Amey Telawane
7e6d4ff177 ARM: dts: msm: add stm dts support for msmfalcon
Add CoreSight-STM support for msmfalcon that is
used to collect the HW & SW events.

CRs-fixed: 1056777
Change-Id: Ifef16d82f48d2597db4b4dc71bc94c8f1621166e
Signed-off-by: Amey Telawane <ameyt@codeaurora.org>
2016-09-09 16:43:34 +05:30
Himanshu Aggarwal
501c621ee3 input: ft5x06: check return value of kobject_create_and_add
The Focaltech driver creates a sysfs under sys/kernel/ts_info
to access touch panel details. However, the return value of the
API is not checked properly. Check the return value of the API.
Also avoid making a duplicate copy of the kobject and clean up
the show routine.

Change-Id: Ib36e9d7661ee3d2ce7b229d8692e6212e33cbf36
Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
2016-09-09 03:28:36 -07:00
Abinaya P
d30cccfe22 input: ft5x06: Add support for clocks for secure touch on 8937 QRD
Because of a change in the underlying bus driver, the secure touch
layer in the input drivers is now required to control directly the
clocks which are needed during the touch sessions. The clocks which
are associated with the underlying I2C bus are clk_gcc_blsp1_ahb_clk
and clk_gcc_blsp1_qup3_i2c_apps_clk. These clocks are turned on/off
when the secure touch session is started/ended.

Change-Id: If5abca579e264cc7799310628c4e379ac4368e7e
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-09-09 03:28:28 -07:00
Abinaya P
93d6b9b0b4 input: ft5x06: create secure touch sysfs files
This patch creates two sysfs files for secure touch -
secure_touch and secure_touch_enable which will be
accessed by secure ui app. We also define the store
and show function for these sysfs files.

Change-Id: I4bc156de12a8b41c3640c4f1fb2d32ca3d8b5b43
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-09-09 15:53:54 +05:30
Linux Build Service Account
3dc7ca5e82 Merge "soc: qcom: irq-helper: Add comments to exposed APIs" 2016-09-09 01:26:15 -07:00
Linux Build Service Account
ea31f5c965 Merge "scsi: ufs: export set_bus_vote ops" 2016-09-09 01:26:14 -07:00
Linux Build Service Account
9ff4c51df9 Merge "sched: Further re-factor HMP specific code" 2016-09-09 01:26:13 -07:00
Linux Build Service Account
696d6979fd Merge "defconfig: msm: Add MSMTRITON in defconfigs" 2016-09-09 01:26:12 -07:00
Linux Build Service Account
8363983cc2 Merge "ARM: dts: msm: Add initial device tree files for msmtriton" 2016-09-09 01:26:11 -07:00
Linux Build Service Account
981a0eae00 Merge "ASoC: qdsp6v2: Add proper dependency for audio driver" 2016-09-09 01:26:10 -07:00
Linux Build Service Account
cb8988669c Merge "usb: Add support for reset controller framework" 2016-09-09 01:26:06 -07:00