Commit graph

587867 commits

Author SHA1 Message Date
Linux Build Service Account
bb9662f8f5 Merge "iio: qcom-tadc: use HW default for batt therm HW conversion trigger" 2017-04-07 16:05:49 -07:00
Linux Build Service Account
dbadf2a17e Merge "diag: Check for diag glink handle on connect event" 2017-04-07 16:05:48 -07:00
Linux Build Service Account
dd5ae38fec Merge "mhi: core: Enable mhi_dev_net interface channels" 2017-04-07 16:05:47 -07:00
Linux Build Service Account
1cd138bdcb Merge "usb: gadget: f_mass_storage: Perform async runtime suspend after ep disable" 2017-04-07 16:05:46 -07:00
Jose Abreu
80ded5dd4b drm: edid: HDMI 2.0 HF-VSDB block parsing
Adds parsing for HDMI 2.0 'HDMI Forum Vendor
Specific Data Block'. This block is present in
some HDMI 2.0 EDID's and gives information about
scrambling support, SCDC, 3D Views, and others.

Parsed parameters are stored in drm_connector
structure.

Change-Id: I018cfefea2fd3827d5f83c8e5717ebd95e497519
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: Carlos Palminha <palminha@synopsys.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Patch-mainline: dri-devel @ 10 Aug 2016 16:29
Signed-off-by: Jin Li <jinl@codeaurora.org>
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-04-07 15:50:46 -07:00
Dave Airlie
ced4456e08 drm/edid: add displayid detailed 1 timings to the modelist. (v1.1)
The tiled 5K Dell monitor appears to be hiding it's tiled mode
inside the displayid timings block, this patch parses this
block and adds the modes to the modelist.

v1.1: add missing __packed.

Change-Id: Ief7b88bc18b6a7514a8575412937b74c38f971e4
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95207
Signed-off-by: Dave Airlie <airlied@redhat.com>
Git-commit: a39ed680bddb1ead592e22ed812c7e47286bfc03
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-04-07 15:48:47 -07:00
AnilKumar Chimata
17b7ffbc13 crypto: msm: Fix buffer overflow issue
In multi-threaded environment diglen variable could be modified
by multiple threads at the same time. Buffer overflow might
happen in current thread if another thread changes the diglen
variable. So add mutex locks to avoid this issue.

Change-Id: I62c63c55c028dedb1dd0eec862851bd8e818a5d3
Signed-off-by: AnilKumar Chimata <anilc@codeaurora.org>
2017-04-08 03:54:02 +05:30
Shashank Mittal
a00d0eaa9f ARM: dts: msm: move bluetooth node under /vendor on msm8998
Move bluetooth node under /vendor path. This will help in overlaying
this node from board overlay files.

Change-Id: Ieeec5811c8cf2693f45ebd5f922b7edbb760e804
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-07 15:05:54 -07:00
Shashank Mittal
60df96df1b ARM: dts: msm: add /vendor node in msm8998
Add /vendor node. This node can be used to add vendor specific platform
devices.

Change-Id: I4c043c376b0e3ade7798c68ecaafe7235d27e959
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-07 15:05:54 -07:00
Shashank Mittal
ee23474d2d ARM: dts: msm: add support to compile DT overlay files on msm8998
Add support to compile DT overlays for MSM8998.

Change-Id: I73c17887b470a44721bbef7ab18e824f4dfabbd3
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-07 15:05:27 -07:00
Shashank Mittal
16ead6dd25 ARM: dts: msm: separate board and SoC bindings from msm8998
Split DT source files to separate out board and SoC specific DT
bindings.

Change-Id: Ic35abcc54654e420d3f389a289bbdae18a661c4e
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-04-07 15:05:01 -07:00
Shashank Mittal
9e3df02482 ARM: dts: msm: remove extra pinctrl dtsi include from msm8998
msm8998-pintctrl dtsi is already included by msm8998.dtsi. So we don't
need to include this file in board specific dtsi.

Change-Id: Iee7c0f4b8bd7da40ff059c531a450a0f3d3b2ae7
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-07 15:04:24 -07:00
Sreelakshmi Gownipalli
8ea9435855 diag: Check for diag glink handle on connect event
Check for diag glink handle on receiving connect and
disconnect events from glink.

Change-Id: I049367ffa4fbab1b8b3585cf6d1b53760e7431a6
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
2017-04-07 13:38:18 -07:00
Kasin Li
a9f76539c1 drm/msm: Fix gmem range setting
GMEM IOVA range is intend to start from 0x100000, But currently it
is initialized with RANGE_MIN_LO:RANGE_MIN_LO. It makes GMEM IOVA
start from 0.

Change-Id: I6028c076c32d861303cbec1c6ad168d8494e094c
Signed-off-by: Kasin Li <donglil@codeaurora.org>
2017-04-08 01:18:07 +08:00
Rama Krishna Phani A
1113317949 ARM: dts: msm: Add thermistor support for PM660
Thermal clients will be monitoring thermistors for
temperature mitigations. Add pa_therm0 support for PM660.

Change-Id: I61cb6a5147b68868d782490885969ceb2feef06c
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2017-04-07 20:27:00 +05:30
Linux Build Service Account
1da237c93b Merge "diag: Set context properly while sending command responses" 2017-04-07 06:39:29 -07:00
Linux Build Service Account
d15461eb97 Merge "ath10k: synchronize restart work with FW ready indication" 2017-04-07 06:39:29 -07:00
Linux Build Service Account
0eb82372dc Merge "msm: ipa: Fix memory leak in ipa driver" 2017-04-07 06:39:28 -07:00
Sunil Khatri
1c4ddc4c7a msm: kgsl: Fix the race between context create and destroy
Hold the context lock before updating the context id in
param->drawctxt_id to avoid race condition between context
creation and context destroy.

Change-Id: Ic26d3e5b68078c02d15c38080b1a262ea4b1f7fe
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
2017-04-07 05:36:33 -07:00
Sunil Khatri
9ef4ee8e3d msm: kgsl: Fix kgsl memory allocation and free race condition
When allocating userspace memory keep reference to memory
allocation till it is completely initialized and info is sent back
to userspace.

Change-Id: Id72c82bf98c094ecbd4722813c732a998dcbb188
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
2017-04-07 05:33:56 -07:00
Rohit Kumar
9eac7a79db drivers: mfd: wcd934x: Set CDC_TOP_TOP_CFG1 register as non-volatile
CDC_TOP_TOP_CFG1 register is used for setting VI_SENSE order.
Set this to non-volatile to avoid speaker protection calibration
failure.

CRs-Fixed: 2028565
Change-Id: If721514cdf79552d1c0fb6f72fa6799fe17a940d
Signed-off-by: Rohit Kumar <rohitkr@codeaurora.org>
2017-04-07 00:02:16 -07:00
Ray Zhang
04c46c685b ARM: dts: msm: refine JDI a407 panel setting
Tune JDI a407 panel setting for better performance. Two items might
be impacted. One is DSI link rate which is not enough for command
mode panel. Increase this rate in order to complete pixel transition
in time. The other is only sending init sequence from left DSI CTRL,
this can avoid unnecessary delay in panel resume.

Change-Id: I5ba9dc8f75c9a39dd8d4b41beb8eb8d9497f7c8e
CRs-Fixed: 1105343 1106131
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-04-06 23:59:29 -07:00
Laxminath Kasam
44a8756de9 ASoC: msm: Update proper clock frequency for slave mode
Clock framework in LPASS expects valid clock frequency
for slave mode (EBIT) as well. This is required to maintain
corresponding voltage as per respective frequencies by clock
team in frequency plan. Avoid sending zero clock frequency
in clock enable even though it is slave mode.

CRs-Fixed: 2028063
Change-Id: Ie9c28a921ee7bbeda67b0591f0caf0a88ea2d19c
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-04-06 23:58:25 -07:00
Vijayavardhan Vennapusa
f9979adc6d usb: gadget: f_mass_storage: Perform async runtime suspend after ep disable
commit 82f2935616 ("usb: gadget: f_mass_storage: Allow USB LPM
upon ep disable") decrements power usage count by 1 for dwc3 device
in thread handler as part of do_set_interface(). fsg_disable() and
fsg_unbind() will raise exception for status change so that status change
is handled in thread handler. Due to this, there is a chance that
fsg_thread can run two times and results in calling do_set_interface()
twice for disabling endpoints. This causes decrementing power usage count
two times instead of 1 and power usage count can become negative. If cable
is disconnected at this time, it could cause unclocked access or fsg_thread
gets stuck. common->fsg bieng non NULL confirms that MSC interface is being
enabled. Hence fix the issue by decrementing power usage count only right
after disbling endpoints as disabling endpoints happens once due to check
of common->fsg.

Change-Id: Ia870838f5a7055436b7412fec5910b5cdbb42de2
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-04-07 11:43:07 +05:30
Linux Build Service Account
e4a1db03db Merge "diag: Do not mark buffers free during channel opening" 2017-04-06 22:31:58 -07:00
Linux Build Service Account
3d449c081c Merge "ion: change data type of source_vm* variable to int" 2017-04-06 22:31:56 -07:00
Linux Build Service Account
c079ecdc4e Merge "wil6210: missing reinit_completion in HALP voting" 2017-04-06 22:31:43 -07:00
Linux Build Service Account
5da4139c92 Merge "wil6210: use print_hex_dump_debug instead of print_hex_dump_bytes" 2017-04-06 22:31:38 -07:00
Tomas Bzatek
a45e263992 drm/displayid: Iterate over all DisplayID blocks
This will iterate over all DisplayID blocks found in the buffer.
Previously only the first block was parsed.

https://bugs.freedesktop.org/show_bug.cgi?id=95207

Change-Id: Ida0480aa1652d3725a02950df83c3602fce8bb6e
Signed-off-by: Tomas Bzatek <tomas@bzatek.net>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Git-commit: 3a4a2ea39f86c581054794c0a727597745f1084b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-04-06 20:35:44 -07:00
Dave Airlie
9695df13df drm/edid: move displayid validation to it's own function.
We need to use this for validating modeline additions.

Change-Id: I55fe5a92c614cf949de906bea9a7c84d64450bb2
Signed-off-by: Dave Airlie <airlied@redhat.com>
Git-commit: c97291774c1b867b56c3d439ddaec9a965cf559e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-04-06 20:33:24 -07:00
Dave Airlie
accb2a52de drm/edid: move displayid tiled block parsing into separate function.
This just makes the code easier to follow.

Change-Id: I96b57a9d895fadc9e351ad56824e6c477496a918
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Git-commit: 5e546cd5b3bc76824069ffa98c52a5f48cf91aba
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-04-06 20:31:20 -07:00
Linux Build Service Account
6319cf033b Merge "ASoC: msm: update TDM slot mapping and FE DAI array" 2017-04-06 14:33:16 -07:00
Linux Build Service Account
bce56352aa Merge "seemp: fix code analysis issues" 2017-04-06 14:33:15 -07:00
Linux Build Service Account
89364febeb Merge "msm: pcie: update mask and linkdown check in PCIe read/write API" 2017-04-06 14:33:14 -07:00
Linux Build Service Account
61bae6eff7 Merge "msm: pcie: expand PCIe boot option" 2017-04-06 14:33:13 -07:00
Linux Build Service Account
f825071893 Merge "msm-core: Fix uninitialized sampling work" 2017-04-06 14:33:13 -07:00
Linux Build Service Account
8dbe64734d Merge "soc: qcom: glink_pkt: Add mutex in glink_pkt_read" 2017-04-06 14:33:11 -07:00
Linux Build Service Account
7b572c28b1 Merge "wil6210: prevent access to 11AD device if resume fails" 2017-04-06 14:33:11 -07:00
Linux Build Service Account
5a0cfd1234 Merge "Revert "sd: Fix rw_max for devices that report an optimal xfer size"" 2017-04-06 14:33:10 -07:00
Linux Build Service Account
ebc1fa334d Merge "spi: spi_qsd: Disable packing for unaliged non DMA mode transfers" 2017-04-06 14:33:09 -07:00
Linux Build Service Account
6c5cc8bddc Merge "cpu-hotplug: Always use real time scheduling when hotplugging a CPU" 2017-04-06 14:33:08 -07:00
Linux Build Service Account
94a297b730 Merge "binder: use group leader instead of open thread" 2017-04-06 14:33:07 -07:00
Linux Build Service Account
d7dac6fbf0 Merge "pps-gpio: Timestamp alignment with boottime" 2017-04-06 14:33:06 -07:00
Harry Yang
950030a3cf qcom: smblib: Show correct charging status
Currently, POWER_SUPPLY_STATUS shows status 'in charging' even with
JEITA hard HOT or COLD condition where charging actually stops.
Change status to 'not in charging'.

Change-Id: Id86296aed878499e24f9c3eb6e032239e2f02e40
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2017-04-06 12:43:13 -07:00
David Ahern
99151e7afe net: ipv6: ignore null_entry on route dumps
lkp-robot reported a BUG:
[   10.151226] BUG: unable to handle kernel NULL pointer dereference at 00000198
[   10.152525] IP: rt6_fill_node+0x164/0x4b8
[   10.153307] *pdpt = 0000000012ee5001 *pde = 0000000000000000
[   10.153309]
[   10.154492] Oops: 0000 [#1]
[   10.154987] CPU: 0 PID: 909 Comm: netifd Not tainted 4.10.0-rc4-00722-g41e8c70ee162-dirty #10
[   10.156482] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014
[   10.158254] task: d0deb000 task.stack: d0e0c000
[   10.159059] EIP: rt6_fill_node+0x164/0x4b8
[   10.159780] EFLAGS: 00010296 CPU: 0
[   10.160404] EAX: 00000000 EBX: d10c2358 ECX: c1f7c6cc EDX: c1f6ff44
[   10.161469] ESI: 00000000 EDI: c2059900 EBP: d0e0dc4c ESP: d0e0dbe4
[   10.162534]  DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
[   10.163482] CR0: 80050033 CR2: 00000198 CR3: 10d94660 CR4: 000006b0
[   10.164535] Call Trace:
[   10.164993]  ? paravirt_sched_clock+0x9/0xd
[   10.165727]  ? sched_clock+0x9/0xc
[   10.166329]  ? sched_clock_cpu+0x19/0xe9
[   10.166991]  ? lock_release+0x13e/0x36c
[   10.167652]  rt6_dump_route+0x4c/0x56
[   10.168276]  fib6_dump_node+0x1d/0x3d
[   10.168913]  fib6_walk_continue+0xab/0x167
[   10.169611]  fib6_walk+0x2a/0x40
[   10.170182]  inet6_dump_fib+0xfb/0x1e0
[   10.170855]  netlink_dump+0xcd/0x21f

This happens when the loopback device is set down and a ipv6 fib route
dump is requested.

ip6_null_entry is the root of all ipv6 fib tables making it integrated
into the table and hence passed to the ipv6 route dump code. The
null_entry route uses the loopback device for dst.dev but may not have
rt6i_idev set because of the order in which initializations are done --
ip6_route_net_init is run before addrconf_init has initialized the
loopback device. Fixing the initialization order is a much bigger problem
with no obvious solution thus far.

The BUG is triggered when the loopback is set down and the netif_running
check added by a1a22c1206 fails. The fill_node descends to checking
rt->rt6i_idev for ignore_routes_with_linkdown and since rt6i_idev is
NULL it faults.

The null_entry route should not be processed in a dump request. Catch
and ignore. This check is done in rt6_dump_route as it is the highest
place in the callchain with knowledge of both the route and the network
namespace.

CRs-Fixed: 1065581
Change-Id: Iaf7265f3a83ecba1a3c4f90ec3288b296d918c5a
Fixes: a1a22c1206("net: ipv6: Keep nexthop of multipath route on admin down")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: 1f17e2f2c8a8be3430813119fa7b633398f6185b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2017-04-06 13:03:02 -06:00
Tatenda Chipeperekwa
48e69387e5 msm: mdss: dp: skip transfer unit setup on link training requests
Skip the transfer unit setup and the routine to wait for the
video ready interrupt as link training tests do not require
video frames to be sent.

CRs-Fixed: 2006096
Change-Id: Ibf9cda18f8740890f384b1d99f8d00b4692ab74d
Signed-off-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
2017-04-06 11:41:08 -07:00
Shashank Mittal
20fbb62014 AndroidKernel: add support to configure DLKM install path
Add support to configure DLKM install path.

TARGET_OUT is hard coded to system directory.
Use PRODUCT_OUT instead of TARGET_OUT to use user configured path
instead.

Change-Id: Iacbfa0fce69d3cb4b6f47a6c857983034633dc19
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-06 11:24:57 -07:00
Shashank Mittal
d076b99bfe arm64: add config option to enable DT overlay
Add config option to enable DT overlay. This option sets DTC_FLAGS to
enable DT compilation with overlay support.

Change-Id: I74b1ed9828ec94093fab40a70c0cd0c155796c94
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-06 11:24:50 -07:00
Shashank Mittal
47c6fb9e63 scripts: Makefile: add support to use external DTC
Add support to use external DTC to compile device tree blobs.

Change-Id: I268d2332d5328c3b0050b35c96f91e8ef9e1f6f8
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-06 11:22:41 -07:00
Shashank Mittal
18a3ceeb5e scripts: Makefile: add support to compile DT overlay blobs
Add support to compile device tree overlay blob.
'dtbo-y' target can be used to specify DT overlay blob.
'<target>-obj'  must be specified to list base and overlay blobs.

Change-Id: Ib5036c70ba46374619cc43f9f7b697e1a444aebf
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
2017-04-06 11:22:41 -07:00