WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] [PATCH 06/14] xen: events: refactor GSI pirq bindings fu

To: Ian Campbell <ian.campbell@xxxxxxxxxx>
Subject: Re: [Xen-devel] [PATCH 06/14] xen: events: refactor GSI pirq bindings functions
From: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Date: Wed, 9 Mar 2011 23:00:42 -0500
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>
Delivery-date: Wed, 09 Mar 2011 20:02:14 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <1299692486-28634-6-git-send-email-ian.campbell@xxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <1299692459.17339.700.camel@xxxxxxxxxxxxxxxxxxxxxx> <1299692486-28634-6-git-send-email-ian.campbell@xxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.20 (2009-06-14)
On Wed, Mar 09, 2011 at 05:41:18PM +0000, Ian Campbell wrote:
> Following the example set by xen_allocate_pirq_msi and
> xen_bind_pirq_msi_to_irq:
> 
> xen_allocate_pirq becomes xen_allocate_pirq_gsi and now only allocates
> a pirq number and does not bind it.
> 
> xen_map_pirq_gsi becomes xen_bind_pirq_gsi_to_irq and binds an
> existing pirq.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> ---
>  arch/x86/pci/xen.c   |   40 ++++++++++++++++++++++++++++------------
>  drivers/xen/events.c |    7 ++++---
>  include/xen/events.h |   10 +++++++---
>  3 files changed, 39 insertions(+), 18 deletions(-)
> 
> diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
> index 8c4085a..b0fb79d 100644
> --- a/arch/x86/pci/xen.c
> +++ b/arch/x86/pci/xen.c
> @@ -50,7 +50,7 @@ static int acpi_register_gsi_xen_hvm(struct device *dev, 
> u32 gsi,
>               name = "ioapic-level";
>       }
>  
> -     irq = xen_map_pirq_gsi(map_irq.pirq, gsi, shareable, name);
> +     irq = xen_bind_pirq_gsi_to_irq(gsi, map_irq.pirq, shareable, name);
>  
>       printk(KERN_DEBUG "xen: --> irq=%d, pirq=%d\n", irq, map_irq.pirq);
>  
> @@ -237,6 +237,7 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
>  {
>       int rc;
>       int share = 1;
> +     int pirq;
>       u8 gsi;
>  
>       rc = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi);
> @@ -246,13 +247,21 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
>               return rc;
>       }
>  
> +     rc = xen_allocate_pirq_gsi(gsi);
> +     if (rc < 0) {
> +             dev_warn(&dev->dev, "Xen PCI: failed to allocate a PIRQ for 
> GSI%d: %d\n",
> +                      gsi, rc);
> +             return rc;
> +     }
> +     pirq = rc;
> +
>       if (gsi < NR_IRQS_LEGACY)
>               share = 0;
>  
> -     rc = xen_allocate_pirq(gsi, share, "pcifront");
> +     rc = xen_bind_pirq_gsi_to_irq(gsi, pirq, share, "pcifront");
>       if (rc < 0) {
> -             dev_warn(&dev->dev, "Xen PCI: failed to register GSI%d: %d\n",
> -                      gsi, rc);
> +             dev_warn(&dev->dev, "Xen PCI: failed to bind GSI%d (PIRQ%d) to 
> IRQ: %d\n",
> +                      gsi, pirq, rc);
>               return rc;
>       }
>  
> @@ -309,7 +318,7 @@ int __init pci_xen_hvm_init(void)
>  #ifdef CONFIG_XEN_DOM0
>  static int xen_register_pirq(u32 gsi, int triggering)
>  {
> -     int rc, irq;
> +     int rc, pirq, irq = -1;
>       struct physdev_map_pirq map_irq;
>       int shareable = 0;
>       char *name;
> @@ -325,17 +334,20 @@ static int xen_register_pirq(u32 gsi, int triggering)
>               name = "ioapic-level";
>       }
>  
> -     irq = xen_allocate_pirq(gsi, shareable, name);
> -
> -     printk(KERN_DEBUG "xen: --> irq=%d\n", irq);
> +     pirq = xen_allocate_pirq_gsi(gsi);
> +     if (pirq < 0)
> +             goto out;
>  
> +     irq = xen_bind_pirq_gsi_to_irq(gsi, pirq, shareable, name);
>       if (irq < 0)
>               goto out;
>  
> +     printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d\n", pirq, irq);
> +
>       map_irq.domid = DOMID_SELF;
>       map_irq.type = MAP_PIRQ_TYPE_GSI;
>       map_irq.index = gsi;
> -     map_irq.pirq = irq;
> +     map_irq.pirq = pirq;
>  
>       rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
>       if (rc) {
> @@ -422,13 +434,17 @@ static int __init pci_xen_initial_domain(void)
>  
>  void __init xen_setup_pirqs(void)
>  {
> -     int irq;
> +     int pirq, irq;
>  
>       pci_xen_initial_domain();
>  
>       if (0 == nr_ioapics) {
> -             for (irq = 0; irq < NR_IRQS_LEGACY; irq++)
> -                     xen_allocate_pirq(irq, 0, "xt-pic");
> +             for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
> +                     pirq = xen_allocate_pirq_gsi(irq);
> +                     if (pirq < 0)
> +                             break;

Would it make sense to print a warning here?

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>