Commit graph

586660 commits

Author SHA1 Message Date
Linux Build Service Account
5bd64ca62c Merge "mhi: core: add support for MHI to operate on slave mode" 2017-03-15 10:25:29 -07:00
Linux Build Service Account
e59fe1c6b9 Merge "mhi: core: add support for MHI host managing firmware upload" 2017-03-15 10:25:28 -07:00
Linux Build Service Account
1e3cff4cba Merge "mhi: mhi_rmnet: pass maximum payload size to mhi during registration" 2017-03-15 10:25:27 -07:00
zhaoyuan
41f002b596 ARM: dts: msm: Move improve touch device node for SDM660 QRD
Improve touch device setting is needed by QTC800H only. So move
the node to qrd dts from common file.

Change-Id: I1c04e2b2540a4db9dff839ebe3dfe45efe552c9a
Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
2017-03-15 01:28:41 -07:00
Ray Zhang
58d17170ba ARM: dts: msm: enable HDMI and DP functionality for HDK835
HDK835 has HDMI and DP hardware blocks, so enable them in the
device tree.

CRs-Fixed: 2012660
Change-Id: I04a58527875bd6c62d7d31e20bc4ade3824d7e03
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-03-14 23:50:42 -07:00
Linux Build Service Account
ad64f3159b Merge "soc: qcom: qmi: add export symbol qmi_response_type_v01_ei" 2017-03-14 23:45:55 -07:00
Linux Build Service Account
012107e127 Merge "ARM: dts: msm: Update more thermal-mitigation levels for PM660" 2017-03-14 23:45:54 -07:00
Linux Build Service Account
31af073d20 Merge "epoll: Drop struct epoll_event definition" 2017-03-14 23:45:53 -07:00
Linux Build Service Account
5362d67feb Merge "msm: ipa: Add spinlock to avoid deleting already deleted list" 2017-03-14 23:45:53 -07:00
Linux Build Service Account
aebd97e372 Merge "msm: ipa: Hold wakelock on Neutrino offload enable" 2017-03-14 23:45:51 -07:00
Linux Build Service Account
081dc50ec7 Merge "clk: qcom: Update ops for esc clock source" 2017-03-14 23:45:50 -07:00
Linux Build Service Account
e326dbfb8f Merge "wil6210: protect against sporadic interrupt during suspend flow" 2017-03-14 23:45:49 -07:00
Linux Build Service Account
ebcfa03af9 Merge "ARM: dts: msm: Modify pm660 gpio3 to 10uA pulldown" 2017-03-14 23:45:48 -07:00
Linux Build Service Account
7309dc1ced Merge "ARM: dts: msm: Add routing controls for sdm660 qrd" 2017-03-14 23:45:47 -07:00
Linux Build Service Account
7a17dfedc6 Merge "ASoc: msm: qdsp6v2: Add timestamp support for offload playback" 2017-03-14 23:45:46 -07:00
Linux Build Service Account
3961be10c4 Merge "soc: qcom: Avoid possible buffer overflow in service-locator" 2017-03-14 23:45:45 -07:00
Linux Build Service Account
040d1247eb Merge "usb: host: xhci: Move LPM support quirk to xhci_plat_quirks" 2017-03-14 23:45:45 -07:00
Linux Build Service Account
bb6ff6488f Merge "ARM: dts: msm: enable display for SDM660 PM660A QRD" 2017-03-14 23:45:44 -07:00
Linux Build Service Account
01107b6d9c Merge "msm: mdss: set interface stopped flag properly during suspend" 2017-03-14 23:45:43 -07:00
Linux Build Service Account
83b21004d2 Merge "msm: mdss: Avoid unnecessary warnings during pipe unstaging" 2017-03-14 23:45:42 -07:00
Linux Build Service Account
6b1a41eea8 Merge "firmware: qcom: tz_log: fix reading log issue on secure boot enabled device" 2017-03-14 23:45:41 -07:00
Linux Build Service Account
29620da5ab Merge "msm: isp: Add support for VFE dual camera resolution limit" 2017-03-14 23:45:40 -07:00
Linux Build Service Account
c4849b9b3e Merge "ARM: dts: msm: update vote on ldo11 for amoled panel on sdm660" 2017-03-14 23:45:39 -07:00
Linux Build Service Account
026bc74afe Merge "ASoC: codecs: Add PM suspend routines for digital codec" 2017-03-14 23:45:38 -07:00
Linux Build Service Account
6490c4e227 Merge "drm/msm: Remove DRM_MSM_NUM_IOCTLS" 2017-03-14 23:45:37 -07:00
Linux Build Service Account
3d973006bc Merge "drm/msm: Move QTI specific ioctls to avoid conflict" 2017-03-14 23:45:36 -07:00
Linux Build Service Account
ba76a5fa05 Merge "msm: camera: isp: correct the CX iPeak voting logic" 2017-03-14 23:45:36 -07:00
Linux Build Service Account
f3392ded87 Merge "msm: camera: cpp: Add support for CX iPeak limits Management" 2017-03-14 23:45:35 -07:00
Srikanth Uyyala
01b701c4af msm: camera: Rate limit debug logs
Rate limit the debug logs for vfe client.

Change-Id: I4d686ea6ecef50d99795cc102280c85925d63fec
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2017-03-14 23:39:27 -07:00
Srikanth Uyyala
886031df5d msm: camera: isp: use correct list API
list_first_entry expects the list to be not empty.
Use list_first_entry_or_null to return null incase
list is empty.

Change-Id: I44a8b726a90f8f55fd9388e74e31909c0bd71317
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2017-03-14 23:37:29 -07:00
Raviteja Tamatam
a1e75564f8 msm: mdss: disable programmable fetch when not in use
During the resolution switch use case where the active resolution
needs prefetch but the new resolution doesnot require it, currently
programmable fetch blocks are not disabled if not in use.

Change-Id: Ib5ea8ef75308132f5530aaf35aaea53858ea94a2
Signed-off-by: Raviteja Tamatam <travitej@codeaurora.org>
2017-03-14 23:31:09 -07:00
Shubhraprakash Das
02f717ea10 ARM: dts: msm: Set the rate for camss vfe clock on msm8998
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.

CRs-Fixed: 2013802
Change-Id: Ic735b405348e7f54c02fe222c87b6ceb862a9096
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2017-03-14 20:20:24 -07:00
Subbaraman Narayanamurthy
b7dad2b5a4 dt-bindings: Add DVDD_HARD_RESET and DVDD_SHUTDOWN types to power-on.h
Add DVDD_HARD_RESET and DVDD_SHUTDOWN types to power-on.h so that
they can be used in PMIC PON configuration.

CRs-Fixed: 2017642
Change-Id: I34ec58230fe38a193c50f7bf4d3ab0b2d96f82f1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-03-14 19:28:40 -07:00
Greg Kroah-Hartman
804a935963 Linux 4.4.54 2017-03-15 09:57:56 +08:00
K. Y. Srinivasan
4cdfa660c8 drivers: hv: Turn off write permission on the hypercall page
commit 372b1e91343e657a7cc5e2e2bcecd5140ac28119 upstream.

The hypercall page only needs to be executable but currently it is setup to
be writable as well. Fix the issue.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Acked-by: Kees Cook <keescook@chromium.org>
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Tested-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
OGAWA Hirofumi
8353f338de fat: fix using uninitialized fields of fat_inode/fsinfo_inode
commit c0d0e351285161a515396b7b1ee53ec9ffd97e3c upstream.

Recently fallocate patch was merged and it uses
MSDOS_I(inode)->mmu_private at fat_evict_inode().  However,
fat_inode/fsinfo_inode that was introduced in past didn't initialize
MSDOS_I(inode) properly.

With those combinations, it became the cause of accessing random entry
in FAT area.

Link: http://lkml.kernel.org/r/87pohrj4i8.fsf@mail.parknet.co.jp
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Reported-by: Moreno Bartalucci <moreno.bartalucci@tecnorama.it>
Tested-by: Moreno Bartalucci <moreno.bartalucci@tecnorama.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
Arnd Bergmann
13ef90e1bb libceph: use BUG() instead of BUG_ON(1)
commit d24cdcd3e40a6825135498e11c20c7976b9bf545 upstream.

I ran into this compile warning, which is the result of BUG_ON(1)
not always leading to the compiler treating the code path as
unreachable:

    include/linux/ceph/osdmap.h: In function 'ceph_can_shift_osds':
    include/linux/ceph/osdmap.h:62:1: error: control reaches end of non-void function [-Werror=return-type]

Using BUG() here avoids the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
Hans de Goede
7952b6490b drm/i915/dsi: Do not clear DPOUNIT_CLOCK_GATE_DISABLE from vlv_init_display_clock_gating
commit bb98e72adaf9d19719aba35f802d4836f5d5176c upstream.

On my Cherrytrail CUBE iwork8 Air tablet PIPE-A would get stuck on loading
i915 at boot 1 out of every 3 boots, resulting in a non functional LCD.
Once the i915 driver has successfully loaded, the panel can be disabled /
enabled without hitting this issue.

The getting stuck is caused by vlv_init_display_clock_gating() clearing
the DPOUNIT_CLOCK_GATE_DISABLE bit in DSPCLK_GATE_D when called from
chv_pipe_power_well_ops.enable() on driver load, while a pipe is enabled
driving the DSI LCD by the BIOS.

Clearing this bit while DSI is in use is a known issue and
intel_dsi_pre_enable() / intel_dsi_post_disable() already set / clear it
as appropriate.

This commit modifies vlv_init_display_clock_gating() to leave the
DPOUNIT_CLOCK_GATE_DISABLE bit alone fixing the pipe getting stuck.

Changes in v2:
-Replace PIPE-A with "a pipe" or "the pipe" in the commit msg and
comment

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97330
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161202142904.25613-1-hdegoede@redhat.com
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
(cherry picked from commit 721d484563e1a51ada760089c490cbc47e909756)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: River Zhou <riverzhou2000@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
Alexander Aring
77fec8bc7a fakelb: fix schedule while atomic
commit bdca1fd9a6df745857e23c6056494b7fe062b4e6 upstream.

This patch changes the spinlock to mutex for the available fakelb phy
list. When holding the spinlock the ieee802154_unregister_hw is called
which holding the rtnl_mutex, in that case we get a "BUG: sleeping function
called from invalid context" error. We simple change the spinlock to
mutex which allows to hold the rtnl lock there.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
Dan Carpenter
bb5b96344e drm/atomic: fix an error code in mode_fixup()
commit f9ad86e42d0303eeb8e0d41bb208153022ebd9d2 upstream.

Having "ret" be a bool type works for everything except
ret = funcs->atomic_check().  The other functions all return zero on
error but ->atomic_check() returns negative error codes.  We want to
propagate the error code but instead we return 1.

I found this bug with static analysis and I don't know if it affects
run time.

Fixes: 4cd4df8080 ("drm/atomic: Add ->atomic_check() to encoder helpers")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170207234601.GA23981@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
Michel Dänzer
59fc34fc69 drm/ttm: Make sure BOs being swapped out are cacheable
commit 239ac65fa5ffab71adf66e642750f940e7241d99 upstream.

The current caching state may not be tt_cached, even though the
placement contains TTM_PL_FLAG_CACHED, because placement can contain
multiple caching flags. Trying to swap out such a BO would trip up the

	BUG_ON(ttm->caching_state != tt_cached);

in ttm_tt_swapout.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Christian König <christian.koenig@amd.com>.
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
Tomeu Vizoso
36fd36b900 drm/edid: Add EDID_QUIRK_FORCE_8BPC quirk for Rotel RSX-1058
commit 36fc579761b50784b63dafd0f2e796b659e0f5ee upstream.

Rotel RSX-1058 is a receiver with 4 HDMI inputs and a HDMI output, all
1.1.

When a sink that supports deep color is connected to the output, the
receiver will send EDIDs that advertise this capability, even if it
isn't possible with HDMI versions earlier than 1.3.

Currently the kernel is assuming that deep color is possible and the
sink displays an error.

This quirk will make sure that deep color isn't used with this
particular receiver.

Fixes: 7a0baa6234 ("Revert "drm/i915: Disable 12bpc hdmi for now"")
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170220152545.13153-1-tomeu.vizoso@collabora.com
Cc: Matt Horan <matt@matthoran.com>
Tested-by: Matt Horan <matt@matthoran.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99869
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:15 +08:00
Y.C. Chen
b9cfd5517b drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS
commit 3856081eede297b617560b85e948cfb00bb395ec upstream.

The current POST code for the AST2300/2400 family doesn't work properly
if the chip hasn't been initialized previously by either the BMC own FW
or the VBIOS. This fixes it.

Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Y.C. Chen <yc_chen@aspeedtech.com>
Acked-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00
Y.C. Chen
93eab4f525 drm/ast: Call open_key before enable_mmio in POST code
commit 9bb92f51558f2ef5f56c257bdcea0588f31d857e upstream.

open_key enables access the registers used by enable_mmio

Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Joel Stanley <joel@jms.id.au>
Tested-by: Y.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00
Y.C. Chen
8b78765238 drm/ast: Fix test for VGA enabled
commit 905f21a49d388de3e99438235f3301cabf0c0ef4 upstream.

The test to see if VGA was already enabled is doing an unnecessary
second test from a register that may or may not have been initialized
to a valid value. Remove it.

Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Joel Stanley <joel@jms.id.au>
Tested-by: Y.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00
Alex Deucher
0d80ac62b6 drm/amdgpu: add more cases to DCE11 possible crtc mask setup
commit 4ce3bd45b351633f2a0512c587f7fcba2ce044e8 upstream.

Add cases for asics with 3 and 5 crtcs.  Fixes an artificial
limitation on asics with 3 or 5 crtcs.

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

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00
Matt Chen
8650af261d mac80211: flush delayed work when entering suspend
commit a9e9200d8661c1a0be8c39f93deb383dc940de35 upstream.

The issue was found when entering suspend and resume.
It triggers a warning in:
mac80211/key.c: ieee80211_enable_keys()
...
WARN_ON_ONCE(sdata->crypto_tx_tailroom_needed_cnt ||
             sdata->crypto_tx_tailroom_pending_dec);
...

It points out sdata->crypto_tx_tailroom_pending_dec isn't cleaned up successfully
in a delayed_work during suspend. Add a flush_delayed_work to fix it.

Signed-off-by: Matt Chen <matt.chen@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00
Max Filippov
21096328c9 xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
commit 4ab18701c66552944188dbcd0ce0012729baab84 upstream.

FDT tag parsing is not related to whether BLK_DEV_INITRD is configured
or not, move it out of the corresponding #ifdef/#endif block.
This fixes passing external FDT to the kernel configured w/o
BLK_DEV_INITRD support.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00
Clemens Gruber
6ef213d621 pwm: pca9685: Fix period change with same duty cycle
commit 8d254a340efb12b40c4c1ff25a48a4f48f7bbd6b upstream.

When first implementing support for changing the output frequency, an
optimization was added to continue the PWM after changing the prescaler
without having to reprogram the ON and OFF registers for the duty cycle,
in case the duty cycle stayed the same. This was flawed, because we
compared the absolute value of the duty cycle in nanoseconds instead of
the ratio to the period.

Fix the problem by removing the shortcut.

Fixes: 01ec847200 ("pwm-pca9685: Support changing the output frequency")
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00
Trond Myklebust
e1c924e85a nlm: Ensure callback code also checks that the files match
commit 251af29c320d86071664f02c76f0d063a19fefdf upstream.

It is not sufficient to just check that the lock pids match when
granting a callback, we also need to ensure that we're granting
the callback on the right file.

Reported-by: Pankaj Singh <psingh.ait@gmail.com>
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-15 09:57:14 +08:00