Commit graph

586301 commits

Author SHA1 Message Date
Linux Build Service Account
a646f0ad6f Merge "ASoC: wcd-mbhc: Fix list del entry issue on mbhc variable" 2017-03-23 09:44:32 -07:00
Linux Build Service Account
a69882a961 Merge "pinctrl: qcom: correct register offset for lpi_gpio_16/17 on sdm660" 2017-03-23 09:44:32 -07:00
Linux Build Service Account
9b1eeebe92 Merge "ASoC: audio-ext-clk: correct pinctrl info for lpass mclk" 2017-03-23 09:44:31 -07:00
Linux Build Service Account
ab2411c816 Merge "ARM: dts:msm: correct clk setting for native playback on SDM660" 2017-03-23 09:44:30 -07:00
Linux Build Service Account
2edff433a4 Merge "ASoC: wcd-spi: pre-allocate buffers used for transfers" 2017-03-23 09:44:29 -07:00
Linux Build Service Account
3535fcdc1b Merge "ASoC: sdm660_cdc: Fix no headset remove event after SSR" 2017-03-23 09:44:29 -07:00
Linux Build Service Account
0776e27963 Merge "ASoc: msm: remove capture property for SLIMBUS_6 Hostless playback" 2017-03-23 09:44:27 -07:00
Linux Build Service Account
733e887153 Merge "clk: msm: gcc-8996: Add pinctrl clk for ln_bb_clk" 2017-03-23 09:44:27 -07:00
Linux Build Service Account
17aa43536b Merge "clk: msm: clock-gcc-8996: Add additional frequencies for QSPI clock" 2017-03-23 09:44:26 -07:00
Linux Build Service Account
419d25863f Merge "usb: phy: qmp: Add support for fpc re-drive chipset" 2017-03-23 09:44:25 -07:00
Linux Build Service Account
70b1b26572 Merge "ARM: dts: msm: Add fpc re-drive support for SDM630 QRD" 2017-03-23 09:44:24 -07:00
Linux Build Service Account
775eee3cbf Merge "ARM: dts: msm: Add fpc re-drive support for SDM660 QRD" 2017-03-23 09:44:23 -07:00
Linux Build Service Account
1180bf2d24 Merge "ath10k: change log level for unknown wmi event print to debug" 2017-03-23 09:44:23 -07:00
Linux Build Service Account
24a299f33b Merge "iio: adc: tadc: fix leakage problem" 2017-03-23 09:44:22 -07:00
Linux Build Service Account
47577ec76d Merge "msm: camera: cpp: Replace const by macro" 2017-03-23 09:44:17 -07:00
Linux Build Service Account
3ed0c82430 Merge "msm: camera: add description for laser sensor" 2017-03-23 09:44:16 -07:00
Linux Build Service Account
76b2cd2549 Merge "qcom: qnovo: Fix property write out of range errors" 2017-03-23 09:44:13 -07:00
Linux Build Service Account
41bcca59c9 Merge "msm: isp: Fix ping pong mismatch issue" 2017-03-23 09:44:12 -07:00
Linux Build Service Account
7918375ff3 Merge "msm: camera: Add error check for cmd in IOCTL." 2017-03-23 09:44:11 -07:00
Linux Build Service Account
42762d628d Merge "msm: isp: update logic to reject invalid frame" 2017-03-23 09:44:06 -07:00
Linux Build Service Account
edb4127363 Merge "ARM: dts: msm: Set the rate for camss vfe clock on msm8998" 2017-03-23 09:44:05 -07:00
Linux Build Service Account
23c2afd695 Merge "msm: common: set clk rate when rate is INIT_RATE" 2017-03-23 09:44:04 -07:00
Ashish Kumar Dhanotiya
932b3c2ccd msm: wlan: Change EIRP value for country China
Change EIRP value for Country China according to latest Regulatory Sheet.

Change-Id: Ice3d212403f1a34a023e2e003cb55c23b90067ae
CRs-Fixed: 2023783
Signed-off-by: Ashish Kumar Dhanotiya <adhanoti@codeaurora.org>
2017-03-23 16:02:02 +05:30
Deepak Kumar
7fa081a4e8 Revert "ARM: dts: msm: Enable midframe sampling timer on SDM660"
This reverts commit fbecfd709f ("ARM: dts: msm: Enable midframe
sampling timer on SDM660") to avoid power regression caused in
certain use cases.

Change-Id: Iec274e34532f34c9e8f63600ef144306059d9da4
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-03-23 15:48:07 +05:30
David Collins
a366d8cc5f ARM: dts: msm: add speed bin 1 CPU clock boost frequency for msm8996pro
Update the frequency plan for the MSM8996-Pro CPU clocks in order
to include the new 1996.8 MHz power cluster boost frequency.

Change-Id: I289f5910d21bd0e97ceff39d6ca09ba8b5f2aea4
CRs-Fixed: 1010722
Signed-off-by: David Collins <collinsd@codeaurora.org>
2017-03-23 03:11:26 -07:00
Venu Yeshala
8704c78a0c msm: camera: isp: Rate limit certain logs
This will help reduce excessive logging in case of certain
error scenarios.

Change-Id: I466c05642988ab72edb77a16f9271678aeb44b74
Signed-off-by: Venu Yeshala <vyeshala@codeaurora.org>
2017-03-23 02:45:13 -07:00
Venu Yeshala
f38e93e11f ARM: dts: msm: Set the rate for camss vfe clock on SDM660 & SDM630
Under ispif node set clock rate for camss vfe clock since
after xo shutdown this clock cannot be enabled without
setting rate first. Also, enable vfe clk src before
camss clock.

Change-Id: I3f80837abbb3f7d788db5b736cdb0d9816d7da14
Signed-off-by: Venu Yeshala <vyeshala@codeaurora.org>
2017-03-22 23:57:21 -07:00
Vijayavardhan Vennapusa
24a0aec139 ARM: dts: msm: designate LDO10A as a parent of LDO7B on sdm630
On SDM630, there is a HW bug that could lead to chip damage if
the 3.1V rail (normally provided by PM660 LDO7B) is turned on
while the 1.8V (LDO10A) rail is off. A simple workaround is to
ensure that LDO10A is turned on prior to LDO7B. Achieve this by
making pm660_l10 the parent-supply of the pm6601_l7 regulator.

Change-Id: If04edf52dbbc7f0fccb6fcc86982935a62cc0e0c
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-03-23 11:42:40 +05:30
Prakash Gupta
aadb9ac89c ion: ion_system_heap: Fix null pointer dereference
The pointer returned from alloc_pages passed unchecked to
ion_pages_sync_for_device.
This patch checks the return for NULL.

Change-Id: I407efc73a1e1297f382a7926cc79542bde88d06d
Fixes: 2d4fdc7bde ("ion: Fix DMA operations for ARM64")
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-03-23 10:52:59 +05:30
Vijayavardhan Vennapusa
2fb81fbba6 USB: qdss: Fix NULL pointer deference issue during QDSS transfers
There is a chance that usb_qdss_close() and disconnect race each other and
it might result in NULL pointer dereference in set_qdss_data_connection()
called from usb_qdss_close(). Fix the issue by passing qdss as argument
to set_qdss_data_connection() instead of ep.

Also remove restart call, which simulates spoof disconnect and connect,
when qdss channel is being closed, which is not required anymore as
DBM endpoints can be claimed without full USB block reset now.

Change-Id: I00642402dbe2e9595d3b3ce760ba4ed2deb2899f
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-03-23 10:19:50 +05:30
Satya Durga Srinivasu Prabhala
87494947a8 soc: qcom: service-locator: Free memory in case of error
Free previously allocated memory in case of error to avoid
memory leak.

CRs-Fixed: 2022322
Change-Id: I297bd6ee1d75c039cacf8409b324c119f1b86875
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-03-22 19:09:04 -07:00
Harry Yang
5bad79e773 qcom: qnovo: Fix property write out of range errors
Update property value ranges, in compliance with qnovo design spec.

Also, allow the user to set the parameters values in different number
base. While at it, fix the file permission values for all the
parameters to octal representation.

Change-Id: I0d0f14c22457322c7d79b95107e3cbfcd4a8a0b6
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2017-03-22 15:15:13 -07:00
Subash Abhinov Kasiviswanathan
b268a55a9f net: rmnet_data: Add support to configure custom device name
rmnet_data assigns device name by the order they are created.
This causes problems which multiple processes are trying to
create devices and leads to random device names.

Assign device name as specified by user.

CRs-Fixed: 2018785
Change-Id: Iab8e053c6ccacbeedaa7763e760d0c12e756b5d0
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2017-03-22 12:55:20 -06:00
Jordan Crouse
4870006adc drm/msm: Take the mutex before calling msm_gem_new_impl
Amongst its other duties, msm_gem_new_impl adds the newly created
GEM object to the shared inactive list which may also be actively
modifiying the list during submission.  All the paths to modify
the list are protected by the mutex except for the one through
msm_gem_import which can end up causing list corruption.

Change-Id: Ic0dedbad6b68d4d3db726e0d598d4d21af4b328c
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-03-22 11:19:44 -06:00
Ard Biesheuvel
9fcccba399 arm64: kaslr: use callee saved register to preserve SCTLR across C call
The KASLR code incorrectly expects the contents of x18 to be preserved
across a call into C code, and uses it to stash the contents of SCTLR_EL1
before enabling the MMU. If the MMU needs to be disabled again to create
the randomized kernel mapping, x18 is written back to SCTLR_EL1, which is
likely to crash the system if x18 has been clobbered by kasan_early_init()
or kaslr_early_init(). So use x22 instead, which is not in use so far in
head.S

Change-Id: I6a79b0c3b2e2306d080406c7f617483f6f1519b0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Git-commit: d5e5743797adc26e09db262e7a4b6b81d8c0f45c
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[neeraju@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-03-22 19:22:53 +05:30
Neeraj Upadhyay
ff0f90c107 arm64: kaslr: Fix up the kernel image alignment
If kernel image extends across alignment boundary, existing
code increases the KASLR offset by size of kernel image. The
offset is masked after resizing. There are cases, where after
masking, we may still have kernel image extending across
boundary. This eventually results in only 2MB block getting
mapped while creating the page tables. This results in data aborts
while accessing unmapped regions during second relocation (with
kaslr offset) in __primary_switch. To fix this problem, round up the
kernel image size, by swapper block size, before adding it for
correction.

For example consider below case, where kernel image still crosses
1GB alignment boundary, after masking the offset, which is fixed
by rounding up kernel image size.

SWAPPER_TABLE_SHIFT = 30
Swapper using section maps with section size 2MB.
CONFIG_PGTABLE_LEVELS = 3
VA_BITS = 39

_text  : 0xffffff8008080000
_end   : 0xffffff800aa1b000
offset : 0x1f35600000
mask = ((1UL << (VA_BITS - 2)) - 1) & ~(SZ_2M - 1)

(_text + offset) >> SWAPPER_TABLE_SHIFT = 0x3fffffe7c
(_end + offset) >> SWAPPER_TABLE_SHIFT  = 0x3fffffe7d

offset after existing correction (before mask) = 0x1f37f9b000
(_text + offset) >> SWAPPER_TABLE_SHIFT = 0x3fffffe7d
(_end + offset) >> SWAPPER_TABLE_SHIFT  = 0x3fffffe7d

offset (after mask) = 0x1f37e00000
(_text + offset) >> SWAPPER_TABLE_SHIFT = 0x3fffffe7c
(_end + offset) >> SWAPPER_TABLE_SHIFT  = 0x3fffffe7d

new offset w/ rounding up = 0x1f38000000
(_text + offset) >> SWAPPER_TABLE_SHIFT = 0x3fffffe7d
(_end + offset) >> SWAPPER_TABLE_SHIFT  = 0x3fffffe7d

Change-Id: I6de9019cffe5e730a505fba1fd1168bb13fb10af
Fixes: f80fb3a3d508 ("arm64: add support for kernel ASLR")
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2017-03-22 18:42:11 +05:30
Dilip Kota
d30e4d4e54 devfreq_spdm: Handle spurious interrupts during bootup
Terminate the interrupts triggered before the intitalisation
itself.

Change-Id: I7c005134ecbdae38b58e4312f9e294f5b59c2510
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-03-22 02:47:41 -07:00
Odelu Kukatla
9a36746dc7 ARM: dts: msm: Add support for speed-bin 2 for MSM8996v3
Add speed-bin 2 to support the fmax of 1.9GHz and 1.5GHz
for perf and power clusters respectively.
Also add speed-bin 2 to support the fmax of 560MHz for GPU clock.

Change-Id: I9bc547b0f8a2f2c7cad04ec8c967ed580755ae75
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2017-03-22 02:21:15 -07:00
Shantanu Jain
141fe25708 input: keyboard: add syscore_ops support to gpio_key driver
Add syscore_ops support for gpio-keys driver to service
wakeable irq handler before the CPUs resume after
suspend state.

Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Change-Id: I7fe266661abfd469c68309a66aed0cb0fa2de33e
2017-03-22 14:39:37 +05:30
Vijayavardhan Vennapusa
7c9990241e f_qc_rndis: Compile rndis.c if CONFIG_USB_F_QCRNDIS is enabled
When CONFIG_USB_F_QCRNDIS is enabled to support RNDIS over BAM2BAM
to IPA, it needs to compile rndis.c driver as well. Otherwise
will see compilation error. Hence compile rndis.c along with f_qc_rndis.c
when CONFIG_USB_F_QCRNDIS is enabled. Disable CONFIG_USB_F_GSI as both
configs can't be enabled at a time as that would cause compilation errors
and warnings seen due to same misc device name registration.

Change-Id: Ie11fba25be53e158811b05c7054bbdf126689c36
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-03-22 13:29:06 +05:30
Laxminath Kasam
727455f34d ASoC: msm_sdw: Avoid initial SSR notifications at bootup
In MSM soundwire codec, avoid initial bootup SSR
notifications after registration of notifier.

Change-Id: I06b1ffedf3b7247baa1d3ffe92a66584a321e624
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:52:27 -07:00
Laxminath Kasam
9c53a155cc ASoC: wsa881x: Add mixer control to set WSA PA mute
Add mixer control to allow set WSA speaker PGA mute
when required for any usecase.

Change-Id: Ic02a5973ec25b4c5b613b42129fdab9c0d7a2133
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:52:09 -07:00
Laxminath Kasam
145923d535 ASoC: sdm660_cdc: Fix 44.1 clip mute first time after boot
After boot, insert headphone and play 44.1 clip fails to play
first time sometimes. Since at bootup MCLK is acquired at
9.6MHz and not reset. And for 44.1MHz, request for 11.2896MHz
is done causes overwrite of frequency request at DSP which is not
allowed and causes playback to fail. At bootup regacache call for
digital codec result in additional vote for MCLK if int_mclk0_enabled
flag is false. Change the order in device_down call from analog codec
and also avoid notifier call for SUBSYS_DOWN at bootup.

Change-Id: Ifc0540826d38c5adf8b068ea87d5a5f71a4ac674
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:51:47 -07:00
Laxminath Kasam
bd01dc59f2 ASoC: swr-wcd: Reduce latency for cold start on speaker
In SDM660 WSA speaker using MSM over soundwire version,
observe high cold start latency. As interrupt is disabled,
broadcast ack is not received which results in 200ms higher
latency. Reduce latency impact by blocking only for 10ms
for MSM over soundwire version.

Change-Id: Ic0e659d7c443c1462aba4da2f8bf9471031d02d2
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:51:02 -07:00
Laxminath Kasam
78bbe3cbe5 ASoC: sdm660_cdc: fix HPH CnP on sdm660 internal codec
Enable digital clock bits before digital codec reset.
Also update HD2 settings as per latest HW sequences.

CRs-Fixed: 2018603
Change-Id: I270a324ffebc8b84ef23ff6b209efcde724f9b37
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:42:11 -07:00
AnilKumar Chimata
223fd81f3a hwrng: Add quality parameter to msm-rng driver
With the recent changes in upstream, certain parameters
are updated in the core random number generator driver.
So update HW rng driver to provide the quality estimation
of true entropy in RNG's bitstream. Value 700 corresponds
to 70% an arbitrary value, which is taken from 3.10.

Change-Id: I0d27e44a05473bcbc84af82c79565f87329b9ae7
Signed-off-by: AnilKumar Chimata <anilc@codeaurora.org>
2017-03-22 13:12:05 +05:30
Laxminath Kasam
9fab026308 ASoC: msm_sdw: Fix random mute on speaker when device switch
Observe random mute on speaker during device switch on
secondary images. Avoid reading previous register
read when SWR slave read and overwrite of previous register
when SWR slave write, by adjusting delays in respective APIs.

Change-Id: I302968ad8e774598c8414e05ba669f90bf39b82c
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:37:24 -07:00
Laxminath Kasam
9c6cccf6b8 ASoC: msm_sdw: Fix compander register setting for speaker
Observe compander for one speaker is not working.
Update offset in config compander API to set compander registers
as expected.

CRs-Fixed: 2019754
Change-Id: Ib75e01016e6a9fd39a953da40f36babc3beaec13
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:33:37 -07:00
Laxminath Kasam
f4a76fca6b ASoC: wcd-mbhc: Fix list del entry issue on mbhc variable
Without re-init timeout completion of btn_press object
waiting in correct_plug_swch work, if mbhc_deinit and mbhc_start
happens again, it results in crash. In mbhc_deinit,
cancel correct_plug_swch work to handle this.

CRs-Fixed: 2018976
Change-Id: Ic26edea18f5a8554f4dff3bf6ad49ec039493a64
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-03-22 00:33:07 -07:00
Meng Wang
eeba4974b8 pinctrl: qcom: correct register offset for lpi_gpio_16/17 on sdm660
Register offset for LPI_GPIO_16/17 should be 0x5040/0x5050.
Correct the offset to make sure LPI_GPIO_16/17 work.

CRs-Fixed: 2019608
Change-Id: Iac0bc2b434b23094c297e69eabea4d72bfd1eb8b
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-03-22 00:30:23 -07:00