Commit graph

589667 commits

Author SHA1 Message Date
Linux Build Service Account
76e08ee8fb Merge "msm: mdss: add support for mdss throttle clock handling" 2017-05-06 14:24:17 -07:00
Linux Build Service Account
a501834cd6 Merge "ARM: dts: msm: add mdss throttle clock for SDM660 and SDM630" 2017-05-06 14:24:16 -07:00
Linux Build Service Account
01ecd15b9d Merge "msm: mdss: fix memcpy source and dest memory buffer size mismatch" 2017-05-06 14:24:15 -07:00
Steve Muckle
40d8db5ddf ANDROID: android-base.cfg: remove defunct options
INET6_DIAG_DESTROY and NETFILTER_TPROXY are not used anymore
so they should not be part of the base Android kernel configuration.

Bug: 37749708
Change-Id: Iab263a5723f1810e2133919b8db93cc2bb986624
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-05-06 03:38:28 +00:00
Linux Build Service Account
980599904f Merge "defconfig: msmcortex: Enable PAN emulation" 2017-05-05 18:10:30 -07:00
Linux Build Service Account
ee38ff43b0 Merge "wil6210: Enable write ioctl" 2017-05-05 18:10:30 -07:00
Linux Build Service Account
a1409b4b4b Merge "seemp: check array index range" 2017-05-05 18:10:29 -07:00
Linux Build Service Account
b74085afd8 Merge "msm: mdss: Add multi-rectangle validation support" 2017-05-05 18:10:27 -07:00
Subbaraman Narayanamurthy
d2af865c75 power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id
Even with proper ESR pulse qualification threshold and ESR pulse
amplitude, ESR pulses are still seen occasionally on devices
that use battery with debug battery id. Disable ESR pulldown when
debug battery id is found. This helps saving power by stopping
ESR pulses.

Change-Id: I2b9588ec39a2268123d94c06517b0dbb43d66fc7
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-05-05 14:07:53 -07:00
Olav Haugan
875fa8b847 defconfig: msmcortex: Enable PAN emulation
Privilege Access Never (PAN) enforces the usage of
copy_to_user/copy_from_user and friends when kernel accesses data from
user space. If user space memory is accessed outside of these functions
a kernel panic occurs.

Change-Id: Ic32ad8ecb6d921293fca74664116098723afc436
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2017-05-05 11:21:21 -07:00
Hareesh Gundu
9ca3a31c0c ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro
Add GPU clock plan for speed bin 2 of MSM8996Pro target.
This is initial change for supporting GPU speed bin 2.

CRs-Fixed: 1082439
Change-Id: Ifb21ae3baa3df001d944aa2c9db36dffa2a29504
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-05-05 10:13:07 -07:00
Linux Build Service Account
1e4c353d70 Merge "ARM: dts: msm: Add OnSemi regulator node for msm8996" 2017-05-05 09:10:06 -07:00
Linux Build Service Account
cd42f16f98 Merge "msm: mdss: Set LM flush bit for DE/Scalar reg update" 2017-05-05 09:10:05 -07:00
Linux Build Service Account
e04e7d0f39 Merge "input: touchscreen: fix issues related to variable initialization" 2017-05-05 09:10:04 -07:00
Linux Build Service Account
83384a6076 Merge "usb: gadget: mtp: Move mutex_init() to alloc_inst_mtp_ptp()" 2017-05-05 09:10:03 -07:00
Yida Wang
21d772b83f seemp: check array index range
Check whether array index is within the bounds in
seemp_logk_get_bit_from_vector().

Change-Id: Idccf75736582b2390540f4d7b3351c018937186a
Signed-off-by: Yida Wang <yidaw@codeaurora.org>
2017-05-05 11:39:19 -04:00
Wei Ding
75fe8f2413 input: stm: Fix NULL dereference in laser driver
Fix issues where we are referring to a null pointer
and uninitialized variable.

Change-Id: I9289a41fdef57a916781ad246ca06bfd2e031807
Signed-off-by: Wei Ding <weiding@codeaurora.org>
2017-05-05 21:12:51 +08:00
Sai krishna juturi
c5f8a96b24 usb: gadget: f_mtp: Handle OS descriptors properly
The mtp_ctrl_request function is responding to
every os descriptor sent by host,There by enumerating
the device with mtp composition. Once mtp is disabled,
need to clear the function instances on unbind.

Change-Id: I6679a1c1009df291a85ba8dcc34997d757c320b9
Signed-off-by: Sai krishna juturi <jsaikrishna@codeaurora.org>
2017-05-05 17:34:33 +05:30
Ajay Agarwal
82fe037ea7 sound: usb: Fix format desc usage for BADD 3.0 devices
For a BADD device, the audioformat structure was directly
being populated without initialising the format type
descriptor. This can lead to a crash later when the
format  type and rates are being parsed but the NULL fmt
desc is dereferenced. Fix this by allocating a dummy copy
of fmt desc for BADD 3.0 devices and populating
necessary fields.

Change-Id: I80f33b0e400a9c522a800e989228da134100bb55
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2017-05-05 17:24:12 +05:30
Linux Build Service Account
8312e8d304 Merge "scsi: ufs: add command logging infrastructure" 2017-05-05 01:02:38 -07:00
Linux Build Service Account
150579e6af Merge "defconfig: msm: Sync up perf_defconfig with defconfig" 2017-05-05 01:02:37 -07:00
Kiran Gunda
96ea755a18 ARM: dts: msm: Add OnSemi regulator node for msm8996
OnSemi buck regulator is used to provide the supply for
graphics rail. The programmable output voltage range is
from 0.6 V to 1.4 V in 6.25 mV steps.

Change-Id: I5f4ec11075b7f658ffa0af13dde5694b03c1495c
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-05-05 13:02:01 +05:30
zhaoyuan
1db7368215 msm: mdss: set HDMI max TMDS clock rate
Need consider both SINK and SOURCE max supported TMDS
clock. For the devices, if we set TMDS clock larger than
device caps, it could not display well. SINK max TMDS
clock could read from HDMI VSDB and HF-VSDB in EDID.

CRs-Fixed: 2035529
Change-Id: I1f31f2a05d0502367b877c4d324cbc131b2366d5
Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
2017-05-05 15:29:53 +08:00
Shilpa Mamidi
38d8c13c8c ARM: dts: msm: Add support for camss throttle clock on SDM660
Camss throttle clock is always on which is consuming power.
To avoid this add support to dynamically enable and disable
clock.

Change-Id: I2eddb414f5c1a22ab42154d28a05e41e64cb5bc9
Signed-off-by: Shilpa Mamidi <shilpam@codeaurora.org>
2017-05-04 23:25:48 -07:00
Shantanu Jain
bda70401dd input: touchscreen: fix issues related to variable initialization
Fix issues related to variable initialization in FTS touchscreen
driver.

Change-Id: I2911787dd1e1979e027bacdd1bc1cec06845ffd3
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-05-05 11:49:13 +05:30
Samyukta Mogily
ba60c15e8f msm: camera: Fixing NULL dereference in sensor code
Fixing issues where we are referring to a null pointer.

Change-Id: I6ae18f61a9dc65fbec5650baf9b1d1fb7ad59262
Signed-off-by: Samyukta Mogily <smogily@codeaurora.org>
2017-05-05 11:37:25 +05:30
Wei Li
e5e90e8d97 defconfig: msm: Sync up perf_defconfig with defconfig
Sync up msm-auto-perf_defconfig with msm-auto_defconfig

Change-Id: Ief53b4c287ca3efbe8f82779a8d4e9f524b06fd8
Signed-off-by: Wei Li <weili@codeaurora.org>
2017-05-05 09:49:01 +08:00
Linux Build Service Account
9416e47b01 Merge "msm: pcie: move PCIe enumerate sysfs init" 2017-05-04 17:44:33 -07:00
Linux Build Service Account
932034e5a1 Merge "diag: Validate memory device client's process descriptor" 2017-05-04 17:44:32 -07:00
Linux Build Service Account
96a33ee792 Merge "net: pppolac/pppopns: Add back the msg_flags" 2017-05-04 17:44:31 -07:00
Linux Build Service Account
06d9001dc4 Merge "msm: ipa: Add a support to retry uC send command" 2017-05-04 17:44:30 -07:00
Trishansh Bhardwaj
50f424f032 msm: camera: Do not pass kptr in copy_from_user
Do not call copy_from_user in ioctl handler if CONFIG_COMPAT
is defined.
In 64 bit kernel and 32 bit userspace, ioctl call invokes
compat_ioctl. First copy_from_user is done in compat_ioctl then
pointer is passed to unlocked_ioctl for actual processing. In
unlocked_ioctl again copy_from_user is called on kernel pointer.

Change-Id: I2334379f48e30b58757f0fe5e238e8df5753eea8
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2017-05-05 02:32:23 +05:30
Amit Pundir
3c72862e8f ANDROID: arm64: suspend: Restore the UAO state
Upstream commit d08544127d9f ("arm64: suspend: Reconfigure PSTATE
after resume from idle") when cherry-picked on LTS linux-4.4.y
removed UAO reset code because UAO is not supported in linux-4.4.y.

But common/android-4.4 has UAO support, added in Change-Id:
I1a6a74a1f33b92d54368bd99387b55cf62930903 ("UPSTREAM: arm64: kernel:
Add support for User Access Override").

This patch pick up the UAO specific changes of upstream commit
dropped in LTS cherry-pick.

Fixes: LTS commit 71710cd35a ("arm64: suspend: Reconfigure PSTATE after resume from idle")
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2017-05-05 01:54:39 +05:30
Dedy Lansky
a51470bcae wil6210: fix array out of bounds access in pmc
Array index 'i' is used before limits check.
Fix this by doing limits check first.

Change-Id: I9a3d6f3165b3a0ba41dec3707d7c193a26ec6eb2
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 98a830a98dab6d474190bec72c4a4ad0f7f9bf75
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-05-04 23:07:36 +03:00
Hamad Kadmany
f427d2ba1b wil6210: fix check for sparrow D0 FW file
Driver fails to load FW for sparrow D0 devices in some cases.
Fix this by returning correct value from wil_fw_verify_file_exists
when D0 FW file is not detected for any reason.

Change-Id: I11f4e63c70f0f269372e780b3659d981924c8963
Signed-off-by: Hamad Kadmany <qca_hkadmany@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 4d4f8132f72b78d1260ec9afa94c3b44deb12adf
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-05-04 23:07:35 +03:00
Lior David
f2fac4fbfb wil6210: support 8KB RX buffers
The 11ad spec requires 11ad devices to be able to receive 8KB
packets over the air. Currently this is only possible by
loading the driver with mtu_max=7912 but this also forces
a smaller block ACK window size which reduces performance
for stations which transmit normal sized packets (<2KB).
Fix this problem as follows:
1. Add a module parameter rx_large_buf that when set,
will allocate 8KB RX buffers regardless of mtu_max
setting.
2. When receiving block ACK request agree to any window
size not above our maximum, regardless of the mtu_max setting.
This means if the other side transmits small packets (2KB)
it can still set up block ACK with a large window size,
and get better performance.

Change-Id: I8d18d9306d2546b54125b77df82c984878d0f84f
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 52a457020a89158f4eb886544165dc162ca9a35e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-05-04 23:07:34 +03:00
Jordan Crouse
c0cdf12705 drm/msm: Allocate secure buffer objects
Allow the user to allocate and use secured buffer objects. Secured
buffer objects are suitable for use as a write target while the GPU
is in secure mode. They work exactly like regular buffers except
Secure buffers cannot be mmap()ed.

Change-Id: Ic0dedbadd8135fd8472b38ddf61e2bc70983b12f
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-05-04 14:07:07 -06:00
Jordan Crouse
f3cb10780a drm/msm: Support importing secure buffers
Check to see if an imported buffer is an Ion secure buffer and mark
it as such so that it can be used for secure rendering.

Change-Id: Ic0dedbadb414dcbb11d70785d61481a1b7bd4e19
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-05-04 14:07:06 -06:00
Jordan Crouse
90dbea373e ion: Add ion_dma_buf_is_secure() to query buffer type
Outside clients (such as the display or GPU) may import a dmabuf
and need to figure out if it is secure so that it can be handled
accordingly. In an ideal world this would be part of the generic
dma-buf structure but until then we can assume that the only outside
source of dmabuf-ified secure buffers is Ion so add a function to
directly query the status of the buffer from Ion.

ion_dma_buf_is_secure() returns true if the dmabuf was created
by Ion and was created from a secure heap.

Change-Id: Ic0dedbad5e5a4464c6948f05bb7e0e3e94cd4cc2
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-05-04 14:07:06 -06:00
Jordan Crouse
b2fd7c67bc drm/msm: Support secure rendering for A5XX targets
A5XX targets support GPU rendering on secured surfaces by going
into a special secure mode to execute the commands.  In secure mode
GPU rendering can only write to secure buffers that have been mapped
in an appropriately secured pagetable. In secure mode the GPU can read
both secure and unsecure buffers and the CP engine can only access
unsecured buffers (so commands do not need to be secure).

Secure buffers virtual addresses must fall into a specific range; this
is the clue to the GPU that it should use the secure pagetable
instead of the regular one.  For A5XX targets that range will start
at 0xC0000000 and be 256MB in size. All secure buffers in all processes
share the same pagetable.

Add a secure address space for A5XX targets and automatically trigger
into secure mode if any buffer in the submission is marked as secure.

Change-Id: Ic0dedbad8f7168711d10928cd1894b98f908425f
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-05-04 14:07:05 -06:00
Lazar Alexei
6cb6d7e6ed wil6210: restore power save state after internal FW reset
The power save profile is set to default state in case of FW reset,
regardless of the state before the reset took place.
Fix this by saving the current power save profile and restore it
in case of FW reset.

Change-Id: I9bcf8c4a60b72851631e25bf33a8335cffb2644f
Signed-off-by: Lazar Alexei <qca_ailizaro@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 8b068c032a5cbe6f80168e0ecf2c9625c8d14d90
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
[merez@codeaurora.org: fix trivial merge conflicts]
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-05-04 23:06:57 +03:00
Blagovest Kolenichev
78cf4322e2 Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'
* refs/heads/tmp-24ac44d
  Linux 4.4.66
  ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram
  ARCv2: save r30 on kernel entry as gcc uses it for code-gen
  nfsd: check for oversized NFSv2/v3 arguments
  Input: i8042 - add Clevo P650RS to the i8042 reset list
  p9_client_readdir() fix
  MIPS: Avoid BUG warning in arch_check_elf
  MIPS: KGDB: Use kernel context for sleeping threads
  ALSA: seq: Don't break snd_use_lock_sync() loop by timeout
  ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type
  ipv6: check raw payload size correctly in ioctl
  ipv6: check skb->protocol before lookup for nexthop
  macvlan: Fix device ref leak when purging bc_queue
  ip6mr: fix notification device destruction
  netpoll: Check for skb->queue_mapping
  net: ipv6: RTF_PCPU should not be settable from userspace
  dp83640: don't recieve time stamps twice
  tcp: clear saved_syn in tcp_disconnect()
  sctp: listen on the sock only when it's state is listening or closed
  net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given
  l2tp: fix PPP pseudo-wire auto-loading
  l2tp: take reference on sessions being dumped
  net/packet: fix overflow in check for tp_reserve
  net/packet: fix overflow in check for tp_frame_nr
  l2tp: purge socket queues in the .destruct() callback
  net: phy: handle state correctly in phy_stop_machine
  net: neigh: guard against NULL solicit() method
  sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write()
  sparc64: kern_addr_valid regression
  xen/x86: don't lose event interrupts
  usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize
  regulator: core: Clear the supply pointer if enabling fails
  RDS: Fix the atomicity for congestion map update
  net_sched: close another race condition in tcf_mirred_release()
  net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata
  MIPS: Fix crash registers on non-crashing CPUs
  md:raid1: fix a dead loop when read from a WriteMostly disk
  ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()
  drm/amdgpu: fix array out of bounds
  crypto: testmgr - fix out of bound read in __test_aead()
  clk: sunxi: Add apb0 gates for H3
  ARM: OMAP2+: timer: add probe for clocksources
  xc2028: unlock on error in xc2028_set_config()
  f2fs: do more integrity verification for superblock
  net: pppolac/pppopns: Add back the msg_flags

Conflicts:
	drivers/regulator/core.c

Change-Id: I8e7b279efa442a0338ee735d27ff3ebe866a8dee
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-05-04 13:06:18 -07:00
Hamad Kadmany
60e1252f7d wil6210: fix sequence for scan-abort during reset
Communication with FW must be done before wil->status
is initialized in order to properly handle cases where
communication with FW halts during reset sequence.

Change-Id: Ia9b74143b45ae3c83a36a7c2f18b16794e5a2c57
Signed-off-by: Hamad Kadmany <qca_hkadmany@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 82e9f646555442d63e47155171592ee790275ea3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-05-04 22:38:13 +03:00
Harsh Sahu
663e995012 msm: mdss: fix null pointer dereferencing
Current driver checks if the address of start pointer is zero. But
in cases when start pointer is NULL this check will result in null
pointer dereferencing. This change adds an additioanl check on the
start pointer to avoid null pointer dereferencing.

CRs-fixed: 2035100
Change-Id: Ic86c9e73cd676cbf8680f5b7266ee3829f4ccbd2
Signed-off-by: Harsh Sahu <hsahu@codeaurora.org>
2017-05-04 11:21:11 -07:00
Rajkumar Subbiah
9cf8bad48b msm: mdss: Relocate timing flush for avr vtotal setup
The AVR vtotal setup is done during ctl start. Since the slave
ctl is not yet setup, currently the master and slave controls
get flushed independently even though it is a split display
setup. Instead, just set a flag and then do the actual flush
as part of commit when the controls are properly setup.

Change-Id: I8eb1693c9a3a6404d28a82cab9a9f0ce58d1bb03
Signed-off-by: Rajkumar Subbiah <rsubbia@codeaurora.org>
2017-05-04 10:32:25 -07:00
Tony Truong
821a04092d msm: pcie: move PCIe enumerate sysfs init
PCIe enumerate sysfs initialization should be
done after all other resources are setup.

Change-Id: I33b43e39453eeee9ac9e22bd1a5463af9eb1fd05
Signed-off-by: Tony Truong <truong@codeaurora.org>
2017-05-04 10:17:39 -07:00
Linux Build Service Account
baf0fa8f1e Merge "wil6210: add option to ignore OTA regulatory hints" 2017-05-04 08:45:27 -07:00
Linux Build Service Account
da84e26540 Merge "ion:synchronize debugfs callback and ion_client_destroy" 2017-05-04 08:45:26 -07:00
Linux Build Service Account
303fb8a3ac Merge "btfm: Program multi channel registers in wcn3990 for Tx/Rx" 2017-05-04 08:45:25 -07:00
Linux Build Service Account
2cba763104 Merge "regulator: onsemi-ncp6335d: Add is_enabled API support" 2017-05-04 08:45:24 -07:00