Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751309Ab3E3XWr (ORCPT ); Thu, 30 May 2013 19:22:47 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:32982 "EHLO mail-ob0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750865Ab3E3XWh (ORCPT ); Thu, 30 May 2013 19:22:37 -0400 MIME-Version: 1.0 In-Reply-To: References: <1369892734-26244-1-git-send-email-xudong.hao@intel.com> From: Bjorn Helgaas Date: Thu, 30 May 2013 17:22:17 -0600 Message-ID: Subject: Re: [PATCH] PCI: set correct value for iov device before device To: Yinghai Lu Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , Xudong Hao , Jiang Liu , Yijing Wang Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3212 Lines: 81 On Thu, May 30, 2013 at 2:27 PM, Yinghai Lu wrote: > On Wed, May 29, 2013 at 11:04 PM, Yinghai Lu wrote: >> On Wed, May 29, 2013 at 10:45 PM, Xudong Hao wrote: >>> Since device registering is put into pci_device_add(), it must set value of >>> Virtual Function device's member before the pci_dev is put to device tree. Or >>> some relevant subsystem of driver model such as xen will report a incorrect >>> IOV device to Xen hypervior. >>> >>> Signed-off-by: Xudong Hao >>> --- >>> drivers/pci/iov.c | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c >>> index c93071d..43d3de9 100644 >>> --- a/drivers/pci/iov.c >>> +++ b/drivers/pci/iov.c >>> @@ -110,12 +110,12 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset) >>> if (reset) >>> __pci_reset_function(virtfn); >>> >>> - pci_device_add(virtfn, virtfn->bus); >>> - mutex_unlock(&iov->dev->sriov->lock); >>> - >>> virtfn->physfn = pci_dev_get(dev); >>> virtfn->is_virtfn = 1; >>> >>> + pci_device_add(virtfn, virtfn->bus); >>> + mutex_unlock(&iov->dev->sriov->lock); >>> + >>> rc = pci_bus_add_device(virtfn); >>> sprintf(buf, "virtfn%u", id); >>> rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf); >> >> I have similar patch at >> https://patchwork.kernel.org/patch/2562551/ >> [5/7] PCI, ACPI: Don't glue ACPI dev with pci VFs >> >> and Jiang has another one >> https://patchwork.kernel.org/patch/2613481/ >> [v3,part1,10/10] PCI, IOV: hide remove and rescan sysfs interfaces >> for SR-IOV virtual functions > > Bjorn, > > I double check this one, we should split the patch from me or Jiang. I don't know what the sentence above means. > and the one about set virtfn=1 should be -stable material. I assume you mean that Jiang's "[v3,part1,10/10] PCI, IOV: hide remove and rescan sysfs interfaces for SR-IOV virtual functions" patch does not need to be in v3.10, but it should be marked for -stable. How far back should it go? v3.9+? > That will address another problem that is caused by > moving device_add from pci_bus_add_device to pci_device_add. I assume you're talking about a problem caused by 4f535093 ("PCI: Put pci_dev in device tree as early as possible"). That commit appeared in v3.9. If we're asking to add the "hide remove and rescan sysfs interfaces" patch to the v3.9 stable series, we should have a description of exactly what problem it fixes, and ideally, a bugzilla for it. Can you provide that? That patch appears to be the only one in the [v3,part1,0/10] series that actually directly fixes an issue, so it would be nice to have more specifics in that changelog to begin with. The other patches in that series appear to to be cleanups and preparation for the real fixes that will come later. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/