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

Commit 040a2b6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix booting on V100 systems.
parents 532df780 2cc7345f

arch/sparc64/kernel/pci.c

+12 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm, 
{

	struct device_node *child;

	const u32 *reg;

	int reglen, devfn;

	int reglen, devfn, prev_devfn;

	struct pci_dev *dev;



	if (ofpci_verbose)
@@ -752,14 +752,25 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm, 
		       node->full_name, bus->number);



	child = NULL;

	prev_devfn = -1;

	while ((child = of_get_next_child(node, child)) != NULL) {

		if (ofpci_verbose)

			printk("  * %s\n", child->full_name);

		reg = of_get_property(child, "reg", &reglen);

		if (reg == NULL || reglen < 20)

			continue;



		devfn = (reg[0] >> 8) & 0xff;



		/* This is a workaround for some device trees

		 * which list PCI devices twice.  On the V100

		 * for example, device number 3 is listed twice.

		 * Once as "pm" and once again as "lomp".

		 */

		if (devfn == prev_devfn)

			continue;

		prev_devfn = devfn;



		/* create a new pci_dev for this device */

		dev = of_create_pci_dev(pbm, child, bus, devfn, 0);

		if (!dev)