OSDN Git Service

sagit-ice-cold/kernel_xiaomi_msm8998.git
7 years agoMerge "Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'"
Linux Build Service Account [Thu, 11 May 2017 18:48:48 +0000 (11:48 -0700)]
Merge "Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'"

7 years agoMerge "drm/msm: add extern C guard for the UAPI header"
Linux Build Service Account [Thu, 11 May 2017 18:48:47 +0000 (11:48 -0700)]
Merge "drm/msm: add extern C guard for the UAPI header"

7 years agoMerge "input: misc: fix error path for hbtp touch driver"
Linux Build Service Account [Thu, 11 May 2017 18:48:46 +0000 (11:48 -0700)]
Merge "input: misc: fix error path for hbtp touch driver"

7 years agoMerge "ARM: dts: msm: Add SMB1381 device node for QRD SDM660"
Linux Build Service Account [Thu, 11 May 2017 18:48:45 +0000 (11:48 -0700)]
Merge "ARM: dts: msm: Add SMB1381 device node for QRD SDM660"

7 years agoMerge "diag: Validate proper mdlog session for a PD"
Linux Build Service Account [Thu, 11 May 2017 18:48:44 +0000 (11:48 -0700)]
Merge "diag: Validate proper mdlog session for a PD"

7 years agoMerge "ota_crypto: Add NULL pointer check for new_req variable"
Linux Build Service Account [Thu, 11 May 2017 18:48:43 +0000 (11:48 -0700)]
Merge "ota_crypto: Add NULL pointer check for new_req variable"

7 years agoMerge "USB: f_qdss: Fix crash issue during connect_work"
Linux Build Service Account [Thu, 11 May 2017 18:48:42 +0000 (11:48 -0700)]
Merge "USB: f_qdss: Fix crash issue during connect_work"

7 years agoMerge "soc: qcom: qpnp-haptic: add support for auto mode"
Linux Build Service Account [Thu, 11 May 2017 18:48:41 +0000 (11:48 -0700)]
Merge "soc: qcom: qpnp-haptic: add support for auto mode"

7 years agoMerge "scsi: ufs: ufs-qcom-ice: Initialize local variable in ice_cfg_start()"
Linux Build Service Account [Thu, 11 May 2017 18:48:40 +0000 (11:48 -0700)]
Merge "scsi: ufs: ufs-qcom-ice: Initialize local variable in ice_cfg_start()"

7 years agoMerge "mmc: core: Replacing sprintf() with snprintf()"
Linux Build Service Account [Thu, 11 May 2017 18:48:39 +0000 (11:48 -0700)]
Merge "mmc: core: Replacing sprintf() with snprintf()"

7 years agoMerge "sound: usb: Fix format desc usage for BADD 3.0 devices"
Linux Build Service Account [Thu, 11 May 2017 18:48:38 +0000 (11:48 -0700)]
Merge "sound: usb: Fix format desc usage for BADD 3.0 devices"

7 years agoMerge "drm/msm: Allocate secure buffer objects"
Linux Build Service Account [Thu, 11 May 2017 18:48:35 +0000 (11:48 -0700)]
Merge "drm/msm: Allocate secure buffer objects"

7 years agoMerge "mmc: host: sdhci-msm-ice: Initialize local variable in ice_cmdq_cfg()"
Linux Build Service Account [Thu, 11 May 2017 13:48:13 +0000 (06:48 -0700)]
Merge "mmc: host: sdhci-msm-ice: Initialize local variable in ice_cmdq_cfg()"

7 years agoMerge "ath10k: cancel the event work in wlan snoc driver module remove"
Linux Build Service Account [Thu, 11 May 2017 13:48:12 +0000 (06:48 -0700)]
Merge "ath10k: cancel the event work in wlan snoc driver module remove"

7 years agoMerge "qseecom: Initialize the hlos_ce_hw_instance array"
Linux Build Service Account [Thu, 11 May 2017 13:48:11 +0000 (06:48 -0700)]
Merge "qseecom: Initialize the hlos_ce_hw_instance array"

7 years agoMerge "btfm: Fix coding error with uninitialized variables"
Linux Build Service Account [Thu, 11 May 2017 13:48:10 +0000 (06:48 -0700)]
Merge "btfm: Fix coding error with uninitialized variables"

7 years agoMerge "input: stm: Fix NULL dereference in laser driver"
Linux Build Service Account [Thu, 11 May 2017 13:48:08 +0000 (06:48 -0700)]
Merge "input: stm: Fix NULL dereference in laser driver"

7 years agoMerge "msm: camera: Fixing NULL dereference in sensor code"
Linux Build Service Account [Thu, 11 May 2017 13:48:07 +0000 (06:48 -0700)]
Merge "msm: camera: Fixing NULL dereference in sensor code"

7 years agoMerge "ARM: dts: msm: Add support for camss throttle clock on SDM660"
Linux Build Service Account [Thu, 11 May 2017 13:48:06 +0000 (06:48 -0700)]
Merge "ARM: dts: msm: Add support for camss throttle clock on SDM660"

7 years agoMerge "msm: isp: Fix pdaf buffer drop"
Linux Build Service Account [Thu, 11 May 2017 13:48:05 +0000 (06:48 -0700)]
Merge "msm: isp: Fix pdaf buffer drop"

7 years agoMerge "msm: camera: Do not pass kptr in copy_from_user"
Linux Build Service Account [Thu, 11 May 2017 13:48:03 +0000 (06:48 -0700)]
Merge "msm: camera: Do not pass kptr in copy_from_user"

7 years agoMerge "msm: isp: Fix isp recovery mechanism"
Linux Build Service Account [Thu, 11 May 2017 13:48:02 +0000 (06:48 -0700)]
Merge "msm: isp: Fix isp recovery mechanism"

7 years agoMerge "msm: isp: Correct UB size for RDI"
Linux Build Service Account [Thu, 11 May 2017 13:48:01 +0000 (06:48 -0700)]
Merge "msm: isp:  Correct UB size for RDI"

7 years agoMerge "msm: camera: isp: Vote for bandwidth to avoid race condition"
Linux Build Service Account [Thu, 11 May 2017 13:48:00 +0000 (06:48 -0700)]
Merge "msm: camera: isp: Vote for bandwidth to avoid race condition"

7 years agoMerge "ARM: dts: msm: Add iris support on msm8998 and sdm660"
Linux Build Service Account [Thu, 11 May 2017 13:47:58 +0000 (06:47 -0700)]
Merge "ARM: dts: msm: Add iris support on msm8998 and sdm660"

7 years agoMerge "drivers: nfc: make nq-nci probe as async probe"
Linux Build Service Account [Thu, 11 May 2017 13:47:56 +0000 (06:47 -0700)]
Merge "drivers: nfc: make nq-nci probe as async probe"

7 years agoMerge "ASoC: wsa881x-analog: make probe as async probes"
Linux Build Service Account [Thu, 11 May 2017 13:47:55 +0000 (06:47 -0700)]
Merge "ASoC: wsa881x-analog: make probe as async probes"

7 years agoMerge "ASoC: wsa881x-analog: fix overwrite of client->dev->driver_data"
Linux Build Service Account [Thu, 11 May 2017 13:47:53 +0000 (06:47 -0700)]
Merge "ASoC: wsa881x-analog: fix overwrite of client->dev->driver_data"

7 years agoMerge "mmc: sdhci-msm: make probe as async probe"
Linux Build Service Account [Thu, 11 May 2017 13:47:51 +0000 (06:47 -0700)]
Merge "mmc: sdhci-msm: make probe as async probe"

7 years agoinput: misc: fix error path for hbtp touch driver
Shantanu Jain [Wed, 10 May 2017 09:32:58 +0000 (15:02 +0530)]
input: misc: fix error path for hbtp touch driver

Fix error path for hbtp touch driver where error
variable is not given proper error code while bailing
out from the function.

Change-Id: I56e2654ecffb021a60dd07ea5b5afe45a70a1c85
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
7 years agodiag: Validate proper mdlog session for a PD
Manoj Prabhu B [Wed, 10 May 2017 11:06:52 +0000 (16:36 +0530)]
diag: Validate proper mdlog session for a PD

The patch updates the mdlog session to be checked
based on the active user PD logging session.

CRs-Fixed: 2045080
Change-Id: Ieac3301545970aac91efa5a6f66c44530ff251f3
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
7 years agoota_crypto: Add NULL pointer check for new_req variable
Brahmaji K [Fri, 5 May 2017 11:28:52 +0000 (16:58 +0530)]
ota_crypto: Add NULL pointer check for new_req variable

Add NULL pointer check before accessing the new_req
variable.

Change-Id: I8460115ccb16a2c43c45394275e9519ed3c6b045
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
7 years agoMerge "drm/msm/sde: avoid adding plane states in crtc atomic check"
Linux Build Service Account [Thu, 11 May 2017 06:04:06 +0000 (23:04 -0700)]
Merge "drm/msm/sde: avoid adding plane states in crtc atomic check"

7 years agoMerge "defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE"
Linux Build Service Account [Thu, 11 May 2017 06:04:06 +0000 (23:04 -0700)]
Merge "defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE"

7 years agoMerge "icnss_utils: replace mutex lock by spinlock"
Linux Build Service Account [Thu, 11 May 2017 06:04:05 +0000 (23:04 -0700)]
Merge "icnss_utils: replace mutex lock by spinlock"

7 years agoMerge "drm: add extern C guard for the UAPI headers"
Linux Build Service Account [Thu, 11 May 2017 06:04:03 +0000 (23:04 -0700)]
Merge "drm: add extern C guard for the UAPI headers"

7 years agoMerge "msm: ipa: support aggregated ipa stats query"
Linux Build Service Account [Thu, 11 May 2017 06:04:02 +0000 (23:04 -0700)]
Merge "msm: ipa: support aggregated ipa stats query"

7 years agoMerge "msm: ADSPRPC: close glink channel before opening again"
Linux Build Service Account [Thu, 11 May 2017 06:04:01 +0000 (23:04 -0700)]
Merge "msm: ADSPRPC: close glink channel before opening again"

7 years agoMerge "usb: gadget: f_mtp: Handle OS descriptors properly"
Linux Build Service Account [Thu, 11 May 2017 06:04:00 +0000 (23:04 -0700)]
Merge "usb: gadget: f_mtp: Handle OS descriptors properly"

7 years agoMerge "drm/msm/sde: move topology name reset to release resources"
Linux Build Service Account [Thu, 11 May 2017 06:03:59 +0000 (23:03 -0700)]
Merge "drm/msm/sde: move topology name reset to release resources"

7 years agoMerge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open"
Linux Build Service Account [Thu, 11 May 2017 06:03:58 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open"

7 years agoMerge "drm/msm: notify hpd status when audio codec is ready"
Linux Build Service Account [Thu, 11 May 2017 06:03:57 +0000 (23:03 -0700)]
Merge "drm/msm: notify hpd status when audio codec is ready"

7 years agoMerge "defconfig: msm: Enable CNSS_ASYNC for auto platform"
Linux Build Service Account [Thu, 11 May 2017 06:03:55 +0000 (23:03 -0700)]
Merge "defconfig: msm: Enable CNSS_ASYNC for auto platform"

7 years agoMerge "msm: mdss: fix null pointer dereferencing"
Linux Build Service Account [Thu, 11 May 2017 06:03:54 +0000 (23:03 -0700)]
Merge "msm: mdss: fix null pointer dereferencing"

7 years agoMerge "msm: mdss: set HDMI max TMDS clock rate"
Linux Build Service Account [Thu, 11 May 2017 06:03:53 +0000 (23:03 -0700)]
Merge "msm: mdss: set HDMI max TMDS clock rate"

7 years agoMerge "ARM64: config: msm: Adding perf defconfig for mediabox"
Linux Build Service Account [Thu, 11 May 2017 06:03:52 +0000 (23:03 -0700)]
Merge "ARM64: config: msm: Adding perf defconfig for mediabox"

7 years agoMerge "net: wireless: Fix regdb for 60G band"
Linux Build Service Account [Thu, 11 May 2017 06:03:51 +0000 (23:03 -0700)]
Merge "net: wireless: Fix regdb for 60G band"

7 years agoMerge "defconfig: msm: Enable OnSemi regulator driver for msm8996-auto"
Linux Build Service Account [Thu, 11 May 2017 06:03:50 +0000 (23:03 -0700)]
Merge "defconfig: msm: Enable OnSemi regulator driver for msm8996-auto"

7 years agoMerge "wil6210: fix array out of bounds access in pmc"
Linux Build Service Account [Thu, 11 May 2017 06:03:47 +0000 (23:03 -0700)]
Merge "wil6210: fix array out of bounds access in pmc"

7 years agoMerge "wil6210: fix check for sparrow D0 FW file"
Linux Build Service Account [Thu, 11 May 2017 06:03:47 +0000 (23:03 -0700)]
Merge "wil6210: fix check for sparrow D0 FW file"

7 years agoMerge "wil6210: support 8KB RX buffers"
Linux Build Service Account [Thu, 11 May 2017 06:03:46 +0000 (23:03 -0700)]
Merge "wil6210: support 8KB RX buffers"

7 years agoMerge "scsi: ufs: Add states to debug abnormal clocks turn off"
Linux Build Service Account [Thu, 11 May 2017 06:03:45 +0000 (23:03 -0700)]
Merge "scsi: ufs: Add states to debug abnormal clocks turn off"

7 years agoMerge "input: misc: fix error path for hbtp touch screen driver"
Linux Build Service Account [Thu, 11 May 2017 06:03:44 +0000 (23:03 -0700)]
Merge "input: misc: fix error path for hbtp touch screen driver"

7 years agoMerge "power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id"
Linux Build Service Account [Thu, 11 May 2017 06:03:43 +0000 (23:03 -0700)]
Merge "power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id"

7 years agoMerge "msm: ipa: apply reset wa to GPI channels"
Linux Build Service Account [Thu, 11 May 2017 06:03:42 +0000 (23:03 -0700)]
Merge "msm: ipa: apply reset wa to GPI channels"

7 years agoMerge "memshare: Add guard bytes to avoid access issues"
Linux Build Service Account [Thu, 11 May 2017 06:03:41 +0000 (23:03 -0700)]
Merge "memshare: Add guard bytes to avoid access issues"

7 years agoMerge "diag: dci: Add protection while querying event status"
Linux Build Service Account [Thu, 11 May 2017 06:03:40 +0000 (23:03 -0700)]
Merge "diag: dci: Add protection while querying event status"

7 years agoMerge "ASoC: msm: qdsp6v2: clear address on error"
Linux Build Service Account [Thu, 11 May 2017 06:03:39 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdsp6v2: clear address on error"

7 years agoMerge "ASoC: msm: enhance ADSP Stream Callback"
Linux Build Service Account [Thu, 11 May 2017 06:03:37 +0000 (23:03 -0700)]
Merge "ASoC: msm: enhance ADSP Stream Callback"

7 years agoMerge "ASoC: msm: qdspv2: Add mixer controls for drift query"
Linux Build Service Account [Thu, 11 May 2017 06:03:35 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdspv2: Add mixer controls for drift query"

7 years agoMerge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro"
Linux Build Service Account [Thu, 11 May 2017 06:03:34 +0000 (23:03 -0700)]
Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro"

7 years agoMerge "Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'"
Linux Build Service Account [Thu, 11 May 2017 06:03:33 +0000 (23:03 -0700)]
Merge "Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'"

7 years agoARM: dts: msm: Add SMB1381 device node for QRD SDM660
Yingwei Zhao [Wed, 3 May 2017 11:08:40 +0000 (19:08 +0800)]
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>
7 years agodrm/msm: add extern C guard for the UAPI header
Emil Velikov [Thu, 7 Apr 2016 18:03:46 +0000 (19:03 +0100)]
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>
7 years agodrm/msm/sde: avoid adding plane states in crtc atomic check
Clarence Ip [Wed, 19 Apr 2017 15:50:11 +0000 (11:50 -0400)]
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>
7 years agodrm: add extern C guard for the UAPI headers
Emil Velikov [Thu, 7 Apr 2016 17:49:00 +0000 (18:49 +0100)]
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>
7 years agodrm: Make drm.h uapi header safe for C++
Daniel Vetter [Wed, 30 Mar 2016 15:12:33 +0000 (17:12 +0200)]
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>
7 years agoicnss_utils: replace mutex lock by spinlock
Yuanyuan Liu [Wed, 10 May 2017 00:13:35 +0000 (17:13 -0700)]
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>
7 years agommc: core: Replacing sprintf() with snprintf()
Siba Prasad [Wed, 10 May 2017 13:07:49 +0000 (18:37 +0530)]
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>
7 years agommc: host: sdhci-msm-ice: Initialize local variable in ice_cmdq_cfg()
Siba Prasad [Thu, 23 Mar 2017 11:48:20 +0000 (17:18 +0530)]
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>
7 years agoscsi: ufs: ufs-qcom-ice: Initialize local variable in ice_cfg_start()
Siba Prasad [Wed, 10 May 2017 06:52:07 +0000 (12:22 +0530)]
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>
7 years agoASoC: msm: qdsp6v2: Add TrueHD to compressed open
Ben Romberger [Mon, 1 May 2017 19:17:58 +0000 (12:17 -0700)]
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>
7 years agomsm: ADSPRPC: close glink channel before opening again
Tharun Kumar Merugu [Wed, 10 May 2017 06:02:25 +0000 (11:32 +0530)]
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>
7 years agoUSB: f_qdss: Fix crash issue during connect_work
Vijayavardhan Vennapusa [Thu, 4 May 2017 11:55:01 +0000 (17:25 +0530)]
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>
7 years agodrm/msm/sde: move topology name reset to release resources
Lloyd Atkinson [Thu, 23 Feb 2017 20:01:08 +0000 (12:01 -0800)]
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>
7 years agodefconfig: msm: Enable CNSS_ASYNC for auto platform
Wei Li [Fri, 21 Apr 2017 01:37:40 +0000 (09:37 +0800)]
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>
7 years agocnss: add an option to allow driver using asynchronous probe
Wei Li [Fri, 21 Apr 2017 01:35:07 +0000 (09:35 +0800)]
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>
7 years agodrm/msm: allow SDE HDMI display to support 4K
Abhinav Kumar [Wed, 10 May 2017 00:55:46 +0000 (17:55 -0700)]
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>
7 years agoMerge branch 'android-4.4@9796ea8' into branch 'msm-4.4'
Blagovest Kolenichev [Tue, 9 May 2017 23:43:06 +0000 (16:43 -0700)]
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>
7 years agodefconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE
Mohit Khanna [Sat, 6 May 2017 20:13:17 +0000 (13:13 -0700)]
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>
7 years agosoc: qcom: qpnp-haptic: add support for auto mode
Subbaraman Narayanamurthy [Tue, 7 Mar 2017 00:23:23 +0000 (16:23 -0800)]
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>
7 years agonet: wireless: Fix regdb for 60G band
Hamad Kadmany [Tue, 9 May 2017 12:28:12 +0000 (15:28 +0300)]
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>
7 years agoARM64: config: msm: Adding perf defconfig for mediabox
Shadab Naseem [Tue, 9 May 2017 07:25:49 +0000 (12:55 +0530)]
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>
7 years agoath10k: cancel the event work in wlan snoc driver module remove
Sarada Prasanna Garnayak [Thu, 4 May 2017 12:21:10 +0000 (17:51 +0530)]
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>
7 years agodefconfig: msm: Enable OnSemi regulator driver for msm8996-auto
Kiran Gunda [Tue, 9 May 2017 05:58:56 +0000 (11:28 +0530)]
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>
7 years agoinput: misc: fix error path for hbtp touch screen driver
Shantanu Jain [Tue, 9 May 2017 05:53:14 +0000 (11:23 +0530)]
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>
7 years agomsm: ipa: support aggregated ipa stats query
Skylar Chang [Mon, 20 Mar 2017 21:51:29 +0000 (14:51 -0700)]
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>
7 years agomsm: ipa: apply reset wa to GPI channels
Skylar Chang [Fri, 5 May 2017 23:31:32 +0000 (16:31 -0700)]
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>
7 years agoMerge 4.4.67 into android-4.4
Greg Kroah-Hartman [Mon, 8 May 2017 07:55:31 +0000 (09:55 +0200)]
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>
7 years agodrm/msm: notify hpd status when audio codec is ready
Ray Zhang [Wed, 29 Mar 2017 13:04:54 +0000 (21:04 +0800)]
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>
7 years agoqseecom: Initialize the hlos_ce_hw_instance array
Brahmaji K [Fri, 5 May 2017 09:25:13 +0000 (14:55 +0530)]
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>
7 years agomemshare: Add guard bytes to avoid access issues
Mohit Aggarwal [Fri, 5 May 2017 15:31:41 +0000 (21:01 +0530)]
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>
7 years agobtfm: Fix coding error with uninitialized variables
Rupesh Tatiya [Mon, 8 May 2017 05:06:19 +0000 (10:36 +0530)]
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>
7 years agoLinux 4.4.67
Greg Kroah-Hartman [Mon, 8 May 2017 05:46:17 +0000 (07:46 +0200)]
Linux 4.4.67

7 years agodm ioctl: prevent stack leak in dm ioctl call
Adrian Salido [Thu, 27 Apr 2017 17:32:55 +0000 (10:32 -0700)]
dm ioctl: prevent stack leak in dm ioctl call

commit 4617f564c06117c7d1b611be49521a4430042287 upstream.

When calling a dm ioctl that doesn't process any data
(IOCTL_FLAGS_NO_PARAMS), the contents of the data field in struct
dm_ioctl are left initialized.  Current code is incorrectly extending
the size of data copied back to user, causing the contents of kernel
stack to be leaked to user.  Fix by only copying contents before data
and allow the functions processing the ioctl to override.

Signed-off-by: Adrian Salido <salidoa@google.com>
Reviewed-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
7 years agonfsd: stricter decoding of write-like NFSv2/v3 ops
J. Bruce Fields [Fri, 21 Apr 2017 19:26:30 +0000 (15:26 -0400)]
nfsd: stricter decoding of write-like NFSv2/v3 ops

commit 13bf9fbff0e5e099e2b6f003a0ab8ae145436309 upstream.

The NFSv2/v3 code does not systematically check whether we decode past
the end of the buffer.  This generally appears to be harmless, but there
are a few places where we do arithmetic on the pointers involved and
don't account for the possibility that a length could be negative.  Add
checks to catch these.

Reported-by: Tuomas Haanpää <thaan@synopsys.com>
Reported-by: Ari Kauppi <ari@synopsys.com>
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
7 years agonfsd4: minor NFSv2/v3 write decoding cleanup
J. Bruce Fields [Tue, 25 Apr 2017 20:21:34 +0000 (16:21 -0400)]
nfsd4: minor NFSv2/v3 write decoding cleanup

commit db44bac41bbfc0c0d9dd943092d8bded3c9db19b upstream.

Use a couple shortcuts that will simplify a following bugfix.

(Minor backporting required to account for a change from f34b95689d2c
"The NFSv2/NFSv3 server does not handle zero length WRITE requests
correctly".)

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
7 years agoext4/fscrypto: avoid RCU lookup in d_revalidate
Jaegeuk Kim [Tue, 12 Apr 2016 23:05:36 +0000 (16:05 -0700)]
ext4/fscrypto: avoid RCU lookup in d_revalidate

commit 03a8bb0e53d9562276045bdfcf2b5de2e4cff5a1 upstream.

As Al pointed, d_revalidate should return RCU lookup before using d_inode.
This was originally introduced by:
commit 34286d666230 ("fs: rcu-walk aware d_revalidate method").

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
7 years agoext4 crypto: use dget_parent() in ext4_d_revalidate()
Theodore Ts'o [Sat, 26 Mar 2016 20:15:42 +0000 (16:15 -0400)]
ext4 crypto: use dget_parent() in ext4_d_revalidate()

commit 3d43bcfef5f0548845a425365011c499875491b0 upstream.

This avoids potential problems caused by a race where the inode gets
renamed out from its parent directory and the parent directory is
deleted while ext4_d_revalidate() is running.

Fixes: 28b4c263961c
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
7 years agoext4 crypto: revalidate dentry after adding or removing the key
Theodore Ts'o [Mon, 8 Feb 2016 00:35:05 +0000 (19:35 -0500)]
ext4 crypto: revalidate dentry after adding or removing the key

commit 28b4c263961c47da84ed8b5be0b5116bad1133eb upstream.

Add a validation check for dentries for encrypted directory to make
sure we're not caching stale data after a key has been added or removed.

Also check to make sure that status of the encryption key is updated
when readdir(2) is executed.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>