Commit graph

567684 commits

Author SHA1 Message Date
Greg Hackmann
a5e2a1ddbc ANDROID: sched: fix duplicate sched_group_energy const specifiers
EAS uses "const struct sched_group_energy * const" fairly consistently.
But a couple of places swap the "*" and second "const", making the
pointer mutable.

In the case of struct sched_group, "* const" would have been an error,
since init_sched_energy() writes to sd->groups->sge.

Change-Id: Ic6a8fcf99e65c0f25d9cc55c32625ef3ca5c9aca
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2017-03-17 16:26:10 +00:00
Max Shi
2474d8bad0 config: disable CONFIG_USELIB and CONFIG_FHANDLE
turn off the two kernel configs to disable related system ABI.

Bug: 30903194
Change-Id: I32e2ff3323135ce4b67a86f106fa9327a71fe309
Signed-off-by: Max Shi <meixuanshi@google.com>
2017-03-16 21:14:15 +00:00
yangdongdong
152a401d26 ANDROID: power: align wakeup_sources format
This aligns every column of elements in wakeup_sources to
conveniently check any specific column for suspicious power
consumption wakeup source or for other easily human readable purpose.

Change-Id: Iac8b0538170fcc0cca9f6857c15d9a4c62c8865e
Signed-off-by: yangdongdong <yangdongdong@xiaomi.com>
2017-03-16 10:42:16 -07:00
Bowgo Tsai
870382b806 ANDROID: dm: android-verity: allow disable dm-verity for Treble VTS
To start Treble VTS test, a single AOSP system.img will be flashed onto
the device. The size of AOSP system.img might be different than the
system partition size on device, making locating verity metadata fail
(at the last fixed size of the partition).

This change allows disabling dm-verity on system partition when the
device is unlocked (orange device state) with invalid metadata.

BUG: 35603549
Test: boot device with a different-sized system.img, checks verity is
      not enabled via:

          "adb shell getprop | grep partition.system.verified"

Change-Id: Ide78dca4eefde4ab019e4b202d3f590dcb1bb506
Signed-off-by: Bowgo Tsai <bowgotsai@google.com>
2017-03-15 11:22:44 -07:00
Greg Kroah-Hartman
850beefa42 Linux 4.4.54
am: 804a935963

Change-Id: Ib3397fd2644f9990c1338b330969efc933a005eb
2017-03-15 02:14:21 +00:00
K. Y. Srinivasan
3d39608598 drivers: hv: Turn off write permission on the hypercall page
am: 4cdfa660c8

Change-Id: I417fd5e5734565e9d36bd0fc3dc48bf0d313c255
2017-03-15 02:14:10 +00:00
OGAWA Hirofumi
c29b2d6c1c fat: fix using uninitialized fields of fat_inode/fsinfo_inode
am: 8353f338de

Change-Id: I8079951acacf4ede0afacd719fef7218b5a4b118
2017-03-15 02:14:00 +00:00
Arnd Bergmann
80eb540081 libceph: use BUG() instead of BUG_ON(1)
am: 13ef90e1bb

Change-Id: I11386824d9c7c24ed221efd0da79f47bf57062bd
2017-03-15 02:13:49 +00:00
Hans de Goede
e2079fac44 drm/i915/dsi: Do not clear DPOUNIT_CLOCK_GATE_DISABLE from vlv_init_display_clock_gating
am: 7952b6490b

Change-Id: Idd5d5c02e40654fed8d91a1fa5fd5b50018ad96c
2017-03-15 02:13:40 +00:00
Alexander Aring
06196a12e5 fakelb: fix schedule while atomic
am: 77fec8bc7a

Change-Id: Ie09b250bdafef24d8308f1e8977eba931c04c1fa
2017-03-15 02:13:29 +00:00
Dan Carpenter
de7ac7e30b drm/atomic: fix an error code in mode_fixup()
am: bb5b96344e

Change-Id: Id18b07ab38b358a2644299de3b74256febb8e9e1
2017-03-15 02:13:19 +00:00
Michel Dnzer
8b3e7e31c6 drm/ttm: Make sure BOs being swapped out are cacheable
am: 59fc34fc69

Change-Id: I2006bbe231b7fb6b69496ee0b9918c237e849d9a
2017-03-15 02:13:10 +00:00
Tomeu Vizoso
e2d4a36ac7 drm/edid: Add EDID_QUIRK_FORCE_8BPC quirk for Rotel RSX-1058
am: 36fd36b900

Change-Id: Ifc087265486cb0a234985426ca029da8348a504d
2017-03-15 02:13:00 +00:00
Y.C. Chen
e177304400 drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS
am: b9cfd5517b

Change-Id: I3f6b8b65cd8d24aac36b35bb8d57ee58cc9a2685
2017-03-15 02:12:51 +00:00
Y.C. Chen
1330b28fd7 drm/ast: Call open_key before enable_mmio in POST code
am: 93eab4f525

Change-Id: Ieaf6f4e8b92348752eecdbe4f2cf623871bc5f52
2017-03-15 02:12:41 +00:00
Y.C. Chen
e9bd0b324b drm/ast: Fix test for VGA enabled
am: 8b78765238

Change-Id: Iaf901c402f1a6a37e5d6d86d49692c0a8509f128
2017-03-15 02:12:32 +00:00
Alex Deucher
031c424254 drm/amdgpu: add more cases to DCE11 possible crtc mask setup
am: 0d80ac62b6

Change-Id: Id64b0474df8cc1740ad7f4f7913194c53fcfbdfb
2017-03-15 02:12:22 +00:00
Matt Chen
ee80f8e022 mac80211: flush delayed work when entering suspend
am: 8650af261d

Change-Id: I953388770e8b1940c90476fc9559f0a158d78e99
2017-03-15 02:12:09 +00:00
Max Filippov
609d86bb1b xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
am: 21096328c9

Change-Id: I915bb01e5d632c98bd85d640a18f423be57e7a83
2017-03-15 02:11:59 +00:00
Clemens Gruber
27eb9f28e3 pwm: pca9685: Fix period change with same duty cycle
am: 6ef213d621

Change-Id: I8fb7580acf2136527372f2435e04081821bac7c7
2017-03-15 02:11:49 +00:00
Trond Myklebust
27bd8e883c nlm: Ensure callback code also checks that the files match
am: e1c924e85a

Change-Id: I6dbae6de1a61687cb174b45dc47f488d24320bdf
2017-03-15 02:11:39 +00:00
Nicholas Bellinger
f2775d8e46 target: Fix NULL dereference during LUN lookup + active I/O shutdown
am: ca739e3fd7

Change-Id: I8e9360ec3bd7fbe14368fd1912c7719e85be6bb9
2017-03-15 02:11:29 +00:00
Jeff Layton
256257f5af ceph: remove req from unsafe list when unregistering it
am: 05a9143edb

Change-Id: Ic90462feeb10c8a27d64134995c4977d675743da
2017-03-15 02:11:18 +00:00
Steven Rostedt (VMware)
713f4b78ef ktest: Fix child exit code processing
am: 485171b1ee

Change-Id: Ieab6fa2965534c94e45facc8a7a39a27d5d90bf9
2017-03-15 02:11:09 +00:00
Bart Van Assche
3eee5d1ecc IB/srp: Fix race conditions related to task management
am: 696255449b

Change-Id: I8522738607d73a73eae610007ec6e9251bd6aa20
2017-03-15 02:10:59 +00:00
Bart Van Assche
396d34e761 IB/srp: Avoid that duplicate responses trigger a kernel bug
am: 944690cdb5

Change-Id: Ia3796823de8637786e2dd9f46ce28de188787b9a
2017-03-15 02:10:49 +00:00
Erez Shitrit
8d4558285a IB/IPoIB: Add destination address when re-queue packet
am: bb4a21dcb6

Change-Id: Iec2af2c31a8e5a58a0e5c6e3cafe6813de39073f
2017-03-15 02:10:39 +00:00
Feras Daoud
b576323b87 IB/ipoib: Fix deadlock between rmmod and set_mode
am: 10beca5374

Change-Id: I9eaddaaac8da4e38418436e47eacb36306302b31
2017-03-15 02:10:30 +00:00
Eric W. Biederman
cd237bd504 mnt: Tuck mounts under others instead of creating shadow/side mounts.
am: 839d42687d

Change-Id: Id06d474c7f7b46c1ce05056028ca02837cacf215
2017-03-15 02:10:19 +00:00
Thomas Petazzoni
9df6fc2c3c net: mvpp2: fix DMA address calculation in mvpp2_txq_inc_put()
am: b57ffb2a84

Change-Id: I1cfecb3cd4e065ced5bedd6e48db679cec278d4f
2017-03-15 02:10:09 +00:00
Heiko Carstens
e389acfa39 s390: use correct input data address for setup_randomness
am: 376a12eb7f

Change-Id: Ic167ef8c95a6386e6edd9c8ad4e3606e84f04480
2017-03-15 02:09:59 +00:00
Heiko Carstens
3d9e15ab2d s390: make setup_randomness work
am: 296f7bd7f1

Change-Id: I47ce7a3407fd4716d30d8ab99aa2f6c252ed764f
2017-03-15 02:09:48 +00:00
Martin Schwidefsky
83d128b227 s390: TASK_SIZE for kernel threads
am: 9cf431dbd8

Change-Id: I62feff095e424cd3b83f63dcabdd5429d9e8dd27
2017-03-15 02:09:37 +00:00
Gerald Schaefer
db2f9fb43c s390/dcssblk: fix device size calculation in dcssblk_direct_access()
am: 792bd1fb5b

Change-Id: If6e12e0aa8f000c22b2f519263f693da207a17f2
2017-03-15 02:09:28 +00:00
Julian Wiedmann
ec279dedbe s390/qdio: clear DSCI prior to scanning multiple input queues
am: ec50c80c78

Change-Id: I01f8bdc3df7bfc4af5eaf9e3312918b1ec0eeca2
2017-03-15 02:09:19 +00:00
Dmitry Tunin
0412734732 Bluetooth: Add another AR3012 04ca:3018 device
am: 00cfdbf5ab

Change-Id: I391df4e63d6be18bf4d5e1b221e67f9409b2ab7c
2017-03-15 02:09:08 +00:00
Chao Peng
b0c04f1fbe KVM: VMX: use correct vmcs_read/write for guest segment selector/base
am: cae929bd8d

Change-Id: Icde3175a519f3b74723ad19d43fdfe2e99b01709
2017-03-15 02:08:58 +00:00
Janosch Frank
27dd3fdbc7 KVM: s390: Disable dirty log retrieval for UCONTROL guests
am: 0a3df0418d

Change-Id: Ie7d3d174fc58848cf16071c36ad1b1202795f9ce
2017-03-15 02:08:47 +00:00
Ian Abbott
37480b0d7e serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards
am: 4b34572e98

Change-Id: If7b34c0bc49a3e77660e218aa4881628967968d2
2017-03-15 02:08:37 +00:00
Alexander Popov
e67441c33e tty: n_hdlc: get rid of racy n_hdlc.tbuf
am: 999853d941

Change-Id: Ie1fc1f51817dafc00dac0f380fa33047d7f9cfa8
2017-03-15 02:08:28 +00:00
Jiri Slaby
877dc8bce6 TTY: n_hdlc, fix lockdep false positive
am: 59c4d7838e

Change-Id: Ic6c91f3b505bb4883f85e1698d8729e7a6e040a6
2017-03-15 02:08:15 +00: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