Commit 78e70952 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio updates from Michael Tsirkin:

 - vduse driver ("vDPA Device in Userspace") supporting emulated virtio
   block devices

 - virtio-vsock support for end of record with SEQPACKET

 - vdpa: mac and mq support for ifcvf and mlx5

 - vdpa: management netlink for ifcvf

 - virtio-i2c, gpio dt bindings

 - misc fixes and cleanups

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (39 commits)
  Documentation: Add documentation for VDUSE
  vduse: Introduce VDUSE - vDPA Device in Userspace
  vduse: Implement an MMU-based software IOTLB
  vdpa: Support transferring virtual addressing during DMA mapping
  vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap()
  vdpa: Add an opaque pointer for vdpa_config_ops.dma_map()
  vhost-iotlb: Add an opaque pointer for vhost IOTLB
  vhost-vdpa: Handle the failure of vdpa_reset()
  vdpa: Add reset callback in vdpa_config_ops
  vdpa: Fix some coding style issues
  file: Export receive_fd() to modules
  eventfd: Export eventfd_wake_count to modules
  iova: Export alloc_iova_fast() and free_iova_fast()
  virtio-blk: remove unneeded "likely" statements
  virtio-balloon: Use virtio_find_vqs() helper
  vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro
  vsock_test: update message bounds test for MSG_EOR
  af_vsock: rename variables in receive loop
  virtio/vsock: support MSG_EOR bit processing
  vhost/vsock: support MSG_EOR bit processing
  ...
parents b79bd0d5 7bc7f618

Documentation/devicetree/bindings/gpio/gpio-virtio.yaml

0 → 100644
+59 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/gpio/gpio-virtio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Virtio GPIO controller



maintainers:

  - Viresh Kumar <viresh.kumar@linaro.org>



allOf:

  - $ref: /schemas/virtio/virtio-device.yaml#



description:

  Virtio GPIO controller, see /schemas/virtio/virtio-device.yaml for more

  details.



properties:

  $nodename:

    const: gpio



  compatible:

    const: virtio,device29



  gpio-controller: true



  "#gpio-cells":

    const: 2



  interrupt-controller: true



  "#interrupt-cells":

    const: 2



required:

  - compatible

  - gpio-controller

  - "#gpio-cells"



unevaluatedProperties: false



examples:

  - |

    virtio@3000 {

        compatible = "virtio,mmio";

        reg = <0x3000 0x100>;

        interrupts = <41>;



        gpio {

            compatible = "virtio,device29";

            gpio-controller;

            #gpio-cells = <2>;

            interrupt-controller;

            #interrupt-cells = <2>;

        };

    };



...

Documentation/devicetree/bindings/i2c/i2c-virtio.yaml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/i2c/i2c-virtio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Virtio I2C Adapter



maintainers:

  - Viresh Kumar <viresh.kumar@linaro.org>



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#

  - $ref: /schemas/virtio/virtio-device.yaml#



description:

  Virtio I2C device, see /schemas/virtio/virtio-device.yaml for more details.



properties:

  $nodename:

    const: i2c



  compatible:

    const: virtio,device22



required:

  - compatible



unevaluatedProperties: false



examples:

  - |

    virtio@3000 {

        compatible = "virtio,mmio";

        reg = <0x3000 0x100>;

        interrupts = <41>;



        i2c {

            compatible = "virtio,device22";



            #address-cells = <1>;

            #size-cells = <0>;



            light-sensor@20 {

                compatible = "dynaimage,al3320a";

                reg = <0x20>;

            };

        };

    };



...

Documentation/devicetree/bindings/virtio/mmio.yaml

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ required: 
  - reg

  - interrupts



additionalProperties: false

additionalProperties:

  type: object



examples:

  - |

Documentation/devicetree/bindings/virtio/virtio-device.yaml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/virtio/virtio-device.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Virtio device bindings



maintainers:

  - Viresh Kumar <viresh.kumar@linaro.org>



description:

  These bindings are applicable to virtio devices irrespective of the bus they

  are bound to, like mmio or pci.



# We need a select here so we don't match all nodes with 'virtio,mmio'

properties:

  compatible:

    pattern: "^virtio,device[0-9a-f]{1,8}$"

    description: Virtio device nodes.

      "virtio,deviceID", where ID is the virtio device id. The textual

      representation of ID shall be in lower case hexadecimal with leading

      zeroes suppressed.



required:

  - compatible



additionalProperties: true



examples:

  - |

    virtio@3000 {

        compatible = "virtio,mmio";

        reg = <0x3000 0x100>;

        interrupts = <43>;



        i2c {

            compatible = "virtio,device22";

        };

    };

...

Documentation/userspace-api/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ place where this information is gathered. 
   iommu

   media/index

   sysfs-platform_profile

   vduse



.. only::  subproject and html