Commit graph

590740 commits

Author SHA1 Message Date
Terence Ho
9dc644af56 msm: camera: validate num_streams in stream_cfg_cmd before using it
stream_cfg_cmd->num_streams is from userspace,
need to check it against MSM_ISP_STATS_MAX before using it.

CRs-Fixed: 2029867
Change-Id: I02a71b983947981806470454654d712bcc732077
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
2017-07-07 15:30:22 -07:00
Linux Build Service Account
3258c68559 Merge "msm: camera: fix untrusted pointer for power down setting" into dev/msm-4.4-8996au 2017-07-07 15:29:00 -07:00
VijayaKumar T M
5c0e1f4016 msm: camera: fix untrusted pointer for power down setting
When getting power down setting, there is an untrusted pointer
from a user space pointer. Need to copy to the kernel space first.

CRs-Fixed: 2037398
Change-Id: I64032a96e62ddfeec85eebe984d8ba52754f6148
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
Signed-off-by: VijayaKumar T M <vtmuni@codeaurora.org>
2017-07-07 14:57:17 -07:00
Terence Ho
dd76644c6c msm: camera: fix untrusted pointer for power down setting
When getting power down setting, there is an untrusted pointer
from a user space pointer.Need to copy to the kernel space first.

Change-Id: I0c66e942453581caac5ea00a54a252840a32972f
CRs-Fixed: 2037398 2037403
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
2017-07-07 14:56:57 -07:00
Linux Build Service Account
87dfd9682c Merge "msm📷 correct stats query out of boundary" into dev/msm-4.4-8996au 2017-07-07 12:04:01 -07:00
Fei Zhang
54105d3ed6 msm📷 correct stats query out of boundary
fix one potential out of boundary query of stats info.

CRs-Fixed: 2041066

Change-Id: I13e4bf8802fcce529f9268c272e4727619d5ad8f
Signed-off-by: Fei Zhang <feizhang@codeaurora.org>
2017-07-07 11:47:06 -07:00
Fei Zhang
735884bc87 msm📷 correct stats query out of boundary
Fix a potential out of boundary query of stats info.

CRs-Fixed: 2041066
Change-Id: I76d4aa8c8ddd523fde007bfb6fa387a17930c2ba
Signed-off-by: Fei Zhang <feizhang@codeaurora.org>
2017-07-07 11:29:43 -07:00
Zhiqiang Tu
3f5f639b13 defconfig: arm64: msm: Enable pass through on virtual platform
Enable basic modules on virtual platform for driver pass through,
including pinctrl, gpio, clock, regulator, i2c, spi etc.

Change-Id: I3d4917e754277e0c55c55154a2ddb2f967199b48
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-06-26 22:02:18 -07:00
Linux Build Service Account
1ce84084dc Merge "defconfig: arm64: msm: Enable virtual platform" into dev/msm-4.4-8996au 2017-06-26 21:39:08 -07:00
Linux Build Service Account
18e7648d41 Merge "iommu: Fix compilation errors without CONFIG_IOMMU_API" into dev/msm-4.4-8996au 2017-06-26 21:39:06 -07:00
Zhiqiang Tu
b0b763bf53 ARM: dts: msm: Add spi_9 and i2c_8 on virtual platform
Add spi_9 and i2c_8 as pass through devices.

Change-Id: I6ccd161eee69ffa062bcb1763eebfe7a4db331ec
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-06-26 21:22:36 -07:00
Atul Raut
88dc521fe6 defconfig: arm64: msm: Enable virtual platform
Add support to build msm kernel based virtual
machine.

CRs-Fixed: 2000635
Change-Id: I76f4920a86adc8bac347c1c6c360ef55f84bc453
Signed-off-by: Atul Raut <araut@codeaurora.org>
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-06-24 07:44:17 -07:00
Patrick Daly
b9e9d37141 iommu: Fix compilation errors without CONFIG_IOMMU_API
Move code into appropriate #ifdef, and add an "inline" so the compiler no
longer gives a defined-but-not-used warning.

CRs-Fixed: 2066432
Change-Id: I226242bf994e659d8018a885f20c3a3f80b9b8e5
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Signed-off-by: Atul Raut <araut@codeaurora.org>
2017-06-23 23:04:05 -07:00
Linux Build Service Account
6fb998c41a Merge "ARM: dts: msm: Add clock and regulator for virtual platform" into dev/msm-4.4-8996au 2017-06-23 01:47:23 -07:00
Zhiqiang Tu
e1ec43ff6d clk: msm: Add fixed rate clock support for dummy clock driver
Virtual platform uses dummy clock driver. It needs dummy clock
driver to support fixed rate clock.

Change-Id: Id0f6ce592447a443c22ad49fddeaa598cf3d047e
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-06-22 21:31:37 -07:00
Zhiqiang Tu
ca6aa324be ARM: dts: msm: Add clock and regulator for virtual platform
Add dummy clock and regulator stub for virutual platform to
bypass clock and regulator operations.

Change-Id: Ic2c15e4b939adc0ea492422c93e3f3eac2d01054
Signed-off-by: Ramachandran Venkataramani <ramavenk@codeaurora.org>
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-06-22 21:30:56 -07:00
Atul Raut
7350d1ad72 arm64: Kconfig: Enable support for guest virtual platform
Enable support for msm kernel based guest virtual machine
runs on QUIN platform.

CRs-Fixed: 2024587
Change-Id: If6b26ca5180f3a148a54c6f8980d4efbb65ab2a9
Signed-off-by: Atul Raut <araut@codeaurora.org>
2017-06-15 09:58:13 -07:00
Robin Murphy
eb7038b13a iommu/dma: Remove bogus dma_supported() implementation
Back when this was first written, dma_supported() was somewhat of a
murky mess, with subtly different interpretations being relied upon in
various places. The "does device X support DMA to address range Y?"
uses assuming Y to be physical addresses, which motivated the current
iommu_dma_supported() implementation and are alluded to in the comment
therein, have since been cleaned up, leaving only the far less ambiguous
"can device X drive address bits Y" usage internal to DMA API mask
setting. As such, there is no reason to keep a slightly misleading
callback which does nothing but duplicate the current default behaviour;
we already constrain IOVA allocations to the iommu_domain aperture where
necessary, so let's leave DMA mask business to architecture-specific
code where it belongs.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Git-commit: a1831bb9403720db6d4c033fe2d6bd0116dd28fe
Git-repo:git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

CRs-Fixed: 2040683
Change-Id: I67431608ce196bf5ca981fb9aea2afce826094f0
Signed-off-by: Atul Raut <araut@codeaurora.org>
2017-06-13 21:48:56 -07:00
Zhiqiang Tu
d992f38d6d Merge remote-tracking branch 'remotes/quic/msm-4.4' into dev/msm-4.4-8996au
Conflicts:
	arch/arm64/configs/msm-auto-perf_defconfig

Change-Id: Ibc59804762c3e14031c22b03a52d49ff2acc36d4
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-06-12 15:40:13 +08:00
Linux Build Service Account
c1a2472056 Merge "fbdev: msm: Allocate fd with O_CLOEXEC flag" 2017-06-10 02:20:47 -07:00
Linux Build Service Account
73d6c8e7de Merge "msm: mdss: Buffer overflow while processing gamut table data" 2017-06-10 02:20:46 -07:00
Linux Build Service Account
1bfc4b2e71 Merge "fb: msm_dba: add post-on-sleep support for adv7533 vreg" 2017-06-10 02:20:45 -07:00
Linux Build Service Account
12cf20b0e9 Merge "ARM: dts: msm: update nt35597 panel properties for msm8998" 2017-06-10 02:20:43 -07:00
Linux Build Service Account
0ca5c4d703 Merge "msm: mdss: Do not attempt to request TE irq again if already requested" 2017-06-10 02:20:42 -07:00
Linux Build Service Account
5564915b1f Merge "ARM: dts: msm: Enable secondary USB port for HDK660" 2017-06-10 02:20:41 -07:00
Linux Build Service Account
69e7fcd32e Merge "icnss: Add APIs to store driver load count" 2017-06-09 18:47:16 -07:00
Linux Build Service Account
7c3a65b23d Merge "ARM: dts: msm: Disable MHI node for msm8996" 2017-06-09 18:47:15 -07:00
Linux Build Service Account
d3be51f52b Merge "ARM: dts: msm: add secure smmu cb node for msm8998" 2017-06-09 18:47:14 -07:00
Amar Singhal
e090be48c6 icnss: Add APIs to store driver load count
Host wlan driver needs to know if the drive has been
reloaded and wiphy re-registered with the kernel.
Therefore add APIs to retrieve this information.

CRs-Fixed: 2058292
Change-Id: Ia323e31e9b6779e2f5279f42b6e1860a9259a189
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
2017-06-09 12:45:06 -07:00
Linux Build Service Account
613ad18682 Merge "ARM: dts: msm: move tdm common prop to parent node for msm8996 auto" 2017-06-09 11:23:09 -07:00
Linux Build Service Account
ea7491238f Merge "ASoc: msm: add support for mixing data from different COPPs" 2017-06-09 11:23:08 -07:00
Linux Build Service Account
b93e191754 Merge "defconfig: add cfg80211 internal regdb suuport" 2017-06-09 11:23:07 -07:00
Linux Build Service Account
cf5d29992c Merge "msm: pcie: do not set irq chip data when using QGIC MSI" 2017-06-09 11:23:06 -07:00
Linux Build Service Account
a72ca7d8c8 Merge "msm: pcie: Fix for MDM enumeration issue" 2017-06-09 11:23:05 -07:00
Abhijit Kulkarni
f7aeaf28f9 ARM: dts: msm: add secure smmu cb node for msm8998
This change adds the secure context bank child node in mdss
driver, this is required for having both the secure and non-secure
smmu context bank support in the driver. This change also renames
the child nodes to avoid compilation issues on the builds where
fb driver mdss device file is also present. As a part of this
change the smmu driver registration is called as a part of
msm driver probe.

CRs-Fixed: 2053654
Change-Id: I90cd31fd792b0fd9772689dc6561bb0b429e1e3a
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
2017-06-09 03:12:28 -07:00
Linux Build Service Account
3d12c58f77 Merge "sched: Fix the bug in select_best_cpu() that returns -1 as target_cpu" 2017-06-09 02:45:19 -07:00
Linux Build Service Account
48b8215ed5 Merge "icnss: Re-phrase debug message and rename state" 2017-06-09 02:45:18 -07:00
Linux Build Service Account
3570da6f66 Merge "icnss: Enable platform device to be a wakeup source" 2017-06-09 02:45:17 -07:00
Linux Build Service Account
8bb96fd0d3 Merge "PD: policy_engine: Add timeout for mode change through sysfs" 2017-06-09 02:45:16 -07:00
Linux Build Service Account
c42ce05512 Merge "drm/sde: add 4k hdmi support" 2017-06-09 02:45:15 -07:00
Linux Build Service Account
92ad29f0c1 Merge "scsi: ufs: fix unclocked register access" 2017-06-09 02:45:14 -07:00
Zhaoyang Liu
39a8bb4fad defconfig: add cfg80211 internal regdb suuport
Enable CFG80211_INTERNAL_REGDB to support WiFi 5G channels.

Change-Id: I7d53d2a09c30173d121368ec2e3584217ddc5093
Signed-off-by: Zhaoyang Liu <zhaoyang@codeaurora.org>
2017-06-09 01:33:57 -07:00
Tony Truong
df92ddf7ad msm: pcie: do not set irq chip data when using QGIC MSI
When using QGIC MSI, the MSI controller is GIC not PCIe host
driver. Only set irq chip data if PCIe host is the MSI
controller.

Change-Id: I0ba9e78127424ab3da4b1f46b3ed3fa5d65d05f6
Signed-off-by: Tony Truong <truong@codeaurora.org>
2017-06-09 01:31:39 -07:00
Liangliang Lu
24a72da8c2 ARM: dts: msm: Enable secondary USB port for HDK660
Enable secondary USB port for HDK660 platform which use
host only mode.

Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 resource entry for SDM660
which is not required to set now during disconnect as writing to this
register causes USB3.0 port and USB2.0 ports working independently.

Change-Id: I936a4012c30e0cd84144b12e34fb780cada541ae
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-06-09 00:43:35 -07:00
Rama Krishna Phani A
d7c4b6867a ARM: dts: msm: Disable MHI node for msm8996
Mhi node needs additional information for driver
probe to get success. This generic node is not
required and hence disable unwanted dtsi node for
msm8996.

Change-Id: I4dffd3d668ac065fc800e5e7d3b52fdf2733e03f
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2017-06-09 12:27:02 +05:30
Rama Krishna Phani A
0e4399bcb0 msm: pcie: Fix for MDM enumeration issue
Add 500ms before MDM enumeration, this delay is needed for
link establishment between switch and MDM.

Change-Id: I32c4a4f9ef68b7672465ced0401fbf6dc0db0002
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2017-06-09 12:16:14 +05:30
Zhiqiang Tu
5beccaf930 Revert "msm: sde: add early display handoff feature."
This reverts commit 45380e2241 ("msm: sde: add early
display handoff feature").  To avoid conflict when
syncing up with mainline, we revert this change.

Change-Id: I9652cd367d242c6f61ed0da3a36c55493cc7d34c
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-06-09 13:44:39 +08:00
Linux Build Service Account
55a25be010 Merge "drm/msm/sde: add secure use case properties" 2017-06-08 19:03:20 -07:00
Linux Build Service Account
16fcfea171 Merge "Revert "msm: smmu: add re-route calling for specified iova."" 2017-06-08 19:03:19 -07:00
Linux Build Service Account
bc22546551 Merge "Merge branch 'android-4.4@9bc4622' into branch 'msm-4.4'" 2017-06-08 19:03:18 -07:00