Commit graph

587973 commits

Author SHA1 Message Date
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
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
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
Linux Build Service Account
4b791a5fa9 Merge "msm: mdss: Ensure MDSS GDSC switched off during FB PM suspend" 2017-04-20 04:40:52 -07:00
Linux Build Service Account
7cf1a4a8da Merge "msm: mdss: make panel status check and dfps update exclusive" 2017-04-20 04:40:51 -07:00
Linux Build Service Account
4eb23fe0d0 Merge "ARM: dts: msm: enable register read based ESD for sdm660" 2017-04-20 04:40:49 -07:00
Maya Erez
6f55f74182 msm_11ad: set geometry attr when SMMU stage1 is enabled
When SMMU stage1 is enabled, set IOVA base and end in geometry
attr to allow PCIe driver to map the GIC MSI address.

Change-Id: I7826a941823a6204143ea077a45c71b22316699b
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-04-20 08:43:10 +03:00
Amit Nischal
520bcb4b2a clk: msm: clock-local2: Fix get_rate ops for branch clock
For branch clocks having aggr_sibling_rates flag as set, get_rate()
always returns the parents rate despite the branch clocks prepare
status. Fix the same by adding a check for branch prepare status
and aggr_sibling_rates flag value.

Change-Id: If0ba62e178f14bc5fd8ec6007a67538a9b97285b
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2017-04-20 10:05:52 +05:30
Linux Build Service Account
7684fb148e Merge "msm: ipa: Fix to use GFP_DMA and add check for dma_map_single" 2017-04-19 19:27:30 -07:00
Linux Build Service Account
536cabaf9c Merge "ARM: dts: msm8998: remove extra simulator panel nodes" 2017-04-19 19:27:28 -07:00
Linux Build Service Account
3b00750d38 Merge "diag: Add validity check for process descriptor" 2017-04-19 19:27:28 -07:00
Linux Build Service Account
ccea62ce17 Merge "regulator: qpnp-oledb: Add support for LAB_VREG_NOT_OK notifier" 2017-04-19 19:27:27 -07:00
Linux Build Service Account
7ca6c92e65 Merge "regulator: qpnp-labibb: Handle LAB short circuit(SC) detection" 2017-04-19 19:27:26 -07:00
Linux Build Service Account
7514c164f1 Merge "usb: gadget: configfs: Replace strncpy with strlcpy" 2017-04-19 11:41:41 -07:00
Linux Build Service Account
1d9cf2a667 Merge "leds: qpnp-flash-v2: Enable charger mitigation" 2017-04-19 11:41:37 -07:00
Linux Build Service Account
1a597a13e8 Merge "arm64: cache: change ARCH_DMA_MINALIGN and L1_CACHE_SHIFT values" 2017-04-19 11:41:36 -07:00
Linux Build Service Account
f984c0f9a0 Merge "ARM: dts: msm: update VDD_APC margin adjustments for msm8998v2" 2017-04-19 11:41:35 -07:00
Linux Build Service Account
a69827fe6d Merge "defconfig: msm: enable vndbinder for sdm660 and msmcortex" 2017-04-19 11:41:34 -07:00
Subash Abhinov Kasiviswanathan
ae714a17b9 defconfig: arm64: msmcortex: Enable IP6_NF_IPTABLES_128
This enables 128 bit matching in ip6tables to help
optimize cases where there is no match required.

This shows a rough improvement of 40Mbps in a UDPv6
downlink test using iperf.

CRs-Fixed: 2034577
Change-Id: I093069b17f21cfbbe60b2bd941f8e2dfef562401
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2017-04-19 11:56:54 -06:00
Subash Abhinov Kasiviswanathan
6f6c1a1f8b net: ipv6: Optimize ipv6 packet matching
iptables matching for ipv6 always has a mask if an address is
specified for match. Adding a check for mask prior to that
helps to improve performance as it avoids the masked comparison.
This is achieved by defining a new feature IP6_NF_IPTABLES_128
which allows to perform 128 bit arithmetic while matching.

CRs-Fixed: 2034577
Change-Id: I9ffd34e29d1b06ad74545d4751aa0e1ea06ded49
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2017-04-19 11:56:49 -06:00
Rajkumar Subbiah
4c368d38aa ARM: dts: msm: Add device tree for 8998 MTP with 4k display
The 4k display variant of the 8998 MTP has a new device subtype.
Creating a new device tree file with the default panel set to
4k command mode to support this MTP variant.

Change-Id: I1f1eee1baf2bfb1f452e724b55536674a9d6d973
Signed-off-by: Rajkumar Subbiah <rsubbia@codeaurora.org>
2017-04-19 10:43:53 -07:00
Kiran Gunda
be5977b833 ARM: dts: msm: Add PBS trigger support for OLEDB for PM660A
OLEDB driver needs to configure the PBS RAM sequence for
disabling the OLEDB pull down during the module disable.
Add it for PM660A.

Change-Id: I8a969125faa14b2011714ad5bd98a1f9a0f5b649
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-19 04:53:47 -07:00
Amir Levy
7f7b911b32 msm: ipa3: disable statuses for modem pipes on SSR
On SSR scenario disable statuses for modem producer pipes.
Since modem is not up these statuses are redundant and are
not read by any EE.

Change-Id: I6e7a475d74902f7c5d1b9083f9f7935d3ed2c7c9
CRs-Fixed: 2034903
Signed-off-by: Amir Levy <alevy@codeaurora.org>
2017-04-19 14:35:12 +03:00
Kiran Gunda
35b84c47a5 regulator: qpnp-oledb: Clear SPARE_CTL register during disable
OLEDB_SPARE_CTL register bit is set by the PBS during the display enable
and is used during the display suspend to trigger the PBS event.
Hence, move clearing of the OLEDB_SPARE_CTL register to regulator disable.
Also enable the force_pd_ctl only for DRAX-A revisions <=2.0.

Change-Id: I339cefc91f94f772bc4f84e85f2471e1a73e4aed
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-19 16:36:46 +05:30
Manu Gautam
851175d661 usb: gadget: configfs: Replace strncpy with strlcpy
Use safer version of strcpy i.e. strlcpy instead of
strncpy for NULL terminated strings.

Change-Id: I5e2800d1d539545744a1b1231e1d589a7c92797a
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
2017-04-19 04:05:56 -07:00
Gopikrishna Mogasati
296e5025fa diag: Add validity check for process descriptor
This fix checks the validity of memory device session's
process descriptor before issuing a signal to it while
subsystem restart is performed. This fix avoids accessing
of cleaned-up process descriptor's fields.

CRs-Fixed: 2034816
Change-Id: I2725d3348fbeb8290c887cccea4bca6d41c5b184
Signed-off-by: Gopikrishna Mogasati <gmogas@codeaurora.org>
2017-04-19 15:58:32 +05:30
Kiran Gunda
6c86753b0d regulator: qpnp-oledb: Add support for LAB_VREG_NOT_OK notifier
Register a notifier callback for LAB_VREG_NOT_OK, which is triggered
by the LABIBB driver when short circuit(SC) is detected on the LAB
rail. Disable the OLEDB module upon receiving the LAB_VREG_NOT_OK
notification.

Change-Id: Ia3cc19d9a3c2f32acc413677a9ea4b3100464cd2
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-19 02:30:41 -07:00
Kiran Gunda
91a6162f19 regulator: qpnp-labibb: Handle LAB short circuit(SC) detection
On certain PMICs, there is no short circuit (SC) detection available
in LAB module. Add support to detect it manually and disable LAB/IBB
module upon SC detection. In addition, notify it to OLEDB driver to
disable OLEDB module.

Change-Id: I2a9dc5b1ae8ece45c85b3992026c7f389fd4d135
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-19 14:47:26 +05:30