From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57718)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Zo6JU-0001ti-8K
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 05:01:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Zo6JR-0003xQ-3C
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 05:01:04 -0400
Received: from mx1.redhat.com ([209.132.183.28]:34920)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Zo6JQ-0003xM-TM
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 05:01:01 -0400
References: <1444837878-11602-1-git-send-email-knut.omang@oracle.com>
	<1444837878-11602-3-git-send-email-knut.omang@oracle.com>
	<56237C62.3050909@gmail.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <5624B145.60507@redhat.com>
Date: Mon, 19 Oct 2015 11:00:53 +0200
MIME-Version: 1.0
In-Reply-To: <56237C62.3050909@gmail.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v5 2/4] pcie: Add support for Single Root
 I/O Virtualization (SR/IOV)
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: marcel@redhat.com, Knut Omang <knut.omang@oracle.com>, qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Richard W.M. Jones" <rjones@redhat.com>, Alex Williamson <alex.williamson@redhat.com>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, Jan Kiszka <jan.kiszka@web.de>, Dotan Barak <dotanba@gmail.com>, Richard Henderson <rth@twiddle.net>



On 18/10/2015 13:02, Marcel Apfelbaum wrote:
> 
> +    pci_device_deassert_intx(dev);
> +    assert(dev->irq_state == 0);
> +
> +    /* Clear all writable bits */
> +    pci_word_test_and_clear_mask(dev->config + PCI_COMMAND,
> +                                 pci_get_word(dev->wmask + PCI_COMMAND) |
> +                                 pci_get_word(dev->w1cmask +
> PCI_COMMAND));
> +    pci_word_test_and_clear_mask(dev->config + PCI_STATUS,
> +                                 pci_get_word(dev->wmask + PCI_STATUS) |
> +                                 pci_get_word(dev->w1cmask + PCI_STATUS));
> +    dev->config[PCI_CACHE_LINE_SIZE] = 0x0;
> +    dev->config[PCI_INTERRUPT_LINE] = 0x0;
> +    pci_reset_regions(dev);
> +    pci_update_mappings(dev);
> +
> +    msi_reset(dev);
> +    msix_reset(dev);

All this should stay in pci_do_device_reset.  Of course it's okay to
split the PF-specific parts to pci_reset_regions.

Paolo