Commit graph

589696 commits

Author SHA1 Message Date
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
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
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
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
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
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
Mohit Khanna
89e74ed898 defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE
This flag is primarily being used for WLAN to support WLAN
hardware which cannot handle "> 32 bit" physical addresses for
DMA.

Disable this flag for the perf variant of msm8998. This flag forces DMA
addresses to be in 32 bit region. Using this flag with ihelium WLAN
solution (which can handle 64 bit physical DMA addresses) is causing a
reduction in peak KPIs for TCP RX.

Since kernel 4.4 is being used only by ihelium and not being used
for older versions of WLAN hardware (e.g. ROME), we can safely disable
this flag.

CRs-Fixed: 2044326
Change-Id: If2e7d4bab15f6211e91b1095a8ac6c2bf7e9000e
Signed-off-by: Mohit Khanna <mkhannaqca@codeaurora.org>
2017-05-09 16:02:03 -07:00
Subbaraman Narayanamurthy
ca8dd889c6 soc: qcom: qpnp-haptic: add support for auto mode
Based on the duration of the pattern, haptics mode and other
parameters needs to be configured dynamically for a better
performance and ease of use. Add support for this through device
tree property "qcom,lra-auto-mode".

Add support to configure some parameters like auto resonance
mode, LRA high-Z period, calibration period, vmax along with an
option to override the settings done by auto_mode configuration.

Change-Id: I4706fed4e3ca97d190f907769fd4a9899479b330
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-05-09 11:00:36 -07:00
Hamad Kadmany
8bdcb4a51a net: wireless: Fix regdb for 60G band
60g frequency range and outdoor for EU updated.
Remove blanks lines as they must not be used.

Change-Id: I35395e8d770521514fc704aa71ccd5c74274b0ff
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2017-05-09 15:28:12 +03:00
Shadab Naseem
78caf61e9a ARM64: config: msm: Adding perf defconfig for mediabox
Adding perf defconfig for APQ8098 mediabox.
APQ8098 Display driver is moving away from Framebuffer (CONFIG_FB)
configuration to DRM (CONFIG_DRM) configuration and mediabox is using
ATH10k wlan driver.

Change-Id: I6f0b52a4beca9b3367d9fc52127aa57426685355
Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
2017-05-09 16:36:16 +05:30
Sarada Prasanna Garnayak
e8397c272f ath10k: cancel the event work in wlan snoc driver module remove
The ath10k snoc driver has two work handlers for the qmi event
processing and serializations of event processing. These two
event work handler must be sync and canceled in driver remove
method to avoid module unload and load failure due to the active
event work handler during device object memory free.

Change-Id: I546c6ba5404e6a26b22b5ef6155e092e279f2c71
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-05-08 23:12:22 -07:00
Kiran Gunda
67661c1acc defconfig: msm: Enable OnSemi regulator driver for msm8996-auto
Enable OnSemi external buck regulator driver to provide
the supply for graphics rail on msm8996-auto board.

Change-Id: I0e7a37aca19fba94c17fb34c81753115b9fe6d7c
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-05-09 11:42:19 +05:30
Shantanu Jain
3ffb190bb8 input: misc: fix error path for hbtp touch screen driver
Fix error path for hbtp touch screen driver where error
variable is not initialized to a error value before bailing
out from the driver function.

Change-Id: Ife3376891950216971cafaf33fd8308697b7f904
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-05-09 11:30:24 +05:30
Derek Chen
626dcee9b6 ARM: dts: msm: move tdm common prop to parent node
Move tdm common properties from child node to parent
for msm8996 automotive adp/cdp/dragonboard platforms.

CRs-fixed: 2034655
Change-Id: I861f221d0cdd47d9748b0ab6f9dee986a9776e87
Signed-off-by: Derek Chen <chenche@codeaurora.org>
2017-05-08 16:04:38 -07:00
Skylar Chang
896cdfb809 msm: ipa: support aggregated ipa stats query
add support on wan-driver to query modem or
wlan-fw to get the total data usage for all
tethered clients.

Change-Id: I56f40f1c0f6b2ec4279e78b3aeb81c687d08bf2e
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-05-08 15:13:55 -07:00
Skylar Chang
052b82d3e4 msm: ipa: apply reset wa to GPI channels
When resetting a GSI channel a special handling is needed
if there is an open aggregation frame. This handling is applied
to USB and MHI channels. This commit applies this handling to
GPI (system) channels as well.

Change-Id: Iebdf3d7375a4bd584c75503f01e64d7106f25e5a
CRs-Fixed: 2029089
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-05-08 09:46:18 -07:00
Greg Kroah-Hartman
9796ea8fa0 This is the 4.4.67 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlkQBi8ACgkQONu9yGCS
 aT5mYw//RVlRt1Ah4vIjj1Gn/CGV9fQeYenHiheZl/rGwa+8Hnq2phkEnOuvnaX7
 +Hi/MEyeSbb27mtrl0C1C7lfJhhEqXafMiMV5SMmvIjgVmfTXw09wzr/JPgTYmPa
 ri5RwfQ2/R+lSbOX6dggP48RrCGuybKFdwE2o+912wRvBoV2WvrwX3FbvPgwXr25
 96c+Ansz3eb9+b0hATQ1sz8dAcWaCmk/NtNxUYgjHVrV0nRhTVccAk04soOmuOBt
 Xm1dVaOEt9w9yh8vIu8KgtaJfWI93TT/L77jDNCzUAsMcMWsiuw1FPwFF5Kcxvlt
 +0vS4q187FWgCbM8ul79WvmqIOeE9lP8iB7Ea3aiknRDoIn0E7xcuCAO8lLDwRsP
 J/MLeNCWymIouNHPZuPlWrC7t/FZJbzs3Z1BjvB2mGwZrTQrEsT16AgcOr9QTxvb
 1vfFFMAW8efAES2UszV8SPon5ZCnLlsBXNDg0RezoenzAXg6yXHE8IIRPkV6KpdV
 crd5DZp3+2M/ErqZERvy1lpd3k4LyPhJm+EtgRgtVWe8IxuohlD3qXr6L+cugtzX
 vp/e0/hkgJLJdHpu1WwCldY8W0EHZndVv/M6qr/TREFFL5Py5f8LWlKsBXJN/p6E
 WjGzu2Iv5uCSo/1UDrUSFZeMFEgpB/D3sGgyEFCOvn6Fv/wxQ8E=
 =tdc4
 -----END PGP SIGNATURE-----

Merge 4.4.67 into android-4.4

Changes in 4.4.67:
	timerfd: Protect the might cancel mechanism proper
	Handle mismatched open calls
	ASoC: intel: Fix PM and non-atomic crash in bytcr drivers
	ALSA: ppc/awacs: shut up maybe-uninitialized warning
	drbd: avoid redefinition of BITS_PER_PAGE
	mtd: avoid stack overflow in MTD CFI code
	net: tg3: avoid uninitialized variable warning
	scsi: cxlflash: Scan host only after the port is ready for I/O
	scsi: cxlflash: Fix to avoid EEH and host reset collisions
	scsi: cxlflash: Improve EEH recovery time
	8250_pci: Fix potential use-after-free in error path
	netlink: Allow direct reclaim for fallback allocation
	IB/qib: rename BITS_PER_PAGE to RVT_BITS_PER_PAGE
	IB/ehca: fix maybe-uninitialized warnings
	ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY
	ext4 crypto: revalidate dentry after adding or removing the key
	ext4 crypto: use dget_parent() in ext4_d_revalidate()
	ext4/fscrypto: avoid RCU lookup in d_revalidate
	nfsd4: minor NFSv2/v3 write decoding cleanup
	nfsd: stricter decoding of write-like NFSv2/v3 ops
	dm ioctl: prevent stack leak in dm ioctl call
	Linux 4.4.67

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-05-08 09:55:31 +02:00
Ray Zhang
c74b2c0e58 drm/msm: notify hpd status when audio codec is ready
HDMI connector should wait for audio codec status and notify
HPD status only in case that audio codec has been registered
successfully. Meanwhile move HPD notification to bridge enable
and disable instead of hotplug work. This ensures the correct
video and audio sequence.

Change-Id: I0dac915c8639bb881265a608016e9d37ec9a153c
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-08 15:09:41 +08:00
Brahmaji K
95f0e29530 qseecom: Initialize the hlos_ce_hw_instance array
Initialize the hlos_ce_hw_instance[] array otherwise
this can lead to assigning qseecom.ce_drv.instance
with garbage value in failure cases.

Change-Id: I5b8fb574468a6a09fcd0f7f1dc7caf11f31374a7
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
2017-05-08 11:56:00 +05:30
Mohit Aggarwal
2b612d1b72 memshare: Add guard bytes to avoid access issues
Currently, TZ is performing merging of resource groups
due to which NOC error is happening during access of
memory allocated to diag. This patch fixes the issue
by adding guard bytes so that merging of resource
groups will not happen.

CRs-Fixed: 2026525
Change-Id: I9829e5a07aef723c4261aa16dd5274cfeb1a75a3
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
2017-05-08 11:55:40 +05:30
Rupesh Tatiya
a76132ce70 btfm: Fix coding error with uninitialized variables
These errors might result in access of uninitialized memory leading to
kernel panic.

Change-Id: I24da5aecd15bd1918e9caf669ed341155a41d6a3
Signed-off-by: Rupesh Tatiya <rtatiya@codeaurora.org>
2017-05-08 11:24:01 +05:30
Greg Kroah-Hartman
dec1dc2a0e Linux 4.4.67 2017-05-08 07:46:17 +02:00