* [PATCH v4 1/3] vfio/platform: Make the vfio-platform device non-abstract
2018-09-13 15:44 [PATCH v4 0/3] vfio/sysbus-fdt: Prepare for Generic DT Pass-Through Geert Uytterhoeven
@ 2018-09-13 15:44 ` Geert Uytterhoeven
2018-09-19 9:34 ` Auger Eric
2018-09-13 15:44 ` [PATCH v4 2/3] hw/arm/sysbus-fdt: Allow device matching with DT compatible value Geert Uytterhoeven
2018-09-13 15:44 ` [PATCH v4 3/3] hw/arm/virt: Allow dynamic vfio-platform devices again Geert Uytterhoeven
2 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2018-09-13 15:44 UTC (permalink / raw)
To: Peter Maydell, Alex Williamson
Cc: Auger Eric, Magnus Damm, Laurent Pinchart, Wolfram Sang,
Kieran Bingham, qemu-arm, qemu-devel, linux-renesas-soc,
Geert Uytterhoeven
From: Auger Eric <eric.auger@redhat.com>
Up to now the vfio-platform device has been abstract and could not be
instantiated. The integration of a new vfio platform device required
creating a dummy derived device which only set the compatible string.
Following the few vfio-platform device integrations we have seen the
actual requested adaptation happens on device tree node creation
(sysbus-fdt).
Hence remove the abstract setting, and read the list of compatible
values from sysfs if not set by a derived device.
Update the amd-xgbe and calxeda-xgmac drivers to fill in the number of
compatible values, as there can now be more than one.
Note that sysbus-fdt does not support the instantiation of the
vfio-platform device yet.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
[geert: Rebase, set user_creatable=true, use compatible values in sysfs
instead of user-supplied manufacturer/model options, reword]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v4:
- Propagate g_file_get_contents() errors through errp,
v3:
- Read all compatible values from sysfs instead of using user-supplied
manufacturer and model options,
- Reword patch description,
- Drop RFC state,
v2:
- No changes,
v1:
- Rebase, Set user_creatable=true,
v0:
- Original version from Eric.
---
hw/vfio/amd-xgbe.c | 1 +
hw/vfio/calxeda-xgmac.c | 1 +
hw/vfio/platform.c | 24 +++++++++++++++++++++++-
include/hw/vfio/vfio-platform.h | 3 ++-
4 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c
index 0c4ec4ba25170366..ee64a3b4a2e45bf5 100644
--- a/hw/vfio/amd-xgbe.c
+++ b/hw/vfio/amd-xgbe.c
@@ -20,6 +20,7 @@ static void amd_xgbe_realize(DeviceState *dev, Error **errp)
VFIOAmdXgbeDeviceClass *k = VFIO_AMD_XGBE_DEVICE_GET_CLASS(dev);
vdev->compat = g_strdup("amd,xgbe-seattle-v1a");
+ vdev->num_compat = 1;
k->parent_realize(dev, errp);
}
diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c
index 24cee6d06512c1b6..e7767c4b021be566 100644
--- a/hw/vfio/calxeda-xgmac.c
+++ b/hw/vfio/calxeda-xgmac.c
@@ -20,6 +20,7 @@ static void calxeda_xgmac_realize(DeviceState *dev, Error **errp)
VFIOCalxedaXgmacDeviceClass *k = VFIO_CALXEDA_XGMAC_DEVICE_GET_CLASS(dev);
vdev->compat = g_strdup("calxeda,hb-xgmac");
+ vdev->num_compat = 1;
k->parent_realize(dev, errp);
}
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 57c4a0ee2b58da70..894333c602eb6fd2 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -655,6 +655,27 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp)
goto out;
}
+ if (!vdev->compat) {
+ GError *gerr = NULL;
+ gchar *contents;
+ gsize length;
+ char *path;
+
+ path = g_strdup_printf("%s/of_node/compatible", vbasedev->sysfsdev);
+ if (!g_file_get_contents(path, &contents, &length, &gerr)) {
+ error_setg(errp, "%s", gerr->message);
+ g_error_free(gerr);
+ return;
+ }
+ g_free(path);
+ vdev->compat = contents;
+ for (vdev->num_compat = 0; length; vdev->num_compat++) {
+ size_t skip = strlen(contents) + 1;
+ contents += skip;
+ length -= skip;
+ }
+ }
+
for (i = 0; i < vbasedev->num_regions; i++) {
if (vfio_region_mmap(vdev->regions[i])) {
error_report("%s mmap unsupported. Performance may be slow",
@@ -700,6 +721,8 @@ static void vfio_platform_class_init(ObjectClass *klass, void *data)
dc->desc = "VFIO-based platform device assignment";
sbc->connect_irq_notifier = vfio_start_irqfd_injection;
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ /* Supported by TYPE_VIRT_MACHINE */
+ dc->user_creatable = true;
}
static const TypeInfo vfio_platform_dev_info = {
@@ -708,7 +731,6 @@ static const TypeInfo vfio_platform_dev_info = {
.instance_size = sizeof(VFIOPlatformDevice),
.class_init = vfio_platform_class_init,
.class_size = sizeof(VFIOPlatformDeviceClass),
- .abstract = true,
};
static void register_vfio_platform_dev_type(void)
diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h
index 9baaa2db09b84f3e..0ee10b1d71ed2503 100644
--- a/include/hw/vfio/vfio-platform.h
+++ b/include/hw/vfio/vfio-platform.h
@@ -54,7 +54,8 @@ typedef struct VFIOPlatformDevice {
QLIST_HEAD(, VFIOINTp) intp_list; /* list of IRQs */
/* queue of pending IRQs */
QSIMPLEQ_HEAD(pending_intp_queue, VFIOINTp) pending_intp_queue;
- char *compat; /* compatibility string */
+ char *compat; /* DT compatible values, separated by NUL */
+ unsigned int num_compat; /* number of compatible values */
uint32_t mmap_timeout; /* delay to re-enable mmaps after interrupt */
QEMUTimer *mmap_timer; /* allows fast-path resume after IRQ hit */
QemuMutex intp_mutex; /* protect the intp_list IRQ state */
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v4 1/3] vfio/platform: Make the vfio-platform device non-abstract
2018-09-13 15:44 ` [PATCH v4 1/3] vfio/platform: Make the vfio-platform device non-abstract Geert Uytterhoeven
@ 2018-09-19 9:34 ` Auger Eric
0 siblings, 0 replies; 7+ messages in thread
From: Auger Eric @ 2018-09-19 9:34 UTC (permalink / raw)
To: Geert Uytterhoeven, Peter Maydell, Alex Williamson
Cc: Magnus Damm, Laurent Pinchart, Wolfram Sang, Kieran Bingham,
qemu-arm, qemu-devel, linux-renesas-soc
On 9/13/18 5:44 PM, Geert Uytterhoeven wrote:
> From: Auger Eric <eric.auger@redhat.com>
>
> Up to now the vfio-platform device has been abstract and could not be
> instantiated. The integration of a new vfio platform device required
> creating a dummy derived device which only set the compatible string.
>
> Following the few vfio-platform device integrations we have seen the
> actual requested adaptation happens on device tree node creation
> (sysbus-fdt).
>
> Hence remove the abstract setting, and read the list of compatible
> values from sysfs if not set by a derived device.
>
> Update the amd-xgbe and calxeda-xgmac drivers to fill in the number of
> compatible values, as there can now be more than one.
>
> Note that sysbus-fdt does not support the instantiation of the
> vfio-platform device yet.
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> [geert: Rebase, set user_creatable=true, use compatible values in sysfs
> instead of user-supplied manufacturer/model options, reword]
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> v4:
> - Propagate g_file_get_contents() errors through errp,
>
> v3:
> - Read all compatible values from sysfs instead of using user-supplied
> manufacturer and model options,
> - Reword patch description,
> - Drop RFC state,
>
> v2:
> - No changes,
>
> v1:
> - Rebase, Set user_creatable=true,
>
> v0:
> - Original version from Eric.
> ---
> hw/vfio/amd-xgbe.c | 1 +
> hw/vfio/calxeda-xgmac.c | 1 +
> hw/vfio/platform.c | 24 +++++++++++++++++++++++-
> include/hw/vfio/vfio-platform.h | 3 ++-
> 4 files changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c
> index 0c4ec4ba25170366..ee64a3b4a2e45bf5 100644
> --- a/hw/vfio/amd-xgbe.c
> +++ b/hw/vfio/amd-xgbe.c
> @@ -20,6 +20,7 @@ static void amd_xgbe_realize(DeviceState *dev, Error **errp)
> VFIOAmdXgbeDeviceClass *k = VFIO_AMD_XGBE_DEVICE_GET_CLASS(dev);
>
> vdev->compat = g_strdup("amd,xgbe-seattle-v1a");
> + vdev->num_compat = 1;
>
> k->parent_realize(dev, errp);
> }
> diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c
> index 24cee6d06512c1b6..e7767c4b021be566 100644
> --- a/hw/vfio/calxeda-xgmac.c
> +++ b/hw/vfio/calxeda-xgmac.c
> @@ -20,6 +20,7 @@ static void calxeda_xgmac_realize(DeviceState *dev, Error **errp)
> VFIOCalxedaXgmacDeviceClass *k = VFIO_CALXEDA_XGMAC_DEVICE_GET_CLASS(dev);
>
> vdev->compat = g_strdup("calxeda,hb-xgmac");
> + vdev->num_compat = 1;
>
> k->parent_realize(dev, errp);
> }
> diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
> index 57c4a0ee2b58da70..894333c602eb6fd2 100644
> --- a/hw/vfio/platform.c
> +++ b/hw/vfio/platform.c
> @@ -655,6 +655,27 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp)
> goto out;
> }
>
> + if (!vdev->compat) {
> + GError *gerr = NULL;
> + gchar *contents;
> + gsize length;
> + char *path;
> +
> + path = g_strdup_printf("%s/of_node/compatible", vbasedev->sysfsdev);
> + if (!g_file_get_contents(path, &contents, &length, &gerr)) {
> + error_setg(errp, "%s", gerr->message);
> + g_error_free(gerr);
leaks path
> + return;
> + }
> + g_free(path);
> + vdev->compat = contents;
> + for (vdev->num_compat = 0; length; vdev->num_compat++) {
> + size_t skip = strlen(contents) + 1;
> + contents += skip;
> + length -= skip;
> + }
> + }
> +
> for (i = 0; i < vbasedev->num_regions; i++) {
> if (vfio_region_mmap(vdev->regions[i])) {
> error_report("%s mmap unsupported. Performance may be slow",
> @@ -700,6 +721,8 @@ static void vfio_platform_class_init(ObjectClass *klass, void *data)
> dc->desc = "VFIO-based platform device assignment";
> sbc->connect_irq_notifier = vfio_start_irqfd_injection;
> set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> + /* Supported by TYPE_VIRT_MACHINE */
> + dc->user_creatable = true;
> }
>
> static const TypeInfo vfio_platform_dev_info = {
> @@ -708,7 +731,6 @@ static const TypeInfo vfio_platform_dev_info = {
> .instance_size = sizeof(VFIOPlatformDevice),
> .class_init = vfio_platform_class_init,
> .class_size = sizeof(VFIOPlatformDeviceClass),
> - .abstract = true,
> };
>
> static void register_vfio_platform_dev_type(void)
> diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h
> index 9baaa2db09b84f3e..0ee10b1d71ed2503 100644
> --- a/include/hw/vfio/vfio-platform.h
> +++ b/include/hw/vfio/vfio-platform.h
> @@ -54,7 +54,8 @@ typedef struct VFIOPlatformDevice {
> QLIST_HEAD(, VFIOINTp) intp_list; /* list of IRQs */
> /* queue of pending IRQs */
> QSIMPLEQ_HEAD(pending_intp_queue, VFIOINTp) pending_intp_queue;
> - char *compat; /* compatibility string */
> + char *compat; /* DT compatible values, separated by NUL */
> + unsigned int num_compat; /* number of compatible values */
> uint32_t mmap_timeout; /* delay to re-enable mmaps after interrupt */
> QEMUTimer *mmap_timer; /* allows fast-path resume after IRQ hit */
> QemuMutex intp_mutex; /* protect the intp_list IRQ state */
>
With leak fix,
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 2/3] hw/arm/sysbus-fdt: Allow device matching with DT compatible value
2018-09-13 15:44 [PATCH v4 0/3] vfio/sysbus-fdt: Prepare for Generic DT Pass-Through Geert Uytterhoeven
2018-09-13 15:44 ` [PATCH v4 1/3] vfio/platform: Make the vfio-platform device non-abstract Geert Uytterhoeven
@ 2018-09-13 15:44 ` Geert Uytterhoeven
2018-09-19 9:34 ` Auger Eric
2018-09-13 15:44 ` [PATCH v4 3/3] hw/arm/virt: Allow dynamic vfio-platform devices again Geert Uytterhoeven
2 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2018-09-13 15:44 UTC (permalink / raw)
To: Peter Maydell, Alex Williamson
Cc: Auger Eric, Magnus Damm, Laurent Pinchart, Wolfram Sang,
Kieran Bingham, qemu-arm, qemu-devel, linux-renesas-soc,
Geert Uytterhoeven
From: Auger Eric <eric.auger@redhat.com>
Up to now we have relied on the device type to identify a device tree
node creation function. Since we would like the vfio-platform device to
be instantiatable with different compatible strings we introduce the
capability to specialize the node creation depending on actual
compatible value.
NodeCreationPair is renamed into BindingEntry. The struct is enhanced
with compat and match_fn() fields. We introduce a new matching function
adapted to the vfio-platform generic device.
Soon, the AMD XGBE can be instantiated with either manner, i.e.:
-device vfio-amd-xgbe,host=e0900000.xgmac
or using the new option line:
-device vfio-platform,host=e0900000.xgmac
Signed-off-by: Eric Auger <eric.auger@redhat.com>
[geert: Match using compatible values in sysfs instead of user-supplied
manufacturer/model options, reword]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Eric Auger <eric.auger@redhat.com>
---
v4:
- Add Tested-by (with amd-xgbe),
- s/From now on/Soon/ in patch description,
v3:
- Match using the compatible values from sysfs instead of using
user-supplied manufacturer and model options,
- Reword patch description,
- Drop RFC state,
v2:
- No changes,
v1:
- No changes,
v0:
- Original version from Eric.
---
hw/arm/sysbus-fdt.c | 61 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 47 insertions(+), 14 deletions(-)
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 43d6a7bb48ddc351..0e24c803a1c2c734 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -50,11 +50,13 @@ typedef struct PlatformBusFDTData {
PlatformBusDevice *pbus;
} PlatformBusFDTData;
-/* struct that associates a device type name and a node creation function */
-typedef struct NodeCreationPair {
+/* struct that allows to match a device and create its FDT node */
+typedef struct BindingEntry {
const char *typename;
- int (*add_fdt_node_fn)(SysBusDevice *sbdev, void *opaque);
-} NodeCreationPair;
+ const char *compat;
+ int (*add_fn)(SysBusDevice *sbdev, void *opaque);
+ bool (*match_fn)(SysBusDevice *sbdev, const struct BindingEntry *combo);
+} BindingEntry;
/* helpers */
@@ -413,6 +415,27 @@ static int add_amd_xgbe_fdt_node(SysBusDevice *sbdev, void *opaque)
return 0;
}
+/* DT compatible matching */
+static bool vfio_platform_match(SysBusDevice *sbdev,
+ const BindingEntry *entry)
+{
+ VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev);
+ const char *compat;
+ unsigned int n;
+
+ for (n = vdev->num_compat, compat = vdev->compat; n > 0;
+ n--, compat += strlen(compat) + 1) {
+ if (!strcmp(entry->compat, compat)) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+#define VFIO_PLATFORM_BINDING(compat, add_fn) \
+ {TYPE_VFIO_PLATFORM, (compat), (add_fn), vfio_platform_match}
+
#endif /* CONFIG_LINUX */
static int no_fdt_node(SysBusDevice *sbdev, void *opaque)
@@ -420,14 +443,23 @@ static int no_fdt_node(SysBusDevice *sbdev, void *opaque)
return 0;
}
-/* list of supported dynamic sysbus devices */
-static const NodeCreationPair add_fdt_node_functions[] = {
+/* Device type based matching */
+static bool type_match(SysBusDevice *sbdev, const BindingEntry *entry)
+{
+ return !strcmp(object_get_typename(OBJECT(sbdev)), entry->typename);
+}
+
+#define TYPE_BINDING(type, add_fn) {(type), NULL, (add_fn), type_match}
+
+/* list of supported dynamic sysbus bindings */
+static const BindingEntry bindings[] = {
#ifdef CONFIG_LINUX
- {TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node},
- {TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node},
+ TYPE_BINDING(TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node),
+ TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node),
+ VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node),
#endif
- {TYPE_RAMFB_DEVICE, no_fdt_node},
- {"", NULL}, /* last element */
+ TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node),
+ TYPE_BINDING("", NULL), /* last element */
};
/* Generic Code */
@@ -446,10 +478,11 @@ static void add_fdt_node(SysBusDevice *sbdev, void *opaque)
{
int i, ret;
- for (i = 0; i < ARRAY_SIZE(add_fdt_node_functions); i++) {
- if (!strcmp(object_get_typename(OBJECT(sbdev)),
- add_fdt_node_functions[i].typename)) {
- ret = add_fdt_node_functions[i].add_fdt_node_fn(sbdev, opaque);
+ for (i = 0; i < ARRAY_SIZE(bindings); i++) {
+ const BindingEntry *iter = &bindings[i];
+
+ if (iter->match_fn(sbdev, iter)) {
+ ret = iter->add_fn(sbdev, opaque);
assert(!ret);
return;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v4 2/3] hw/arm/sysbus-fdt: Allow device matching with DT compatible value
2018-09-13 15:44 ` [PATCH v4 2/3] hw/arm/sysbus-fdt: Allow device matching with DT compatible value Geert Uytterhoeven
@ 2018-09-19 9:34 ` Auger Eric
0 siblings, 0 replies; 7+ messages in thread
From: Auger Eric @ 2018-09-19 9:34 UTC (permalink / raw)
To: Geert Uytterhoeven, Peter Maydell, Alex Williamson
Cc: Magnus Damm, Laurent Pinchart, Wolfram Sang, Kieran Bingham,
qemu-arm, qemu-devel, linux-renesas-soc
Hi Geert,
On 9/13/18 5:44 PM, Geert Uytterhoeven wrote:
> From: Auger Eric <eric.auger@redhat.com>
>
> Up to now we have relied on the device type to identify a device tree
> node creation function. Since we would like the vfio-platform device to
> be instantiatable with different compatible strings we introduce the
s/instantiatable/instantiable
> capability to specialize the node creation depending on actual
> compatible value.
>
> NodeCreationPair is renamed into BindingEntry. The struct is enhanced
> with compat and match_fn() fields. We introduce a new matching function
> adapted to the vfio-platform generic device.
>
> Soon, the AMD XGBE can be instantiated with either manner, i.e.:
>
> -device vfio-amd-xgbe,host=e0900000.xgmac
>
> or using the new option line:
>
> -device vfio-platform,host=e0900000.xgmac
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> [geert: Match using compatible values in sysfs instead of user-supplied
> manufacturer/model options, reword]
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Tested-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Feel free to add my T-b on the whole series (tested with amd_xgbe)
Tested-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
> ---
> v4:
> - Add Tested-by (with amd-xgbe),
> - s/From now on/Soon/ in patch description,
>
> v3:
> - Match using the compatible values from sysfs instead of using
> user-supplied manufacturer and model options,
> - Reword patch description,
> - Drop RFC state,
>
> v2:
> - No changes,
>
> v1:
> - No changes,
>
> v0:
> - Original version from Eric.
> ---
> hw/arm/sysbus-fdt.c | 61 ++++++++++++++++++++++++++++++++++-----------
> 1 file changed, 47 insertions(+), 14 deletions(-)
>
> diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
> index 43d6a7bb48ddc351..0e24c803a1c2c734 100644
> --- a/hw/arm/sysbus-fdt.c
> +++ b/hw/arm/sysbus-fdt.c
> @@ -50,11 +50,13 @@ typedef struct PlatformBusFDTData {
> PlatformBusDevice *pbus;
> } PlatformBusFDTData;
>
> -/* struct that associates a device type name and a node creation function */
> -typedef struct NodeCreationPair {
> +/* struct that allows to match a device and create its FDT node */
> +typedef struct BindingEntry {
> const char *typename;
> - int (*add_fdt_node_fn)(SysBusDevice *sbdev, void *opaque);
> -} NodeCreationPair;
> + const char *compat;
> + int (*add_fn)(SysBusDevice *sbdev, void *opaque);
> + bool (*match_fn)(SysBusDevice *sbdev, const struct BindingEntry *combo);
> +} BindingEntry;
>
> /* helpers */
>
> @@ -413,6 +415,27 @@ static int add_amd_xgbe_fdt_node(SysBusDevice *sbdev, void *opaque)
> return 0;
> }
>
> +/* DT compatible matching */
> +static bool vfio_platform_match(SysBusDevice *sbdev,
> + const BindingEntry *entry)
> +{
> + VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev);
> + const char *compat;
> + unsigned int n;
> +
> + for (n = vdev->num_compat, compat = vdev->compat; n > 0;
> + n--, compat += strlen(compat) + 1) {
> + if (!strcmp(entry->compat, compat)) {
> + return true;
> + }
> + }
> +
> + return false;
> +}
> +
> +#define VFIO_PLATFORM_BINDING(compat, add_fn) \
> + {TYPE_VFIO_PLATFORM, (compat), (add_fn), vfio_platform_match}
> +
> #endif /* CONFIG_LINUX */
>
> static int no_fdt_node(SysBusDevice *sbdev, void *opaque)
> @@ -420,14 +443,23 @@ static int no_fdt_node(SysBusDevice *sbdev, void *opaque)
> return 0;
> }
>
> -/* list of supported dynamic sysbus devices */
> -static const NodeCreationPair add_fdt_node_functions[] = {
> +/* Device type based matching */
> +static bool type_match(SysBusDevice *sbdev, const BindingEntry *entry)
> +{
> + return !strcmp(object_get_typename(OBJECT(sbdev)), entry->typename);
> +}
> +
> +#define TYPE_BINDING(type, add_fn) {(type), NULL, (add_fn), type_match}
> +
> +/* list of supported dynamic sysbus bindings */
> +static const BindingEntry bindings[] = {
> #ifdef CONFIG_LINUX
> - {TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node},
> - {TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node},
> + TYPE_BINDING(TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node),
> + TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node),
> + VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node),
> #endif
> - {TYPE_RAMFB_DEVICE, no_fdt_node},
> - {"", NULL}, /* last element */
> + TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node),
> + TYPE_BINDING("", NULL), /* last element */
> };
>
> /* Generic Code */
> @@ -446,10 +478,11 @@ static void add_fdt_node(SysBusDevice *sbdev, void *opaque)
> {
> int i, ret;
>
> - for (i = 0; i < ARRAY_SIZE(add_fdt_node_functions); i++) {
> - if (!strcmp(object_get_typename(OBJECT(sbdev)),
> - add_fdt_node_functions[i].typename)) {
> - ret = add_fdt_node_functions[i].add_fdt_node_fn(sbdev, opaque);
> + for (i = 0; i < ARRAY_SIZE(bindings); i++) {
> + const BindingEntry *iter = &bindings[i];
> +
> + if (iter->match_fn(sbdev, iter)) {
> + ret = iter->add_fn(sbdev, opaque);
> assert(!ret);
> return;
> }
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 3/3] hw/arm/virt: Allow dynamic vfio-platform devices again
2018-09-13 15:44 [PATCH v4 0/3] vfio/sysbus-fdt: Prepare for Generic DT Pass-Through Geert Uytterhoeven
2018-09-13 15:44 ` [PATCH v4 1/3] vfio/platform: Make the vfio-platform device non-abstract Geert Uytterhoeven
2018-09-13 15:44 ` [PATCH v4 2/3] hw/arm/sysbus-fdt: Allow device matching with DT compatible value Geert Uytterhoeven
@ 2018-09-13 15:44 ` Geert Uytterhoeven
2018-09-19 9:34 ` Auger Eric
2 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2018-09-13 15:44 UTC (permalink / raw)
To: Peter Maydell, Alex Williamson
Cc: Auger Eric, Magnus Damm, Laurent Pinchart, Wolfram Sang,
Kieran Bingham, qemu-arm, qemu-devel, linux-renesas-soc,
Geert Uytterhoeven
Allow the instantation of generic dynamic vfio-platform devices again,
without the need to create a new device-specific vfio type.
This is more or less a partial revert of commit 6f2062b9758ebc64
("hw/arm/virt: Allow only supported dynamic sysbus devices").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v4:
- s/sysbus/vfio-platform/ in patch description,
v3:
- Drop RFC state,
v2:
- Restrict from TYPE_SYS_BUS_DEVICE to TYPE_VFIO_PLATFORM, as
suggested by Eric Auger.
---
hw/arm/virt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0b57f87abcbfd54b..e33f7776c72fa9d0 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1758,6 +1758,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
+ machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM);
mc->block_default_type = IF_VIRTIO;
mc->no_cdrom = 1;
mc->pci_allow_0_address = true;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v4 3/3] hw/arm/virt: Allow dynamic vfio-platform devices again
2018-09-13 15:44 ` [PATCH v4 3/3] hw/arm/virt: Allow dynamic vfio-platform devices again Geert Uytterhoeven
@ 2018-09-19 9:34 ` Auger Eric
0 siblings, 0 replies; 7+ messages in thread
From: Auger Eric @ 2018-09-19 9:34 UTC (permalink / raw)
To: Geert Uytterhoeven, Peter Maydell, Alex Williamson
Cc: Magnus Damm, Laurent Pinchart, Wolfram Sang, Kieran Bingham,
qemu-arm, qemu-devel, linux-renesas-soc
Hi Geert,
On 9/13/18 5:44 PM, Geert Uytterhoeven wrote:
> Allow the instantation of generic dynamic vfio-platform devices again,
> without the need to create a new device-specific vfio type.
>
> This is more or less a partial revert of commit 6f2062b9758ebc64
> ("hw/arm/virt: Allow only supported dynamic sysbus devices").
nit: his last sentence is arguable as before we allowed any sysbus
device dynamic instantiation. I would simply remove it.
Besides
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> v4:
> - s/sysbus/vfio-platform/ in patch description,
>
> v3:
> - Drop RFC state,
>
> v2:
> - Restrict from TYPE_SYS_BUS_DEVICE to TYPE_VFIO_PLATFORM, as
> suggested by Eric Auger.
> ---
> hw/arm/virt.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 0b57f87abcbfd54b..e33f7776c72fa9d0 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1758,6 +1758,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
> machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);
> machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
> machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
> + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM);
> mc->block_default_type = IF_VIRTIO;
> mc->no_cdrom = 1;
> mc->pci_allow_0_address = true;
>
^ permalink raw reply [flat|nested] 7+ messages in thread