Commit graph

585045 commits

Author SHA1 Message Date
Linux Build Service Account
f13bb40b09 Merge "ARM: dts: msm: Update SDCC bus voting for SDM660" 2017-03-03 17:39:21 -08:00
Linux Build Service Account
92751c23bd Merge "ARM: dts: msm: add sink capabilities to PM660 PD PHY" 2017-03-03 17:39:20 -08:00
Linux Build Service Account
e6e0a5df5f Merge "ath10k: Remove bus structures from ath10k struct" 2017-03-03 17:39:19 -08:00
Linux Build Service Account
048676be41 Merge "Merge tag 'lsk-v4.4-16.12-android' into branch 'msm-4.4'" 2017-03-03 17:39:18 -08:00
Linux Build Service Account
c0e191cd70 Merge "ARM: dts: msm: Add Nfc device to sdm630" 2017-03-03 17:39:17 -08:00
Linux Build Service Account
9b591f82cc Merge "USB: f_mtp: Perform vfs_write under mutex protection" 2017-03-03 17:39:16 -08:00
Linux Build Service Account
9067d4454d Merge "sched/rt: Fix PI handling vs. sched_setscheduler()" 2017-03-03 17:39:16 -08:00
Linux Build Service Account
2b5b362f11 Merge "msm: kgsl: Change GPU RAC hardware clockgating on SDM660" 2017-03-03 17:39:15 -08:00
Linux Build Service Account
064ad70ba3 Merge "defconfig: Enable REGMAP_ALLOW_WRITE_DEBUGFS for sdm660" 2017-03-03 17:39:14 -08:00
Abhinav Kumar
d528f00b0b drm/msm/sde: fix color component order for UBWC formats
For UBWC formats color component order should
be independent of endianness.

Fix the component order for UBWC formats based
on above requirement for SDE driver.

Change-Id: I054049105d3af99c5496328819ffef7d0eb9610a
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-03-03 14:14:49 -08:00
Sujeev Dias
25a3b9b47d msm: mhi_rmnet: Keep wake when processing transfer
Disable MHI from going into low power mode when
processing inbound transfers.

CRs-Fixed: 1081654
Change-Id: If8af0805501901a15981bbc6db0c92d2e040eb78
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-03-03 13:41:21 -08:00
Sujeev Dias
63b9fc1f66 msm: mhi_rmnet: Add support for platform devices
In order to support multiple instances of mhi_rmnet
net devices re-architect how the driver initialize
by adding support for platform device.

CRs-Fixed: 1027069
Change-Id: I038f9dcb2e9bffb2637d82fb30794f6e6d4c578c
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-03-03 13:40:08 -08:00
Siena Richard
5b2f6e011b drivers: soc: add size check
Add size check to ensure the payload fits inside the declared payload
size to prevent loss of data when copying.

CRs-Fixed: 2009224
Signed-off-by: Siena Richard <sienar@codeaurora.org>
Change-Id: I4275c626605272941143b54a7b8861b25f8e750a
2017-03-03 10:29:35 -08:00
Veerabhadrarao Badiganti
2c7676c7d7 mmc: card: block: Add support for completing cmdq requests with error
Add support for completing failed cmdq requests with error.

If any cmdq request is failed, we enter into error recovery path and
re-queue the same request. But in some cases (e.g. requests failed due
to invalid crypto configuration) same request shouldn't be re-queued
but should complete the request with error so that the a new requested
would be issued.

In mmc_blk_cmdq_complete_rq(), for a request if error information is
present and flag which indicates to skip error handling is set
then complete that request with error info.

Change-Id: I9c4a446bb27b4d82a0847d0bfb4481b314df479c
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-03-03 09:01:29 -08:00
Mahesh Sivasubramanian
b8d9268af5 ARM: dts: msm: Add rpm stats for TZ and SPSS for MSM8998
Add rpm master stats votes for TZ and SPSS to track votes from these
masters.

Change-Id: I98781d33f4e8424660898d5635624b8b891237f8
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
2017-03-03 08:56:48 -07:00
Vijayavardhan Vennapusa
399fa239e4 USB: composite: Check return value before composite_setup_complete()
Currently driver is calling composite_setup_complete() when request
queuing to control endpoint fails. During disconnect or composition switch,
ep_queue() fails with -ESHUTDOWN return value. In this case also, driver is
calling composite_setup_complete(), which leads to invalid pointer
dereference. Fix it by not calling composite_setup_complete() in case of
return value of -ESHUTDOWN as anyhow composite_unbind() will take care of
clearing pending flags before freeing request buffers.

Change-Id: I87ea6ecb1e925c6b36dede59486e49ba3a4e90c7
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-03-03 18:53:25 +05:30
Manish Poddar
88ad6090d3 msm: camera: Lack of copy_from_user in camera driver.
In msm_copy_camera_private_ioctl_args function in
msm_buf_mgr camera driver arg is pointing to an address
in userspace and not kernel.
Done changes to use copy_from_user to fix it.

Change-Id: Ia9b747dcf86b448656a5d3676455ccb4eccd4e5a
Signed-off-by: Manish Poddar <mpoddar@codeaurora.org>
2017-03-03 02:25:19 -08:00
Govind Singh
473d827675 ath10k: skip cal configuration for WCN3990
Calibration data configuration is done from user space
for WCN3990 target. Skip cal configuration from debug
routine.

Change-Id: I349575a04029e80ef4efc2ac486f5716561c37d8
Signed-off-by: Govind Singh <govinds@codeaurora.org>
2017-03-03 12:37:09 +05:30
Veerabhadrarao Badiganti
83333ef2f4 mmc: cmdq_hci: ice: Handle ICE HCI errors in cmdq mode
With ICE HCI addition in SDHC, couple of errors conditions
got introduced. These errors would be detected by ICE HCI and
triggers interrupt.

The two errors are:
1. Generic Crypto Error (GCE): This error is detected during the
transfer. Need to reset SDHC to recover.
2. Invalid Crypto Configuration Error (ICCE): The HW detects it
before the beginning of the transfer and terminates the transfer
before actual execution started.

Driver has to handle these error for recovering ICE-HCI from
these error conditions. This patch is for handling there errors
in cmdq mode.

Change-Id: Ia10075aca429cbc49ccccdae5c0499c7a176b8a2
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-03-03 12:13:32 +05:30
Manoj Kumar AVM
26dc184bbb defconfig: enable VT driver for mediabox
Enable CONFIG_VT in msmcortex mediabox defonfig. This is needed for
Weston compositor functionality.

CRs-Fixed: 2002381
Change-Id: Id7d57d4b1862252af40fe1d8b296a4e5a8ee0fba
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2017-03-02 20:11:33 -08:00
zhaoyuan
4fea7185a7 ARM: dts: msm: Add improve touch device node into sdm630 QRD
Improve touch will be used on sdm630 QRD so add support for it.

Change-Id: I4e7868f81dbd86a425375e98f4fea4a40f53887f
Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
2017-03-03 11:22:56 +08:00
Subbaraman Narayanamurthy
0996508e0d leds: qpnp-wled: add support to control PSM dynamically
As per the hardware recommendation, keep PSM disabled 10 ms after
WLED module is enabled. Enable PSM back when the module is
disabled. This is to ensure that PFM mode is operational without
the precedence from PSM. Make this configurable through a device
tree property.

Change-Id: Ic6be160a88be40e94a4a0798646b8aa3f169ab49
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-03-02 18:52:08 -08:00
Xiaojun Sang
3053c8faea ASoC: msm: add support for VI sense recording
Add new routing dailink to support VI recording using
DAI of Slimbus4 Capture.

CRs-Fixed: 1113625
Change-Id: I75282bd39a7299a9906ac38907e93e359403c077
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2017-03-02 18:19:53 -08:00
Subbaraman Narayanamurthy
104f30e462 leds: qpnp-wled: improve OVP fault interrupt handling
If there is an OVP event happened in the bootloader and the
interrupt is not handled before, then as soon as the WLED
module is enabled, fault interrupt can fire. This is seen
sometimes during bootup. This is harmless as such and cannot
be stopped completely. However, it would be good to keep the
OVP fault interrupt disabled at the startup. When WLED module
is enabled again, it will get enabled anyways after ~10 ms.

While at it, print the error message in OVP fault interrupt
handler only when the fault status is set.

Change-Id: I0759c87137a52a8872b37d126e71c13f76d10e05
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-03-02 17:57:08 -08:00
Subbaraman Narayanamurthy
4c4a60efd4 ARM: dts: msm: change WLED interrupt configuration for pm660l
Currently, WLED over-voltage and short-circuit fault interrupts
are configured for both rising and falling edge. Configure them
to be on rising edge alone as that should be sufficient.

Change-Id: I9e19cf08e77432a4db5f18894ee445d38f1ad802
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-03-02 17:48:56 -08:00
Subbaraman Narayanamurthy
75b11e217d ARM: dts: msm: change WLED interrupt configuration for pmi8998
Currently, WLED over-voltage and short-circuit fault interrupts
are configured for both rising and falling edge. Configure them
to be on rising edge alone as that should be sufficient.

Change-Id: I7cdaf126c07daa9afb2c0db68ee760a9a4a2956a
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-03-02 17:47:56 -08:00
Manu Gautam
38fb1003b1 USB: gadget: midi: Replace snd_card_free with snd_card_free_closed
snd_card_free is a blocking function which waits for ALSA device to
be closed before freeing it. This could be blocked forever if userspace
has device node opened when midi function is unbound.
Replace it with snd_card_free_when_closed which can be safely used if
userspce has the device node opened.
It is not a blocking function and defers freeing of the card until
userspace closes the ALSA device.

Change-Id: I6becc44dc0f0c1131f9b7dcd1e4a151d830dde2b
CRs-fixed: 1116790
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
2017-03-02 13:30:20 -08:00
Kuirong Wang
5701970e9e ASoC: codecs: add cable connect/disconnect acknowledgment
Add support for cable connect/disconnect acknowledgment
between HDMI/DisplayPort audio codec driver and display
driver to replace sysfs node mechanism.

CRs-Fixed: 2013097
Change-Id: I3b385a5e9933f7e99f1dbb9848a2664f687bd7d7
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
2017-03-02 13:10:16 -08:00
Anirudh Ghayal
9ce8217d4f power: fg-util: Fix the address mask for secure_write check
For the 16-bit FG peripheral register address check the lower-byte
for secure_access instead of the upper-byte.

CRs-Fixed: 2013922
Change-Id: I647aa4eadccb007e6e974eae65cef162c5a40a0d
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-03-03 00:04:09 +05:30
Ashay Jaiswal
16d8287180 qcom: smb-lib: fix adapter allowance for PM660
PM660 only supports VBUS voltage upto 9V, add
support to limit adapter allowance to maximum 9V for
PM660.

Change-Id: I283d5b1105cd9ad397a484982d674acf97f31f8a
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-03-02 23:07:04 +05:30
Linux Build Service Account
2a7bbea49b Merge "msm: mdss: handle synchronization issues during DSI debugfs read/write" 2017-03-02 08:27:04 -08:00
Linux Build Service Account
ac88759295 Merge "msm: vidc: Return correct error code from venus_hfi_suspend" 2017-03-02 08:27:03 -08:00
Linux Build Service Account
2caf0b2fcd Merge "msm: vidc: Add support for Cx ipeak limitation" 2017-03-02 08:27:02 -08:00
Linux Build Service Account
1543b55dce Merge "ARM: dts: msm: Remove debug_timeout property for msm8998" 2017-03-02 08:27:01 -08:00
Linux Build Service Account
f1921bde73 Merge "msm: vidc: Add support for querying controls" 2017-03-02 08:27:00 -08:00
Linux Build Service Account
892273039e Merge "msm: vidc: Initialize DCVS load properly" 2017-03-02 08:26:59 -08:00
Linux Build Service Account
3ad6b7e9f4 Merge "soc: qcom: Propagate separate error code for PDR disabled" 2017-03-02 08:26:59 -08:00
Linux Build Service Account
86aba807c8 Merge "leds: remove unused driver leds-qpnp-flash.c" 2017-03-02 08:26:58 -08:00
Linux Build Service Account
240cfdc172 Merge "ARM: dts: msm: Change FG cut-off voltage to default for SDM660 QRD" 2017-03-02 08:26:57 -08:00
Linux Build Service Account
07138c3906 Merge "ARM: dts: msm: Add support for sdm630 QRD board" 2017-03-02 08:26:56 -08:00
Ghanim Fodi
243a07207f msm: ipa3: fix DMA memory allocation success check
IPA allocates memory for Filtering and Routing tables
by the DMA memory allocation Linux APIs.
The code did not check the success of allocation
correctly. This change fixes the check.

CRs-fixed: 2014060
Change-Id: I95a170f19e3becfc2b90bf5931947c0637464257
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2017-03-02 07:34:16 -08:00
Mohit Aggarwal
738d2a8fea alarmtimer: Program mpm wakeup time in milliseconds
Currently, mpm wakeup time is programmed in seconds
due to which there is a possibility that wakeup
happens later than the expected time. This patch
fixes the issue by programming the mpm wakeup time
in milliseconds.

CRs-Fixed: 2010001
Change-Id: I5c4905a0386e60ae54876f30d89f445fd06a161c
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
2017-03-02 03:05:45 -08:00
Narender Ankam
a471176a2b ARM: dts: msm: add device nodes to support DP on sdm630
Add device nodes for dp_ctrl and dp_pll to bring up display port
on sdm630.

Change-Id: I14621a6e4d6273b56c1ad7639baa5e83c058fe63
Signed-off-by: Narender Ankam <nankam@codeaurora.org>
2017-03-02 16:10:38 +05:30
Maulik Shah
47beb3017e cpuidle: lpm-levels: Update suspend wake time
Alarmtimer will send suspend wake time in milliseconds
instead of seconds to minimize round off errors. Update
lpm-levels accordingly.

Change-Id: I58c780993ce35cda69cd963996f057d6e2265c6d
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
2017-03-02 15:48:35 +05:30
Sarada Prasanna Garnayak
84cfceeac2 ath10k: define structure for the copy engine misc regs
Define structures for the copy engine misc registers
copy engine CMD halt, watermark source, watermark
destination, host IE ring.

This adds support to avoid the conditional compilation,
code optimization and dynamic configuration of the copy
engine register map for respective hardware bus interface.

Change-Id: I42b9c0ad0927b492e3b4f040ae7163456b161735
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-03-01 23:24:39 -08:00
Sarada Prasanna Garnayak
ff6155fa90 ath10k: define structure for the copy engine CTRL_1 regs
Define a structure for the copy engine CTRL_1 register
source, destination and dmax ring. This adds support to
avoid the conditional compilation, code optimization and
dynamic configuration of the copy engine register map
for respective hardware bus interface.

Change-Id: Ic0a4190b0735fb5d905ea75ac71e8060260dde74
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-03-01 23:24:33 -08:00
Sarada Prasanna Garnayak
e42e488a2d ath10k: define structure for the copy engine register map
Instead of defining the copy engine register map as a macro,
Define a structure for the copy engine register map to avoid
the conditional compilation, code optimization and dynamic
configuration of the copy engine register map for respective
hardware bus interface.

Change-Id: I799794ed85b83e342c2aab3d12b2876fc28d680b
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-03-01 23:24:26 -08:00
Shrey Vijay
280b83a89c ARM: dts: msm: Change BLSP assignment for APQ8098-mediabox
By default codec uses SPI_10 BLSP instance. On mediabox platform,
codec usecase is not present. Hence disable SPI_10 instance on
APQ8098 mediabox platform.

Change-Id: I721673b8cc0ef6d974e715ffd405fc1b11e2c9d5
Signed-off-by: Shrey Vijay <shreyv@codeaurora.org>
2017-03-02 12:10:30 +05:30
Govind Singh
58ce0d4576 ath10k: Remove bus structures from ath10k struct
ath10k struct is bus opaque structure.
Remove bus structures from ath10k struct to make it
bus independent.

Change-Id: Ifb82e1fc4525c535e8a19f95bd4da006294be203
Signed-off-by: Govind Singh <govinds@codeaurora.org>
2017-03-01 22:20:55 -08:00
Sayali Lokhande
9db290026f ARM: dts: msm: Update SDCC PM QOS values for SDM660
Update SDCC PM QOS latencies to allow l2-retention
state as per measured LPM latencies on SDM660 target.

Change-Id: Iac0a0473f78be90722ceb07db1f85ac6adb69911
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-03-02 10:53:16 +05:30