Commit graph

708,694 commits

Author SHA1 Message Date
Chris Wilson
ae351beb1f drm/i915: Combine reset_all_global_seqno() loops into one
We can merge the pair of loops over the engines and their timelines into
a single loop, making it easier to read and more consistent with the
commentary.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330145041.9005-6-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2017-03-31 12:10:53 +01:00
Chris Wilson
7a453fb82f drm/i915: Remove redudant wait for each engine to idle from seqno wrap
Having added the wait upon each engine to idle into the central
i915_gem_wait_for_idle(), we can remove the now redundant wait from
reset_all_global_seqno(). This has the advantage of removing the late
detection of an error (an engine still busy) which left the seqno reset
only partially complete (though it should be safe enough!).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330145041.9005-5-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2017-03-31 12:09:46 +01:00
Chris Wilson
25112b64b3 drm/i915: Wait for all engines to be idle as part of i915_gem_wait_for_idle()
Make i915_gem_wait_for_idle() be a little heavier in order to try and
guarantee that the GPU is indeed idle (by checking each engine
individually is idle, i.e. all writes are complete and the rings
stopped) after waiting for in-flight requests to be completed.

v2: And return the final error.
v3: Break the wait_for() out from under the WARN -- the macro expansion
is hideous and unreadable in the warning message
v4: If wait_for_engine() fails the result is catastrophic, mark the
device as wedged and wait for the repair team.

References: https://bugs.freedesktop.org/show_bug.cgi?id=98836
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330145041.9005-4-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2017-03-31 12:07:17 +01:00
Chris Wilson
72022a705e drm/i915: Move retire-requests into i915_gem_wait_for_idle()
As we now distinguish everywhere that can call
i915_gem_retire_requests() following a successful wait_for_idle, we can
remove the duplication by moving that call into i915_gem_wait_for_idle()
itself.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330145041.9005-3-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2017-03-31 12:03:46 +01:00
Martin Schwidefsky
6fb81d69d0 Merge branch 'vfio-ccw-for-martin' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features
Pull vfio-ccw branch to add the basic channel I/O passthrough
intrastructure based on vfio.

The focus is on supporting dasd-eckd(cu_type/dev_type = 0x3990/0x3390)
as the target device.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31 13:01:46 +02:00
Dong Jia Shi
1877888d0a MAINTAINERS: Add vfio-ccw maintainers
Add Cornelia Huck and myself as the vfio-ccw driver maintainers.

Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-17-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:12 +02:00
Dong Jia Shi
d686f21ace vfio: ccw: introduce support for ccw0
Although Linux does not use format-0 channel command words (CCW0)
these are a non-optional part of the platform spec, and for the sake
of platform compliance, and possibly some non-Linux guests, we have
to support CCW0.

Making the kernel execute a format 0 channel program is too much hassle
because we would need to allocate and use memory which can be addressed
by 24 bit physical addresses (because of CCW0.cda). So we implement CCW0
support by translating the channel program into an equivalent CCW1
program instead.

Based upon an orginal patch by Kai Yue Wang.
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-16-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:12 +02:00
Dong Jia Shi
25627ba389 docs: add documentation for vfio-ccw
Add file Documentation/s390/vfio-ccw.txt that includes details
of vfio-ccw.

Acked-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-15-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:11 +02:00
Dong Jia Shi
bbe37e4cb8 vfio: ccw: introduce a finite state machine
The current implementation doesn't check if the subchannel is in a
proper device state when handling an event. Let's introduce
a finite state machine to manage the state/event change.

Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-14-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:11 +02:00
Dong Jia Shi
e5f84dbaea vfio: ccw: return I/O results asynchronously
Introduce a singlethreaded workqueue to handle the I/O interrupts.
With the work added to this queue, we store the I/O results to the
io_region of the subchannel, then signal the userspace program to
handle the results.

Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-13-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:10 +02:00
Dong Jia Shi
120e214e50 vfio: ccw: realize VFIO_DEVICE_G(S)ET_IRQ_INFO ioctls
Realize VFIO_DEVICE_GET_IRQ_INFO ioctl to retrieve
VFIO_CCW_IO_IRQ information.

Realize VFIO_DEVICE_SET_IRQS ioctl to set an eventfd fd for
VFIO_CCW_IO_IRQ. Once a write operation to the ccw_io_region
was performed, trigger a signal on this fd.

Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Message-Id: <20170317031743.40128-12-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:09 +02:00
Dong Jia Shi
83d1193a96 vfio: ccw: realize VFIO_DEVICE_RESET ioctl
Introduce VFIO_DEVICE_RESET ioctl for vfio-ccw to make it possible
to hot-reset the device.

We try to achieve a reset by first disabling the subchannel and
then enabling it again: this should clear all state at the subchannel.

Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-11-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:08 +02:00
Dong Jia Shi
e01bcdd613 vfio: ccw: realize VFIO_DEVICE_GET_REGION_INFO ioctl
Introduce device information about vfio-ccw: VFIO_DEVICE_FLAGS_CCW.
Realize VFIO_DEVICE_GET_REGION_INFO ioctl for vfio-ccw.

Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Message-Id: <20170317031743.40128-10-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:08 +02:00
Dong Jia Shi
4e149e431a vfio: ccw: handle ccw command request
We implement the basic ccw command handling infrastructure
here:
1. Translate the ccw commands.
2. Issue the translated ccw commands to the device.
3. Once we get the execution result, update the guest SCSW
   with it.

Acked-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-9-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:07 +02:00
Dong Jia Shi
060d2b5afc vfio: ccw: introduce ccw_io_region
To provide user-space a set of interfaces to:
1. pass in a ccw program to perform an I/O operation.
2. read back I/O results of the completed I/O operations.
We introduce an MMIO region for the vfio-ccw device here.

This region is defined to content:
1. areas to store arguments that an ssch required.
2. areas to store the I/O results.

Using pwrite/pread to the device on this region, a user-space program
could write/read data to/from the vfio-ccw device.

Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-8-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:06 +02:00
Dong Jia Shi
84cd8fc484 vfio: ccw: register vfio_ccw to the mediated device framework
To make vfio support subchannel devices, we need to leverage the
mediated device framework to create a mediated device for the
subchannel device.

This registers the subchannel device to the mediated device
framework during probe to enable mediated device creation.

Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-7-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:06 +02:00
Dong Jia Shi
0a19e61e6d vfio: ccw: introduce channel program interfaces
Introduce ccwchain structure and helper functions that can be used to
handle a channel program issued from a virtual machine.

The following limitations apply:
1. Supports only prefetch enabled mode.
2. Supports idal(c64) ccw chaining.
3. Supports 4k idaw.
4. Supports ccw1.
5. Supports direct ccw chaining by translating them to idal ccws.

CCW translation requires to leverage the vfio_(un)pin_pages interfaces
to pin/unpin sets of mem pages frequently. Currently we have a lack of
support to do this in an efficient way. So we introduce pfn_array data
structure and helper functions to handle pin/unpin operations here.

Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-6-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:05 +02:00
Dong Jia Shi
63f1934d56 vfio: ccw: basic implementation for vfio_ccw driver
To make vfio support subchannel devices, we need a css driver for
the vfio subchannels. This patch adds a basic vfio-ccw subchannel
driver for this purpose.

To enable VFIO for vfio-ccw, enable S390_CCW_IOMMU config option
and configure VFIO as required.

Acked-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-5-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:04 +02:00
Dong Jia Shi
aec390b937 vfio: ccw: define device_api strings
Define vfio-ccw device API strings. CCW vendor driver using mediated
device framework should use this string for device_api attribute.

Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Message-Id: <20170317031743.40128-4-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:04 +02:00
Dong Jia Shi
a22217e27c s390: cio: export more interfaces
Export the common I/O interfaces those are needed by an I/O
subchannel driver to actually talk to the subchannel.

Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-3-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:03 +02:00
Dong Jia Shi
5434da4ddf s390: cio: introduce cio_cancel_halt_clear
For future code reuse purpose, this decouples the cio code with
the ccw device specific parts from ccw_device_cancel_halt_clear,
and makes a new common I/O interface named cio_cancel_halt_clear.

Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Message-Id: <20170317031743.40128-2-bjsdjshi@linux.vnet.ibm.com>
[CH: Fix typo]
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
2017-03-31 12:55:02 +02:00
Chris Wilson
ecf8e89917 drm/i915: Use a dummy timeline name for a signaled fence
Michał Winiarski pointed out that the debugging infrastructure (such as
trace_dma_fence_release) likes to pretty print the timeline name, long
after we have freed the timeline. Our timelines currently live as part of
the GTT (due to the strict ordering we currently use through each) which
belong to the context. We aim to free the context and release its
hardware resources as soon as we able to (i.e. when the last
fence/request using it has been signaled and retired). As the
.get_timeline_name is purely a debug feature, rather than extending the
lifetime of the context, or splitting it into many different release
phases just to keep the name around, replace the timeline name with a
constant after the fence has been signaled. This avoids the potential
use-after-free.

Reported-by: Krzysztof Olinski <krzysztof.e.olinski@intel.com>
Fixes: 80b204bce8 ("drm/i915: Enable multiple timelines")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: <stable@vger.kernel.org> # v4.10+
Link: http://patchwork.freedesktop.org/patch/msgid/20170330111614.29757-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
(cherry picked from commit 05506b5be0)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2017-03-31 13:40:07 +03:00
Chris Wilson
1383aeca92 drm/i915: Ironlake do_idle_maps w/a may be called w/o struct_mutex
Since commit 1233e2db19 ("drm/i915: Move object backing storage
manipulation to its own locking"), i915_gem_object_put_pages() and
specifically the i915_gem_gtt_finish_pages() may be called from outside
of the struct_mutex and so we can no longer pass I915_WAIT_LOCKED to
i915_gem_wait_for_idle.

Fixes: 1233e2db19 ("drm/i915: Move object backing storage manipulation to its own locking")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.10+
Link: http://patchwork.freedesktop.org/patch/msgid/20170330085341.20311-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
(cherry picked from commit 228ec87ccd)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2017-03-31 13:40:02 +03:00
Tina Zhang
9ba2a6261d drm/i915/gvt: remove the redundant info NULL check
The variable info is never NULL, which is checked by the caller. This
patch removes the redundant info NULL check logic.

Fixes: 695fbc08d8 ("drm/i915/gvt: replace the gvt_err with gvt_vgpu_err")
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
(cherry picked from commit 865f03d42e)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2017-03-31 13:39:57 +03:00
Zhenyu Wang
729a0cd45c drm/i915/gvt: adjust mem size for low resolution type
From commit d1a513be1f ("drm/i915/gvt: add resolution definition for vGPU
type"), small type has been restricted to small resolution, so not
require larger high GM size any more. Change to smaller 384M for more
VM creation with vGPU enabled which still perform reasonable workload.

Fixes: d1a513be1f ("drm/i915/gvt: add resolution definition for vGPU type")
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
(cherry picked from commit bf39ec335e)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2017-03-31 13:39:52 +03:00
Chris Wilson
6c9a8cdad4 drm/i915: Avoid lock dropping between rescheduling
Unlocking is dangerous. In this case we combine an early update to the
out-of-queue request, because we know that it will be inserted into the
correct FIFO priority-ordered slot when it becomes ready in the future.
However, given sufficient enthusiasm, it may become ready as we are
continuing to reschedule, and so may gazump the FIFO if we have since
dropped its spinlock. The result is that it may be executed too early,
before its dependencies.

v2: Move all work into the second phase over the topological sort. This
removes the shortcut on the out-of-rbtree request to ensure that we only
adjust its priority after adjusting all of its dependencies.

Fixes: 20311bd350 ("drm/i915/scheduler: Execute requests in order of priorities")
Testcase: igt/gem_exec_whisper
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: <stable@vger.kernel.org> # v4.10+
Link: http://patchwork.freedesktop.org/patch/msgid/20170327202143.7972-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
(cherry picked from commit a79a524e92)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2017-03-31 13:39:47 +03:00
Arnd Bergmann
4a85aae62c multi_v7_defconfig: make Rockchip DRM drivers built-in
These cause warnings in linux-next, as the symbols have become 'bool' there:

arch/arm/configs/multi_v7_defconfig:600:warning: symbol value 'm' invalid for ROCKCHIP_INNO_HDMI
arch/arm/configs/multi_v7_defconfig:599:warning: symbol value 'm' invalid for ROCKCHIP_DW_MIPI_DSI
arch/arm/configs/multi_v7_defconfig:598:warning: symbol value 'm' invalid for ROCKCHIP_DW_HDMI
arch/arm/configs/multi_v7_defconfig:597:warning: symbol value 'm' invalid for ROCKCHIP_ANALOGIX_DP

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-31 12:30:03 +02:00
Arnd Bergmann
3f5099f0c7 Merge tag 'arm-soc/for-4.11/devicetree-fixes' of http://github.com/Broadcom/stblinux into fixes
There was a little conflict between the v4.11 bugfixes and the new changes for 4.12,
this merges the fixes into the 4.12 branch to avoid having to resolve it again.

* Broadcom fixes in mainline
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  ARM: dts: BCM5301X: Fix memory start address
  ARM: dts: BCM5301X: Fix UARTs on bcm953012k

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-31 12:19:39 +02:00
Arnd Bergmann
944d01c5f5 Devicetree changes for omaps for v4.12 merge window:
- Add hecc node for am35x
 
 - Add onenand support for omap3-igep
 
 - Add bluetooth binding for n900/n9/n950
 
 - Configure clocks and SATA for dm81xx
 
 - Update operating points tables for am33xx, am43xx and dra7
 
 - Update SPI flash documentation for w25q64
 
 - Configure SPI NOR for am335x-icev2
 
 - Mux uart0 for am437x-gp-evm
 
 - Add thermal zones for omap3, omap4, omap5, dra7
 
 - Configure LEDs for am335x-baltos
 
 - A series of droid 4 changes to configure various devices
   such as keypad, regulators, gpio-keys, rtc, power button,
   compass, accelerometer, touchscreen, backlight, poweroff,
   tmp105, HDMI, LCD panel and LEDs, EHCI, and micro-SD
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlja1soRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXPS9hAAsFKL0gkbNG+u0P12y73IShSgt0Xhffmq
 ChwdxMsRrPi5IJEOyPjcn3/HzWibBb/v+do1LIIM9i8Q+PchX+6DgssTYZEq5CAZ
 szMvwNfqrT2AmV2iwM4u6xOaM+hAY9RoAtYikQpJ8Wm6vH9Dgy1Ve4ge2NmKna6P
 0wnRJHIBJOzfGq4cP75QXqy2m/LJ4wwmP8pVzVa/9l/XtFlrsNT7n/kQ203PgYtR
 k/nkr/Z3XEyY/nCaKosUbHS6o+CCMcxpdF2RjWcrlqvHg4xdm8eB+ilJh3be0eWH
 7NMakynGXuqiI5lCqLeOpkBftD/kqSTojYuSY11nOhT+hHtoRe+KbOWYTf5UK7vb
 rGXERxoZYm0WVtePDPAb+cyc7XdPTmqkXMJwCBKfomcndgcSQJqYgeUv380+5blF
 76rhOq3xiKEDOPly8tjDS+4saZ+zEHj6dINhu+Lv56uQJCm0Y7o0j/RO4KMmZYAv
 Ht71lOM7xNEAhw/Opk03A1ERkQNDuK1lmjW4M5hmHDskboB0RLOnGBLDDvWBIH/Q
 H129hbDyEjEgMqgTuZi3cEt83jvQ0clzwjnmDDBW9O/nk1OpUHzPD4MMELNo+hBR
 g1BOKjAQ6nwN3yV9i+eyiY+nk822Hu1L5CpXXDrP0XZlVOhGFbSS+6/uCztfBhcl
 p7uZtAidu68=
 =CRcK
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.12/dt-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "Devicetree changes for omaps for v4.12 merge window" from Tony Lindgren:

- Add hecc node for am35x

- Add onenand support for omap3-igep

- Add bluetooth binding for n900/n9/n950

- Configure clocks and SATA for dm81xx

- Update operating points tables for am33xx, am43xx and dra7

- Update SPI flash documentation for w25q64

- Configure SPI NOR for am335x-icev2

- Mux uart0 for am437x-gp-evm

- Add thermal zones for omap3, omap4, omap5, dra7

- Configure LEDs for am335x-baltos

- A series of droid 4 changes to configure various devices
  such as keypad, regulators, gpio-keys, rtc, power button,
  compass, accelerometer, touchscreen, backlight, poweroff,
  tmp105, HDMI, LCD panel and LEDs, EHCI, and micro-SD

* tag 'omap-for-v4.12/dt-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (35 commits)
  ARM: dts: am335x-baltos: add LED support
  ARM: dts: omap4-droid4: Fix MMC1 card for detect GPIO and regulator
  ARM: dts: OMAP4460: Thermal: Add slope and offset values
  ARM: dts: OMAP443x: Thermal: Add slope and offset values
  ARM: dts: OMAP5: Thermal: Add slope and offset values
  ARM: dts: DRA7: Thermal: Add slope and offset values
  ARM: dts: omap3: Add cpu_thermal zone
  ARM: dts: am437x-gp-evm: Add pinmux for uart0
  ARM: dts: am335x-icev2: Add SPI based NOR
  Documentation: devicetree: mtd: add w25q64 to list of supported SPI flashes
  ARM: dts: dra7: Add updated operating-points-v2 table for cpu
  ARM: dts: am4372: Update operating-points-v2 table for cpu
  ARM: dts: am335x-boneblack: Enable 1GHz OPP for cpu
  ARM: dts: am33xx: Add updated operating-points-v2 table for cpu
  ARM: dts: dm8168-evm: add SATA node
  ARM: dts: dm8168-evm: add the external reference clock for SATA
  ARM: dts: N9/N950: add bluetooth
  ARM: dts: N900: Add bluetooth
  ARM: dts: omap4-droid4: Configure EHCI so modems can be accessed
  ARM: dts: motorola-cpcap-mapphone: add LEDs
  ...
2017-03-31 12:11:03 +02:00
Arnd Bergmann
5ea67992f7 Contains one new board, the Tinkerboard from Asus based on the rk3288,
definitions for the mmc resets in the socs reset controller, sound
 support for the Rock2, dma support for mmc controllers on the rk3188
 and a led-fix for the MiQi board and and irq-fix for older Cortex-A9 socs.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAljY6NUQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgTORB/49/3AhQ9neAjN5igVGMxv2PX5OPkYz07wJ
 AgPPyUDBchXIU2teAuPzv/T9rS0wAJR58qLL7JiYjYz+II/XE3qWJUjiT5p5mjsp
 ko4ijesWraf5C7z2ltL0T25lIyZwkjCJgjMzIxLMOsDgF4nN1yBxYh18CXXyc3sL
 G3GYVGwEAhM9EwFjzrpyL7guFe2ZiKAZ7QmVeLmsDT9goECgz1XebuM+3idbOwJB
 JjhmOmiSuUAHZO6o3soOZiDzb6xD9MELp/5a6MAoyoBWfnzHFtvsGwD/npDBEFB8
 7JP9z4tc+LgKlIjg3QWUU52FVm1vEKA8p7jMNLpZmlMkc7pNPjLf
 =oPg4
 -----END PGP SIGNATURE-----

Merge tag 'v4.12-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "Rockchip dts32 updates for 4.12 part1" from Heiko Stübner:

Contains one new board, the Tinkerboard from Asus based on the rk3288,
definitions for the mmc resets in the socs reset controller, sound
support for the Rock2, dma support for mmc controllers on the rk3188
and a led-fix for the MiQi board and and irq-fix for older Cortex-A9 socs.

* tag 'v4.12-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: setup DMA-channels for mmc0 and emmc for rk3188
  ARM: dts: rockchip: fix PPI misconfiguration on Cortex-A9 socs
  ARM: dts: rockchip: add rk322x dw-mmc resets
  ARM: dts: rockchip: add rk3066/rk3188 dw-mmc resets
  ARM: dts: rockchip: add rk3036 dw-mmc resets
  ARM: dts: rockchip: add rk3288 dw-mmc resets
  ARM: dts: rockchip: add dts for RK3288-Tinker board
  dt-bindings: add rk3288-based Asus Tinker board
  ARM: dts: rockchip: fix the MiQi board's LED definition
  ARM: dts: rockchip: Add support for ES8388 to the Radxa Rock 2
2017-03-31 12:09:39 +02:00
Arnd Bergmann
f63c00bcd1 DTS updates for the Gemini on top of the multiplatform base:
- Add the power controller to the DTS.
 - Augment the GPIO nodes to also include the Faraday
   compatible.
 - Add the PCI bus host and config to the Gemini device trees.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJY2WqsAAoJEEEQszewGV1zLDwP/jEiGTQwVdZZJO1/NfLlE4fv
 yXsA9Uu1BxB+n0XvcXL1+kSR3Bpn7ozl6cqPBvoaVYinafrPfQKJOn48Lmeory8x
 pswzdnG4vEiRka7z1WZjr9eAOIMeloYkl6KSkH+kJxQpJx5kHAehAeTPNJ5dwY2w
 WuKbVP2Fjgc6wtqVANGneeKGln1sdYHe5VoPov4SS4L/sWANUW2Zjdl9onnzJYHX
 NkEq5XwEafYcPOmbC1b8GgeU/UHLmkk1njfIHLlPwjcTqYaKZHa7C5TT2Uy459AO
 bgVE30StqzXIQBQGzIjN0CcJJabWYaF1RyI5qaoxWcGIATcZq2BmCAZpM6naMFvx
 EiHE/nAYoqpcGnfy8vOtqufVhi9Qpk3eGUqkcQoTClgPkiFdMVs60IbBAD38qOF6
 msOqj1l94YPimt3YdLRtZXq5vkw/446MrbLUdyJQ62N4xTZNkE+V0AHmmSJIDLKc
 1uaER+Wl+l7jQ2g5e2CobZEuVOsoFPc14xS0hsr5J4sA6DWU0LzUCEfUuiTuTBEB
 17ciL66LGCTvlz9ViHbdSg56ReRq+eCOQD5cSElF3UoWlMXPaC5bc9LYrj/vybO9
 8RyCz+FW0Aai8sdLDDIlUuj2wM9B8uBAyM0yStXfy6RR60rjdJOo5M0fow177H9l
 Xq3vEH59C5Fl9SrA5JOR
 =AkSm
 -----END PGP SIGNATURE-----

Merge tag 'gemini-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Pull "DTS updates for the Gemini on top of the multiplatform base" from Linus Walleij:

- Add the power controller to the DTS.
- Augment the GPIO nodes to also include the Faraday
  compatible.
- Add the PCI bus host and config to the Gemini device trees.

* tag 'gemini-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: add PCI to the Gemini device trees
  ARM: dts: augment Gemini GPIO nodes
  ARM: dts: add power controller to the Gemini DTS
2017-03-31 12:05:13 +02:00
Rob Herring
dc10ef2dfd arm64: dts: juno: fix PCI bus dtc warnings
dtc recently added PCI bus checks. Fix these warnings.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2017-03-31 11:03:15 +01:00
Arnd Bergmann
1b18832977 This pull request contains Broadcom ARM-based SoCs Device Tree updates for
4.12, please pull the following:
 
 - Rafal:
 
 	* adds basic support for the Linksys EA9200, Linksys EA6300 V1, Linksys
 	  EA9500, TP-Link Archer C5 V2 which are all based on BCM470x SoCs with
 	  a bunch of BCM43602 radios.
 
 	* updates the BCM5301X DTS and DTS include file and moves the serial
 	  console parameters to the DTS include file since all BCM5301X that we have so
 	  far are consistent in using the same UART. He also does the same for the
 	  BCM53573 DTS.
 
 	* makes some updates to the Tenda AC9 platform by describing its
 	  PCIe controllers and endpoints in order to be able to represent GPIOs attached
 	  to the on-chip Wi-Fi module. Once done, he adds the 2Ghz LED which is connected
 	  to one of these GPIOs.
 
 	* re-licenses the DTS files he created to the ISC license
 
 	* removes the use of the non-existend "default-off" LED trigger in the
 	  BCM53573 and BCM5301X DTS files
 
 - Aditya adds missing Netgear R8000 LEDS and keys for WAN status LEDS and brightness
 
 - Jon:
 	* adds NAND controller Device Tree nodes to the BCM953012K reference board
 
   	* converts the BCM5301X SoC to use the recently introduced Broadcom QSPI controller
   	  Device Tree nodes.
 
 	* fixes the GIC PPI interrupt flags that the kernel now
   	  reports about.
 
 	* adds ARM TWD watchdog entries to the BCM5301X DTS include file
   	* adds I2C entries to the BCM5301X DTS include files.
 
 	* disables i2c by default in the Northstar Plus DTS include file, and
 	 ,enables it at the board level instead.
 
 	* adds USB (OHCI & EHCI) Device Tree nodes to the Northstar Plus DTS
 	  include files.
 
 - Steven adds the mailbox (PDC) unit and the crytographic unit (SPU) to the
   Broadcom Northstar Plus SoC DTS include file. Steven also adds proper ethernet
   aliases to the BCM53012HR board since some bootloaders require that for MAC address
   patching.
 
 - Eric adds the DSI and its corresponding clock nodes to the BCM283x DTS files
   but leaves them disabled by default (overlays should take care of enabling it)
 
 - Boris adds support for HDMI audio and related DMA channels to the BCM283x SoCs
 
 - Gerd adds support for the BCM2835 specific SDHCI controller to the BCM283x SoCs
 
 - Rob fixes the iProc msi-controller name and unit address now that DTC can produce
   additional errors
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY1VzSAAoJEIfQlpxEBwcEI+EQALcm2qF0IP/y3xYB4kmNBf3b
 Xnb81oMhMcfFHj6CSQDdSObj8lv9FU4RoktosNtqYUTgvZUGsf/5GqWcwoYekH7W
 +1yrHdX9Cjx9B8A5FyQDIRyYZVbQ3yON0MhEo7X9gIPbi03uAdsIEOW4v+5DbRat
 X1aPhy0NkybhpDKzSudFejvIIM0IdjhhnUuBg3JtBC1mAMX0cnh+/lzxdxFXRMlV
 YvHGi3KYSGR4hEYnAlyHlFJsuTHYNN9rHKO0QyMTMGF2GyrLUuo9kO68kxmRzxEU
 LEcDFG/6oPQlzmc/KRIQHWjW+jBRvTn6n3cqwBHbwJc4P0S+f7b0UlG/uEwsfeD/
 jf8vIMFTa/IOgP4cabnDms8NW+x5Dl4ppizB5WB/3lFG09iSFJNNHBHnFLPF/N7A
 aw70ui47SbPbNxstAenHd/yJrkkNleitr1YQTQLLORof9+h0bePgxphM0AKgBrFU
 fEiC916fDkuyIj7+Qq2TUUiJnhfUA1bT6Vav+L3Hc4mWMS+xDuOLYIZv+Isf1eam
 duOQ3ECHHqP9VXf2qug4xwsAHalu3FTZT+FJEgJsFJ47mUnA4v7ySN0//Ta1crX3
 4P2Stt/0x0Ai/8Gx4DhqAI7CsIsRpb9FJ0KOUJTad/AlO5NAQvvzQoDjvVUQR7Km
 wIZiU2hq+PrtjLlc7bot
 =VFXn
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.12/devicetree' of http://github.com/Broadcom/stblinux into next/dt

Pull "Broadcom devicetree changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoCs Device Tree updates for
4.12, please pull the following:

- Rafal:

	* adds basic support for the Linksys EA9200, Linksys EA6300 V1, Linksys
	  EA9500, TP-Link Archer C5 V2 which are all based on BCM470x SoCs with
	  a bunch of BCM43602 radios.

	* updates the BCM5301X DTS and DTS include file and moves the serial
	  console parameters to the DTS include file since all BCM5301X that we have so
	  far are consistent in using the same UART. He also does the same for the
	  BCM53573 DTS.

	* makes some updates to the Tenda AC9 platform by describing its
	  PCIe controllers and endpoints in order to be able to represent GPIOs attached
	  to the on-chip Wi-Fi module. Once done, he adds the 2Ghz LED which is connected
	  to one of these GPIOs.

	* re-licenses the DTS files he created to the ISC license

	* removes the use of the non-existend "default-off" LED trigger in the
	  BCM53573 and BCM5301X DTS files

- Aditya adds missing Netgear R8000 LEDS and keys for WAN status LEDS and brightness

- Jon:
	* adds NAND controller Device Tree nodes to the BCM953012K reference board

  	* converts the BCM5301X SoC to use the recently introduced Broadcom QSPI controller
  	  Device Tree nodes.

	* fixes the GIC PPI interrupt flags that the kernel now
  	  reports about.

	* adds ARM TWD watchdog entries to the BCM5301X DTS include file
  	* adds I2C entries to the BCM5301X DTS include files.

	* disables i2c by default in the Northstar Plus DTS include file, and
	 ,enables it at the board level instead.

	* adds USB (OHCI & EHCI) Device Tree nodes to the Northstar Plus DTS
	  include files.

- Steven adds the mailbox (PDC) unit and the crytographic unit (SPU) to the
  Broadcom Northstar Plus SoC DTS include file. Steven also adds proper ethernet
  aliases to the BCM53012HR board since some bootloaders require that for MAC address
  patching.

- Eric adds the DSI and its corresponding clock nodes to the BCM283x DTS files
  but leaves them disabled by default (overlays should take care of enabling it)

- Boris adds support for HDMI audio and related DMA channels to the BCM283x SoCs

- Gerd adds support for the BCM2835 specific SDHCI controller to the BCM283x SoCs

- Rob fixes the iProc msi-controller name and unit address now that DTC can produce
  additional errors

* tag 'arm-soc/for-4.12/devicetree' of http://github.com/Broadcom/stblinux: (27 commits)
  ARM: dts: bcm: fix msi-controller name and unit address
  ARM: dts: BCM53573: Specify serial console parameters
  ARM: dts: BCM5301X: Specify serial console params in dtsi files
  ARM: dts: NSP: Add crypto (SPU) to dtsi
  ARM: dts: NSP: Add mailbox (PDC) to NSP
  ARM: dts: BCM953012HR: Add ethernet aliases
  ARM: dts: BCM5301X: Add support for TP-LINK Archer C5 V2
  ARM: dts: NSP: disable i2c DT entry by default
  ARM: dts: NSP: Add EHCI/OHCI USB nodes to device tree
  ARM: dts: BCM5301X: Add I2C support to the DT
  ARM: dts: BCM5301X: Add TWD WD Support to DT
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  ARM: dts: bcm2835: add sdhost controller to devicetree
  ARM: dts: bcm283x: Add HDMI audio related properties
  ARM: dts: BCM5301X: Don't use nonexistent "default-off" LED trigger
  ARM: dts: BCM53573: Don't use nonexistent "default-off" LED trigger
  ARM: dts: BCM5301X: Add missing Netgear R8000 LEDs and Keys
  ARM: dts: BCM5301X: Relicense DTS files I created to the ISC
  ARM: dts: bcm2835: Add the DSI module nodes and clocks.
  ARM: dts: BCM53573: Add Tenda AC9 2 GHz LED
  ...
2017-03-31 12:02:22 +02:00
Arnd Bergmann
b916a60994 mvebu dt for 4.12 (part 1)
- Add node lable for Armada 38x
 - Add support for Synology DS116 NAS and Linksys WRT1900ACS
 - Update mbus controller description on Armada 38x allowing entering in standby
 - Add default trigger for sata led on various linksys boards
 - Update newly added armada-xp-98dx3236
 - Enable hardware buffer manager support for the devices in the
   Linksys WRT AC Serie
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWNVVVyMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71f1XAJ0WIMcrTJPA
 uiYAEbN2f+InledW9wCeOD5+hJTSEFFznZSfbzN4Morh0tw=
 =+cen
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-4.12-1' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu dt for 4.12 (part 1)" from Gregory CLEMENT:

- Add node lable for Armada 38x
- Add support for Synology DS116 NAS and Linksys WRT1900ACS
- Update mbus controller description on Armada 38x allowing entering in standby
- Add default trigger for sata led on various linksys boards
- Update newly added armada-xp-98dx3236
- Enable hardware buffer manager support for the devices in the
  Linksys WRT AC Serie

* tag 'mvebu-dt-4.12-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: mvebu: linksys: enable buffer manager support
  ARM: dts: mvebu: remove unnecessary PCI range from 98dx3236
  ARM: dts: mvebu: Move mv98dx3236 clock bindings
  ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236
  ARM: dts: armada-xp-98dx3236: combine dfx server nodes
  ARM: dts: armada: Add default trigger for sata led
  ARM: dts: armada-38x: Adjust mbus controller description on Armada 38x
  ARM: dts: armada-385: add support for the Linksys WRT1900ACS (Shelby)
  ARM: dts: armada-385-synology-ds116: add support for Synology DS116 NAS
  ARM: dts: armada-38x add node labels
2017-03-31 12:01:24 +02:00
Arnd Bergmann
2c5ad9764e DaVinci device tree updates to enable
Video display on DA850 along with some
 whitespace clean-up.
 
 Also, enables sound and ADC support on
 Lego EV3.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY0hYtAAoJEGFBu2jqvgRNJzoQAIUrXYqHYaD+ZuvVrtUfK0b2
 IG4bd9gQ09s+jVOPdhtiT+FGwTWXFTBValLAABWyjP9YV0SL6JNR0Kn6lXjZk3BD
 Kprctk/EpphdmKurSEFRERulws7VOtagx88qUZqDPjootMbUGxFU7yYXzUoD1o/U
 VmQfV0jpNuLZ5abRld7Qyar5Oh6w1r58YQtbHNT82Dwkk1NfXNEEL+9WJA6Eqx8L
 nQBv4Yep8KuTw5PN3nWIYWQfVuKkRbdSHvnuuaCB0sxQLCQLOLtPhFlf2f9fsBaO
 enxfZcKzRuH21E0aRGjQKrtoWGiZqNOoZb2nPYjcEmtgcBeoZJPtp4A9U9AEOUyO
 GM9RfiWeszfcgQ9Yi6TiXqFJBVON61LAhe5IGYWGyOHsgzAFRTDqSmQ9aYL0vGzy
 Z49OYTHsA22YeSHtXoFRZD9owJAouHL3dIdw97FB4gC9DeqM04+8a8nkFhg14URW
 1NlaocDxFUO351OgVS+9W5P1GtvN0mYekMlk2VkS1UQihwBg2Q30RKU4Hvf2EnkH
 c3B2DMWAO/lQHSQWxdpdrTzZdIdjjCSe07JoIC1A+8cWg5NOV4AncM+gAwxHRlOu
 Sfbyb9dEa+0cFlz/3QGiALbmht2T/4TQFI3kkrwvU3lTFp0CZ/QCn5VpL4uBzOKH
 4xZ3qSUCItMDS8xgsjp7
 =DFR4
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

Pull "DaVinci DT updates for v4.12" from Sekhar Nori:

DaVinci device tree updates to enable
Video display on DA850 along with some
whitespace clean-up.

Also, enables sound and ADC support on
Lego EV3.

* tag 'davinci-for-v4.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850-evm: add the output port to the vpif node
  ARM: dts: da850-evm: add IO expander node on UI card
  ARM: dts: da850: add vpif video display pins
  ARM: dts: da850-evm: fix whitespace errors
  ARM: da850-lego-ev3: Add device tree node for sound
  ARM: da850-lego-ev3: Add device tree node for A/DC
2017-03-31 12:00:34 +02:00
Alexey Klimov
c511fa3f35 firmware: arm_scpi: reinit completion instead of full init_completion()
Instead of performing full initialization of the completion structure
on each transfer in scpi_send_message(), we initialize it at boot time
(more specifically, in the relevant probe() function) and use
reinit_completion() to reset ->done counter on each message transfer.

Signed-off-by: Alexey Klimov <alexey.klimov@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2017-03-31 11:00:23 +01:00
Linus Walleij
0409d756d0 ARM: dts: augment Moxa ART GPIO node
The Moxa ART GPIO is a Faraday FTGPIO010. Augment the DTS node
to indicate both compatible values for the SoC and the IP part.
Also increase the register range to 0x100, it has at least 0x48
bytes of registers, and a few extra will not hurt.

Tested-by: Jonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-31 11:59:56 +02:00
Arnd Bergmann
c83e93e64d UniPhier ARM SoC DT updates for v4.12
- Remove skeleton.dtsi inclusion
 - Fix W=* build warnings
 - Fix eMMC pin-mux node
 - Add pagesize properties to EEPROM nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY0bjZAAoJED2LAQed4NsGKyAP/3clkx8xiQDd4yTRbY23NCr8
 x3KdvyYXzt+St8QGAsyE7W2juuEzb0hDDctzmn2UPH6xGtFwKa0FzjW+H5W9z3og
 3YfS0S1hLxv+7dLxUTrpZYqpJOBaPQsm9Cr16qTemggpVudzAQYtncMhR1QJGnDq
 u/k1M+YP4hy3lT4fK1wCVJuogR9x2KktPjqaAQ9iXo5m/ko9V4hww4HneOnfe6gp
 A3IxgNtfBrzXS1aMHGywTu4JMmLpbnwYQ20USEU4D8DudWCyUQFlEDQG0kbRNSGN
 jFpfSaU40ENx60noIkg8VHpAfLHtPbQ03QRfUdkkP2jO7G716e5vAsL3fSE2udAu
 z3TzDVlOslAtDWjGSJGF/2Q/KvWXWMaPGeeOzHZv5pX2BXgweTZ5dq6eikSPxA3M
 j8jox/uqyEYhmFgJ7acJuTtItrU4WwoxH7EHIWo0nS7SMicGgu8vVSgO5Cn2N6rw
 4JxIhaMGLH0+pW/N9UDd+eGT7fBGpxFDIL1mw2uf85R2slGAxmsi0TykTFfiIvlZ
 PoCrHdsXBnGHKkCmnG1zaALDCUNTB20l+ZoRt50tqSwFDeXqHfzQMCNJS3URE254
 HNC4A+4lcHsYqpQ5fNQAj7u05TmEyNBbuYMnerCEwmF04tu/Y1Uo/4if11dtmTwL
 SfBIc94pDWXfS751WtBL
 =8/Z2
 -----END PGP SIGNATURE-----

Merge tag 'uniphier-dt-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM SoC DT updates for v4.12" from Masahiro Yamada:

- Remove skeleton.dtsi inclusion
- Fix W=* build warnings
- Fix eMMC pin-mux node
- Add pagesize properties to EEPROM nodes

* tag 'uniphier-dt-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add pagesize property to EEPROM of proto boards
  ARM: dts: uniphier: add pagesize property to EEPROM of Support Card
  ARM: dts: uniphier: fix pin groups of eMMC pin-mux node
  ARM: dts: uniphier: move memory node below aliases node
  ARM: dts: uniphier: fix no unit name warnings
  ARM: dts: uniphier: remove skeleton.dtsi inclusion
2017-03-31 11:58:50 +02:00
Arnd Bergmann
9720a9a31d Rockchip dts changes based on the newly created arm/arm64 symlinks.
The core addition is the support for the rk3399-based Gru family of
 ChromeOS devices, like the Kevin board which is the recently released
 Samsung Chromebook Plus. Additionally the usb3 controllers are added
 to rk3399 as they're used on Gru devices and even without full type-c
 support they can at least drive usb2 devices already.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAljY62IQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgYkKCACdlgqbhUPiGj/xGqSlBRdWzX20nMAmFMLh
 jPDSX3wjOTtmxCUoyGB4eac/823fVydVzf0OeLGTyJc7zx3IS+7p6dPMdV0ulLio
 UAKyhJk6HbAOWdQXRZFQbSGeWfcaRB12gu5uNbUiwaDsD7Pguk2z/H/z9pS03ydB
 OIXB3UrIKl0YW0CYhqH6Rt09af/8q3IaTDVwJpAXvAUNVcYogUK797fTXsxH8CD2
 e92qmtbEEdI6FGsACP6OTQx2mBDZCd+weABaacxKhIJ9IPce8QHVtcZj2VjH43L7
 TzIZkQ4b5MMG176mpofNzv2+O3i9BAzAkoX87czz7Y9fwuf7pFfy
 =rqs0
 -----END PGP SIGNATURE-----

Merge tag 'v4.12-rockchip-dts64-symlinks-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64

Pull "Rockchip dts64 updates (using arm/arm64 symlinks) for 4.12 part1" from Heiko Stübner

Rockchip dts changes based on the newly created arm/arm64 symlinks.
The core addition is the support for the rk3399-based Gru family of
ChromeOS devices, like the Kevin board which is the recently released
Samsung Chromebook Plus. Additionally the usb3 controllers are added
to rk3399 as they're used on Gru devices and even without full type-c
support they can at least drive usb2 devices already.

* tag 'v4.12-rockchip-dts64-symlinks-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: add regulator info for Kevin digitizer
  arm64: dts: rockchip: describe Gru/Kevin OPPs + CPU regulators
  arm64: dts: rockchip: add Gru/Kevin DTS
  dt-bindings: Document rk3399 Gru/Kevin
  arm64: dts: rockchip: support dwc3 USB for rk3399
2017-03-31 11:54:40 +02:00
Arnd Bergmann
a5cd01ff18 Contains various changes for the rk3368 (dma, i2s, disable mailbox per
default, mmc-resets) and also removes the wrongly added idle states, that
 do not match the hardware's capabilities, as well as some general rk3399
 pcie fixes as well as also the mmc resets.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAljY6c0QHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgdIYB/wKt/kONmWhi3RsXCXFUv/PBM0NToKvUq5e
 5LvprMvIb/dyEBpA1bSaxOmktYDmEzqQFfxBOT7gfWX8/N+oFLWsfLsMNGkReev0
 QPxQaITA1sOVSqDPWb5Pw4jDJ58CKUH1Cvj9GU1NuU3qp5ioggMTr/RFk2FsQ2wi
 AJTDmyRHIp2Hfr7C//H85U7qd0NB0xQJz4GpZ98HnuZoSzpeQs7SRikOr4PZAaEA
 mqsFizsELiAee/BmsTsppjzEIM5MpCIe91fx4S5NBNbnbmy2pFvXsmL5QazTWyao
 FiWPPcIWuEVnuVLWXAGn4vLlKJG7DH+aJSOtN482J/fRnaTZABU6
 =/nLm
 -----END PGP SIGNATURE-----

Merge tag 'v4.12-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64

Pull "Rockchip dts64 updates for 4.12 part1" from Heiko Stübner:

Contains various changes for the rk3368 (dma, i2s, disable mailbox per
default, mmc-resets) and also removes the wrongly added idle states, that
do not match the hardware's capabilities, as well as some general rk3399
pcie fixes as well as also the mmc resets.

* tag 'v4.12-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: fix PCIe domain number for rk3399
  arm64: dts: rockchip: add rk3399 dw-mmc resets
  arm64: dts: rockchip: add rk3368 dw-mmc resets
  arm64: dts: rockchip: disable mailbox of RK3368 SoCs per default
  arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs
  arm64: dts: rockchip: add dmac nodes for rk3368 SoCs
  arm64: dts: rockchip: remove wrongly added idle states on rk3368
  arm64: dts: rockchip: sort rk3399-pcie by unit address
2017-03-31 11:53:40 +02:00
Arnd Bergmann
bda484e76e This pull request contains Broadcom ARM64-based SoCs Device Tree updates for
4.12, please pull the following:
 
 - Rob enables the cryptographic block on Northstar 2 (SPU) by adding the proper
   Device Tree nodes
 
 - Jon replaces all occurences of: status = "ok" with status = "okay" to better
   conform to the Device Tree specification
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY1VaOAAoJEIfQlpxEBwcEcV4P/3jbaahcHY8RQgzUEV2IOHL6
 r82SI54BGNzrLRZQCeOQopUzTSiVtpSuFkjaZZr3zsKg0rFOQL5krQQiqXFq4m4G
 uzzBRCFXJb4ePE/czylE6YyNZFjAiQmpvWltNJwRQ8vbEml5M3B/PEfWaW9OTFxx
 5FulbvF1RG4zU0BG3DS1YggejQqNmNiT/CvwVBg1qLq2m9yGXd8XVsIRKMVxKGTx
 YZnxAEKueE/DqY5N9WvwKcTPP7JzBPPSPLqbSlPFI5+uRKn/EQ6pHBbSzCQXGEjb
 hpfKkMK2gFhnNw0Uvb9k5cT/sbst3evsaYGTE6q2DplKchCF1D1OQbUK5Dqn2ork
 MvitS7zkOavHrx+QPP0QkwPjWJrcCNnlIGwjFR/L8xl1Cz0WvSg9npyLVJr5kjmH
 uLDnx1RxKzDDaf/K42ZmuABRC7OURf2w7ARoAD4Z8Y4hRe+in7A9YTP8pHMjOcgG
 BR1aSr6zgLnqvMJDT+p0WrCTiEnd4rOJKL2zM/mmYdlYzkLe+HQ1YTi3mkCkEaTR
 Ao6TH8uAGJnc5ve7xY50ChNDlbKOUL6Nip/RMiayqr6JfG5OkMoqkrhF9gLYcnNo
 c4zLRT7sKBXJrYHqgo3xZuk41mYaiqoSsYiuXS283T1miOK1BWZ0ZzqIP+MH53yz
 yA1EmWP1XdHuU6hvKrZ8
 =yeV5
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.12/devicetree-arm64' of http://github.com/Broadcom/stblinux into next/dt64

Pull "Broadcom devicetree-arm64 changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoCs Device Tree updates for
4.12, please pull the following:

- Rob enables the cryptographic block on Northstar 2 (SPU) by adding the proper
  Device Tree nodes

- Jon replaces all occurences of: status = "ok" with status = "okay" to better
  conform to the Device Tree specification

* tag 'arm-soc/for-4.12/devicetree-arm64' of http://github.com/Broadcom/stblinux:
  arm64: dts: NS2: convert "ok" to "okay"
  arm64: dts: NS2: Add Broadcom SPU driver DT entry
2017-03-31 11:52:16 +02:00
Arnd Bergmann
8e8c72535d mvebu dt64 for 4.12 (part 1)
- Add RTC support on Armada 7k/8k
 - Improve i2c support on Armada 37xx
 - Add gpio expander and RTC on Armada 3720 board
 - Improve USB3 support on Armada 37xx
 - Add network support on Armada 7k/8k
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWNVViCMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71b/NAJ9Y60FsHOFK
 08mr2r3h/4+ydzlxWQCfQeR509BowT9/i92+Rl1ZhqS7SS0=
 =kbjv
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt64-4.12-1' of git://git.infradead.org/linux-mvebu into next/dt64

Pull "mvebu dt64 for 4.12 (part 1)" from Gregory CLEMENT:

- Add RTC support on Armada 7k/8k
- Improve i2c support on Armada 37xx
- Add gpio expander and RTC on Armada 3720 board
- Improve USB3 support on Armada 37xx
- Add network support on Armada 7k/8k

* tag 'mvebu-dt64-4.12-1' of git://git.infradead.org/linux-mvebu:
  arm64: marvell: dts: add PPv2.2 description to Armada 7K/8K
  ARM64: dts: marvell: armada-3720 add RTC support
  ARM64: dts: marvell: armada-3720-db: Add phy for USB3
  ARM64: dts: marvell: armada-37xx: Add clock resource for USB3
  ARM64: dts: marvell: armada-37xx: Fix interrupt mapping for USB3
  ARM64: dts: marvell: armada-3720-db: add gpio expander
  ARM64: dts: marvell: armada37xx: add address and size property for i2c cells
  arm64: dts: marvell: add RTC description for Armada 7K/8K
2017-03-31 11:51:03 +02:00
Arnd Bergmann
6cd8eaacb8 UniPhier ARM64 SoC DT updates for v4.12
- Fix W=* build warnings
 - Add pinctrl properties to eMMC nodes
 - Fix resets properties of USB nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY0byiAAoJED2LAQed4NsGG/0P/34WlG/kvjVxm2XRNUNz/+Mv
 zT1d5t+4yG0vD2m2RhaB0FhJPLX3h8U1ZgulZgALzDyi2R/1IDvZBjXzzgYUTz14
 LZPD/XOFfbrD//KHXPvbreOr6qcOgqIZq7P03oBYcyg2AmkfUNdfNSRLtF+YFKIf
 tjNJOUHewBr6mtMzWdp+PO8ARUSWFw9x7fro6B5eW1vh9CRZxfXGiNp8yJIxHu8i
 3hq3QFlCFO5pspY6OCpap+hf1O/duvT2W4vp/ZO+4BSjxaPTMdWxmNLehxlSkYi0
 tQbLPN9nnqVd/Z7dODCokcPaSM5QJLOP7k9yoSgldu/J92XF42CARkaC4jK07KAJ
 gGZN5MtCHTsZAkHUnbNiZRWgmiMBZhECSainEVMtDORCngyUGdP2Mi+Uriyqqy2j
 vK8MBDbI1BcQQP29JAE7cuBAE0n1r9SyUyTE5iBiFXnatExKJzqnc6fmk3+CO2l5
 Q5EYhlFeYXvEYXHhB1Zu5wa9OguTjqsNqLLm6FLqX6yUAOG/ZCSsQ0ijza3m8swj
 lnTik+F3ePbMDQ45zsSo6e+mlEOizWw7p7bpJBQ8Cgkbqivyk2qME1/sCUwuw+Bq
 WyuIsOGpkverPfI1g+EnOLkK3GTzQWlM/LIvrlvZsqhsqYlxuUX9UeIzN9ss31sG
 AW6piCyxUyfN6fli1nHd
 =X39C
 -----END PGP SIGNATURE-----

Merge tag 'uniphier-dt64-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64

Pull "UniPhier ARM64 SoC DT updates for v4.12" from Masahiro Yamada:

- Fix W=* build warnings
- Add pinctrl properties to eMMC nodes
- Fix resets properties of USB nodes

* tag 'uniphier-dt64-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: re-order reset deassertion of USB of LD11
  arm64: dts: uniphier: add pinctrl property to eMMC node for LD11/LD20
  arm64: dts: uniphier: move memory node below aliases node
  arm64: dts: uniphier: fix no unit name warnings
2017-03-31 11:45:14 +02:00
Jayachandran C
517b311eae arm64: dts: move from ARCH_VULCAN to ARCH_THUNDER2
Move and update device tree files as part of transition from Broadcom
Vulcan to Cavium ThunderX2.

The changes are to:
 * rename dts/broadcom/vulcan.dtsi to cavium/thunder2-99xx.dtsi,
   update cpu cores to be "cavium,thunder2", and update SoC to be
   "cavium,thunderx2-cn9900"
 * move SoC dts/broadcom/vulcan-eval.dtsi to cavium/thunder2-99xx.dtsi
   and update board name string
 * Update dts/broadcom/Makefile not to build vulcan dtbs
 * Update dts/cavium/Makefile to build thunder2 dtbs

No changes to the dts contents except the updated "compatible" and
"model" properties.

Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-31 11:42:30 +02:00
Jayachandran C
8aac4bc519 dt-bindings: Add arm64 ARCH_THUNDER2 platform documentation
Add documentation for Cavium's ThunderX2 CN99XX ARM64 processor. This
SoC will use "cavium,thunderx2-cn9900" as the compatible property.

Also add a documentation entry for the "cavium,thunder2" cpu core
present in these SoCs.

Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-31 11:40:12 +02:00
Denis Kirjanov
19fa6e601b tty/hvc_console: fix console lock ordering with spinlock
hvc_remove() takes a spin lock first then acquires the console
semaphore. This situation can easily lead to a deadlock scenario
where we call scheduler with spin lock held.

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-31 11:37:13 +02:00
Johan Hovold
93857edd98 tty: reset termios state on device registration
Free any saved termios data when registering a tty device so that the
termios state is reset when reusing a minor number.

This is useful for hot-pluggable buses such as USB where it does not
make much sense to reuse saved termios data from an unrelated device
when a new device is later plugged in.

This specifically avoids a situation where the new device does not have
the carrier-detect signal wired, but the saved termios state has CLOCAL
cleared, effectively preventing the port from being opened in blocking
mode as noted by Jan Kundrát <jan.kundrat@cesnet.cz>.

Note that clearing the saved data at deregistration would not work as
the device could still be open.

Also note that the termios data is not reset for drivers with
TTY_DRIVER_DYNAMIC_ALLOC set (e.g. legacy pty) as their character device
is registered at driver registration and could theoretically already
have been opened (and pty termios state is never saved anyway).

Reported-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-31 11:37:13 +02:00
Johan Hovold
16b00ae82d tty: drop obsolete termios_locked comments
Drop comments about tty-driver termios_locked structures, which have
been outdated since commit fe6e29fdb1 ("tty: simplify ktermios
allocation").

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-31 11:37:13 +02:00
Johan Hovold
6a7e6f78c2 tty: close race between device register and open
The tty class device is currently not registered until after the
character device has been registered thereby leaving a small window
were a racing open could end up with a NULL tty->dev pointer due to the
class-device lookup failing in alloc_tty_struct.

Close this race by registering the class device before the character
device while making sure to defer the user-space uevent notification
until after the character device has been registered.

Note that some tty drivers expect a valid tty->dev and would misbehave
or crash otherwise. Some line disciplines also currently dereference the
class device unconditionally despite the fact that not every tty is
guaranteed to have one (Unix98 pty), but this is being fixed separately.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-31 11:37:13 +02:00
Takashi Iwai
03a1f48e53 ALSA: usb-audio: Fake also USB device id when alias is given
Recently snd-usb-audio driver received a new option, quirk_alias, to
allow user to apply the existing quirk for a different device.  This
works for many quirks as is, but some still need more tune-ups:
namely, some quirks check the USB vendor/device IDs in various places,
thus it doesn't work as long as the ID is different from the expected
one.

With this patch, the driver stores the aliased USB ID, so that these
rest quirks per device ID are applied.  The transition to use the
cached USB ID was already done in the past, so what we needed now is
only to overwrite chip->usb_id.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2017-03-31 11:19:19 +02:00