| Message ID | 20190821035315.12812-1-sstabellini@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4,1/8] xen/arm: introduce handle_device_interrupts | expand |
Hi Stefano, On 8/21/19 4:53 AM, Stefano Stabellini wrote: > Move the interrupt handling code out of handle_device to a new function > so that it can be reused for dom0less VMs (it will be used in later > patches). > > Signed-off-by: Stefano Stabellini <stefanos@xilinx.com> Acked-by: Julien Grall <julien.grall@arm.com> Cheers, > --- > Changes in v4: > - rename handle_interrupts to handle_device_interrupts > - improve in-code comment > - remove return 1 if mapping is done > - use unsigned > > Changes in v3: > - add patch > > The diff is hard to read but I just moved the interrupts related code > from handle_devices to a new function handle_device_interrupts, and very > little else. > --- > xen/arch/arm/domain_build.c | 80 +++++++++++++++++++++++-------------- > 1 file changed, 51 insertions(+), 29 deletions(-) > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index 4c8404155a..f92069c85f 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -1220,41 +1220,22 @@ static int __init map_device_children(struct domain *d, > } > > /* > - * For a given device node: > - * - Give permission to the guest to manage IRQ and MMIO range > - * - Retrieve the IRQ configuration (i.e edge/level) from device tree > - * When the device is not marked for guest passthrough: > - * - Assign the device to the guest if it's protected by an IOMMU > - * - Map the IRQs and iomem regions to DOM0 > + * handle_device_interrupts retrieves the interrupts configuration from > + * a device tree node and maps those interrupts to the target domain. > + * > + * Returns: > + * < 0 error > + * 0 success > */ > -static int __init handle_device(struct domain *d, struct dt_device_node *dev, > - p2m_type_t p2mt) > +static int __init handle_device_interrupts(struct domain *d, > + struct dt_device_node *dev, > + bool need_mapping) > { > - unsigned int nirq; > - unsigned int naddr; > - unsigned int i; > + unsigned int i, nirq; > int res; > struct dt_raw_irq rirq; > - u64 addr, size; > - bool need_mapping = !dt_device_for_passthrough(dev); > > nirq = dt_number_of_irq(dev); > - naddr = dt_number_of_address(dev); > - > - dt_dprintk("%s passthrough = %d nirq = %d naddr = %u\n", > - dt_node_full_name(dev), need_mapping, nirq, naddr); > - > - if ( dt_device_is_protected(dev) && need_mapping ) > - { > - dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); > - res = iommu_assign_dt_device(d, dev); > - if ( res ) > - { > - printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", > - dt_node_full_name(dev)); > - return res; > - } > - } > > /* Give permission and map IRQs */ > for ( i = 0; i < nirq; i++ ) > @@ -1291,6 +1272,47 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, > return res; > } > > + return 0; > +} > + > +/* > + * For a given device node: > + * - Give permission to the guest to manage IRQ and MMIO range > + * - Retrieve the IRQ configuration (i.e edge/level) from device tree > + * When the device is not marked for guest passthrough: > + * - Assign the device to the guest if it's protected by an IOMMU > + * - Map the IRQs and iomem regions to DOM0 > + */ > +static int __init handle_device(struct domain *d, struct dt_device_node *dev, > + p2m_type_t p2mt) > +{ > + unsigned int naddr; > + unsigned int i; > + int res; > + u64 addr, size; > + bool need_mapping = !dt_device_for_passthrough(dev); > + > + naddr = dt_number_of_address(dev); > + > + dt_dprintk("%s passthrough = %d naddr = %u\n", > + dt_node_full_name(dev), need_mapping, naddr); > + > + if ( dt_device_is_protected(dev) && need_mapping ) > + { > + dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); > + res = iommu_assign_dt_device(d, dev); > + if ( res ) > + { > + printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", > + dt_node_full_name(dev)); > + return res; > + } > + } > + > + res = handle_device_interrupts(d, dev, need_mapping); > + if ( res < 0 ) > + return res; > + > /* Give permission and map MMIOs */ > for ( i = 0; i < naddr; i++ ) > { >
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4c8404155a..f92069c85f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1220,41 +1220,22 @@ static int __init map_device_children(struct domain *d, } /* - * For a given device node: - * - Give permission to the guest to manage IRQ and MMIO range - * - Retrieve the IRQ configuration (i.e edge/level) from device tree - * When the device is not marked for guest passthrough: - * - Assign the device to the guest if it's protected by an IOMMU - * - Map the IRQs and iomem regions to DOM0 + * handle_device_interrupts retrieves the interrupts configuration from + * a device tree node and maps those interrupts to the target domain. + * + * Returns: + * < 0 error + * 0 success */ -static int __init handle_device(struct domain *d, struct dt_device_node *dev, - p2m_type_t p2mt) +static int __init handle_device_interrupts(struct domain *d, + struct dt_device_node *dev, + bool need_mapping) { - unsigned int nirq; - unsigned int naddr; - unsigned int i; + unsigned int i, nirq; int res; struct dt_raw_irq rirq; - u64 addr, size; - bool need_mapping = !dt_device_for_passthrough(dev); nirq = dt_number_of_irq(dev); - naddr = dt_number_of_address(dev); - - dt_dprintk("%s passthrough = %d nirq = %d naddr = %u\n", - dt_node_full_name(dev), need_mapping, nirq, naddr); - - if ( dt_device_is_protected(dev) && need_mapping ) - { - dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); - res = iommu_assign_dt_device(d, dev); - if ( res ) - { - printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", - dt_node_full_name(dev)); - return res; - } - } /* Give permission and map IRQs */ for ( i = 0; i < nirq; i++ ) @@ -1291,6 +1272,47 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, return res; } + return 0; +} + +/* + * For a given device node: + * - Give permission to the guest to manage IRQ and MMIO range + * - Retrieve the IRQ configuration (i.e edge/level) from device tree + * When the device is not marked for guest passthrough: + * - Assign the device to the guest if it's protected by an IOMMU + * - Map the IRQs and iomem regions to DOM0 + */ +static int __init handle_device(struct domain *d, struct dt_device_node *dev, + p2m_type_t p2mt) +{ + unsigned int naddr; + unsigned int i; + int res; + u64 addr, size; + bool need_mapping = !dt_device_for_passthrough(dev); + + naddr = dt_number_of_address(dev); + + dt_dprintk("%s passthrough = %d naddr = %u\n", + dt_node_full_name(dev), need_mapping, naddr); + + if ( dt_device_is_protected(dev) && need_mapping ) + { + dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); + res = iommu_assign_dt_device(d, dev); + if ( res ) + { + printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", + dt_node_full_name(dev)); + return res; + } + } + + res = handle_device_interrupts(d, dev, need_mapping); + if ( res < 0 ) + return res; + /* Give permission and map MMIOs */ for ( i = 0; i < naddr; i++ ) {
Move the interrupt handling code out of handle_device to a new function so that it can be reused for dom0less VMs (it will be used in later patches). Signed-off-by: Stefano Stabellini <stefanos@xilinx.com> --- Changes in v4: - rename handle_interrupts to handle_device_interrupts - improve in-code comment - remove return 1 if mapping is done - use unsigned Changes in v3: - add patch The diff is hard to read but I just moved the interrupts related code from handle_devices to a new function handle_device_interrupts, and very little else. --- xen/arch/arm/domain_build.c | 80 +++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 29 deletions(-)