Commit graph

587691 commits

Author SHA1 Message Date
Linux Build Service Account
b290a7a8e7 Merge "ath10k: recal the txpower when removing interface" 2017-04-13 02:19:02 -07:00
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
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
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
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
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
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
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
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
Linux Build Service Account
98b937d2fd Merge "smb138x: introduce support for smb1355" 2017-04-11 11:43:05 -07:00
Linux Build Service Account
3cc6a31bb7 Merge "ASoC: wcd: fix pop noise at start of recording on msm8998" 2017-04-11 11:43:04 -07:00
Charan Teja Reddy
32cec6bec3 dma-mapping: add the missing functions to dma_map_ops
Add the missing callback functions on 32bit systems that can be used to
set the dma_mask and get the dma error information.

Change-Id: I69c454ea8cbceb4301ec812c5f74f6a751fc7df1
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-04-11 06:03:22 -07:00
Charan Teja Reddy
de6efb5e94 dma-mapping: add i/o coherency support for 32bit
Add the I/O coherency support for devices that can issue a cache
coherent transactions.

Change-Id: I01b1dca4d72395df41ac5b882dcd3fd75a682b8c
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-04-11 05:11:29 -07:00
Jouni Malinen
16793068c2 cfg80211: Add Fast Initial Link Setup (FILS) auth algs
This defines authentication algorithms for FILS (IEEE 802.11ai).

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 631810603a20874554b2f17adf42b72d0f15eda5
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
CRs-Fixed: 2028536
Change-Id: I530913c84f2c3e678e83144ac474195184f4dd3b
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-04-11 03:54:45 -07:00
Jouni Malinen
ea3b2dcdde cfg80211: Rename SAE_DATA to more generic AUTH_DATA
This adds defines and nl80211 extensions to allow FILS Authentication to
be implemented similarly to SAE. FILS does not need the special rules
for the Authentication transaction number and Status code fields, but it
does need to add non-IE fields. The previously used
NL80211_ATTR_SAE_DATA can be reused for this to avoid having to
duplicate that implementation. Rename that attribute to more generic
NL80211_ATTR_AUTH_DATA (with backwards compatibility define for
NL80211_SAE_DATA).

Also document the special rules related to the Authentication
transaction number and Status code fiels.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 11b6b5a4ced2f2c76073b97ee08ca0eab8358fde
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
CRs-Fixed: 2028536
Change-Id: Icc8bbdf3530c46048239ca88bfcb8b100a7f0822
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-04-11 03:53:46 -07:00
Dhoat Harpal
e61cfc0bb8 soc: qcom: glink_smem_native_xport: Check smem item in non cache region
Smem item is searched in cached region only, however it depends on remote
processor if smem exist in cache region or non cache region of smem memory.

Check for smem item in both cached and non cached region.

CRs-Fixed: 2031705
Change-Id: Ib11fd15c6c49353950c0892b45d0eec1fbc33f46
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-04-11 15:53:08 +05:30
Linux Build Service Account
1c450066c7 Merge "msm: vidc: Protect debug_buffer access in info_read with lock" 2017-04-11 02:34:30 -07:00
Linux Build Service Account
2537bdfe86 Merge "drm/msm: fix the display type string in SDE HDMI driver" 2017-04-11 02:34:29 -07:00
Linux Build Service Account
e07366de95 Merge "ARM: dts: msm: move battery node under /vendor for 8998 platforms" 2017-04-11 02:34:26 -07:00
Linux Build Service Account
4387138a3a Merge "ARM: dts: msm: move bluetooth node under /vendor on msm8998" 2017-04-11 02:34:26 -07:00
Linux Build Service Account
f1283dace8 Merge "drm/displayid: Iterate over all DisplayID blocks" 2017-04-11 02:34:24 -07:00
Linux Build Service Account
f52bb19a62 Merge "drm/edid: move displayid validation to it's own function." 2017-04-11 02:34:24 -07:00
Linux Build Service Account
9e7e43be2d Merge "drm/edid: move displayid tiled block parsing into separate function." 2017-04-11 02:34:23 -07:00