Commit graph

572983 commits

Author SHA1 Message Date
Zhen Kong
cfa588d94a qseecom: validate the inputs of __qseecom_send_modfd_resp
The resp_len and resp_buf_ptr of qseecom_send_modfd_listener_resp
are not checked, then an userspace application that manipulates
resp_len can corrupt the kernel memory. Thus make changes to
validate these parameters.

CRs-fixed: 1036418
Change-Id: Id43ec6b55b332d0dac09a9abb998a410f49b44f7
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2016-07-29 12:21:30 -07:00
Hemant Kumar
d5ccebfe35 usb: gadget: f_cdev: Fix NULL ptr dereference in usb_cser_notify
Upon usb disconnect or composition switch notify ep request buffer
as well as the request are freed. This is racing with user space
ioctl on character device trying to send the notification to USB
host. As a result notify ep request buffer is being dereferenced
causing NULL pointer dereference. Fix the issue by checking
is_connected flag by taking port lock before accessing notify
ep request and request buffer.

Change-Id: I380efdf90305a65d4cde46dfe44762ac11c87678
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-07-29 11:46:23 -07:00
Mayank Rana
d59b5a86d7 usb: dwc3: Update VBUS status with USB controller
It is required to update VBUS status to USB controller using qscratch
registers HS_PHY_CTRL and SS_PHY_CTRL interfacing high-speed and
super-speed PHYs. This change perfoms same from USB controller's glue
driver on starting and stopping peripheral mode based on supported
USB speed with USB gadget.

It also updates devicetree documentation explicitly mentioning required
register sets.

CRs-Fixed: 1046503
Change-Id: I92df87c0e2ff54dd7ee513d277cc075eab561019
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2016-07-29 11:39:35 -07:00
Mayank Rana
7d94325630 usb: phy: qusb: Remove updating VBUS status from QUSB PHY driver
This change removes updating VBUS status from QUSB PHY driver using
QSCRATCH register. New change would be adding same functionality from
USB controller driver.

- It also updates devicetree documentation and existing supported
MSM platforms' USB device node property to accommodate above changes.

CRs-Fixed: 1046503
Change-Id: I4573a077bb455ebe3750ab76a91d2593d7e94ea5
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2016-07-29 11:39:25 -07:00
Linux Build Service Account
77e6c75442 Merge "cfg80211: Advertise extended capabilities per interface type to userspace" 2016-07-29 11:24:31 -07:00
Linux Build Service Account
e21b49baaf Merge "msm: ipa3: add mapping for IPA SMEM to SMMU" 2016-07-29 11:24:30 -07:00
Linux Build Service Account
29e6a3b923 Merge "msm: ipa3: add support for additional mappings to smmu" 2016-07-29 11:24:29 -07:00
Linux Build Service Account
4065bfcc2f Merge "scsi: ufs: return appropriate error code" 2016-07-29 11:24:28 -07:00
Linux Build Service Account
4d639b901b Merge "ARM: dts: msm: Enable the GPU QDSS STM for msm8996" 2016-07-29 11:24:28 -07:00
Devesh Jhunjhunwala
ce47dd6134 ARM: dts: msm: Enable droop and fault detection for pmicobalt flash LED
Add device tree properties to enable detection of VPH droop,
short circuit and open circuit faults for flash LED on pmicobalt.

CRs-Fixed: 1024187
Change-Id: I13cf07b36f7bb890a71bedb9998a937e2c60ecb0
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:24:27 -07:00
Devesh Jhunjhunwala
88e140010a leds: qpnp-flash-v2: Add support for led_fault_irq
Add support to receive and process the led_fault_irq to
detect short_circuit and open_circuit faults. Also, add
support to read all led_status registers in the irq handler.

CRs-Fixed: 1024187
Change-Id: I6941660484ea8b27377c668d1e7d815d52e83d83
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:24:14 -07:00
Devesh Jhunjhunwala
ba678210c5 leds: qpnp-flash-v2: Add support for droop and fault detection
Add support for configuring the following features available
in flash LED:
	1. VPH droop detection
	2. Short circuit fault detection
	3. Open circuit fault detection

CRs-Fixed: 1024187
Change-Id: I982e51ba62f0a75d1dcd3ef30e5d1249c970ffde
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:22:30 -07:00
Devesh Jhunjhunwala
a0a1d3cd64 leds: qpnp-flash: Implement the flash_prepare API
Add the flash_prepare API to the leds-qpnp-flash driver to
maintain consistent usage of the API by the camera flash driver
across targets.

CRs-Fixed: 1043718
Change-Id: I21cc4b4556b2a4a1a918bfeb1d55ae164d4b5568
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:22:06 -07:00
Devesh Jhunjhunwala
dc12c73b37 leds: qpnp-flash-v2: Update the flash_prepare API
Update the flash prepare API to accept a led_trigger device as an
argument. Also split the leds-qpnp-flash-v2 header file to keep the
flash_prepare API in a common header file for both legacy and v2
flash drivers.

CRs-Fixed: 1043718
Change-Id: Idb4ab086740b680e101d76d882bcfb618ac4b936
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-29 11:21:23 -07:00
Subbaraman Narayanamurthy
5d12dfffb4 ARM: dts: msm: add battery profiles to msmcobalt MTP
Ascent and Itech batteries might be used with msmcobalt MTP. Add
the battery profiles to support that.

Change-Id: Icfed6881763df35a7f948f171856903de7e07a2a
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-07-29 11:10:47 -07:00
Subbaraman Narayanamurthy
064f1af82c ARM: dts: msm: add batterydata for itech and ascent batteries
Batterydata for itech 3000mah and ascent 3450mah batteries are
newly created to be used with GEN3 FG on pmicobalt. Add them.

Change-Id: I0fe51b607d44920784cc0bb8bfd442e81f3c5d3d
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-07-29 11:10:47 -07:00
Harry Yang
4e4144f643 qcom-charger: add support for WiPower
Add support for WiPower by instantiating DC power supply and the required
properties.

CRs-Fixed: 1044422
Change-Id: I81d2e3b67bf55460f40406328c5ad8c40851033a
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2016-07-29 10:46:09 -07:00
Sudheer Papothi
23c3ff0a00 ASoC: msm: Add dapm ignore suspend for front end dais
DAPM marks front end dai as dirty during ASoC suspend
which triggers device path teardown. Add ignore suspend
to all front end dais to avoid device path teardown.

CRs-Fixed: 1031932
Change-Id: I1d85578534c58c121ca8e560d67faf9b94e87be9
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2016-07-29 10:15:30 -07:00
Amy Maloche
5d244099f0 ft5x06: Set input property bit to indicate a direct input device
Property bit is checked in userspace and must be set in
driver in order to be recognized correctly since it defaults
to mouse pointer.

Change-Id: Ibdc78547e6376e6db54db75b1423718d13afaaa7
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2016-07-29 03:39:06 -07:00
Chandan Uddaraju
63dbca3ed8 msm: mdss: add support to configure transfer unit for DP
Configure the transfer unit settings to control the
symbol stuffing.

Change-Id: I80d6c1ae6d7096e170105e5d297a563b3bee053d
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
2016-07-29 00:17:31 -07:00
Chandan Uddaraju
ba7779beec mdss: display-port: add mutex logic and configure data lanes
Add locking mechanism for host init. Remove mainlink_reset
before configuring the link rates.

Depending on the USB plug orientation, configure the
lane mapping register to support display-port over
usb-type-c port.

Change-Id: I7bf3fc6e102df113611b9450c92ecd4e50b26fb4
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
2016-07-29 00:17:15 -07:00
Chandan Uddaraju
160151f738 mdss: display-port: add support for USB type-C Alt mode
This change is needed to support display port
over USB type-C port. Add usbpd changes to
enable display port using Alternate mode for
type-C port.

Add support to parse VDO messages and send dp_config
packets when HPD is high.

Change-Id: I3ea5d969a73e3418af23ba4d8b7374fb20d2889f
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
2016-07-29 00:16:58 -07:00
Chandan Uddaraju
e400fce1aa msm: mdss: display-port: add support to configure pixel and link rates
Use the DPCD info to configure pixel and link rates
supported by the sink.

Change-Id: Idd7ba4b564b013eda7596a111b9b934f6b6ff84f
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
2016-07-29 00:16:44 -07:00
Chandan Uddaraju
20f40d92b8 mdss: display-port: fix register offsets for link training
Add proper register base and register address offsets
when configuring the voltage swings and preemphsis
settings. Fix interrupt register bit for VIDEO_READY.

Change-Id: I6e89f6fbb3660d13c186b38eb7ca1f71cbe8109d
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
2016-07-29 00:16:30 -07:00
Chandan Uddaraju
f34448c324 mdss: display-port: add support for DP related gpios
The DP driver will need GPIOs to configure the
AUX channel and orientation of USB type-C port. Add
support for the GPIOs.

Change-Id: I9940ff3cbcca7dd0ac972cabbfddcbd9ac4657fa
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
2016-07-29 00:16:14 -07:00
Chandan Uddaraju
48965d20af msm: mdss: fix clock and regulator configurations for DP
Add support for clock initialization during driver probe.
Add support to configure clock rates before enabling the
clocks.

Fix the regulators disable sequence for display-port.

We can only read hardware revision register only after
configuring the PHY. Move revision read to host_init()
function.

Change-Id: I0e9f6caf84a8cdd825002938dad18482e2489cbd
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
2016-07-29 00:14:27 -07:00
Shantanu Jain
1108a17322 input: ft5x06_ts: clean up the focaltech touchscreen driver
Clean up the focaltech driver by fixing the following checkpatch
errors.

1. else is not generally useful after a break or return
2. Possible unnecessary 'out of memory' message
3. Using __devexit is unnecessary
4. Unnecessary space before function pointer arguments

This patch is a propagated patch from 3.18 kernel
'commit 2b6ea311a968 ("input: ft5x06_ts: fix checkpatch errors")'

Change-Id: I36ed0497c12b0f14e9d7b60c2d8e78729871b8d0
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-07-29 12:18:37 +05:30
Kanchanapally, Vidyullatha
33ec44fb7e cfg80211: Advertise extended capabilities per interface type to userspace
The driver extended capabilities may differ for different
interface types which the userspace needs to know (for
example the fine timing measurement initiator and responder
bits might differ for a station and AP). Add a new nl80211
attribute to provide extended capabilities per interface type
to userspace.

Signed-off-by: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com>
Reviewed-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 019ae3a918811715192b22c400ac78d54acc26a9
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
CRs-fixed: 1030694
Change-Id: I816b21d8433aea9407a14a8c8a5098701ee53b8c
[pkushwah@codeaurora.org: backport to 4.4-This commit includes the
changes from following commits in include/uapi/linux/nl80211.h to compile
for msm-4.4.
38de03d2a28925b489c11546804e2f5418cc17a4 :
nl80211: add feature for BSS selection support.
17b942478643c5a90c06d978479bd326040bfa19 :
cfg80211: allow userspace to specify client P2P PS support.
9b95fe59b18bcc891a6c60ae11d725c9c679574b :
nl80211: add missing kerneldoc for new *_PAD attributes.
2dad624e6dd65c6048a9bbe0e16559fce182c87c :
wireless: use nla_put_u64_64bit().]
Signed-off-by: Purushottam Kushwaha <pkushwah@codeaurora.org>
2016-07-28 22:24:57 -07:00
Amit Pundir
9e776febf8 Revert "misc: uidstat: Adding uid stat driver to collect network statistics."
This reverts commit 6b6d5fbf9a.

Change-Id: I5c64b6264e0d55a7ca16a72e31316e6329f2b842
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: ece28ad441
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-28 19:49:15 -07:00
John Stultz
cf25e3a538 xt_qtaguid: Fix panic caused by processing non-full socket.
In an issue very similar to 4e461c777e (xt_qtaguid: Fix panic
caused by synack processing), we were seeing panics on occasion
in testing.

In this case, it was the same issue, but caused by a different
call path, as the sk being returned from qtaguid_find_sk() was
not a full socket. Resulting in the sk->sk_socket deref to fail.

This patch adds an extra check to ensure the sk being retuned
is a full socket, and if not it returns NULL.

Change-Id: Icee0df589ea8d61a999e8c7ea3afdcf4a40b412b
CRs-Fixed: 1035969
Reported-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-commit: cc0063b8eb
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-28 19:49:12 -07:00
John Stultz
52d2c42bc4 xt_qtaguid: Fix panic caused by synack processing
In upstream commit ca6fb06518
(tcp: attach SYNACK messages to request sockets instead of
listener)
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ca6fb0651883

The building of synack messages was changed, which made it so
the skb->sk points to a casted request_sock. This is problematic,
as there is no sk_socket in a request_sock. So when the qtaguid_mt
function tries to access the sk->sk_socket, it accesses uninitialized
memory.

After looking at how other netfilter implementations handle this,
I realized there was a skb_to_full_sk() helper added, which the
xt_qtaguid code isn't yet using.

This patch adds its use, and resovles panics seen when accessing
uninitialzed memory when processing synack packets.

Change-Id: Id0dbb7853aba221c1926e44616524fed90677602
CRs-Fixed: 1035969
Reported-by: YongQin Liu <yongquin.liu@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-commit: 4e461c777e
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-28 19:49:09 -07:00
Amit Pundir
843033e005 Revert "net: activity_stats: Add statistics for network transmission activity"
This reverts commit afedd7beba.

Change-Id: Ibc9160b445254b0212c23664a94fd27b7788aa76
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 42d9422a80
Git-repo: https://android.googlesource.com/kernel/common/
[bflowers@codeaurora.org: Fix-up internal configs]
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-28 19:47:52 -07:00
Patrick Daly
d83bcb15fd defconfig: Enable REMOTEQDSS
Allow enabling debug events for other processors through debugfs.

Change-Id: Ic3140ee333e646352f7ede3ecf969b7f078ff2c9
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
2016-07-28 19:23:00 -07:00
Runmin Wang
fb0c8af0af ARM: dts: msm: Add platform info for msmcobalt
Add platform info to the machine name on msmcobalt device tree node.

CRs-Fixed: 1047798
Change-Id: I52095462c60d1320e3aeabed7aaf7462f143f8da
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-07-28 16:52:49 -07:00
Runmin Wang
9791b32e85 soc: qcom: socinfo: Add support for APQCOBALT
Add soc chip ID information to support APQCOBALT platform.

CRs-Fixed: 1047772
Change-Id: I17817fbf6692829959314923c514b377e612aff8
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-07-28 16:36:17 -07:00
Venkat Gopalakrishnan
4667018ad7 scsi: ufs: return appropriate error code
If link recovery succeeds after a hibern8 exit failure,
return success as the link is active now for use.

Change-Id: I76ac226a2a1e33dd9c6240cac3443a03355bb75e
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2016-07-28 13:15:01 -07:00
Devesh Jhunjhunwala
f2509065e9 leds: qpnp-flash-v2: Create atomic notifier chain for flash irqs
Create an atomic notifier call chain to notify registered
clients of a flash-led irq event.

CRs-Fixed: 921325
Change-Id: I218195c29fede7ae5959df8c40df0231a71de379
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-28 12:43:30 -07:00
Chinmay Sawarkar
2e1c097214 ARM: dts: msm: By default, handle FW errors as fatal on msmcobalt
All FW errors such as SYS_ERROR, SESSION_ERROR and timeouts
will be treated as Fatal.

CRs-Fixed: 1037031
Change-Id: I12463f98cf50f5c8cdfdd47775dec075219974d6
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
2016-07-28 12:21:57 -07:00
Sudheer Papothi
712b785a73 ASoC: msm-cpe-lsm: add support for two CPE sessions
Existing CPE(Codec Processing Engine) driver supports single session.
Add support for two sessions with different sampling rates.

CRs-fixed: 1022917
Change-Id: Icb355cd07db9cc66632ac0ea14464c5610919725
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-07-28 11:20:07 -07:00
Deepak Katragadda
21d9b84ac3 ARM: dts: msm: Update the graphics OPP property on MSMCOBALT
Use the correct OPP handle property in order to store the
actual voltages and not the corners for the graphics rail
in the OPP table

CRs-Fixed: 1047605
Change-Id: I593d288edb704d2a92a65d47ca7f6399ba2e080d
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2016-07-28 10:16:30 -07:00
Devesh Jhunjhunwala
6b49283ec8 ARM: dts: msm: Add interrupts to flash-led device for pmicobalt
Add the all-ramp-up-done and all-ramp-down-done interrupts
to the flash-led device for pmicobalt. These interrupts will
be used to notify the flash-led clients when all leds have
completed ramping up or down after the flash is triggered.

CRs-Fixed: 921325
Change-Id: I39a6ba34e43dab8035bf232d0e640e72d7a34575
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-28 09:54:24 -07:00
Devesh Jhunjhunwala
6820e0c51b leds: qpnp-flash-v2: Add support to handle ramp up and down irqs
Add support to register and handle the all-ramp-up-done
and all-ramp-down-done irqs for flash-led.

CRs-Fixed: 921325
Change-Id: I843a008dbe6900f9f16c202a05435dbaf7a37627
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-28 09:54:24 -07:00
Dhanalakshmi Siddani
78505032fe ASoC: msm: Implement HFP tx mute get function
Implement function to get HFP Tx mute status.

CRs-Fixed: 1045063
Change-Id: I64931decb9948ed47f046c0b6267150fe512a3dc
Signed-off-by: Dhanalakshmi Siddani <dsiddani@codeaurora.org>
2016-07-28 01:18:31 -07:00
Abinaya P
70dede533e input: it7258_ts_i2c: add DT parsing support for touch driver
Add device tree support for ITE Tech touch controller driver.

Change-Id: I2671b7c30b0f2ed1d7ad788f29b7f900a2a1cdcc
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-07-28 11:31:53 +05:30
Linux Build Service Account
956d9b1ab3 Merge "thermal: tsens: Remove registering for Critical trip zone" 2016-07-27 19:27:17 -07:00
Linux Build Service Account
006d8efe02 Merge "defconfig: msmcortex: Enable FG_GEN3 driver" 2016-07-27 19:27:15 -07:00
Linux Build Service Account
80d67524f5 Merge "defconfig: arm64: msm: enable CP15 barrier and SETEND simulation" 2016-07-27 19:27:14 -07:00
Linux Build Service Account
94a518173d Merge "msm: ipa3: add support for SMMU to USB" 2016-07-27 19:27:12 -07:00
Linux Build Service Account
b649d7e19b Merge "usb: f_gsi: Update connection parameters for GSI channels" 2016-07-27 19:27:11 -07:00
Linux Build Service Account
843ed09846 Merge "ASoC: wcd_cpe: Add support for two CPE sessions" 2016-07-27 19:27:09 -07:00