Commit graph

599852 commits

Author SHA1 Message Date
Vinayak Menon
34d3a71963 ion: invalidate the pool pointers after free
ion_system_heap_destroy_pools frees the pool, but
does not invalidate the pointer. This can result in
a double free if ion_system_heap_create_pools fails,
and then causes ion_system_heap_create to call into
ion_system_heap_destroy_pools again from the error
path. This can happen in ion_system_heap_create when
one of the secure pool creation fails.

Change-Id: Ic73ca78722aa5a575cc4dd7c1caa560b518094f2
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2018-06-18 13:28:38 +05:30
Linux Build Service Account
2df3743287 Merge "soc: qcom: subsystem_restart: Add checks to verify validity of a device" 2018-06-16 18:58:01 -07:00
Linux Build Service Account
e4340a3ea8 Merge "uio: msm_sharedmem: Add a function to release the shared RAM section" 2018-06-16 18:57:56 -07:00
Linux Build Service Account
d225d1aed1 Merge "usb: gadget: f_cdev: Send zero length packets in modem data calls" 2018-06-16 18:57:53 -07:00
Linux Build Service Account
899380f9bb Merge "i2c-msm-v2: Add NULL pointer check for DMA descriptor" 2018-06-16 18:57:47 -07:00
Anant Goel
a6672f6af9 soc: qcom: subsystem_restart: Add checks to verify validity of a device
Extra checks are added to ensure a subsystem device is valid before
accessing any of its fields.

Change-Id: Ia8e3dced005485b1edb5d6ccf9429f90d31fa613
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2018-06-15 13:32:42 -07:00
Anant Goel
205812e0fc uio: msm_sharedmem: Add a function to release the shared RAM section
A function to free the shared RAM section has been added to the
msm_sharedmem driver. This function is needed to free the RAM section
on shutdown of the msm_sharedmem driver. The function is called on
the shutdown command for the driver.

Change-Id: Iff04f93d380664c5e3df9b0cd575cf9e6300ea39
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2018-06-15 12:19:56 -07:00
Linux Build Service Account
69f3e88c6c Merge "nl80211: fix nlmsg allocation in cfg80211_ft_event" 2018-06-15 10:28:13 -07:00
Linux Build Service Account
4fb9f9a7b7 Merge "mmc: host: msm: Don't check for core-dll lock during hs400es dll init" 2018-06-15 10:28:12 -07:00
Linux Build Service Account
e931ea69a1 Merge "msm: ADSPRPC: handle 32 bit support" 2018-06-15 10:28:02 -07:00
Linux Build Service Account
ae6b75092d Merge "soc: qcom: hab: add support for multiple hypervisors" 2018-06-15 10:28:01 -07:00
Linux Build Service Account
9963b625f3 Merge "packet: fix race condition in packet_set_ring" 2018-06-15 10:28:00 -07:00
Camus Wong
86b1b75f47 ARM: dts: msm: Enable Control Path and mixer preference on msm8996
Add dtsi entries for display control path and mixer destination display
preference.  The possible input are "primary", "secondary", "tertiary",
"none".  For example, when user set ctrl path 1 preference to
"primary" and mixer1 preference to "primary".  SDE RM will let primary
display to use ctrl path 1 and mixer 1.

Change-Id: Ie7f0cb122552a3d8b7406a8d1fcbcb184c67a073
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-06-15 08:45:49 -07:00
Zhu Jianmin
df55603b24 nl80211: fix nlmsg allocation in cfg80211_ft_event
Allocation size of nlmsg in cfg80211_ft_event is based on ric_ies_len
and doesn't take into account ies_len. This leads to
NL80211_CMD_FT_EVENT message construction failure in case ft_event
contains large enough ies buffer.
Add ies_len to the nlmsg allocation size.

Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 1039d08100e58f016a814347baadb77bf8dd21ab
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: I224ac6113e4b15958f3b155982ff5cf84ff9ed74
CRs-Fixed: 2207276
Signed-off-by: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Zhu Jianmin <jianminz@codeaurora.org>
2018-06-15 04:37:17 -07:00
Linux Build Service Account
53c73b7190 Merge "ARM: dts: msm: Add GPU maximum frequency 585Mhz support for SDM660-Lite" 2018-06-15 03:06:21 -07:00
Linux Build Service Account
51b2f06de2 Merge "ASoC: msm: qdsp6v2: add lsm support for tdm ports" 2018-06-15 03:06:20 -07:00
Linux Build Service Account
f8c3bac9ce Merge "ASoC: msm: qdsp6v2: Rx DTMF detection via voice stream callback" 2018-06-15 03:06:19 -07:00
Gerrit - the friendly Code Review server
37805d9fef Merge changes into msm-4.4 2018-06-15 02:27:22 -07:00
Linux Build Service Account
f73a388a11 Merge "ARM: memory hotplug: stop cpus while memory hotplug" 2018-06-14 16:07:08 -07:00
Linux Build Service Account
0d3fe1e8bf Merge "Merge remote-trac king branch 'origin/caf/invensense/master' into msm-4.4" 2018-06-14 16:07:08 -07:00
Linux Build Service Account
06872e732f Merge "power: battery: Add support for FCC stepping" 2018-06-14 16:06:55 -07:00
Linux Build Service Account
f9a1c8211f Merge "ASoC: qdsp6v2: Fix null pointer dereference for prtd pointer" 2018-06-14 16:06:54 -07:00
Linux Build Service Account
a0e118cf53 Merge "msm: ipa: Fix race condition head_desc_list variable access" 2018-06-14 16:06:52 -07:00
Umang Agrawal
491b7aff28 power: battery: Add support for FCC stepping
On some PMIC designs a sudden increase or decrease in FCC
can impact the PMIC die thermally, causing the XO to drift.
Introduce a logic which gradually ramps up/down the FCC
whenever there is a change in its value, this spreads out
the thermals over-time. The default step rate is 100mA/sec
and the feature can be enabled using the DT property
"qcom,fcc-stepping-enable".

Change-Id: I59ee932b60766208912054f7031cd34151fb5deb
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
2018-06-14 15:53:57 +05:30
Venkata Rao Kakani
42cadd5165 ARM: memory hotplug: stop cpus while memory hotplug
Avoid page table corruptions during memory hotplug by
stopping all other cpus.

Change-Id: I527a616c5603b882a43626c746ef0b4dda977202
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
2018-06-14 03:13:02 -07:00
Ashay Jaiswal
eafe2f3d08 power: power_supply: add property for FCC stepper
Add power_supply property POWER_SUPPLY_PROP_FCC_STEPPER_ENABLE
which reports the state of FCC stepped feature.

Change-Id: Ibbb6e6fa7bba6b804a94bb93ddc75e5dfe0afdd1
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2018-06-14 15:29:34 +05:30
Shrey Vijay
f5634d1c91 i2c-msm-v2: Add NULL pointer check for DMA descriptor
Add NULL pointer check for RX/TX DMA descriptors to avoid
NULL dereference.

Change-Id: I71443204e79eb1afc37a6b312cf4aa9adcaa22c6
Signed-off-by: Shrey Vijay <shreyv@codeaurora.org>
2018-06-14 02:03:26 -07:00
Puneet yatnala
39fad015bb Merge remote-trac king branch 'origin/caf/invensense/master' into msm-4.4
* origin/caf/invensense/master:
  MA Lite 8.1.5
  MA Lite 8.1.4a

Change-Id: I7667000896f2d3de0acba83b4020bb3bdd34b248
Signed-off-by: Puneet yatnala <puneet@codeaurora.org>
2018-06-14 12:53:39 +05:30
Vatsal Bucha
b9e306af63 ASoC: qdsp6v2: Fix null pointer dereference for prtd pointer
Private data pointer may not be initialized before
access it in adsp_stream_cmd_put. NULL check for prtd
avoids the issue.

CRs-Fixed: 2252497
Change-Id: Ibd888be601d5b42ed4f4644ed22596a26b61f8fe
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2018-06-13 22:59:54 -07:00
Camus Wong
5db86ecc81 DRM: SDE: Update Color API implementation
Update global PA implementation base on newer kernel revision. Hue,
Saturation, Black/White, Contrast is now go through one internal
API call instead of separate calls.

Change-Id: I9e056f4d68b29bf246c8414e6dff8032f6f9b6c9
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-06-13 15:28:13 -04:00
Guchun Chen
b80fa28840 drm: msm: sde: remove user commit validity check
Such validity check will let Android FDR test failed.
This is because kernel has enabled interrupts, and
access registers, but with this validity check, LK also
co-exists with kernel, while it has disabled interrupts.
Hence conflict happens.

CRs-Fixed: 2247983 2258043
Change-Id: I21be9ae2beeaa0bc187aee241572ce530b9bc93a
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-06-13 17:45:07 +08:00
Pratham Pratap
293a3d1734 usb: gadget: f_cdev: Send zero length packets in modem data calls
The USB protocol requires zero length packets to be sent when the data
transmission ends on a USB packet size boundary. This fix enables sending
zero length packets when required.

Change-Id: I0269ec7ff25c82000f2a5bc4adb449bc0231c66c
Signed-off-by: Pratham Pratap <prathampratap@codeaurora.org>
2018-06-13 02:02:42 -07:00
Tharun Kumar Merugu
d413f3e7fc msm: ADSPRPC: handle 32 bit support
Handle 32 bit support without any truncation.
Add IOCTL calls for map and unmap for 64 bit separately.

Change-Id: I077a0b4345a6c21a88d7a500aa5c9faf7193f620
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2018-06-13 12:17:01 +05:30
Veerabhadrarao Badiganti
8c2f6269d1 mmc: host: msm: Don't check for core-dll lock during hs400es dll init
When initializing DLL in HS400 enhanced strobe-mode, no need to wait
for core dll lock. So skip this wait-on-lock step for hs400es in dll
init sequence.

Change-Id: I8cda0244cb5a397824c613a3c667470cd23e7288
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2018-06-13 11:46:56 +05:30
Srinivasa Rao Kuppala
e513723258 packet: fix race condition in packet_set_ring
commit 5a01eaf198 ("packet: fix race condition
in packet_set_ring") was incorrectly resolved.
Add the missing lock_sock(sk) and release_sock(sk) calls.

Change-Id: I6565bf3e3c6a15d6f1b93cab0536424dbacb187b
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
2018-06-13 11:10:43 +05:30
Hardik Arya
4b3d87497b diag: Add NULL pointer check for write buffer of fwd_info
Currently there is a possibility of NULL pointer dereference
because of missing NULL pointer check for writer buffer of
fwd_info. The patch adds NULL pointer check before accessing
write buffer buf_ptr of fwd_info.

CRs-Fixed: 2193526
Change-Id: Ie79eb1c7e3635210c09d4fbb1c751c6a908196ee
Signed-off-by: Hardik Arya <harya@codeaurora.org>
2018-06-12 22:08:25 -07:00
Linux Build Service Account
9912a8c48b Merge "ARM: dts: msm: add diag-camera on msm8996" 2018-06-12 21:13:41 -07:00
Chunhuan Zhan
229865a186 ARM: dts: msm: add diag-camera on msm8996
add a diag-camera for camera diagnostic feature

Change-Id: I982cea845a0f525ef4d317936963bb8a46b49733
Signed-off-by: Chunhuan Zhan <zhanc@codeaurora.org>
2018-06-12 18:22:54 -07:00
Yong Ding
0f3634fa2f soc: qcom: hab: add support for multiple hypervisors
HAB(Hypervisor ABstraction) is used for message transaction
and buffer sharing among different virtual machines with the
underlying hypervisor support. Here is the change to add HAB
support for linux running in multiple hypervisors.

Change-Id: I0747b2fa0f16c7cc0ab662369d45467ac6ba62e5
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-06-12 19:28:48 -04:00
David Dai
0fa26966ff msm: msm_bus: Fix error handling in msm_bus_device_init
Correctly free pointers allocated by kzalloc. Remove devm_kfree
in error handling as device associated memory is automatically
freed upon destruction of device. Always use put_device instead
of kfree on initialized device.

Change-Id: Icbd88e9ccd42fedb4fbce5eff69248c3fceffc02
Signed-off-by: David Dai <daidavid1@codeaurora.org>
2018-06-12 11:24:22 -07:00
Timothy Sham
fe515e9936 ASoC: msm: qdsp6v2: Rx DTMF detection via voice stream callback
Allow msm-pcm-voice-v2 driver to enable Rx DTMF detection and
route the DTMF detection event from QDSP6 to a registered
mixer event callback.

Change-Id: I9ffb714d1ec5dd0f4e2c229830d7170324b295bb
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
2018-06-12 14:00:49 -04:00
Linux Build Service Account
c9dc859c2c Merge "Revert "scsi: sd: remove check_events callback"" 2018-06-12 10:36:43 -07:00
Linux Build Service Account
ead1dfc47b Merge "msm : ais : diagnostic feature" 2018-06-12 10:36:42 -07:00
Linux Build Service Account
ce20da02ae Merge "camera: add pix fmt Y10 to support RDI for mono sensor" 2018-06-12 10:36:41 -07:00
Ravikanth Tuniki
c54e15b617 ARM: dts: msm: Add support for truly FHD+ panel on SDM660
This change adds support for truly FHD+ panel on SDM660
fastboot oem select-display-panel hx8399_truly_fhd_video.

CRs-Fixed: 2234856
Change-Id: I74c4910cd8270b404e6170b7abb0c3eed08089ae
Signed-off-by: Ravikanth Tuniki <rtunik@codeaurora.org>
2018-06-12 02:30:04 -07:00
Chunhuan Zhan
b97610ffa1 msm : ais : diagnostic feature
provide the functions:
1. record the all camera related clocks' status
2. provide the get clock status interfaces
3. provide the read registers interfaces
4. provide read the regulators' status
5. provide set/get the specified gpio
6. get the ISP buffer states

Change-Id: I5ddb6ac5488aa46914a5fc6b642d8330e72d9b70
Signed-off-by: Chunhuan Zhan <zhanc@codeaurora.org>
2018-06-10 22:40:17 -07:00
Linux Build Service Account
7bb3a011f8 Merge "adv7481: Add support for interlaced HDMI and CVBS input" 2018-06-10 20:58:36 -07:00
Zhaohong Chen
0c700f6ac0 camera: add pix fmt Y10 to support RDI for mono sensor
- V4L2_PIX_FMT_Y10 is a format for mono sensor. Add this format in isp
   axi driver to support RDI(RAW data interface) output for mono sensor
   of 10 bits per pix.

Change-Id: Id602731349ff41330a2aaa587c46279707004856
Signed-off-by: Zhaohong Chen <zhaohong@codeaurora.org>
2018-06-10 19:08:13 -07:00
Linux Build Service Account
974d74cb90 Merge "msm: ais: translate wall clock time to userspace" 2018-06-09 22:23:49 -07:00
Linux Build Service Account
c13b3cdc0d Merge "ARM: dts: msm: update pcie boot option on msm8996au" 2018-06-09 12:58:51 -07:00