Skip to content

Commit 78e7095

Browse files
committed
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 ...
2 parents b79bd0d + 7bc7f61 commit 78e7095

File tree

41 files changed

+4127
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4127
-325
lines changed
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/gpio-virtio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Virtio GPIO controller
8+
9+
maintainers:
10+
- Viresh Kumar <[email protected]>
11+
12+
allOf:
13+
- $ref: /schemas/virtio/virtio-device.yaml#
14+
15+
description:
16+
Virtio GPIO controller, see /schemas/virtio/virtio-device.yaml for more
17+
details.
18+
19+
properties:
20+
$nodename:
21+
const: gpio
22+
23+
compatible:
24+
const: virtio,device29
25+
26+
gpio-controller: true
27+
28+
"#gpio-cells":
29+
const: 2
30+
31+
interrupt-controller: true
32+
33+
"#interrupt-cells":
34+
const: 2
35+
36+
required:
37+
- compatible
38+
- gpio-controller
39+
- "#gpio-cells"
40+
41+
unevaluatedProperties: false
42+
43+
examples:
44+
- |
45+
virtio@3000 {
46+
compatible = "virtio,mmio";
47+
reg = <0x3000 0x100>;
48+
interrupts = <41>;
49+
50+
gpio {
51+
compatible = "virtio,device29";
52+
gpio-controller;
53+
#gpio-cells = <2>;
54+
interrupt-controller;
55+
#interrupt-cells = <2>;
56+
};
57+
};
58+
59+
...
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/i2c/i2c-virtio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Virtio I2C Adapter
8+
9+
maintainers:
10+
- Viresh Kumar <[email protected]>
11+
12+
allOf:
13+
- $ref: /schemas/i2c/i2c-controller.yaml#
14+
- $ref: /schemas/virtio/virtio-device.yaml#
15+
16+
description:
17+
Virtio I2C device, see /schemas/virtio/virtio-device.yaml for more details.
18+
19+
properties:
20+
$nodename:
21+
const: i2c
22+
23+
compatible:
24+
const: virtio,device22
25+
26+
required:
27+
- compatible
28+
29+
unevaluatedProperties: false
30+
31+
examples:
32+
- |
33+
virtio@3000 {
34+
compatible = "virtio,mmio";
35+
reg = <0x3000 0x100>;
36+
interrupts = <41>;
37+
38+
i2c {
39+
compatible = "virtio,device22";
40+
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
44+
light-sensor@20 {
45+
compatible = "dynaimage,al3320a";
46+
reg = <0x20>;
47+
};
48+
};
49+
};
50+
51+
...

Documentation/devicetree/bindings/virtio/mmio.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ required:
3636
- reg
3737
- interrupts
3838

39-
additionalProperties: false
39+
additionalProperties:
40+
type: object
4041

4142
examples:
4243
- |
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/virtio/virtio-device.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Virtio device bindings
8+
9+
maintainers:
10+
- Viresh Kumar <[email protected]>
11+
12+
description:
13+
These bindings are applicable to virtio devices irrespective of the bus they
14+
are bound to, like mmio or pci.
15+
16+
# We need a select here so we don't match all nodes with 'virtio,mmio'
17+
properties:
18+
compatible:
19+
pattern: "^virtio,device[0-9a-f]{1,8}$"
20+
description: Virtio device nodes.
21+
"virtio,deviceID", where ID is the virtio device id. The textual
22+
representation of ID shall be in lower case hexadecimal with leading
23+
zeroes suppressed.
24+
25+
required:
26+
- compatible
27+
28+
additionalProperties: true
29+
30+
examples:
31+
- |
32+
virtio@3000 {
33+
compatible = "virtio,mmio";
34+
reg = <0x3000 0x100>;
35+
interrupts = <43>;
36+
37+
i2c {
38+
compatible = "virtio,device22";
39+
};
40+
};
41+
...

Documentation/userspace-api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ place where this information is gathered.
2727
iommu
2828
media/index
2929
sysfs-platform_profile
30+
vduse
3031

3132
.. only:: subproject and html
3233

Documentation/userspace-api/ioctl/ioctl-number.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ Code Seq# Include File Comments
299299
'z' 10-4F drivers/s390/crypto/zcrypt_api.h conflict!
300300
'|' 00-7F linux/media.h
301301
0x80 00-1F linux/fb.h
302+
0x81 00-1F linux/vduse.h
302303
0x89 00-06 arch/x86/include/asm/sockios.h
303304
0x89 0B-DF linux/sockios.h
304305
0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range

0 commit comments

Comments
 (0)