Commit graph

588006 commits

Author SHA1 Message Date
Amir Samuelov
b4968ee80c spcom: use mutex on spcom_unlock_ion_buf()
Only the channel owner app can lock/unlock a channel ion buf.
However, if the app share the ION buf FD with its child tasks,
they might wrongly free the same ion buf twice.
The ion driver panic if a non-valid ION buff handle is provided.

Change-Id: Ia8166df5ea314949090f7e94e90eff3a3ed78b19
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2017-04-23 13:53:27 +03:00
Linux Build Service Account
6cf6835d96 Merge "msm: mdss: check for audio support before notifying frameworks" 2017-04-21 17:57:37 -07:00
Linux Build Service Account
35cc04df55 Merge "msm: mdss: add debug bus support for dsi block" 2017-04-21 17:57:37 -07:00
Linux Build Service Account
0fc565ebdb Merge "FROMLIST: 9p: fix a potential acl leak" 2017-04-21 17:57:35 -07:00
Linux Build Service Account
038de1e53d Merge "soc: qcom: pil: Avoid possible buffer overflow during Modem boot" 2017-04-21 17:57:35 -07:00
Cong Wang
bea6f1c779 FROMLIST: 9p: fix a potential acl leak
(https://lkml.org/lkml/2016/12/13/579)

posix_acl_update_mode() could possibly clear 'acl', if so
we leak the memory pointed by 'acl'. Save this pointer
before calling posix_acl_update_mode() and release the memory
if 'acl' really gets cleared.

Reported-by: Mark Salyzyn <salyzyn@android.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Greg Kurz <groug@kaod.org>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Bug: 32458736
Change-Id: Ia78da401e6fd1bfd569653bd2cd0ebd3f9c737a0
Git-repo: https://android.googlesource.com/kernel/msm/
Git-commit: 7c780387c931f63fe67830c817f65c1272512bb1
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-04-21 11:09:12 -07:00
Linux Build Service Account
d44796d6ae Merge "arm: dma-mapping: add iova size alignment check" 2017-04-21 09:41:39 -07:00
Linux Build Service Account
f9da89f3ca Merge "lpm-levels: Select lpm for isolated cpu when sleep is disabled" 2017-04-21 09:41:38 -07:00
Linux Build Service Account
2fcd6d4d01 Merge "arm: dma-mapping: set the proper bitmap size" 2017-04-21 09:41:37 -07:00
Linux Build Service Account
3cbe2d2e4e Merge "staging: android: sync: Limit sync log dumping" 2017-04-21 09:41:36 -07:00
Linux Build Service Account
9b9651811b Merge "ARM: dts: msm: Add dts setting for a530 DRM on msm8996" 2017-04-21 09:41:35 -07:00
Linux Build Service Account
94d3609ffa Merge "iommu: iommu-debug: assign iova space for fastmap client" 2017-04-21 09:41:34 -07:00
Linux Build Service Account
377b645155 Merge "drivers: cpuidle: lpm-levels: add lpm_debug to Minidump" 2017-04-21 09:41:33 -07:00
Linux Build Service Account
c571b68a7c Merge "soc: qcom: Add Minidump support" 2017-04-21 09:41:32 -07:00
Linux Build Service Account
c30ff10a70 Merge "ARM: dts: msm: Add overlay files for 8998 QRD boards" 2017-04-21 00:37:36 -07:00
Linux Build Service Account
8ab7fc2939 Merge "char: msm_smd_pkt: Add snapshot of SMD packet driver" 2017-04-21 00:37:35 -07:00
Linux Build Service Account
f1a91e13f2 Merge "clk: msm: clock-mmss-8998: Set non_local_children flag for mdp_clk_src" 2017-04-21 00:37:34 -07:00
Linux Build Service Account
c2b5adaf8a Merge "diag: Split data stream for User PDs on LPASS" 2017-04-21 00:37:34 -07:00
Linux Build Service Account
ee129a0667 Merge "ANDROID: ion: Fix uninitialized variable" 2017-04-21 00:37:32 -07:00
Linux Build Service Account
9cf7045fb6 Merge "ANDROID: ion: Protect kref from userspace manipulation" 2017-04-21 00:37:32 -07:00
Linux Build Service Account
d7eb0a4d7f Merge "scsi: ufs: fix issue with scaling up gear" 2017-04-21 00:37:31 -07:00
Linux Build Service Account
a171c21c8a Merge "Perf: arm64: disable irq for hotplug offline" 2017-04-21 00:37:30 -07:00
Charan Teja Reddy
ae4040d39a arm: dma-mapping: add iova size alignment check
On 32bit systems, bitmap storing the iova information is stored in per
page and each page represents the 128MB of IOVA. So, for the
alloc_iova() to return the requested range, iova size should be aligned
to 128MB.

Change-Id: I66eb15cdbb3d6730cc4d84cad9f0c652f91278d6
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-04-21 12:45:35 +05:30
Maulik Shah
ce47b1c984 lpm-levels: Select lpm for isolated cpu when sleep is disabled
Isolated cpu can enter to wfi if sleep is disabled and stay in
wfi until it wakes up and selects deeper lpm again.

Select cpu lpm for isolated cpu when sleep is disabled.

Change-Id: Id936ebaac0118d48d07e74aff7569f93b8b98b8b
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
2017-04-21 11:27:18 +05:30
Deepak Kumar
5ef49cfc5b staging: android: sync: Limit sync log dumping
Dump sync logs only when a fence is not signalled
for SYNC_DUMP_TIME_LIMIT or more. This is necessary
to reduce CPU hogging because of excessive sync logs
dumped due to fence timeouts which are less than
SYNC_DUMP_TIME_LIMIT and are harmless.

Change-Id: Id21a02925dd45a01361d096048a25d1879ebde9e
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-04-21 10:55:52 +05:30
Charan Teja Reddy
182caa19ec arm: dma-mapping: set the proper bitmap size
Set the size of bitmap area properly to ensure the proper iova address
to be returned by the bitmap_() API's through alloc_iova(). The current
implementation causes the bitmap index search out of bounds of a page
which can lead to the randomn corruption issues.

Change-Id: Ie57ca0b7465c91d318145ed270b7d47d822c8eeb
Fixes:I88ddd98a76b ("arm/arm64: dma-mapping: Fix iova region size")
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-04-21 10:01:15 +05:30
Sudarshan Rajagopalan
0c17028a92 iommu: iommu-debug: assign iova space for fastmap client
With fast mapping, the iova range is zero in the absence of
mapping object from the client. In such case, set the iova
space using the DOMAIN_ATTR_GEOMETRY dommain attribute.

CRs-Fixed: 2020868
Change-Id: I28790728c02ecb2d0a921bf5a218fb8b16662619
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2017-04-20 17:39:20 -07:00
Linux Build Service Account
1a2fe3d28e Merge "msm_11ad: set geometry attr when SMMU stage1 is enabled" 2017-04-20 16:10:37 -07:00
Linux Build Service Account
155c23df2a Merge "ARM: dts: msm: Add device tree for 8998 MTP with 4k display" 2017-04-20 16:10:36 -07:00
Linux Build Service Account
1d7b0bcc5f Merge "clk: msm: clock-local2: Fix get_rate ops for branch clock" 2017-04-20 16:10:35 -07:00
Linux Build Service Account
ccee2cb02c Merge "defconfig: arm64: msmcortex: Enable IP6_NF_IPTABLES_128" 2017-04-20 16:10:35 -07:00
Linux Build Service Account
a94dbcafdf Merge "msm: mdss: fix race condition during mdp debugfs release" 2017-04-20 16:10:34 -07:00
Linux Build Service Account
9d26a7fb14 Merge "msm: mdss: dp: gracefully handle cable disconnect" 2017-04-20 16:10:27 -07:00
Linux Build Service Account
e66fc6f5af Merge "msm: mdss: dp: fix HDCP 1.x state transitions" 2017-04-20 16:10:25 -07:00
Linux Build Service Account
ddc8181a46 Merge "msm: camera: isp: add bound check to handle array out of access" 2017-04-20 16:10:24 -07:00
Linux Build Service Account
68ddf4f0c2 Merge "msm: camera: Add spinlock protection for flags in CCI driver" 2017-04-20 16:10:22 -07:00
Linux Build Service Account
661a45ee18 Merge "msm: camera: isp: Use the frame id from correct source" 2017-04-20 16:10:21 -07:00
Daniel Rosenberg
dadd3624c1 ANDROID: ion: Fix uninitialized variable
Fix an uninitialized variable in user_ion_handle_put_nolock

Change-Id: Ia634b790661089ad01aca8e5975984435463d148
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 34276203
[d-cagle@codeaurora.org: Add commit message]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-04-20 13:18:19 -07:00
Daniel Rosenberg
8309865527 ANDROID: ion: Protect kref from userspace manipulation
This separates the kref for ion handles into two components.
Userspace requests through the ioctl will hold at most one
reference to the internally used kref. All additional requests
will increment a separate counter, and the original reference is
only put once that counter hits 0. This protects the kernel from
a poorly behaving userspace.

Bug: 34276203

Change-Id: Ibc36bc4405788ed0fea7337b541cad3be2b934c0
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Git-repo: https://android.googlesource.com/kernel/msm/
Git-commit: 20abfcc16884a5af973a5e91dd013ddd789c44f4
[d-cagle@codeaurora.org: Resolve style issues]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-04-20 13:15:44 -07:00
Subhash Jadavani
576fd3829b scsi: ufs: fix issue with scaling up gear
Commit <be0960374> ("scsi: ufs: scale up the gear in 2 steps") introduced
a bug where we would not scale up the gear to HS-G3 if
UFS_DEVICE_QUIRK_HS_G1_TO_HS_G3_SWITCH quirk isn't enabled for UFS device.
Fix this by allowing HS-G3 scaling irrespective of quirk state.

Change-Id: Id6a958fb2908ae773283bcdd3dc871292e56f4ce
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2017-04-20 12:14:11 -07:00
Puja Gupta
1a2966e711 ARM: dts: msm: Add overlay files for 8998 QRD boards
Add 8998 QRD board specific device tree overlay files.

CRs-Fixed: 2034685
Change-Id: I13b8e53aaad4c1c0582513b79b3efc82cf9a82a5
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-04-20 11:54:30 -07:00
Manoj Prabhu B
dc5e63d935 diag: Split data stream for User PDs on LPASS
This patch segregates different PD data onto separate buffers
and then onto its own data stream.

CRs-Fixed: 2019189
Change-Id: I09c4e1a7da0ccd3ba3e025e9f13da0fbcb95f103
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-04-20 20:52:49 +05:30
Linux Build Service Account
6ee87610ac Merge "msm: ipa3: disable statuses for modem pipes on SSR" 2017-04-20 04:41:01 -07:00
Linux Build Service Account
b620fb4961 Merge "iommu/io-pgtable-fast: invalidate TLBs on unmap" 2017-04-20 04:41:00 -07:00
Linux Build Service Account
4303a6f9e6 Merge "iommu/io-pgtable-fast: fix sign extension position" 2017-04-20 04:40:58 -07:00
Linux Build Service Account
27a0d415d4 Merge "iommu/arm-smmu: add support to configure IOVA range" 2017-04-20 04:40:58 -07:00
Linux Build Service Account
815709b5cd Merge "net: ipv6: Optimize ipv6 packet matching" 2017-04-20 04:40:57 -07:00
Linux Build Service Account
1295975733 Merge "wcnss: fix the buffer overflow in MAC address store sysfs" 2017-04-20 04:40:56 -07:00
Linux Build Service Account
5342b7ef09 Merge "ARM: dts: msm: Add PBS trigger support for OLEDB for PM660A" 2017-04-20 04:40:55 -07:00
Linux Build Service Account
3d65a6ba20 Merge "msm: mdss: dp: always set default resolution" 2017-04-20 04:40:53 -07:00