From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=39486 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OPBc7-0003Io-Ti
	for qemu-devel@nongnu.org; Thu, 17 Jun 2010 05:42:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OPBc6-0000bg-4B
	for qemu-devel@nongnu.org; Thu, 17 Jun 2010 05:42:23 -0400
Received: from mx1.redhat.com ([209.132.183.28]:39847)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OPBc5-0000bW-Ts
	for qemu-devel@nongnu.org; Thu, 17 Jun 2010 05:42:22 -0400
Date: Thu, 17 Jun 2010 12:37:21 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20100617093721.GB7912@redhat.com>
References: <cover.1276755023.git.yamahata@valinux.co.jp>
	<81d134b49ddbd54e82648618c0ce4e4d11fb77c3.1276755023.git.yamahata@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <81d134b49ddbd54e82648618c0ce4e4d11fb77c3.1276755023.git.yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH 09/10] pci: set PCI multi-function bit
	appropriately.
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: stefano.stabellini@eu.citrix.com, jan.kiszka@siemens.com, allen.m.kay@intel.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, kraxel@redhat.com, jean.guyader@gmail.com

On Thu, Jun 17, 2010 at 03:15:51PM +0900, Isaku Yamahata wrote:
> set PCI multi-function bit appropriately.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> 
> ---
> changes v1 -> v2:
> don't set header type register in configuration space.
> ---
>  hw/pci.c |   25 +++++++++++++++++++++++++
>  1 files changed, 25 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index 5316aa5..ee391dc 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -607,6 +607,30 @@ static void pci_init_wmask_bridge(PCIDevice *d)
>      pci_set_word(d->wmask + PCI_BRIDGE_CONTROL, 0xffff);
>  }
>  
> +static void pci_init_multifunction(PCIBus *bus, PCIDevice *dev)
> +{
> +    uint8_t slot = PCI_SLOT(dev->devfn);
> +    uint8_t func_max = 8;

enum or define would be better

> +    uint8_t func;

If I understand correctly what this does, it goes over
other functions of the same device, and sets the MULTI_FUNCTION bit
for them if there's more than one function.
Instead, why don't we just set PCI_HEADER_TYPE_MULTI_FUNCTION
in relevant devices?

> +
> +    for (func = 0; func < func_max; ++func) {
> +        if (bus->devices[PCI_DEVFN(slot, func)]) {
> +            break;
> +        }
> +    }
> +    if (func == func_max) {
> +        return;
> +    }
> +

The above only works if the function is called before
device is added to bus.

> +    for (func = 0; func < func_max; ++func) {
> +        if (bus->devices[PCI_DEVFN(slot, func)]) {
> +            bus->devices[PCI_DEVFN(slot, func)]->config[PCI_HEADER_TYPE] |=
> +                PCI_HEADER_TYPE_MULTI_FUNCTION;
> +        }
> +    }
> +    dev->config[PCI_HEADER_TYPE] |= PCI_HEADER_TYPE_MULTI_FUNCTION;

Isn't the bit set above already?

> +}
> +
>  static void pci_config_alloc(PCIDevice *pci_dev)
>  {
>      int config_size = pci_config_size(pci_dev);
> @@ -660,6 +684,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
>      if (is_bridge) {
>          pci_init_wmask_bridge(pci_dev);
>      }
> +    pci_init_multifunction(bus, pci_dev);
>  
>      if (!config_read)
>          config_read = pci_default_read_config;
> -- 
> 1.6.6.1