Commit graph

574468 commits

Author SHA1 Message Date
Linux Build Service Account
86ed229775 Merge "nf: xt_qtaguid: fix handling for cases where tunnels are used." 2016-09-02 13:52:34 -07:00
Linux Build Service Account
d48d1c2287 Merge "msm: sde: Fix SMMU fault in SDE rotator for secure playback" 2016-09-02 13:52:33 -07:00
Linux Build Service Account
ce208ebb32 Merge "ARM: dts: msm: add 2 lane support for msmcobalt ufs phy" 2016-09-02 13:52:32 -07:00
Linux Build Service Account
90d089418c Merge "qseecom: improve listener resp processing if app is blocked" 2016-09-02 13:52:32 -07:00
Linux Build Service Account
48b6724178 Merge "msm: sde: Fix SDE rotator driver error handling" 2016-09-02 13:52:31 -07:00
Linux Build Service Account
8309f6afda Merge "msm: ipa: fix potential race condition ioctls" 2016-09-02 13:52:30 -07:00
Linux Build Service Account
40b4ea195d Merge "cnss: Reset QCA Card during WLAN SubSystem Recovery" 2016-09-02 13:52:29 -07:00
Linux Build Service Account
e6fe53412e Merge "scsi: ufs: Initiate crypto before SCSI for UFS fast boot" 2016-09-02 13:52:28 -07:00
Linux Build Service Account
d9fed05410 Merge "cfg80211: Add option to specify previous BSSID for Connect command" 2016-09-02 13:52:27 -07:00
Linux Build Service Account
01b7812ef9 Merge "cfg80211: Define macro to indicate prev_bssid connect support" 2016-09-02 13:52:26 -07:00
Linux Build Service Account
d95f7bea18 Merge "soc: qcom: glink: Validate ctx before using" 2016-09-02 13:52:25 -07:00
Linux Build Service Account
ca667c3ef5 Merge "mutex: Add a delay into the SPIN_ON_OWNER wait loop." 2016-09-02 13:52:24 -07:00
Linux Build Service Account
cf923055eb Merge "net: ipc_router: Fix remote port conn_info memory leak" 2016-09-02 13:52:24 -07:00
Linux Build Service Account
da1845f69c Merge "host: sdhci-msm: implement get_current_limit() host op" 2016-09-02 13:52:23 -07:00
Linux Build Service Account
3fa0d6f138 Merge "diag: Add error handler to free buffers when fwd fails" 2016-09-02 13:52:22 -07:00
Linux Build Service Account
0e34d5ec1c Merge "icnss: Shutdown only if probed" 2016-09-02 13:52:20 -07:00
Linux Build Service Account
4e06ee349f Merge "icnss: Fix NULL pointer dererference" 2016-09-02 13:52:20 -07:00
Linux Build Service Account
a278b7c5a4 Merge "defconfig: msmcortex: enable QCOM_TADC driver" 2016-09-02 13:52:18 -07:00
Linux Build Service Account
e5e464d857 Merge "defconfig: msm: enable common log for msmcobalt" 2016-09-02 13:52:17 -07:00
Linux Build Service Account
d03c5b32e3 Merge "msm: camera: secure camera support" 2016-09-02 13:52:17 -07:00
Linux Build Service Account
c4aaae0d6a Merge "msm: camera: isp: Use single stream for dual vfe" 2016-09-02 13:52:15 -07:00
Linux Build Service Account
8e942d7343 Merge "coresight-stm: let runtime PM handle core clock" 2016-09-02 13:52:14 -07:00
Linux Build Service Account
7854019283 Merge "msm: sensor: Add support for querying flash max current" 2016-09-02 13:52:14 -07:00
Linux Build Service Account
f7e6d28c0b Merge "msm: mdss: increase mdp hw recovery timeout" 2016-09-02 13:52:13 -07:00
Linux Build Service Account
b2bff7109a Merge "ARM: dts: msm: change the CX handle in PCIe node on msmcobalt" 2016-09-02 13:52:12 -07:00
Linux Build Service Account
531271409b Merge "msm: pcie: config core and peripheral memory for PCIe clocks" 2016-09-02 13:52:11 -07:00
Linux Build Service Account
b11aa41c03 Merge "msm: pcie: correct size of local PCIe clock frequency buffer" 2016-09-02 13:52:10 -07:00
Linux Build Service Account
340e0f63ff Merge "USB: f_accessory: Fix crash if driver failed to initialize" 2016-09-02 13:52:09 -07:00
Linux Build Service Account
fd69ea1825 Merge "USB: f_accessory: set manufacturer and model string to default value" 2016-09-02 13:52:08 -07:00
Prashanth Bhatta
e7203bbcb0 icnss: Fix NULL pointer dererference
With commit a3a3c169dd ("icnss: Prevent power collapse during
driver probe/remove"), NULL pointer dereference happens in probe
because of recent changes in the function. Fix the issue by using
right pointer.

CRs-Fixed: 1061279
Change-Id: I464579953fabe1bd42ced50f0bbfdfd3cda0a492
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-09-01 16:55:10 -07:00
Prashanth Bhatta
a15f85fc40 icnss: Shutdown only if probed
With the recovery changes, if modem is brought down without FW
ready but WLAN driver is registered then shutdown call back is
called. This causes stability issue.
Make sure not call the shutdown call back if driver is not
registered. Also listening for PD notifications are enough even
for Subsystem restart so changing the quirks to take care of it.

CRs-fixed: 1061734
Change-Id: Ic5d1a38dfb6ea3e255424af135e2afbe47d1fc18
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-08-31 12:45:58 -07:00
Prashanth Bhatta
a3a3c169dd icnss: Prevent power collapse during driver probe/remove
Race condition observed during driver probe/remove and
suspend/resume because suspend/resume is not serialized
to work queue. Fix this problem by holding a wake lock
during wlan driver probe/remove to prevent system
suspend/resume.

CRs-Fixed: 1061279
Change-Id: Iad1c9abbdbaea21d4c55d64a6c120d3bcf0df1eb
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-08-30 17:18:27 -07:00
Prashanth Bhatta
5fc63ed649 icnss: Fix logic to wait for WCSS out of retention
WCSS may take upto 400us to get out of retention. Fix the polling
logic to wait for more than 400us before proceeding with the
reset sequence.
Also do not send mode request to firmware during recovery.

CRs-fixed: 1060725
Change-Id: Id19518a12fe8a0acffd725b25dbcb0240bdbf446
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-08-30 14:56:42 -07:00
Linux Build Service Account
ab26d09879 Merge "msm: mdss: Fix to validate data copied from user space" 2016-08-30 05:43:46 -07:00
Linux Build Service Account
019b7d0c64 Merge "msm: vidc: Compare ion_handles rather than fds" 2016-08-30 05:43:45 -07:00
Linux Build Service Account
a3d968ba61 Merge "msm: vidc: Amend DCVS condition" 2016-08-30 05:43:44 -07:00
Linux Build Service Account
37b89f3848 Merge "msm: ipa: WDI2.0: hotspot offload using WDI 2.0 interface" 2016-08-30 05:43:43 -07:00
Linux Build Service Account
81d6052b05 Merge "msm: kgsl: Change %p to %pK in debug messages" 2016-08-30 05:43:42 -07:00
Komal Seelam
fcf844fbdd cnss: Reset QCA Card during WLAN SubSystem Recovery
During SSR, we observe cases where card enter bad state
and does not responding to any I/O commands. Fix it by
powering off and on the card.

Change-Id: Ia3ab2781c93d1cfe7427e2b1c2644f6628f6465f
CRs-Fixed: 1058794
Signed-off-by: Komal Seelam <kseelam@codeaurora.org>
2016-08-30 14:49:30 +05:30
Linux Build Service Account
166af733db Merge "scsi: ufs-qcom: skip svs2 configuration for newer controllers" 2016-08-29 19:14:22 -07:00
Linux Build Service Account
78170f03d5 Merge "mfd: qcom-i2c-pmic: prepare for shared interrupt" 2016-08-29 19:14:22 -07:00
Linux Build Service Account
1f2cf9a987 Merge "defconfig: arm64: Add coresight abort support for msmcobalt" 2016-08-29 19:14:21 -07:00
Linux Build Service Account
6f177c586e Merge "ARM: dts: msm: add audio codec as child of MSM External display" 2016-08-29 19:14:20 -07:00
Linux Build Service Account
1c39aaa3b8 Merge "msm: qpnp-haptic: Update function declarations" 2016-08-29 19:14:19 -07:00
JP Abgrall
97a4ac881a nf: xt_qtaguid: fix handling for cases where tunnels are used.
* fix skb->dev vs par->in/out
When there is some forwarding going on, it introduces extra state
around devs associated with xt_action_param->in/out and sk_buff->dev.
E.g.
   par->in and par->out are both set, or
   skb->dev and par->out are both set (and different)
This would lead qtaguid to make the wrong assumption about the
direction and update the wrong device stats.
Now we rely more on par->in/out.

* Fix handling when qtaguid is used as "owner"
When qtaguid is used as an owner module, and sk_socket->file is
not there (happens when tunnels are involved), it would
incorrectly do a tag stats update.

* Correct debug messages.

Bug: 11687690
Change-Id: I2b1ff8bd7131969ce9e25f8291d83a6280b3ba7f
CRs-Fixed: 747810
Signed-off-by: JP Abgrall <jpa@google.com>
Git-commit: 2b71479d6f5fe8f33b335f713380f72037244395
Git-repo: https://www.codeaurora.org/cgit/quic/la/kernel/mediatek
[imaund@codeaurora.org: Resolved trivial context conflicts.]
Signed-off-by: Ian Maund <imaund@codeaurora.org>
[bflowers@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-08-29 13:59:18 -07:00
Benjamin Chan
aeb8d34871 msm: sde: Fix SMMU fault in SDE rotator for secure playback
When playing secure content, framebuffer is setup as secure in the
rotator. But the sw timestamp is not going through the secure
route, and must clear out the secure setting, otherwise a smmu fault
will be issued. This fix make sure the secure buffer status is
cleared during the sw timestamp submission.

CRs-Fixed: 1059620
Change-Id: Ifb0f9928fa1d948351e6fc1ad925a070a7f50a96
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2016-08-29 13:06:55 -07:00
Benjamin Chan
3990c6a17a msm: sde: Fix SDE rotator driver error handling
Initialize some local variables before using them and safely return an
error code when encounter error cases in the SDE rotator driver.

CRs-Fixed: 1060558
Change-Id: I25406b13ac2007f1789d8d32e428c39dac4c29cf
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2016-08-29 11:24:53 -04:00
Utkarsh Saxena
c6d6062033 msm: ipa: WDI2.0: hotspot offload using WDI 2.0 interface
Add support to enable WDI 2.0 interface on IPA version 2.6.1
which is used in falcon.

Change-Id: Id6460f21245808b739ad215fe8073ae7cae8422c
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2016-08-29 07:49:51 -07:00
Linux Build Service Account
aaf356abef Merge "scsi: ufs: add 2 lane support" 2016-08-29 06:46:44 -07:00
Komal Seelam
9bb7d6728f net: cnss: Release QCA chip resources when Wi-Fi is turned off
When WiFi is turned off from userspace, save power by toggling
WLAN_EN gpio and restore power when wifi is loaded again.

CRs-Fixed: 1058794
Change-Id: I0257698d9d168d7c889436a05693061cafe5ea7c
Signed-off-by: Komal Seelam <kseelam@codeaurora.org>
2016-08-29 17:03:49 +05:30