Commit graph

594405 commits

Author SHA1 Message Date
Linux Build Service Account
5d64261f21 Merge "step-chg-jeita: run only when charging" 2017-10-05 16:10:08 -07:00
Linux Build Service Account
e10b471b51 Merge "FROMLIST: binder: fix memory corruption in binder_transaction binder" 2017-10-05 16:10:07 -07:00
Linux Build Service Account
9e61cad143 Merge "sched: Make resched_cpu() unconditional" 2017-10-05 16:10:06 -07:00
Linux Build Service Account
9b952ff615 Merge "rcu: Stop disabling interrupts in scheduler fastpaths" 2017-10-05 16:10:04 -07:00
Linux Build Service Account
f5684568b9 Merge "iio: qcom-rradc: Disable continuous mode when read fails" 2017-10-05 16:10:03 -07:00
Linux Build Service Account
9a6c530f34 Merge "defconfig: msm-auto: Enbale CONFIG_SLUB_DEBUG_ON" 2017-10-05 16:10:02 -07:00
Linux Build Service Account
699891bf07 Merge "ARM: dts: msm: change smb138x_parallel_slave node name" 2017-10-05 16:10:01 -07:00
Linux Build Service Account
4afd92d32e Merge "drm/msm: Remove too many hdmi_i2c_xfer warnings" 2017-10-05 16:10:00 -07:00
Linux Build Service Account
52b59ba4bd Merge "msm: mdss: dp: fix handling of device shutdown with cable connected" 2017-10-05 16:09:59 -07:00
Linux Build Service Account
92a03ca537 Merge "wil6210: support AOA in FTM session" 2017-10-05 16:09:58 -07:00
Linux Build Service Account
3def0fa97f Merge "ARM: enable vmalloc saving" 2017-10-05 16:09:57 -07:00
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