Commit graph

587836 commits

Author SHA1 Message Date
Linux Build Service Account
4d121122fe Merge "soc: qcom: socinfo: Protect current_image using semaphore lock." 2017-04-13 02:19:00 -07:00
Linux Build Service Account
27925f25a9 Merge "ARM: dts: msm: add SMB1351 charger node for SDM630 MTP" 2017-04-13 02:18:59 -07:00
Linux Build Service Account
0adf9d4050 Merge "Merge branch 'android-4.4@8e53f7c' into branch 'msm-4.4'" 2017-04-13 02:18:57 -07:00
Charan Teja Reddy
9c490fa73d arm: make default iova alignment as 2mb
To get the 2MB aligned IOVA section mappings, set
ARM_DMA_IOMMU_ALIGNMENT to 9.

Change-Id: I3254c39e4864c32d6f25a4d416b1b7aec6756ecd
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-04-12 22:28:14 -07:00
Rohit Gupta
b596bcc918 arm64: defconfig: Add a config option to compile cpu-boost driver
CONFIG_CPU_BOOST config option is only enabled for
msmcortex-perf_defconfig. Enable it for msmcortex_defconfig too.

Change-Id: I31d42aa4ac3a78e6bc3c52aa0ba7cebd8c5a7893
Signed-off-by: Rohit Gupta <rohgup@codeaurora.org>
2017-04-12 19:11:41 -07:00
Karthikeyan Mani
d1e077de03 ASoC: wcd-spi: Initialize variables before use
Initialize variable before use to avoid
invalid memory access.

CRs-fixed: 2004067
Change-Id: I9f7dd1e87d323ff300060c3d838342f55e6711e8
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
2017-04-12 17:26:53 -07:00
Karthikeyan Mani
13feabf360 ASoC: wcd9335: Initialize variables before use
Initialize variable before use to avoid
invalid memory access.

CRs-fixed: 2004067
Change-Id: I719bb13acb1ae8a9654604d251f728d98cffe936
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
2017-04-12 17:26:36 -07:00
Karthikeyan Mani
075b17a1d2 ASoC: wcd_cpe_core: Initialize variables before use
Initialize variable before use to avoid
invalid memory access.

CRs-fixed: 2004067
Change-Id: I882cdf78709d6dcc2dcd1fc7f903492aa2581138
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
2017-04-12 17:26:25 -07:00
Abhinav Kumar
fe965aa6bc drm/msm/sde: remove redundant CRTC event caching
Currently both sde_crtc_atomic_begin() and
sde_crtc_atomic_flush() add the CRTC state event
to the cached sde_crtc->event.

This has a potential NULL ptr issue in the
case of vblank event firing in between sde_crtc_atomic_begin() and
sde_crtc_atomic_flush() because the upstream DRM vblank API
send_vblank_event() doesn't consider the case when the VBLANK
interrupt could have already freed any pending vblank events.

Remove the caching from sde_crtc_atomic_begin() to avoid this
condition.

Also make sure that a page_flip event was indeed submitted before
signaling the complete_flip() by setting a PENDING_FLIP flag right
after HW flush.

Change-Id: Ib201d2851e57bf22ec1f00814fc2e4dd2f35bfa1
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-04-12 16:39:08 -07:00
Linux Build Service Account
4a4051e573 Merge "diag: Place proper NULL pointer checks" 2017-04-12 16:10:20 -07:00
Linux Build Service Account
d96dc0727a Merge "wil6210: add sysfs file for enable/disable fst link loss" 2017-04-12 16:10:19 -07:00
Linux Build Service Account
fd64062315 Merge "ASoC: msm: qdspv2: add mutex to prevent access same memory simultaneously" 2017-04-12 16:10:18 -07:00
Linux Build Service Account
a4d598f9ee Merge "ASoC: msm: qdsp6v2: support TDM to AUX_PCM loopback for BT HFP uplink" 2017-04-12 16:10:17 -07:00
Linux Build Service Account
3ce5511759 Merge "ASoC: msm: support up to 8 channel capture on MM1" 2017-04-12 16:10:17 -07:00
Linux Build Service Account
d11deab41b Merge "ASoC: msm: defer the machine driver probing if ADSP is down" 2017-04-12 16:10:16 -07:00
Linux Build Service Account
7cd2991c8e Merge "ASoC: msm: add support for TERT_TDM_RX_4 BE" 2017-04-12 16:10:14 -07:00
Linux Build Service Account
ae9e7ab9f2 Merge "ASoC: codecs: Fix mbhc data NULL pointer dereferencing" 2017-04-12 16:10:13 -07:00
Linux Build Service Account
4c9126a7a2 Merge "dma-mapping: add the missing functions to dma_map_ops" 2017-04-12 16:10:12 -07:00
Linux Build Service Account
e56d3280a5 Merge "dma-mapping: add i/o coherency support for 32bit" 2017-04-12 16:10:12 -07:00
Linux Build Service Account
840c2fd1fb Merge "drm/msm: Re-trigger preemption upon command completion" 2017-04-12 16:10:11 -07:00
Linux Build Service Account
a694bbf616 Merge "msm: vidc: Update QP control values" 2017-04-12 16:10:10 -07:00
Linux Build Service Account
0a2d2c47a8 Merge "ARM: dts: msm: Add RRADC die-temp channel for PM660 FG" 2017-04-12 16:10:09 -07:00
Linux Build Service Account
f6b72aa023 Merge "drm/msm: add HDMI debugfs support to show edid modes" 2017-04-12 16:10:05 -07:00
Linux Build Service Account
5ccdda59a4 Merge "drm/msm: Add DRM EDID parser for external displays" 2017-04-12 16:10:05 -07:00
Linux Build Service Account
9ffdd89420 Merge "drivers/video: Add new aspect ratios for HDMI 2.0" 2017-04-12 16:10:04 -07:00
Satya Durga Srinivasu Prabhala
bfd0d96f4b soc: qcom: remove debugfs interface from ssr, service locator & notifier
As debugfs interface is intended to test the respective framework, remove
from the driver to make sure it won't be available by default.

CRs-Fixed: 2025661
Change-Id: I6af9a8333c8028611f889cc2f9b0beb37ef12c9b
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-04-12 12:16:37 -07:00
bings
dbb543631c msm: wlan: AR TX power regulatory updates
Regulatory updates for AR TX power

CRs-Fixed: 2031894
Change-Id: I8b198d009b1e008be252698128285b9c218100ba
Signed-off-by: bings <bings@codeaurora.org>
2017-04-13 00:51:44 +08:00
Swetha Chikkaboraiah
2fb8a14c6d soc: qcom: socinfo: Protect current_image using semaphore lock.
Variable current_image can be modified by multiple threads.
This change will protect current_image getting modified
by multiple threads.

Change-Id: I33df463311b24f73b1ba124d388731a72bd13263
CRs-Fixed: 2016485
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2017-04-12 04:56:13 -07:00
Manoj Prabhu B
e6707683f3 diag: Place proper NULL pointer checks
This patch checks the buffer for NULL
pointer to prevent undefined access.

CRs-Fixed: 2032374
Change-Id: I1a1c4ca24e5c3d538ea93685de304dd186968308
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-04-12 03:27:04 -07:00
Ajay Agarwal
61add90b90 usb: gadget: ffs: Fix runtime PM usage count for multiple set_alt
In some scenarios such as USBCV tests, multiple set_alt
could be issued with same interface and alternate
setting. In that case, EPs are disabled and enabled,
we get the usage count but do not put it. This causes
a mismatch and DWC3 LPM does not work anymore. Fix
this issue by moving put_usage_count to ffs_func_set_alt.

Change-Id: Ic85db09820d2c18b67bd463fe27e2c1ef41e8c74
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2017-04-12 15:43:42 +05:30
Ashay Jaiswal
36c0827bfa ARM: dts: msm: add SMB1351 charger node for SDM630 MTP
Add SMB1351 charger node in parallel charger configuration
for SDM630.

Change-Id: Icf7e307971f5d34b28d8363c055d9a8c65adffcd
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-12 15:10:36 +05:30
Vijayavardhan Vennapusa
cc3a256819 ARM: dts: msm: Disable U1U2 low power modes for SDM660
Enable support for "Disable U1U2 low power modes" for SDM660 in
superspeed mode.

Change-Id: Ic49cf7ef48cb027cd82c0a3de7f98ae3da1fca61
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-04-12 14:28:19 +05:30
Sharat Masetty
ba1ad63339 drm/msm: Re-trigger preemption upon command completion
Trigger preemption from the interrupt handler. This allows us
to aggressively change ringbuffers especially to lower priority
ones and finish working on pending commands.

Change-Id: Ic05213f3d02b1bb7400461edd0d19e38d5b01ec2
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
2017-04-11 23:59:17 -07:00
Walter Yang
7b35d8ac22 Revert "ASoC: msm: decrement slim channel ref to set the property"
This reverts commit 8777df6c6e
("ASoC: msm: decrement slim channel ref to set the property").

Slimbus channel deallocate and slimbus channel query should
happen in pair to ensure the ref count and state of the
channel are both in correct value.

CRs-Fixed: 1102349
Change-Id: Ie15f6e65448194ba781160856dd3f4e2ab081de1
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
2017-04-11 22:38:59 -07:00
Ryan Hsu
adad11994a ath10k: recal the txpower when removing interface
The txpower is being recalculated when adding interface to make sure
txpower won't overshoot the spec, and when removing the interface,
the txpower should again to be recalculated to restore the correct value
from the active interface list.

Following is one of the scenario
	vdev0 is created as STA and connected: txpower:23
	vdev1 is created as P2P_DEVICE for control interface: txpower:0
	vdev2 is created as p2p go/gc interface: txpower is 21

So the vdev2@txpower:21 will be set to firmware when vdev2 is created.
When we tear down the vdev2, the txpower needs to be recalculated to
re-set it to vdev0@txpower:23 as vdev0/vdev1 are the active interface.

	ath10k_pci mac vdev 0 peer create 8c:fd:f0:01:62:98
	ath10k_pci mac vdev_id 0 txpower 23
	... (adding interface)
	ath10k_pci mac vdev create 2 (add interface) type 1 subtype 3
	ath10k_pci mac vdev_id 2 txpower 21
	ath10k_pci mac txpower 21
	... (removing interface)
	ath10k_pci mac vdev 2 delete (remove interface)
	ath10k_pci vdev 1 txpower 0
	ath10k_pci vdev 0 txpower 23
	ath10k_pci mac txpower 23

Signed-off-by: Ryan Hsu <ryanhsu@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Git-commit: d679fa1b3c8997e3a371da3cca08c44a38054c34
CRs-Fixed: 2027293
Change-Id: I56befd4c4fd80ab77ed65926663a1f2471701f68
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-04-11 22:38:41 -07:00
Deepak Kushwah
aee6a2cd41 msm: vidc: Update QP control values
Update QP Control value and sanitise QP values for
Initial QP properly.

Change-Id: I870a4f33a0dfbfd3a95970bb9cf319855fba746f
CRs-Fixed: 2027340
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2017-04-11 22:38:18 -07:00
Ryan Hsu
f0dc35a514 ath10k: fix incorrect txpower set by P2P_DEVICE interface
Ath10k reports the phy capability that supports P2P_DEVICE interface.

When we use the P2P supported wpa_supplicant to start connection, it'll
create two interfaces, one is wlan0 (vdev_id=0) and one is P2P_DEVICE
p2p-dev-wlan0 which is for p2p control channel (vdev_id=1).

	ath10k_pci mac vdev create 0 (add interface) type 2 subtype 0
	ath10k_add_interface: vdev_id: 0, txpower: 0, bss_power: 0
	...
	ath10k_pci mac vdev create 1 (add interface) type 2 subtype 1
	ath10k_add_interface: vdev_id: 1, txpower: 0, bss_power: 0

And the txpower in per vif bss_conf will only be set to valid tx power when
the interface is assigned with channel_ctx.

But this P2P_DEVICE interface will never be used for any connection, so
that the uninitialized bss_conf.txpower=0 is assinged to the
arvif->txpower when interface created.

Since the txpower configuration is firmware per physical interface.
So the smallest txpower of all vifs will be the one limit the tx power
of the physical device, that causing the low txpower issue on other
active interfaces.

	wlan0: Limiting TX power to 21 (24 - 3) dBm
	ath10k_pci mac vdev_id 0 txpower 21
	ath10k_mac_txpower_recalc: vdev_id: 1, txpower: 0
	ath10k_mac_txpower_recalc: vdev_id: 0, txpower: 21
	ath10k_pci mac txpower 0

This issue only happens when we use the wpa_supplicant that supports
P2P or if we use the iw tool to create the control P2P_DEVICE interface.

Signed-off-by: Ryan Hsu <ryanhsu@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Git-commit: 88407beb1b1462f706a1950a355fd086e1c450b6
CRs-Fixed: 2027293
Change-Id: Ib56352e1601e7400b856cfafe67503bee98d5ced
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-04-11 22:38:13 -07:00
Ajay Agarwal
ade2576e76 USB: gadget: ffs: Fix USBCV compliance failure due to adbd
Userspace f_fs client e.g. ADB daemon can re-open ep0 file node
on adb_read/write error (or on bus reset). This results in device
disabling and enabling pull-up on bus reset. USBCV CH9 tests which
perform bus resets also fail due to this.
Fix this by not failing adb_read on bus reset so that adbd client
woudln't attempt ep0-file close. This behavior is not changed for
composition switch or cable disconnect by checking if adb_read
was attempting first transfer after online state or it was in middle
of a session when disconnect happened.

Change-Id: I2378f22995b7ddffb17d618df059d8aedb594d97
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2017-04-12 09:38:19 +05:30
Linux Build Service Account
9898f867d9 Merge "msm: ipa: rmnet_ipa: stop TX queue on ap suspend" 2017-04-11 20:43:37 -07:00
Linux Build Service Account
49426a3a2c Merge "qcom: smblib: Show correct charging status" 2017-04-11 20:43:36 -07:00
Linux Build Service Account
054789c42f Merge "cfg80211: Add Fast Initial Link Setup (FILS) auth algs" 2017-04-11 20:43:35 -07:00
Linux Build Service Account
51977976da Merge "soc: qcom: glink_smem_native_xport: Check smem item in non cache region" 2017-04-11 20:43:34 -07:00
Linux Build Service Account
8b65846d11 Merge "sound: usb: Populate tunnel mode response struct for BADD devices" 2017-04-11 20:43:32 -07:00
Linux Build Service Account
6ca6a9b6e4 Merge "soc: qcom: glink: Get additional reference in glink open" 2017-04-11 20:43:31 -07:00
Anirudh Ghayal
97a28dd890 ARM: dts: msm: Add RRADC die-temp channel for PM660 FG
Add the RRADC die_temp channel details to the FG node for
the FG standby oscillator frequency drift WA.

Change-Id: I78d385afc82f9d8b7b6cdc64de59dfe964d2b50b
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-12 08:16:00 +05:30
Anirudh Ghayal
cc15024bc2 power: qpnp-fg-gen3: Add WA for oscillator drift on PM660
It is observed that on certain foundry devices, frequency of the
standby oscillator drifts with die temperature. Compensate
for this by correcting the FG time-base based on die temperature.

Change-Id: I0de19b9c342bf50568502b4de96897e159a8e143
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-12 08:14:52 +05:30
Bhalchandra Gajare
9e58aeb33e ASoC: wcd934x: use analog mics in micbias mode for MAD
It is possible to route analog microphone data to the MAD (Microphone
Activity Detection) block in the codec. Currently, VDDIO mode is used
for analog microphones, which can cause degradation of audio data,
causing no detection from the MAD block. Change the MAD programming
to use micbias instead of VDDIO mode for analog microphones to fix
this signal degradation problem.

CRs-fixed: 2021869
Change-Id: I77e089bd9858e5179405f87982b16ddaf7b4cd5b
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2017-04-11 18:16:40 -07:00
Runmin Wang
77082ccbb3 apq8098: rename apq8998 to apq8098
Update "apq8998" to "apq8098" as a proper name for all files
and strings used by apq8098 platform.

Change-Id: Id633d346946251751829fb597c860c8d41944265
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-04-11 16:41:52 -07:00
Shubhraprakash Das
f883a80a90 msm: camera: isp: Detect dual camera out of sync using time
Use timestamp to detect when dual camera interfaces are out
of sync. Without using timestamps the interfaces can remain
out of sync for a long time since it takes a while to detect
the out of sync condition based on frame id increment.

CRs-Fixed: 2029680
Change-Id: I21cf2b0a76a7c9d8ad812ffbdbb1b1a36d9af1a5
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2017-04-11 14:01:45 -07:00
Linux Build Service Account
4901c7fce4 Merge "ARM: dts: msm: Enable wakeup capability of SPMI interrupts for SDM630" 2017-04-11 11:43:07 -07:00