Commit graph

599455 commits

Author SHA1 Message Date
Linux Build Service Account
2d58063eb8 Merge "usb: Use DECLARE_USB_FUNCTION() for initializing USB QDSS function driver" 2018-05-25 00:09:43 -07:00
Linux Build Service Account
c1b445a451 Merge "power: qpnp-fg-gen3: Restore recharge SOC only when not in JEITA" 2018-05-25 00:09:42 -07:00
Linux Build Service Account
0828ba03db Merge "ARM: dts: msm: remove leakage on ldo26 for msm8996" 2018-05-25 00:09:39 -07:00
Mayank Rana
5ddd6eca57 usb: Use DECLARE_USB_FUNCTION() for initializing USB QDSS function driver
USB QDSS function driver is already registered as module and having init
and exit APIs. DECLARE_USB_FUNCTION_INIT() adds additional module entries
for USB QDSS function driver. This results into seeing error as
"usb_qdss_init: failed to register diag -17" when usb_function_register()
is called 2nd time. Hence fix this issue by using DECLARE_USB_FUNCTION()
instead of DECLARE_USB_FUNCTION_INIT() API.

Change-Id: I37da484eaa44e60e331d18fa720289a2dff8ad50
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2018-05-24 17:02:00 -07:00
Subbaraman Narayanamurthy
9c572ce8ee power: qpnp-fg-gen3: Restore recharge SOC only when not in JEITA
Currently, recharge SOC is adjusted (lowered) based on the SOC
where charging terminates. It is restored back to the original
threshold when the charge termination condition goes away. This
works fine in most cases. However there are certain conditions
where the charger fluctuates between fast and taper regions along
with the charge termination status.

Handle this by checking if battery is out of JEITA as well before
restoring back the original recharge SOC threshold.

CRs-Fixed: 2213369
Change-Id: Ic64151ddbbff09c26d6ebfcd3e6d4e70e0be8c9d
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2018-05-24 13:14:29 -07:00
Linux Build Service Account
45c4f7d22f Merge "ASoC: msm: Modify buf size check to prevent OOB error" 2018-05-24 02:46:45 -07:00
Linux Build Service Account
25405b771e Merge "drm/msm : check buffer size before writing to user buffer" 2018-05-24 02:46:44 -07:00
Linux Build Service Account
8696c16cbb Merge "drm/msm/sde: fix array overflow" 2018-05-24 02:46:43 -07:00
Linux Build Service Account
3ff5bbb593 Merge "fb: msm_dba: disable timing generator correctly during suspend" 2018-05-24 02:46:42 -07:00
Linux Build Service Account
f485daa540 Merge "ARM: dts: msm: remove modem region reserved on APQ8096 ADP" 2018-05-24 02:46:41 -07:00
Linux Build Service Account
2ed9c4ea73 Merge "msm: camera: Fix for Possible information leak issue" 2018-05-24 02:46:40 -07:00
Linux Build Service Account
b2798d39f3 Merge "ARM: dts: msm: Configure irq flag for blsp_uart2 in 8996 gvm" 2018-05-24 02:46:38 -07:00
Linux Build Service Account
99f9e4f8bb Merge "power: smb-lib: Allow PD enable/disable for typeC devices only" 2018-05-24 02:46:37 -07:00
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
Vivek Kumar
cb84e2692b ARM: dts: msm: Configure irq flag for blsp_uart2 in 8996 gvm
Configure irq flag as level high for blsp_uart2 wake-up
interrupt in msm8996 gvm.

Change-Id: I028ea5ea36da2a97c6878b763fcde1ebbbed9847
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-05-23 09:49:03 -07:00
vkakani
ad1bef8b82 ARM: dts: msm: remove leakage on ldo26 for msm8996
ssc_sensor voting the ldo26 clock causing leak
disable ssc_sensor which is not required for auto.

Change-Id: I1bc5c3c0f091ad3f7fc0d2180e1825b5019648ec
Signed-off-by: vkakani <vkakani@codeaurora.org>
2018-05-23 15:14:41 +05:30
Vivek Kumar
445cee88de serial: msm_serial_hs: Configure IRQ flag
Configure irq flag for wake_up IRQ which is
passed from the DT.

Change-Id: Ib521a73a6164053c9bf846078482afb6671b76e0
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-05-22 23:18:09 -07:00
Vivek Kumar
a386587650 ARM: dts: msm: remove modem region reserved on APQ8096 ADP
This reverts commit bb5f7ce39e.
GPS uses modem memory in lahb115 for 8996 APQ.

Change-Id: I0784af084f764b64dc1acfa0236a7e4ef949193d
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-05-22 01:20:55 -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
Umang Agrawal
b7c91feb97 power: smb-lib: Allow PD enable/disable for typeC devices only
Currently if pd is not allowed, we force pd_active to 0 inorder
to run the legacy workaround and rerun apsd. But, this workaround
is required only for typeC devices.

Add a check to prevent PD disable for micro usb device.

Change-Id: I842166f66065c281ab366da327080b09a5e282e1
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
2018-05-21 17:55:57 +05:30
annamraj
677db4bc17 msm: camera: Fix for Possible information leak issue
Fix for possible information leak issue because of unintialised variable
Which can be accesed from userspace in camera fd driver

Signed-off-by: annamraj <annamraj@codeaurora.org>
Change-Id: I4552c4829e9532d848e46fd123316b26105e310e
2018-05-21 15:05:52 +05:30
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
Lan Zou
214b55a259 drm/msm/sde: fix array overflow
Array ilm_pair_mask may use index larger than its size. This change
can avoid the risk happens.

Change-Id: I18b2ae814aa19e6c76884bbe71cdd9ea659ce05a
Signed-off-by: Lan Zou <lanz@codeaurora.org>
2018-05-20 19:40:03 -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
Harsh Sahu
31748cad9c drm/msm : check buffer size before writing to user buffer
Check the number of bytes to copy against the size of the
user buffer before copy to user to avoid buffer overflow.

Change-Id: Ida3f2470b8441010adc30312c12c6d75fdd6ccb8
Signed-off-by: Harsh Sahu <hsahu@codeaurora.org>
2018-05-18 00:51:09 -07:00
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