Re: [Qemu-devel] [RFC PATCH 3/4] hw/arm/sysbus-fdt: vfio device property for interrupts

2015-01-15 Thread Eric Auger 
Hi Baptiste
On 01/12/2015 02:21 PM, Baptiste Reynal wrote:
 Use the VFIO device property API to retrieve interrupt
 information (type and flags) during device node creation.
 
 Signed-off-by: Baptiste Reynal b.rey...@virtualopensystems.com
 ---
  hw/arm/sysbus-fdt.c | 26 ++
  1 file changed, 18 insertions(+), 8 deletions(-)
 
 diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
 index efdeea7..087e788 100644
 --- a/hw/arm/sysbus-fdt.c
 +++ b/hw/arm/sysbus-fdt.c
 @@ -31,6 +31,7 @@
  #include hw/vfio/vfio-pl330.h
  
  #include libfdt.h
 +#include linux/vfio.h
  
  /*
   * internal struct that contains the information to create dynamic
 @@ -66,7 +67,7 @@ typedef struct NodeCreationPair {
   * Helper function, generate interrupts property for a given node
might be worth adding something like based on host device tree node
   */
  static int set_interrupts_fdt_node(char *nodename, SysBusDevice *sbdev,
 -void *opaque, int type, int flags)
 +void *opaque)
  {
  PlatformBusFdtData *data = opaque;
  PlatformBusDevice *pbus = data-pbus;
 @@ -76,23 +77,32 @@ static int set_interrupts_fdt_node(char *nodename, 
 SysBusDevice *sbdev,
  int i, ret;
  VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev);
  VFIODevice *vbasedev = vdev-vbasedev;
 +struct vfio_dev_property *irq_prop;
 +
 +irq_prop = vfio_get_dev_property(vbasedev-fd, interrupts,
 +VFIO_DEV_PROPERTY_TYPE_U32);
 +
 +if (irq_prop == NULL) {
 +return -1;
 +}
  
  irq_attr = g_new(uint32_t, vbasedev-num_irqs*3);
  
  for (i = 0; i  vbasedev-num_irqs; i++) {
  irq_number = platform_bus_get_irqn(pbus, sbdev , i)
   + data-irq_start;
 -irq_attr[3*i] = cpu_to_be32(type);
 +irq_attr[3*i] = cpu_to_be32(((__u32 *) irq_prop-data)[3*i]);
  irq_attr[3*i+1] = cpu_to_be32(irq_number);
 -irq_attr[3*i+2] = cpu_to_be32(flags);
 +irq_attr[3*i+2] = cpu_to_be32(((__u32 *) irq_prop-data)[3*i+2]);
  }
  
 -   ret = qemu_fdt_setprop(fdt, nodename, interrupts,
 - irq_attr, vbasedev-num_irqs*3*sizeof(uint32_t));
 +ret = qemu_fdt_setprop(fdt, nodename, interrupts,
 +irq_attr, vbasedev-num_irqs*3*sizeof(uint32_t));
delta may be removed?
  
  g_free(irq_attr);
 +g_free(irq_prop);
  
 -   return ret;
 +return ret;
delta may be removed?
Best Regards
Eric
  }
  
  /**
 @@ -168,7 +178,7 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice 
 *sbdev, void *opaque)
  goto fail;
  }
  
 -ret = set_interrupts_fdt_node(nodename, sbdev, opaque, 0, 0x4);
 +ret = set_interrupts_fdt_node(nodename, sbdev, opaque);
  
  if (ret  0) {
  error_report(could not set interrupts property of node %s,
 @@ -248,7 +258,7 @@ static int add_arm_pl330_fdt_node(SysBusDevice *sbdev, 
 void *opaque)
  goto fail;
  }
  
 -ret = set_interrupts_fdt_node(nodename, sbdev, opaque, 0, 0x4);
 +ret = set_interrupts_fdt_node(nodename, sbdev, opaque);
  
  if (ret  0) {
  error_report(could not set interrupts property of node %s,

[Qemu-devel] [RFC PATCH 3/4] hw/arm/sysbus-fdt: vfio device property for interrupts

2015-01-12 Thread Baptiste Reynal 
Use the VFIO device property API to retrieve interrupt
information (type and flags) during device node creation.

Signed-off-by: Baptiste Reynal b.rey...@virtualopensystems.com
---
 hw/arm/sysbus-fdt.c | 26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index efdeea7..087e788 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -31,6 +31,7 @@
 #include hw/vfio/vfio-pl330.h
 
 #include libfdt.h
+#include linux/vfio.h
 
 /*
  * internal struct that contains the information to create dynamic
@@ -66,7 +67,7 @@ typedef struct NodeCreationPair {
  * Helper function, generate interrupts property for a given node
  */
 static int set_interrupts_fdt_node(char *nodename, SysBusDevice *sbdev,
-void *opaque, int type, int flags)
+void *opaque)
 {
 PlatformBusFdtData *data = opaque;
 PlatformBusDevice *pbus = data-pbus;
@@ -76,23 +77,32 @@ static int set_interrupts_fdt_node(char *nodename, 
SysBusDevice *sbdev,
 int i, ret;
 VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev);
 VFIODevice *vbasedev = vdev-vbasedev;
+struct vfio_dev_property *irq_prop;
+
+irq_prop = vfio_get_dev_property(vbasedev-fd, interrupts,
+VFIO_DEV_PROPERTY_TYPE_U32);
+
+if (irq_prop == NULL) {
+return -1;
+}
 
 irq_attr = g_new(uint32_t, vbasedev-num_irqs*3);
 
 for (i = 0; i  vbasedev-num_irqs; i++) {
 irq_number = platform_bus_get_irqn(pbus, sbdev , i)
  + data-irq_start;
-irq_attr[3*i] = cpu_to_be32(type);
+irq_attr[3*i] = cpu_to_be32(((__u32 *) irq_prop-data)[3*i]);
 irq_attr[3*i+1] = cpu_to_be32(irq_number);
-irq_attr[3*i+2] = cpu_to_be32(flags);
+irq_attr[3*i+2] = cpu_to_be32(((__u32 *) irq_prop-data)[3*i+2]);
 }
 
-   ret = qemu_fdt_setprop(fdt, nodename, interrupts,
- irq_attr, vbasedev-num_irqs*3*sizeof(uint32_t));
+ret = qemu_fdt_setprop(fdt, nodename, interrupts,
+irq_attr, vbasedev-num_irqs*3*sizeof(uint32_t));
 
 g_free(irq_attr);
+g_free(irq_prop);
 
-   return ret;
+return ret;
 }
 
 /**
@@ -168,7 +178,7 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice 
*sbdev, void *opaque)
 goto fail;
 }
 
-ret = set_interrupts_fdt_node(nodename, sbdev, opaque, 0, 0x4);
+ret = set_interrupts_fdt_node(nodename, sbdev, opaque);
 
 if (ret  0) {
 error_report(could not set interrupts property of node %s,
@@ -248,7 +258,7 @@ static int add_arm_pl330_fdt_node(SysBusDevice *sbdev, void 
*opaque)
 goto fail;
 }
 
-ret = set_interrupts_fdt_node(nodename, sbdev, opaque, 0, 0x4);
+ret = set_interrupts_fdt_node(nodename, sbdev, opaque);
 
 if (ret  0) {
 error_report(could not set interrupts property of node %s,
-- 
2.2.1