From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:45760)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UDfsQ-0001lQ-El
	for qemu-devel@nongnu.org; Thu, 07 Mar 2013 13:49:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UDfsN-0007gH-FI
	for qemu-devel@nongnu.org; Thu, 07 Mar 2013 13:49:14 -0500
Received: from mx1.redhat.com ([209.132.183.28]:48094)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UDfsN-0007gC-7A
	for qemu-devel@nongnu.org; Thu, 07 Mar 2013 13:49:11 -0500
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r27InAK0010271
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 7 Mar 2013 13:49:10 -0500
Date: Thu, 7 Mar 2013 20:49:30 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20130307184930.GB31034@redhat.com>
References: <20130307182932.22161.62817.stgit@bling.home>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130307182932.22161.62817.stgit@bling.home>
Subject: Re: [Qemu-devel] [PATCH] xio3130: Add map_irq functions
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: qemu-devel@nongnu.org

On Thu, Mar 07, 2013 at 11:29:46AM -0700, Alex Williamson wrote:
> Just like root ports, I think these are supposed to be direct mapped.
> 
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Hmm, very strange. Why not using standard pci bridge logic?
Any idea?

> ---
>  hw/xio3130_downstream.c |    7 +++++++
>  hw/xio3130_upstream.c   |    7 +++++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/hw/xio3130_downstream.c b/hw/xio3130_downstream.c
> index 7f00bc8..c484770 100644
> --- a/hw/xio3130_downstream.c
> +++ b/hw/xio3130_downstream.c
> @@ -54,6 +54,11 @@ static void xio3130_downstream_reset(DeviceState *qdev)
>      pci_bridge_reset(qdev);
>  }
>  
> +static int xio3130_downstream_map_irq(PCIDevice *pci_dev, int irq_num)
> +{
> +    return irq_num;
> +}
> +
>  static int xio3130_downstream_initfn(PCIDevice *d)
>  {
>      PCIBridge* br = DO_UPCAST(PCIBridge, dev, d);
> @@ -61,6 +66,8 @@ static int xio3130_downstream_initfn(PCIDevice *d)
>      PCIESlot *s = DO_UPCAST(PCIESlot, port, p);
>      int rc;
>  
> +    pci_bridge_map_irq(br, NULL, xio3130_downstream_map_irq);
> +
>      rc = pci_bridge_initfn(d);
>      if (rc < 0) {
>          return rc;
> diff --git a/hw/xio3130_upstream.c b/hw/xio3130_upstream.c
> index 70b15d3..c233a43 100644
> --- a/hw/xio3130_upstream.c
> +++ b/hw/xio3130_upstream.c
> @@ -51,12 +51,19 @@ static void xio3130_upstream_reset(DeviceState *qdev)
>      pcie_cap_deverr_reset(d);
>  }
>  
> +static int xio3130_upstream_map_irq(PCIDevice *pci_dev, int irq_num)
> +{
> +    return irq_num;
> +}
> +
>  static int xio3130_upstream_initfn(PCIDevice *d)
>  {
>      PCIBridge* br = DO_UPCAST(PCIBridge, dev, d);
>      PCIEPort *p = DO_UPCAST(PCIEPort, br, br);
>      int rc;
>  
> +    pci_bridge_map_irq(br, NULL, xio3130_upstream_map_irq);
> +
>      rc = pci_bridge_initfn(d);
>      if (rc < 0) {
>          return rc;