Commit graph

599432 commits

Author SHA1 Message Date
Linux Build Service Account
7b7e229ed2 Merge "cfg80211: Add backport flag for user cellular base hint" 2018-05-24 02:46:35 -07:00
Linux Build Service Account
490a4fd34e Merge "cfg80211: Call reg_notifier for self managed hints conditionally" 2018-05-24 02:46:35 -07:00
Linux Build Service Account
c43f38b61e Merge "msm: ipa: Fix to slab out of bounds issue" 2018-05-23 18:44:49 -07:00
Linux Build Service Account
01008184ec Merge "spmi: pmic-arb: support updating interrupt type flags" 2018-05-23 18:44:45 -07:00
Linux Build Service Account
d0d5319fd6 Merge "soc: qcom: scm_qcpe: Fix unused variable warning" 2018-05-21 21:44:22 -07:00
Linux Build Service Account
f1164b6fff Merge "msm:ais: Remove recursive locks" 2018-05-21 21:44:20 -07:00
Linux Build Service Account
3d8551da60 Merge "arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW" 2018-05-21 08:45:43 -07:00
Mohammed Javid
1e03864e8a msm: ipa: Fix to slab out of bounds issue
Add changes to verify passed value with in the allocated
max array size range or not before accessing structure.

Change-Id: If70493e937f6f0bc29bbfe08bf43738bdb4e9cf4
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-05-21 12:57:20 +05:30
Amit Blay
d78d7b5863 soc: qcom: scm_qcpe: Fix unused variable warning
Fix an unused variable warning when GHS flag is not defined.

Change-Id: Icd5b8bbb0e1bd7bedbaa6c806889d21213cb23f2
Signed-off-by: Amit Blay <ablay@codeaurora.org>
2018-05-21 08:54:27 +03:00
Will Deacon
e30cb51ecc arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW
Recently vDSO support for CLOCK_MONOTONIC_RAW was added in
49eea433b326 ("arm64: Add support for CLOCK_MONOTONIC_RAW in
clock_gettime() vDSO"). Noticing that the core timekeeping code
never set tkr_raw.xtime_nsec, the vDSO implementation didn't
bother exposing it via the data page and instead took the
unshifted tk->raw_time.tv_nsec value which was then immediately
shifted left in the vDSO code.

Unfortunately, by accellerating the MONOTONIC_RAW clockid, it
uncovered potential 1ns time inconsistencies caused by the
timekeeping core not handing sub-ns resolution.

Now that the core code has been fixed and is actually setting
tkr_raw.xtime_nsec, we need to take that into account in the
vDSO by adding it to the shifted raw_time value, in order to
fix the user-visible inconsistency. Rather than do that at each
use (and expand the data page in the process), instead perform
the shift/addition operation when populating the data page and
remove the shift from the vDSO code entirely.

[jstultz: minor whitespace tweak, tried to improve commit
 message to make it more clear this fixes a regression]

Reported-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Daniel Mentz <danielmentz@google.com>
Acked-by: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: "stable #4 . 8+" <stable@vger.kernel.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Link: http://lkml.kernel.org/r/1496965462-20003-4-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Git-commit: dbb236c1ceb697a559e0694ac4c9e7b9131d0b16
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: Ifa530498a6cd364ef258691ddf03cd3bc2a860b5
[vivekuma@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-05-20 22:29:26 -07:00
Suprith Malligere Shankaregowda
84c40e8fb9 msm:ais: Remove recursive locks
We are trying to acquire the same mutex lock twice
in iotcl path and axi/stats start stream.
Removed recursive locks.

Change-Id: I331f79e5a387aa64600656f6377ba46385d11a83
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-05-20 21:37:41 -07:00
Linux Build Service Account
1ff291a124 Merge "ASoC: msm: check payload size before memory allocation" 2018-05-20 19:31:51 -07:00
Linux Build Service Account
e1c2b1f918 Merge "ASoC: msm: qdsp6v2: return the proper LPASS status" 2018-05-20 19:31:50 -07:00
Linux Build Service Account
d803000f57 Merge "Ath10k: enable WLAN channel switch announcement offload" 2018-05-19 14:01:37 -07:00
Linux Build Service Account
1c91ca0a97 Merge "Revert "usb: host: Add support for usb core indexing"" 2018-05-19 14:01:20 -07:00
Linux Build Service Account
fdda6c7afd Merge "ARM: dts: msm: IPA clock switches to virtual clock on msm8996 vplatform" 2018-05-19 14:01:15 -07:00
Linux Build Service Account
7e0d522bfb Merge "ARM: dts: msm: Enable required USB nodes for 8996 lagvm" 2018-05-19 03:29:39 -07:00
Linux Build Service Account
47b2747d79 Merge "Revert "cfg80211: Define new API to send reg change event"" 2018-05-19 03:29:34 -07:00
Linux Build Service Account
9fdb9cd861 Merge "Revert "reg: qcom: call reg notifier during wiphy registration"" 2018-05-19 03:29:28 -07:00
Sarada Prasanna Garnayak
9706f2388c Ath10k: enable WLAN channel switch announcement offload
The WLAN firmware supports the channel switch offload and
channel switch announcement event reporting to the WLAN driver.
In STA mode this feature adds support to wakeup the device from
the wow suspend on channel switch announcement by the connected
access point.

CRs-Fixed: 2170011
Change-Id: I68612beb0a808700a732fc858c8797200d1f4819
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2018-05-18 19:34:40 +05:30
c_krikum
e4c44a9520 ARM: dts: msm: Enable required USB nodes for 8996 lagvm
Enable required USB nodes in LA-GVM specific dts
for msm8996.

Change-Id: I6359f6b7435383019d920e97f574c23ed557a67b
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-05-17 21:57:09 -07:00
Zhiqiang Tu
4703141a1b ARM: dts: msm: IPA clock switches to virtual clock on msm8996 vplatform
Virtual clock driver has added support for RPM controlled clock.
So change the IPA clock which is controlled by RPM from dummy
clock to virtual clock.

Change-Id: If0a95fd0cb530c7a230105f5035373e7cac2c102
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-05-18 09:19:05 +08:00
Linux Build Service Account
3a9f9cc591 Merge "msm: mdss: Increase fbmem buf ref count before use in mdp3" 2018-05-17 12:23:36 -07:00
Linux Build Service Account
c3b0ba5ee3 Merge "diag: Add new log codes to diag mask" 2018-05-17 12:23:34 -07:00
Gerrit - the friendly Code Review server
6d68777c53 Merge changes into msm-4.4 2018-05-17 12:06:46 -07:00
Amar Singhal
b05f752db8 cfg80211: Add backport flag for user cellular base hint
Upstream commit aced43ce780dc5e683b3de00ce9fb3db7d28e1d3 ("cfg80211: Call
reg_notifier for self managed hints conditionally") adds support
for processing user cell_base hints when wiphy is self managed. Add
backport flag for the same.

Change-Id: I44e083f4346cc95eb2f80eeec7d56f305e7ecce0
CRs-Fixed: 2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
2018-05-17 09:57:05 -07:00
Amar Singhal
da26eb3a84 cfg80211: Call reg_notifier for self managed hints conditionally
Currently the regulatory core does not call the regulatory callback
reg_notifier for self managed wiphys, but regulatory_hint_user() call is
independent of wiphy and is meant for all wiphys in the system. Even a
self managed wiphy may be interested in regulatory_hint_user() to know
the country code from a trusted regulatory domain change like a cellular
base station. Therefore, for the regulatory source
NL80211_REGDOM_SET_BY_USER and the user hint type
NL80211_USER_REG_HINT_CELL_BASE, call the regulatory notifier.

No current wlan driver uses the REGULATORY_WIPHY_SELF_MANAGED flag while
also registering the reg_notifier regulatory callback, therefore there
will be no impact on existing drivers without them being explicitly
modified to take advantage of this new possibility.

Change-Id: Ibd700eae551840c94daa8b721add74a8e744c748
CRs-Fixed: 2201959
Git-commit: aced43ce780dc5e683b3de00ce9fb3db7d28e1d3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-testing.git
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
2018-05-17 09:55:26 -07:00
Amar Singhal
f6d05c4ca3 Revert "cfg80211: Define new API to send reg change event"
This reverts commit 98d5572dd2. This API
no more needed since user would use existing kernel API.

Change-Id: I2d5a19fc9159da5ef7020cb1808b704b0344087e
CRs-Fixed: 2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
2018-05-17 09:52:23 -07:00
Amar Singhal
8bfed68306 Revert "reg: qcom: call reg notifier during wiphy registration"
This reverts commit 2aa0bb3ac0. Upstream
commit aced43ce780dc5 ("cfg80211: Call reg_notifier for self managed
hints conditionally") replaces this functionality.

Change-Id: If52d83577ab2f136540f70ba17d417718ba05ddf
CRs-Fixed: 2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
2018-05-17 09:46:49 -07:00
Amar Singhal
7bb5a08db1 Revert "reg: qcom: call regulatory callback for self managed hints"
This reverts commit 31e37a680d. Upstream
commit aced43ce780d ("cfg80211: Call reg_notifier for self managed
hints conditionally") replaces this functionality.

Change-Id: Ic0c3a235aee2dc8ccb36014c60314217b98b5b97
CRs-Fixed: 2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
2018-05-17 09:37:32 -07:00
Linux Build Service Account
1e1ef4660a Merge "rh850: Add support to get irq type from device tree" 2018-05-17 03:38:42 -07:00
Linux Build Service Account
8ca800b9eb Merge "clk: msm: Add rpm controlled clock support for virtual clock" 2018-05-17 03:38:41 -07:00
Linux Build Service Account
540adc801d Merge "lpm-levels: Remove kfree for memory allocated with devm_kzalloc" 2018-05-17 03:38:39 -07:00
Linux Build Service Account
c117762d69 Merge "dsp: codecs: use native API to configure PCM output block in multiaac" 2018-05-17 03:38:38 -07:00
Linux Build Service Account
8787028158 Merge "ARM: dts: msm: Add fastrpc vmid flag for sdm630" 2018-05-17 03:38:36 -07:00
Linux Build Service Account
90327fe81f Merge "msm: camera: Update camera CDR mask setting for CPHY mode" 2018-05-17 03:38:35 -07:00
Linux Build Service Account
67455180f3 Merge "Revert "usb: core: Add helper function to return controller id"" 2018-05-17 03:38:30 -07:00
Linux Build Service Account
125f0beedc Merge "Revert "usb: host: xhci: Add helper function to return controller id"" 2018-05-17 03:38:29 -07:00
Linux Build Service Account
99a11f15e4 Merge "Revert "sound: usb: Provide controller number in QMI response"" 2018-05-17 03:38:26 -07:00
Linux Build Service Account
308200f414 Merge "ARM: dts: msm: Add speed-bin 4 support for sdm660" 2018-05-17 03:38:24 -07:00
Linux Build Service Account
9183d1bec3 Merge "[drm/sde/hdmi] move scrambler setup from mode-set to pre-enable" 2018-05-17 03:38:20 -07:00
Manoj Prabhu B
340ddc2163 diag: Add new log codes to diag mask
The patch adds new requested log codes to diag mask.

Change-Id: I4124e55077ae63b9c0c349feed409851108261d3
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2018-05-17 02:05:53 -07:00
Linux Build Service Account
845a8313ad Merge "ARM: dts: msm: support msm-pcm-dtmf on msm8996 adsp/cdp" 2018-05-16 10:28:47 -07:00
Linux Build Service Account
45df31e9af Merge "ASoC: msm: qdsp6v2: increase max Rx DTMF duration" 2018-05-16 10:28:44 -07:00
Tharun Kumar Merugu
baa2b5341f ARM: dts: msm: Add fastrpc vmid flag for sdm630
Add device specific flag for new vmid heap shared feature.

Change-Id: Ie6abb5d79162d2cbb80e31922452be249f18c632
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2018-05-16 05:45:02 -07:00
Ajay Agarwal
f123787c3f Revert "usb: host: Add support for usb core indexing"
This reverts commit 03a86f5cb1.

Remove support for usb core indexing since it is no longer
required to send controller number to remote client.

Change-Id: I8021c10037a668997782327e4c151d8cac2a2ebb
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-05-16 13:58:40 +05:30
Ajay Agarwal
27fee195e4 Revert "ARM: dts: msm: Pass usb controller id for 8996"
This reverts commit 745e97d518.

Remove unique core IDs of the USB controllers on MSM8996.

Change-Id: Ie929c8c11831422e32e8b673abd8c20dfbcc79c5
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-05-16 13:58:32 +05:30
Linux Build Service Account
6e824c353d Merge "ARM: dts: msm: add HAB physical channels for msm8996 baseline vplatform" 2018-05-16 00:29:10 -07:00
Linux Build Service Account
8269990c6f Merge "Revert "sound: usb: Update QMI indication message"" 2018-05-16 00:29:09 -07:00
Linux Build Service Account
ab1f87ea69 Merge "battery: handle early/late suspend/resume of i2c bus" 2018-05-16 00:29:06 -07:00