1 files changed, 36 insertions, 6 deletions

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index badf0951d73c..c2b202d763a1 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -245,6 +245,18 @@ static void pci_parse_of_addrs(struct platform_device *op,
         }
 }
 
+static void pci_init_dev_archdata(struct dev_archdata *sd, void *iommu,
+                                  void *stc, void *host_controller,
+                                  struct platform_device  *op,
+                                  int numa_node)
+{
+        sd->iommu = iommu;
+        sd->stc = stc;
+        sd->host_controller = host_controller;
+        sd->op = op;
+        sd->numa_node = numa_node;
+}
+
 static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
                                          struct device_node *node,
                                          struct pci_bus *bus, int devfn)
@@ -259,13 +271,10 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         if (!dev)
                 return NULL;
 
+        op = of_find_device_by_node(node);
         sd = &dev->dev.archdata;
-        sd->iommu = pbm->iommu;
-        sd->stc = &pbm->stc;
-        sd->host_controller = pbm;
-        sd->op = op = of_find_device_by_node(node);
-        sd->numa_node = pbm->numa_node;
-
+        pci_init_dev_archdata(sd, pbm->iommu, &pbm->stc, pbm, op,
+                              pbm->numa_node);
         sd = &op->dev.archdata;
         sd->iommu = pbm->iommu;
         sd->stc = &pbm->stc;
@@ -994,6 +1003,27 @@ void pcibios_set_master(struct pci_dev *dev)
         /* No special bus mastering setup handling */
 }
 
+#ifdef CONFIG_PCI_IOV
+int pcibios_add_device(struct pci_dev *dev)
+{
+        struct pci_dev *pdev;
+
+        /* Add sriov arch specific initialization here.
+         * Copy dev_archdata from PF to VF
+         */
+        if (dev->is_virtfn) {
+                struct dev_archdata *psd;
+
+                pdev = dev->physfn;
+                psd = &pdev->dev.archdata;
+                pci_init_dev_archdata(&dev->dev.archdata, psd->iommu,
+                                      psd->stc, psd->host_controller, NULL,
+                                      psd->numa_node);
+        }
+        return 0;
+}
+#endif /* CONFIG_PCI_IOV */
+
 static int __init pcibios_init(void)
 {
         pci_dfl_cache_line_size = 64 >> 2;