Hi,
Currently the DT only provides support for following node types for virtio-mmio
nodes:
virtio_mmio@a000000 {
dma-coherent;
interrupts = <0x00 0x10 0x01>;
reg = <0x00 0xa000000 0x00 0x200>;
compatible = "virtio,mmio";
};
Here, each virtio-mmio corresponds to a virtio-device. But there is no way for
other users in the DT to show their dependency on virtio devices.
This patchset provides that support.
The first patch adds virtio-device bindings to allow for device sub-nodes to be
present and the second patch updates the virtio core to update the of_node.
Other patches add bindings for i2c and gpio devices.
Tested on x86 with qemu for arm64.
V1->V2:
- The changes (both binding and code) are made at virtio level, instead of
virtio-mmio. This allows the same to be used by all device types, irrespective
of the transport mechanism.
- Dropped the reg property and used compatible in the form "virtio,<DID>".
- Dropped dt-bindings/virtio/virtio_ids.h.
- Add a patch to sync virtio-ids from spec, required for the last patch.
--
Viresh
Viresh Kumar (5):
dt-bindings: virtio: Add binding for virtio devices
dt-bindings: i2c: Add bindings for i2c-virtio
dt-bindings: gpio: Add bindings for gpio-virtio
uapi: virtio_ids: Sync ids with specification
virtio: Bind virtio device to device-tree node
.../devicetree/bindings/gpio/gpio-virtio.yaml | 60 +++++++++++++++++
.../devicetree/bindings/i2c/i2c-virtio.yaml | 51 ++++++++++++++
.../devicetree/bindings/virtio/mmio.yaml | 2 +-
.../bindings/virtio/virtio-device.yaml | 47 +++++++++++++
drivers/virtio/virtio.c | 67 ++++++++++++++++++-
include/uapi/linux/virtio_ids.h | 12 ++++
6 files changed, 235 insertions(+), 4 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
create mode 100644 Documentation/devicetree/bindings/virtio/virtio-device.yaml
--
2.31.1.272.g89b43f80a514
This patch adds binding for virtio I2C device, it is based on
virtio-device bindings.
Cc: Wolfram Sang <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
---
.../devicetree/bindings/i2c/i2c-virtio.yaml | 51 +++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
diff --git a/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml b/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
new file mode 100644
index 000000000000..0381d9065287
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
@@ -0,0 +1,51 @@
+# 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 <[email protected]>
+
+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:
+ pattern: '^i2c-virtio(-[a-z0-9]+)?$'
+
+ compatible:
+ const: virtio,22
+
+required:
+ - compatible
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ virtio@3000 {
+ compatible = "virtio,mmio";
+ reg = <0x3000 0x100>;
+ interrupts = <41>;
+
+ i2c-virtio {
+ compatible = "virtio,22";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ light-sensor@1c {
+ compatible = "dynaimage,al3320a";
+ reg = <0x20>;
+ };
+ };
+ };
+
+...
--
2.31.1.272.g89b43f80a514
This synchronizes the virtio ids with the latest list from virtio
specification.
Signed-off-by: Viresh Kumar <[email protected]>
---
Replaces:
https://lore.kernel.org/lkml/7c716c2eb7ace5b5a560d8502af93101dbb53d24.1626170146.git.viresh.kumar@linaro.org/
include/uapi/linux/virtio_ids.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
index 70a8057ad4bb..3c8e11820fdb 100644
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@ -54,8 +54,20 @@
#define VIRTIO_ID_SOUND 25 /* virtio sound */
#define VIRTIO_ID_FS 26 /* virtio filesystem */
#define VIRTIO_ID_PMEM 27 /* virtio pmem */
+#define VIRTIO_ID_RPMB 28 /* virtio rpmb */
#define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */
+#define VIRTIO_ID_VIDEO_ENCODER 30 /* virtio video encoder */
+#define VIRTIO_ID_VIDEO_DECODER 31 /* virtio video decoder */
+#define VIRTIO_ID_SCMI 32 /* virtio scmi */
+#define VIRTIO_ID_NITRO_SEC_MOD 33 /* virtio nitro secure module*/
+#define VIRTIO_ID_I2C_ADAPTER 34 /* virtio i2c adapter */
+#define VIRTIO_ID_WATCHDOG 35 /* virtio watchdog */
+#define VIRTIO_ID_CAN 36 /* virtio can */
+#define VIRTIO_ID_DMABUF 37 /* virtio dmabuf */
+#define VIRTIO_ID_PARAM_SERV 38 /* virtio parameter server */
+#define VIRTIO_ID_AUDIO_POLICY 39 /* virtio audio policy */
#define VIRTIO_ID_BT 40 /* virtio bluetooth */
+#define VIRTIO_ID_GPIO 41 /* virtio gpio */
/*
* Virtio Transitional IDs
--
2.31.1.272.g89b43f80a514
Bind the virtio devices with their of_node. This will help users of the
virtio devices to mention their dependencies on the device in the DT
itself. Like GPIO pin users can use the phandle of the device node, or
the node may contain more subnodes to add i2c or spi eeproms and other
users.
Signed-off-by: Viresh Kumar <[email protected]>
---
drivers/virtio/virtio.c | 67 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 64 insertions(+), 3 deletions(-)
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 4b15c00c0a0a..87bee5b966c3 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -4,6 +4,7 @@
#include <linux/virtio_config.h>
#include <linux/module.h>
#include <linux/idr.h>
+#include <linux/of.h>
#include <uapi/linux/virtio_ids.h>
/* Unique numbering for virtio devices. */
@@ -292,6 +293,9 @@ static int virtio_dev_remove(struct device *_d)
/* Acknowledge the device's existence again. */
virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
+
+ of_node_put(dev->dev.of_node);
+
return 0;
}
@@ -319,6 +323,53 @@ void unregister_virtio_driver(struct virtio_driver *driver)
}
EXPORT_SYMBOL_GPL(unregister_virtio_driver);
+/* Virtio device compatibles and IDs */
+static const struct of_device_id of_virtio_devices[] = {
+ { .compatible = "virtio,22", .data = (void *)VIRTIO_ID_I2C_ADAPTER },
+ { .compatible = "virtio,29", .data = (void *)VIRTIO_ID_GPIO },
+ { }
+};
+
+static int virtio_device_of_init(struct virtio_device *dev)
+{
+ struct device_node *np, *pnode = dev->dev.parent->of_node;
+ const struct of_device_id *match;
+ int ret, count;
+
+ if (!pnode)
+ return 0;
+
+ count = of_get_available_child_count(pnode);
+ if (!count)
+ return 0;
+
+ /* There can be only 1 child node */
+ if (WARN_ON(count > 1))
+ return -EINVAL;
+
+ np = of_get_next_available_child(pnode, NULL);
+ if (WARN_ON(!np))
+ return -ENODEV;
+
+ match = of_match_node(of_virtio_devices, np);
+ if (!match) {
+ ret = -ENODEV;
+ goto out;
+ }
+
+ if ((unsigned long)match->data != dev->id.device) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ dev->dev.of_node = np;
+ return 0;
+
+out:
+ of_node_put(np);
+ return ret;
+}
+
/**
* register_virtio_device - register virtio device
* @dev : virtio device to be registered
@@ -343,6 +394,10 @@ int register_virtio_device(struct virtio_device *dev)
dev->index = err;
dev_set_name(&dev->dev, "virtio%u", dev->index);
+ err = virtio_device_of_init(dev);
+ if (err)
+ goto out_ida_remove;
+
spin_lock_init(&dev->config_lock);
dev->config_enabled = false;
dev->config_change_pending = false;
@@ -362,10 +417,16 @@ int register_virtio_device(struct virtio_device *dev)
*/
err = device_add(&dev->dev);
if (err)
- ida_simple_remove(&virtio_index_ida, dev->index);
+ goto out_of_node_put;
+
+ return 0;
+
+out_of_node_put:
+ of_node_put(dev->dev.of_node);
+out_ida_remove:
+ ida_simple_remove(&virtio_index_ida, dev->index);
out:
- if (err)
- virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED);
+ virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED);
return err;
}
EXPORT_SYMBOL_GPL(register_virtio_device);
--
2.31.1.272.g89b43f80a514
This patch adds binding for virtio GPIO controller, it is based on
virtio-device bindings.
Signed-off-by: Viresh Kumar <[email protected]>
---
.../devicetree/bindings/gpio/gpio-virtio.yaml | 60 +++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
diff --git a/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml b/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
new file mode 100644
index 000000000000..96108cfb7a08
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
@@ -0,0 +1,60 @@
+# 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 <[email protected]>
+
+allOf:
+ - $ref: /schemas/gpio/gpio.yaml#
+ - $ref: /schemas/virtio/virtio-device.yaml#
+
+description:
+ Virtio GPIO controller, see /schemas/virtio/virtio-device.yaml for more
+ details.
+
+properties:
+ $nodename:
+ pattern: '^gpio-virtio(-[a-z0-9]+)?$'
+
+ compatible:
+ const: virtio,29
+
+ 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: gpio-virtio {
+ compatible = "virtio,29";
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
+...
--
2.31.1.272.g89b43f80a514
On Thu, Jul 22, 2021 at 03:26:40PM +0530, Viresh Kumar wrote:
> This patch adds binding for virtio I2C device, it is based on
> virtio-device bindings.
>
> Cc: Wolfram Sang <[email protected]>
> Signed-off-by: Viresh Kumar <[email protected]>
I'll leave the review for Rob. I suppose the series should go in via
some other tree, so for that:
Acked-by: Wolfram Sang <[email protected]>
On Thu, Jul 22, 2021 at 11:56 AM Viresh Kumar <[email protected]> wrote:
>
> +/* Virtio device compatibles and IDs */
> +static const struct of_device_id of_virtio_devices[] = {
> + { .compatible = "virtio,22", .data = (void *)VIRTIO_ID_I2C_ADAPTER },
> + { .compatible = "virtio,29", .data = (void *)VIRTIO_ID_GPIO },
> + { }
> +};
> +
> +static int virtio_device_of_init(struct virtio_device *dev)
> +{
> + struct device_node *np, *pnode = dev->dev.parent->of_node;
> + const struct of_device_id *match;
> + int ret, count;
> +
> + if (!pnode)
> + return 0;
> +
> + count = of_get_available_child_count(pnode);
> + if (!count)
> + return 0;
> +
> + /* There can be only 1 child node */
> + if (WARN_ON(count > 1))
> + return -EINVAL;
> +
> + np = of_get_next_available_child(pnode, NULL);
> + if (WARN_ON(!np))
> + return -ENODEV;
> +
> + match = of_match_node(of_virtio_devices, np);
> + if (!match) {
> + ret = -ENODEV;
> + goto out;
> + }
I think it would be better not to have to enumerate the of_virtio_devices[]
strings, but instead use of_device_is_compatible() to match against
"virtio,%d". Otherwise we end up modifying this function for every
virtio driver that needs a binding.
Arnd
On 22-07-21, 16:52, Arnd Bergmann wrote:
> On Thu, Jul 22, 2021 at 11:56 AM Viresh Kumar <[email protected]> wrote:
> >
> > +/* Virtio device compatibles and IDs */
> > +static const struct of_device_id of_virtio_devices[] = {
> > + { .compatible = "virtio,22", .data = (void *)VIRTIO_ID_I2C_ADAPTER },
> > + { .compatible = "virtio,29", .data = (void *)VIRTIO_ID_GPIO },
> > + { }
> > +};
> > +
> > +static int virtio_device_of_init(struct virtio_device *dev)
> > +{
> > + struct device_node *np, *pnode = dev->dev.parent->of_node;
> > + const struct of_device_id *match;
> > + int ret, count;
> > +
> > + if (!pnode)
> > + return 0;
> > +
> > + count = of_get_available_child_count(pnode);
> > + if (!count)
> > + return 0;
> > +
> > + /* There can be only 1 child node */
> > + if (WARN_ON(count > 1))
> > + return -EINVAL;
> > +
> > + np = of_get_next_available_child(pnode, NULL);
> > + if (WARN_ON(!np))
> > + return -ENODEV;
> > +
> > + match = of_match_node(of_virtio_devices, np);
> > + if (!match) {
> > + ret = -ENODEV;
> > + goto out;
> > + }
>
> I think it would be better not to have to enumerate the of_virtio_devices[]
> strings, but instead use of_device_is_compatible() to match against
> "virtio,%d". Otherwise we end up modifying this function for every
> virtio driver that needs a binding.
Yeah, will do that.
--
viresh
Bind the virtio devices with their of_node. This will help users of the
virtio devices to mention their dependencies on the device in the DT
itself. Like GPIO pin users can use the phandle of the device node, or
the node may contain more subnodes to add i2c or spi eeproms and other
users.
Signed-off-by: Viresh Kumar <[email protected]>
---
V2->V2.1
- Remove list of virtio device and use of_device_is_compatible() instead.
drivers/virtio/virtio.c | 56 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 53 insertions(+), 3 deletions(-)
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 4b15c00c0a0a..7c56b3416895 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -4,6 +4,7 @@
#include <linux/virtio_config.h>
#include <linux/module.h>
#include <linux/idr.h>
+#include <linux/of.h>
#include <uapi/linux/virtio_ids.h>
/* Unique numbering for virtio devices. */
@@ -292,6 +293,9 @@ static int virtio_dev_remove(struct device *_d)
/* Acknowledge the device's existence again. */
virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
+
+ of_node_put(dev->dev.of_node);
+
return 0;
}
@@ -319,6 +323,42 @@ void unregister_virtio_driver(struct virtio_driver *driver)
}
EXPORT_SYMBOL_GPL(unregister_virtio_driver);
+static int virtio_device_of_init(struct virtio_device *dev)
+{
+ struct device_node *np, *pnode = dev->dev.parent->of_node;
+ int ret, count;
+ char compat[12];
+
+ if (!pnode)
+ return 0;
+
+ count = of_get_available_child_count(pnode);
+ if (!count)
+ return 0;
+
+ /* There can be only 1 child node */
+ if (WARN_ON(count > 1))
+ return -EINVAL;
+
+ np = of_get_next_available_child(pnode, NULL);
+ if (WARN_ON(!np))
+ return -ENODEV;
+
+ snprintf(compat, sizeof(compat), "virtio,%x", dev->id.device);
+
+ if (!of_device_is_compatible(np, compat)) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ dev->dev.of_node = np;
+ return 0;
+
+out:
+ of_node_put(np);
+ return ret;
+}
+
/**
* register_virtio_device - register virtio device
* @dev : virtio device to be registered
@@ -343,6 +383,10 @@ int register_virtio_device(struct virtio_device *dev)
dev->index = err;
dev_set_name(&dev->dev, "virtio%u", dev->index);
+ err = virtio_device_of_init(dev);
+ if (err)
+ goto out_ida_remove;
+
spin_lock_init(&dev->config_lock);
dev->config_enabled = false;
dev->config_change_pending = false;
@@ -362,10 +406,16 @@ int register_virtio_device(struct virtio_device *dev)
*/
err = device_add(&dev->dev);
if (err)
- ida_simple_remove(&virtio_index_ida, dev->index);
+ goto out_of_node_put;
+
+ return 0;
+
+out_of_node_put:
+ of_node_put(dev->dev.of_node);
+out_ida_remove:
+ ida_simple_remove(&virtio_index_ida, dev->index);
out:
- if (err)
- virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED);
+ virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED);
return err;
}
EXPORT_SYMBOL_GPL(register_virtio_device);
--
2.31.1.272.g89b43f80a514
On Fri, Jul 23, 2021 at 8:12 AM Viresh Kumar <[email protected]> wrote:
>
> Bind the virtio devices with their of_node. This will help users of the
> virtio devices to mention their dependencies on the device in the DT
> itself. Like GPIO pin users can use the phandle of the device node, or
> the node may contain more subnodes to add i2c or spi eeproms and other
> users.
>
> Signed-off-by: Viresh Kumar <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
On Fri, Jul 23, 2021 at 11:41:31AM +0530, Viresh Kumar wrote:
> Bind the virtio devices with their of_node. This will help users of the
> virtio devices to mention their dependencies on the device in the DT
> itself. Like GPIO pin users can use the phandle of the device node, or
> the node may contain more subnodes to add i2c or spi eeproms and other
> users.
>
> Signed-off-by: Viresh Kumar <[email protected]>
> ---
> V2->V2.1
> - Remove list of virtio device and use of_device_is_compatible() instead.
>
> drivers/virtio/virtio.c | 56 ++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 53 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
> index 4b15c00c0a0a..7c56b3416895 100644
> --- a/drivers/virtio/virtio.c
> +++ b/drivers/virtio/virtio.c
> @@ -4,6 +4,7 @@
> #include <linux/virtio_config.h>
> #include <linux/module.h>
> #include <linux/idr.h>
> +#include <linux/of.h>
> #include <uapi/linux/virtio_ids.h>
>
> /* Unique numbering for virtio devices. */
> @@ -292,6 +293,9 @@ static int virtio_dev_remove(struct device *_d)
>
> /* Acknowledge the device's existence again. */
> virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
> +
> + of_node_put(dev->dev.of_node);
> +
> return 0;
> }
>
> @@ -319,6 +323,42 @@ void unregister_virtio_driver(struct virtio_driver *driver)
> }
> EXPORT_SYMBOL_GPL(unregister_virtio_driver);
>
> +static int virtio_device_of_init(struct virtio_device *dev)
> +{
> + struct device_node *np, *pnode = dev->dev.parent->of_node;
dev_of_node? I think gcc will then be smart enough to
make this a nop with !IS_ENABLED(CONFIG_OF).
> + int ret, count;
> + char compat[12];
I think this assumes device id is 16 bits but it's defined as u32
just in case.
If it's ever extended we will then get
into need to handle snprintf errors which is currently missing.
To keep things simple we can do
char compat[] = "virtio,XXXXXXXX";
> +
> + if (!pnode)
> + return 0;
> +
> + count = of_get_available_child_count(pnode);
> + if (!count)
> + return 0;
> +
> + /* There can be only 1 child node */
> + if (WARN_ON(count > 1))
> + return -EINVAL;
> +
> + np = of_get_next_available_child(pnode, NULL);
> + if (WARN_ON(!np))
> + return -ENODEV;
> +
> + snprintf(compat, sizeof(compat), "virtio,%x", dev->id.device);
worth checking this returns < sizeof(compat) and BUG_ON.
> +
> + if (!of_device_is_compatible(np, compat)) {
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + dev->dev.of_node = np;
> + return 0;
> +
> +out:
> + of_node_put(np);
> + return ret;
> +}
> +
> /**
> * register_virtio_device - register virtio device
> * @dev : virtio device to be registered
> @@ -343,6 +383,10 @@ int register_virtio_device(struct virtio_device *dev)
> dev->index = err;
> dev_set_name(&dev->dev, "virtio%u", dev->index);
>
> + err = virtio_device_of_init(dev);
> + if (err)
> + goto out_ida_remove;
> +
> spin_lock_init(&dev->config_lock);
> dev->config_enabled = false;
> dev->config_change_pending = false;
> @@ -362,10 +406,16 @@ int register_virtio_device(struct virtio_device *dev)
> */
> err = device_add(&dev->dev);
> if (err)
> - ida_simple_remove(&virtio_index_ida, dev->index);
> + goto out_of_node_put;
> +
> + return 0;
> +
> +out_of_node_put:
> + of_node_put(dev->dev.of_node);
> +out_ida_remove:
> + ida_simple_remove(&virtio_index_ida, dev->index);
> out:
> - if (err)
> - virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED);
> + virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED);
> return err;
> }
> EXPORT_SYMBOL_GPL(register_virtio_device);
> --
> 2.31.1.272.g89b43f80a514