Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 172d2d00 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Sync of_create_pci_dev() with drivers/pci/probe.c changes. 



Mirrors powerpc commits bb209c82
("powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()")
and 26b4a0ca
("powerpc/pci: Add missing hookup to pci_slot")

We also need to initialize ->dma_mask explicitly here too.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c2fcadc

arch/sparc/kernel/pci.c

+7 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
					 struct pci_bus *bus, int devfn)

{

	struct dev_archdata *sd;

	struct pci_slot *slot;

	struct of_device *op;

	struct pci_dev *dev;

	const char *type;
@@ -286,6 +287,11 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
	dev->dev.bus = &pci_bus_type;

	dev->devfn = devfn;

	dev->multifunction = 0;		/* maybe a lie? */

	set_pcie_port_type(dev);



	list_for_each_entry(slot, &dev->bus->slots, list)

		if (PCI_SLOT(dev->devfn) == slot->number)

			dev->slot = slot;



	dev->vendor = of_getintprop_default(node, "vendor-id", 0xffff);

	dev->device = of_getintprop_default(node, "device-id", 0xffff);
@@ -322,6 +328,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 


	dev->current_state = 4;		/* unknown power state */

	dev->error_state = pci_channel_io_normal;

	dev->dma_mask = 0xffffffff;



	if (!strcmp(node->name, "pci")) {

		/* a PCI-PCI bridge */