Commit graph

594039 commits

Author SHA1 Message Date
Linux Build Service Account
0d13390c0a Merge "netfilter: xt_socket: Restore mark from full sockets only" 2017-10-05 16:09:56 -07:00
Linux Build Service Account
5ef257fe14 Merge "soc: qcom: glink: Free if_ptr before freeing dummy transport" 2017-10-05 16:09:55 -07:00
Linux Build Service Account
6f710cc042 Merge "spcom: spcom_get_next_request_size() unlock while waiting for rx data" 2017-10-05 16:09:54 -07:00
Linux Build Service Account
f8bec54357 Merge "spcom: avoid using stale glink handle" 2017-10-05 16:09:52 -07:00
Linux Build Service Account
75d9384cc4 Merge "msm:ipa: Fix to slab out of bounds access" 2017-10-05 16:09:51 -07:00
Linux Build Service Account
8a0ae03d44 Merge "mmc: block: Unhalt the command queue before releasing mmc host" 2017-10-05 16:09:50 -07:00
Linux Build Service Account
d640f06626 Merge "msm: kgsl: Fix size check issue in _read_fw2_block_header()" 2017-10-05 16:09:49 -07:00
Linux Build Service Account
afd458fbee Merge "msm: kgsl: Fix calculation of size in _load_regfile" 2017-10-05 16:09:48 -07:00
Linux Build Service Account
928b34b6b3 Merge "mmc: sdhci-msm: flush mmc detect work asynchronously." 2017-10-05 16:09:46 -07:00
Linux Build Service Account
6963c78e4d Merge "fb/msm: add support for HDR playback control sequence" 2017-10-05 16:09:45 -07:00
Linux Build Service Account
0c90b04235 Merge "ath10k: Vote for hardware resources for WCN3990" 2017-10-05 16:09:44 -07:00
Linux Build Service Account
a564649444 Merge "iommu: free io pgtable during domain detach." 2017-10-05 16:09:43 -07:00
Linux Build Service Account
53ce371186 Merge "msm: wlan: Update regulatory database" 2017-10-05 16:09:42 -07:00
Linux Build Service Account
f7b404c71e Merge "cgroupns: Close race between cgroup_post_fork and copy_cgroup_ns" 2017-10-05 16:09:41 -07:00
Linux Build Service Account
175a78586f Merge "msm: ipa3: add lock for num_q6_rule" 2017-10-05 16:09:40 -07:00
Subbaraman Narayanamurthy
d587341753 power: qpnp-fg-gen3: Handle notifications from parallel charger
Handle notifications from parallel charger in GEN3 FG driver so
that ESR FCC control can be configured sooner based on parallel
charging status change. Without this, GEN3 FG driver can simply
wait on notifications from battery/USB power supply to move from
HW autonomous to SW controlled ESR FCC settings when parallel
charging is enabled which cause unwanted battery current spikes.

CRs-Fixed: 2119134
Change-Id: Ic4c473a6cc6062f2eaaebc68c30a1a51763c5dda
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-05 11:00:57 -07:00
Linux Build Service Account
b889d4d995 Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996v3" 2017-10-05 03:06:51 -07:00
Linux Build Service Account
98871f5864 Merge "ASoC: sdm660_cdc: Fix HPH CnP and kernel panic issue on sdm660-internal" 2017-10-05 03:06:50 -07:00
Linux Build Service Account
12be975dcf Merge "msm: ipa: prevent string buffer overflows" 2017-10-05 03:06:48 -07:00
Linux Build Service Account
f43806fb3e Merge "msm: kgsl: Use a lock when updating the sparse bindings" 2017-10-05 03:06:47 -07:00
Linux Build Service Account
cb474c5398 Merge "scsi: ufs: Change power mode on line reset" 2017-10-05 03:06:46 -07:00
Linux Build Service Account
abb2448f18 Merge "usb: gadget: gsi: Avoid spinlock lockup" 2017-10-05 03:06:45 -07:00
Linux Build Service Account
bcecf2ddf8 Merge "ARM: dts: msm: Add fastrpc vmid flag for sdm660" 2017-10-05 03:06:44 -07:00
Linux Build Service Account
41c3357a3d Merge "ARM: dts: msm: Allow pm_suspend in host mode for msm8996 ADP" 2017-10-05 03:06:43 -07:00
Linux Build Service Account
258407248b Merge "usb: dwc3-msm: Allow PM suspend in host mode irrespective of runtimePM" 2017-10-05 03:06:42 -07:00
Linux Build Service Account
668a016621 Merge "platform: msm: Fix USB device does not enumerate in SS mode" 2017-10-05 03:06:40 -07:00
Linux Build Service Account
7eb529ae69 Merge "msm: camera: Add support for plain16 mode" 2017-10-05 03:06:39 -07:00
Linux Build Service Account
725d7669a0 Merge "diag: Add NULL pointer checks for mask info" 2017-10-05 03:06:38 -07:00
Linux Build Service Account
dfa529b414 Merge "ASoC: msm: qdsp6v2: updating downmix/pan_scale control type to bytes" 2017-10-05 03:06:37 -07:00
Linux Build Service Account
ff06c973ae Merge "defconfig: msm-auto: Enable CNSS2 platform driver" 2017-10-05 03:06:36 -07:00
Linux Build Service Account
56fee295de Merge "msm: mdss: check the length of the external input buffer properly" 2017-10-05 03:06:35 -07:00
Linux Build Service Account
db14d92031 Merge "clk: msm: mdss: add support for chip serial number in dfps info" 2017-10-05 03:06:34 -07:00
Linux Build Service Account
ae8fef7239 Merge "ASoC: msm: qdsp6v2: primary plus 8 interactive stream playback fix" 2017-10-05 03:06:33 -07:00
Prateek Sood
9e0a8cda90 Revert "osq_lock: fix osq_lock queue corruption"
This reverts commit ba6bd90a30.

Perparing for taking more optimized patch suggested to upstream
for using smp_wmb() instead of smp_mb().

Change-Id: Idc4fbd884055d9a8f65f102862dd276abe54699d
Signed-off-by: Prateek Sood <prsood@codeaurora.org>
2017-10-05 01:33:22 -07:00
Vijayavardhan Vennapusa
83cf33d6a0 dwc3: msm: Notify -ETIMEDOUT always in case of floating charger
Charger driver expects USB driver notify -ETIMEDOUT always on
POWER_SUPPLY_PROP_CURRENT_MAXCURRENT on enumeration failure in case
of floating charger. This is to set ICL to value based on Rp in case of
floating charger. But currently driver is not notifying this, when floating
charger is disconnected and connected back. Due to this, device is charging
only with 100mA instead of current based on Rp value. Fix this by having
proper check and allow to notify in case of floating charger type.

Change-Id: Iee0c4d8faa7e25c8445b83784a782751e7148421
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-10-05 12:09:37 +05:30
Sathish Kumar
43cbf71858 ARM: dts: msm: Add GPU speed bin 2 support for MSM8996v3
GPU speed-bin 2 supports fmax of 560MHz and DDR 1555MHz.
Add this config to MSM8996v3 to support required GPU fmax.

Change-Id: Ibdf9bb63c7d8f0e980fbf3c192d536adeaeec52d
Signed-off-by: Dumpeti Sathish Kumar <sathyanov14@codeaurora.org>
2017-10-04 23:38:02 -07:00
Prakash Gupta
34701923eb iommu: fix smmu_secure_pool access list after free issue
secure_pool_list is initialized during domain alloc and freed with domain
free.
commit e6a18bb617 ("iommu: free io pgtable during domain detach.") frees
the secure_pool_list as part of iommu detach sequence, and uses the same
list head as part of iommu attach.  This uncovers an existing bug where
list was not being deleted from secure_pool_list and associated memory was
being freed.  This resulted in invalid secure_pool_list head pointing to a
location already freed and resulted in kernel BUG of access after free
during iommu attach.

Call Trace:
arm_smmu_alloc_pages_exact+0x60/0x110
io_pgtable_alloc_pages_exact+0x48/0xb0
__arm_lpae_alloc_pages+0x48/0x1c0
arm_64_lpae_alloc_pgtable_s1+0x100/0x15c
alloc_io_pgtable_ops+0x54/0x88
arm_smmu_attach_dev+0x8cc/0x1144
__iommu_attach_device+0x3c/0xf4
[...]

Change-Id: I7d1b49030986da7f5d05b7e6cb9dc09079f20a41
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-10-05 11:40:33 +05:30
Akhil P Oommen
7ec8ae11d9 msm: kgsl: Avoid cache ops on secure memory
There is no check before cache ops if the memory is marked secure.
This leads to stage 2 pagefault if a secure memory is passed to
IOCTL_KGSL_GPUMEM_SYNC_CACHE ioctl because kernel is not allowed to
do cache ops on secure memory. This can be avoided by returning
success immediately if the memory is marked as secure.

Change-Id: I215d77d2a488cdb00e8e18cfd38cddd9632fd9f6
Signed-off-by: Akhil P Oommen <akhilpo@codeaurora.org>
2017-10-04 17:39:45 +05:30
Vijay kumar Tumati
2b32c1afd4 msm: camera: Check if regulator is null before enabling
Using IS_ERR_OR_NULL instead of IS_ERR to also check for
null pointer.

Change-Id: If53a07db52a4d091693a49f9d084df7d4fbf257a
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2017-10-04 14:13:13 +05:30
Lynus Vaz
ccd73c76f2 msm: kgsl: Use a lock when updating the sparse bindings
Use the appropriate lock when adding sparse bindings, to protect the
list of sparse bindings from concurrent updates by multiple threads.

Change-Id: Ice9750c96fca42f4049ed352533f4722b5166221
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-10-04 11:13:46 +05:30
Lynus Vaz
5b4f3d1608 msm: kgsl: Bail out when two threads add sparse bindings
If we find that a different thread has already added bindings at the
same offset we wanted to add to the sparse object, don't get stuck in
an infinite loop, and return with an error.

Change-Id: I6b17c91eccb14c07e13cae24135dfe7b13f3301d
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-10-04 11:13:46 +05:30
Mohammed Javid
92db5ba9ef msm: ipa: prevent string buffer overflows
In WAN ioctls user-supplied data structures
contain string members,but there's no guarantee
they're null-terminated, add the string terminator
to prevent vulnerability of string buffer overflows.

Change-Id: I17c06c94aa619a2cd3a678c495a31541a65a7741
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2017-10-04 11:13:12 +05:30
Abhinav Kumar
246bafceab drm/msm: reset HDCP 2.2 sink support during disconnect
Reset the HDCP 2.2 sink support during a cable disconnect
to avoid stale information during the next cable connect.

This information is populated again from the sink on the next
cable connect.

Change-Id: I54da6e633915718da4be7023027c1d8c68cd6c21
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-10-03 22:37:32 -07:00
Rahul Sharma
591cb6c90a defconfig: msm: enable DRM driver for msm8996
This change disables FB driver and enable DRM display driver
on msm8996 device.

Change-Id: I2df5ab4e24067f76ec45581b27a577f118b8cec8
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-10-03 14:23:56 -07:00
Subbaraman Narayanamurthy
8c20990f43 iio: qcom-rradc: Disable continuous mode when read fails
Currently, when a channel is read in continuous mode and the read
operation fails, RR_ADC would be left enabled in continuous mode.
Disable the continuous mode in such cases so that the other read
operations which doesn't need continuous mode can go through.

Change-Id: I2bf257bd535e1e4a30e18b6257e584a5be96b69d
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2017-10-03 12:35:39 -07:00
Rahul Sharma
00a9435ff0 drm/msm: null check before initializing a submitqueue
This change checks a NULL condition before initializing submitqueue.

Change-Id: I9ef6b6506b535d33e585be4988fa6433e11b3cb1
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-10-03 09:53:53 -07:00
Rahul Sharma
c95cd30b00 ARM: dts: msm: use sde terminology for DRM based nodes
This changes modifies compatible name for smmu_kms_unsec_cb
to use sde terminology.

Change-Id: I31ee9620f8bb54fd582d9c6b21f5df0fda3cb975
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-10-03 09:53:30 -07:00
Camus Wong
c38bb7f088 drm/msm: avoid loading gpu components if qcom_kgsl present
Avoid loading gpu components from drm driver if qcom_kgsl
driver present.

Change-Id: I74c65634ce9260fba5bb871b3a9854d2c8173f4e
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-10-03 09:52:45 -07:00
Rahul Sharma
792779946e drm/msm: remove the right vlbank event from the event list
This changes fixes an issue with vblank event list corruption.
we should only remove the event corresponding to a crtc from list
for which the thread was queued.

Change-Id: I9b9cef9073ba4cc377a85e21a7257d36e9b92388
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-10-03 05:31:36 -07:00
Dhaval Patel
fec05057ef drm/msm/sde: update release & retire fence timeline
Update release and retire fence timeline according to client
requirement to align it with correct vsync boundary and avoid
issues in jank cases.

Change-Id: Ibee64f4feea2623e8bc8459273b7193d5e7bdacc
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-10-03 05:29:39 -07:00