| Message ID | 20150805092533.GC6092@arm.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, Aug 5, 2015 at 4:25 AM, Will Deacon <will.deacon@arm.com> wrote: > On Wed, Aug 05, 2015 at 10:23:18AM +0100, Will Deacon wrote: >> That said, I just tried to build this and it fails to compile the x-gene >> PCI host driver. Fixup below. > > Wait, there's more! Thanks! I fixed these two and updated pci/enumeration. But the 0-day build also found this: commit: cc44fbb49d995ad2348d530300abf7877105094f [4/13] ARM/PCI, designware, xilinx: Use pci_scan_root_bus_msi() drivers/built-in.o: In function `dw_msi_setup_irq': >> :(.text+0x2a3c8): undefined reference to `pci_write_msi_msg' I don't see the problem there yet, and I'm going on vacation until Monday, so I won't be able to do anything with this until then. Bjorn > diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c > index 514f41b86c49..8ab3bd098424 100644 > --- a/drivers/pci/host/pci-xgene.c > +++ b/drivers/pci/host/pci-xgene.c > @@ -506,7 +506,7 @@ static int xgene_pcie_msi_enable(struct xgene_pcie_port *port) > { > struct device_node *msi_node; > > - msi_node = of_parse_phandle(port->dev.of_node, "msi-parent", 0); > + msi_node = of_parse_phandle(port->dev->of_node, "msi-parent", 0); > if (!msi_node) > return -ENODEV; > > @@ -515,7 +515,7 @@ static int xgene_pcie_msi_enable(struct xgene_pcie_port *port) > return -ENODEV; > > of_node_put(msi_node); > - port->msi->dev = &port->dev; > + port->msi->dev = port->dev; > return 0; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index 514f41b86c49..8ab3bd098424 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -506,7 +506,7 @@ static int xgene_pcie_msi_enable(struct xgene_pcie_port *port) { struct device_node *msi_node; - msi_node = of_parse_phandle(port->dev.of_node, "msi-parent", 0); + msi_node = of_parse_phandle(port->dev->of_node, "msi-parent", 0); if (!msi_node) return -ENODEV; @@ -515,7 +515,7 @@ static int xgene_pcie_msi_enable(struct xgene_pcie_port *port) return -ENODEV; of_node_put(msi_node); - port->msi->dev = &port->dev; + port->msi->dev = port->dev; return 0; }