Commit graph

589874 commits

Author SHA1 Message Date
Linux Build Service Account
3930cf3fa7 Merge "msm: ipa: support aggregated ipa stats query" 2017-05-10 23:04:02 -07:00
Linux Build Service Account
95836aa032 Merge "msm: ADSPRPC: close glink channel before opening again" 2017-05-10 23:04:01 -07:00
Linux Build Service Account
8e831a70d3 Merge "usb: gadget: f_mtp: Handle OS descriptors properly" 2017-05-10 23:04:00 -07:00
Linux Build Service Account
05eae98b38 Merge "drm/msm/sde: move topology name reset to release resources" 2017-05-10 23:03:59 -07:00
Linux Build Service Account
df2fff8d1d Merge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open" 2017-05-10 23:03:58 -07:00
Linux Build Service Account
abb1d6bee6 Merge "drm/msm: notify hpd status when audio codec is ready" 2017-05-10 23:03:56 -07:00
Linux Build Service Account
4952fa0037 Merge "defconfig: msm: Enable CNSS_ASYNC for auto platform" 2017-05-10 23:03:55 -07:00
Linux Build Service Account
00ddc986bb Merge "msm: mdss: fix null pointer dereferencing" 2017-05-10 23:03:53 -07:00
Linux Build Service Account
69f3e161f1 Merge "msm: mdss: set HDMI max TMDS clock rate" 2017-05-10 23:03:52 -07:00
Linux Build Service Account
45fd2409da Merge "ARM64: config: msm: Adding perf defconfig for mediabox" 2017-05-10 23:03:51 -07:00
Linux Build Service Account
9217ca30cc Merge "net: wireless: Fix regdb for 60G band" 2017-05-10 23:03:51 -07:00
Linux Build Service Account
2e2122879c Merge "defconfig: msm: Enable OnSemi regulator driver for msm8996-auto" 2017-05-10 23:03:50 -07:00
Linux Build Service Account
1b96a3f87a Merge "wil6210: fix array out of bounds access in pmc" 2017-05-10 23:03:47 -07:00
Linux Build Service Account
04433d45e2 Merge "wil6210: fix check for sparrow D0 FW file" 2017-05-10 23:03:46 -07:00
Linux Build Service Account
e566d8711d Merge "wil6210: support 8KB RX buffers" 2017-05-10 23:03:46 -07:00
Linux Build Service Account
8e3cba5f68 Merge "scsi: ufs: Add states to debug abnormal clocks turn off" 2017-05-10 23:03:45 -07:00
Linux Build Service Account
277412a0e7 Merge "input: misc: fix error path for hbtp touch screen driver" 2017-05-10 23:03:43 -07:00
Linux Build Service Account
a8b420d53b Merge "power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id" 2017-05-10 23:03:43 -07:00
Linux Build Service Account
af1b766297 Merge "msm: ipa: apply reset wa to GPI channels" 2017-05-10 23:03:42 -07:00
Linux Build Service Account
b2754d1d5b Merge "memshare: Add guard bytes to avoid access issues" 2017-05-10 23:03:41 -07:00
Linux Build Service Account
c576a654b9 Merge "diag: dci: Add protection while querying event status" 2017-05-10 23:03:40 -07:00
Linux Build Service Account
bf1ff6fce1 Merge "ASoC: msm: qdsp6v2: clear address on error" 2017-05-10 23:03:38 -07:00
Linux Build Service Account
d575147a75 Merge "ASoC: msm: enhance ADSP Stream Callback" 2017-05-10 23:03:37 -07:00
Linux Build Service Account
4cb291c99a Merge "ASoC: msm: qdspv2: Add mixer controls for drift query" 2017-05-10 23:03:35 -07:00
Linux Build Service Account
3e3619c81e Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro" 2017-05-10 23:03:34 -07:00
Linux Build Service Account
81c2642f71 Merge "Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'" 2017-05-10 23:03:33 -07:00
Yingwei Zhao
74f4e5d535 ARM: dts: msm: Add SMB1381 device node for QRD SDM660
SMB1381 acts as a slave charger in QRD SDM660 board. Add device node
to support this function. Delete SMB1351 device node to avoid conflict
with SMB1381.

CRs-Fixed: 2042455
Change-Id: I97a5b2acb757cbbf08010ad03df6e24039beccac
Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
2017-05-11 14:01:13 +08:00
Ramesh V
62a7399ea9 msm: camera: isp: Fix excessive logging in w+t
In w+t mode when frames are out of sync, in ISP
we are dumping the stack, if frames goes out of
sync continiously then it can lead to watchdog. To fix
this removed warn_on code.

Change-Id: I01a1133bf5c20db38fd73bea8d86ff53d312f42c
Signed-off-by: Ramesh V <ramev@codeaurora.org>
2017-05-10 22:32:14 -07:00
Lorenzo Colitti
a8cc97d8cf ANDROID: make PF_KEY SHA256 use RFC-compliant truncation.
When using the PF_KEY interface, SHA-256 hashes are hardcoded to
use 96-bit truncation. This is a violation of RFC4868, which
specifies 128-bit truncation, but will not be fixed upstream due
to backwards compatibility concerns and because the PF_KEY
interface is deprecated in favour of netlink XFRM (which allows
the app to specify an arbitrary truncation length).

Change the hardcoded truncation length from 96 to 128 so that
PF_KEY apps such as racoon will work with standards-compliant VPN
servers.

Bug: 34114242
Change-Id: Ie46bff4b6358f18117d0be241171d677d31d33f7
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
2017-05-11 03:10:30 +00:00
Manoj Kumar AVM
01097dd1d0 drm/msm: make msm_drm.h uapi header safe for C++
fixes the C++ related compilation issues.

CRs-Fixed: 2038080
Change-Id: If6b4f379eb27f3de6153b8666f733c0b8245851f
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2017-05-10 16:48:14 -07:00
Emil Velikov
ef65ba5219 drm/msm: add extern C guard for the UAPI header
CRs-Fixed: 2038080
Change-Id: Idf66084b7d07c828d96538dfb7430da2fed796f2
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com> (over irc)
Git-commit: a62424e29dc33fdf1cf9efadfbf54deefbcfe7bf
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a62424e
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2017-05-10 16:43:34 -07:00
Clarence Ip
a198b6cdd1 drm/msm/sde: avoid adding plane states in crtc atomic check
This patch contains fixes to prevent the CRTC's atomic check
from inadvertently adding extra plane states to the current
state object.

CRs-Fixed: 2037970
Change-Id: Ic0b09ab369f77c2412ba7c3e63fe5032ef9bcd74
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-05-10 14:56:26 -07:00
Emil Velikov
ccbadce56c drm: add extern C guard for the UAPI headers
CRs-Fixed: 2038080
Change-Id: Id6f4ac3d41fec4804b1449f303d4872bf7a1fd51
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Git-commit: ebbb0e5cfd2ceb1150b1af7f9fcf7aeebfb1b69f
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ebbb0e5cf
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2017-05-10 14:12:36 -07:00
Daniel Vetter
bacaebb736 drm: Make drm.h uapi header safe for C++
virtual is a protected keyword in C++ and can't be used at all. Ugh.

This aligns the kernel versions of the drm headers with the ones in
libdrm.

v2: Also annote with __user, as request by Emil&Ilia.

CRs-Fixed: 2038080
Change-Id: I184b99e51fc5c6efd4eb6f5ed9da2858b7972a6e
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459350753-18320-1-git-send-email-daniel.vetter@ffwll.ch
Git-commit: 4c4925fa0c2b5943655ef28b2d6a379961db551f
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4c4925f
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2017-05-10 13:20:38 -07:00
Yuanyuan Liu
43515e202c icnss_utils: replace mutex lock by spinlock
Replace mutex lock by spinlock in icnss_wlan_set_dfs_nol
as dfs module may call this function in timer context
which will result apps crash.

CRs-Fixed: 2044689
Change-Id: Ib820589cd8b120a39536aab69d6954ba8cc35e3c
Signed-off-by: Arif Hussain <arifhussain@codeaurora.org>
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2017-05-10 11:43:52 -07:00
Gao Xiang
21ade37258 ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach
According to the following commits,
fs: icache RCU free inodes
vfs: fix the stupidity with i_dentry in inode destructors

sdcardfs_destroy_inode should be fixed for the fast path safety.

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Change-Id: I84f43c599209d23737c7e28b499dd121cb43636d
2017-05-10 17:48:26 +00:00
Siba Prasad
e14f225493 mmc: core: Replacing sprintf() with snprintf()
While using the sysfs entry for getting the different bit values
of EXT_CSD register, it is returned by sprintf(). But sprintf() has
been deprecated, that's why replace with safe function snprintf().
By using this patch, PAGE_SIZE(4Kb) is the max number of characters
store in a buffer.

Change-Id: Ifb3dc39e8d3728094fff10c7e761dc19fdfaa854
Signed-off-by: Siba Prasad <sibap@codeaurora.org>
2017-05-10 20:17:19 +05:30
Siba Prasad
9578a87b8f mmc: host: sdhci-msm-ice: Initialize local variable in ice_cmdq_cfg()
Uninitialized key_index local variable in sdhci_msm_ice_cmdq_cfg() would
be passed as it is to sdhci_msm_ice_hci_update_cmdq_cfg()
/sdhci_msm_ice_update_cfg() when request is not valid. So initialize
this variable with right value.

Without this change, its causing KW warning.

Change-Id: Ibf2f3973e8e2143b303196133758534846437b46
Signed-off-by: Siba Prasad <sibap@codeaurora.org>
2017-05-10 01:48:27 -07:00
Siba Prasad
b9ffa0f20e scsi: ufs: ufs-qcom-ice: Initialize local variable in ice_cfg_start()
Previously local variable ice_set in ufs_qcom_ice_cfg_start() function
was initialized only if qcom_host->ice.vops->config_start was set.
If that was not set, then the uninitialized value of ice_set might have
lead to incorrect configuration of ICE.
So initialize the variable regardless the value of config_start.


Change-Id: I16692902d9f5b8df00ae2ffc7c363413d13e932a
Signed-off-by: Siba Prasad <sibap@codeaurora.org>
2017-05-10 12:22:37 +05:30
Ben Romberger
4d021085de ASoC: msm: qdsp6v2: Add TrueHD to compressed open
Add TrueHD format selection to ASM compressed
open and remove it from non-compressed open.

Change-Id: I94b61958e71d3a0d3aec2aa0206cf35698399d34
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
2017-05-09 23:44:00 -07:00
Tharun Kumar Merugu
5a15915855 msm: ADSPRPC: close glink channel before opening again
Added proper checks to avoid opening a glink channel before
completely closing previously opened channel.

Change-Id: Iaa41f4b27a80967b634dd832cc6ad060ea083b18
Acked-by: Viswanatham Paduchuri <vpaduchu@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-05-09 23:05:44 -07:00
Vijayavardhan Vennapusa
b100f8c339 USB: f_qdss: Fix crash issue during connect_work
If it happens that usb_qdss_close() gets called before
completion of qdss_connect_work(), there is a chance that endless
request being accessed in connect_work(), which will be freed in
usb_qdss_close(). Fix that issue by having proper check for
endless request under spinlock protection.

Change-Id: Ied14137e01bf685547c093b907484b4dee583fda
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-05-10 11:30:23 +05:30
Jaiju Yesudasan
3224a1ca55 ARM: dts: msm: Add support for multiple neutrino on msm8996
Add new nodes for multiple neutrino interfaces. This is for
differentiating multiple neutrino interfaces  connected to
different RC.

CRs-Fixed: 1060701
Change-Id: I6f9f7c050d5736fdf3e6bf45257ae410b7190c3b
Signed-off-by: Jaiju Yesudasan <cjaijuy@codeaurora.org>
2017-05-10 09:17:41 +05:30
Lloyd Atkinson
aeb83d7d6e drm/msm/sde: move topology name reset to release resources
Simplify the clearing of the topology name by moving it directly
to the release resources call.

Change-Id: If1926372b276f01f64138691b805493d1894951a
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-05-09 19:14:02 -07:00
Wei Li
6b444311da defconfig: msm: Enable CNSS_ASYNC for auto platform
This option allow CNSS platform driver to use asynchronous
probe for auto platform.

Change-Id: I54c997be995e3fb660779a18fd848dcbc325c49a
Signed-off-by: Wei Li <weili@codeaurora.org>
2017-05-09 18:47:04 -07:00
Wei Li
3e16478810 cnss: add an option to allow driver using asynchronous probe
Add option CONFIG_CNSS_ASYNC to allow CNSS platform driver probe
asynchronously for boot time optimization in auto platform

Change-Id: Id1fcb8991a47ae56098a9bbd6ff570e22d6450d6
Signed-off-by: Wei Li <weili@codeaurora.org>
2017-05-09 18:46:52 -07:00
Steve Muckle
bc86c1de1d ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG
There are currently a couple different implementations for this
functionality. Until things are unified, remove the requirement
for this kernel config.

Bug: 37749708
Change-Id: I10ef038edc656185644d1dcb128658136a8c994f
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-05-09 18:09:38 -07:00
Abhinav Kumar
7830abef6e drm/msm: allow SDE HDMI display to support 4K
SDE HDMI driver capabilities were capped
to 1080P due to lack of dual pipe support in userspace.

Relax this restriction as full userspace support to
allow dual pipe support is now available.

Change-Id: If8242ea3c65a901ceb3e1004ac40b29ab8554c4b
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-05-09 17:55:46 -07:00
Nicholas Troast
c46f2b3f09 power: qpnp-smb2: remove workaround for USBIN supplied VCONN
VCONN is supplied by USBIN on MTP8998 which causes removal issues when
PMI8998 is in source mode and VCONN is enabled. The workaround is
to ensure VCONN is disabled when OTG is disabled which has implications
on PD power role swap when PMI8998 is sourcing VCONN.

The reference schematic has been updated to address this issue therefore
the workaround should be removed.

Change-Id: Ibe2309f3618d840340bd083cca0df8a8644dd9c8
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-05-09 17:26:21 -07:00
Blagovest Kolenichev
7e061af6db Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'
* refs/heads/9796ea8
  Linux 4.4.67
  dm ioctl: prevent stack leak in dm ioctl call
  nfsd: stricter decoding of write-like NFSv2/v3 ops
  nfsd4: minor NFSv2/v3 write decoding cleanup
  ext4/fscrypto: avoid RCU lookup in d_revalidate
  ext4 crypto: use dget_parent() in ext4_d_revalidate()
  ext4 crypto: revalidate dentry after adding or removing the key
  ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY
  IB/ehca: fix maybe-uninitialized warnings
  IB/qib: rename BITS_PER_PAGE to RVT_BITS_PER_PAGE
  netlink: Allow direct reclaim for fallback allocation
  8250_pci: Fix potential use-after-free in error path
  scsi: cxlflash: Improve EEH recovery time
  scsi: cxlflash: Fix to avoid EEH and host reset collisions
  scsi: cxlflash: Scan host only after the port is ready for I/O
  net: tg3: avoid uninitialized variable warning
  mtd: avoid stack overflow in MTD CFI code
  drbd: avoid redefinition of BITS_PER_PAGE
  ALSA: ppc/awacs: shut up maybe-uninitialized warning
  ASoC: intel: Fix PM and non-atomic crash in bytcr drivers
  Handle mismatched open calls
  timerfd: Protect the might cancel mechanism proper
  ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK
  ANDROID: android-base.cfg: remove defunct options
  ANDROID: arm64: suspend: Restore the UAO state
  ANDROID: usb: gadget: f_audio_source: disable the CPU C-states upon playback
  ANDROID: usb: gadget: f_mtp: Set 0xFFFFFFFF in mtp header ContainerLength field

Conflicts:
	drivers/usb/gadget/function/f_mtp.c
	fs/ext4/crypto.c

Change-Id: I408054176798ba49f0b62fb46a3b0d59060d108e
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-05-09 16:50:19 -07:00