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

Commit e7c40012 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

[POWERPC] Fix pci_setup_phb_io_dynamic for pci_iomap 



We had a problem on a system with only dynamically allocated
PCI buses (using of_pci_phb_driver) in combination with libata.
This setup ended up having no "primary" phb, which means
that pci_io_base never got initialized and all IO port
numbers are 64 bit numbers, which is larger than the
PIO_MASK limit.

Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent bb5db29a

arch/powerpc/kernel/of_platform.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -433,7 +433,7 @@ static int __devinit of_pci_phb_probe(struct of_device *dev, 
	 * Note also that we don't do ISA, this will also be fixed with a

	 * Note also that we don't do ISA, this will also be fixed with a

	 * more massive rework.

	 * more massive rework.

	 */

	 */

	pci_setup_phb_io(phb, 0);

	pci_setup_phb_io(phb, pci_io_base == 0);





	/* Init pci_dn data structures */

	/* Init pci_dn data structures */

	pci_devs_phb_init_dynamic(phb);

	pci_devs_phb_init_dynamic(phb);