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

Commit d1109b75 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc/pci: Make IO workarounds init implicit when first bus is registered 



Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 3cc30d07

arch/powerpc/include/asm/io-workarounds.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct iowa_bus { 
	void   *private;

};



void __devinit io_workaround_init(void);

void __devinit iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,

				 int (*)(struct iowa_bus *, void *), void *);

struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR);

arch/powerpc/kernel/io-workarounds.c

+15 −12
Original line number Diff line number Diff line
@@ -144,7 +144,19 @@ static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size, 
	return res;

}



/* Regist new bus to support workaround */

/* Enable IO workaround */

static void __devinit io_workaround_init(void)

{

	static int io_workaround_inited;



	if (io_workaround_inited)

		return;

	ppc_pci_io = iowa_pci_io;

	ppc_md.ioremap = iowa_ioremap;

	io_workaround_inited = 1;

}



/* Register new bus to support workaround */

void __devinit iowa_register_bus(struct pci_controller *phb,

			struct ppc_pci_io *ops,

			int (*initfunc)(struct iowa_bus *, void *), void *data)
@@ -152,6 +164,8 @@ void __devinit iowa_register_bus(struct pci_controller *phb, 
	struct iowa_bus *bus;

	struct device_node *np = phb->dn;



	io_workaround_init();



	if (iowa_bus_count >= IOWA_MAX_BUS) {

		pr_err("IOWA:Too many pci bridges, "

		       "workarounds disabled for %s\n", np->full_name);
@@ -171,14 +185,3 @@ void __devinit iowa_register_bus(struct pci_controller *phb, 
	pr_debug("IOWA:[%d]Add bus, %s.\n", iowa_bus_count-1, np->full_name);

}

/* enable IO workaround */

void __devinit io_workaround_init(void)

{

	static int io_workaround_inited;



	if (io_workaround_inited)

		return;

	ppc_pci_io = iowa_pci_io;

	ppc_md.ioremap = iowa_ioremap;

	io_workaround_inited = 1;

}

arch/powerpc/platforms/cell/celleb_pci.c

+5 −13
Original line number Diff line number Diff line
@@ -468,18 +468,6 @@ static struct of_device_id celleb_phb_match[] __initdata = { 
	},

};



static int __init celleb_io_workaround_init(struct pci_controller *phb,

					    struct celleb_phb_spec *phb_spec)

{

	if (phb_spec->ops) {

		iowa_register_bus(phb, phb_spec->ops, phb_spec->iowa_init,

				  phb_spec->iowa_data);

		io_workaround_init();

	}



	return 0;

}



int __init celleb_setup_phb(struct pci_controller *phb)

{

	struct device_node *dev = phb->dn;
@@ -499,7 +487,11 @@ int __init celleb_setup_phb(struct pci_controller *phb) 
	if (rc)

		return 1;



	return celleb_io_workaround_init(phb, phb_spec);

	if (phb_spec->ops)

		iowa_register_bus(phb, phb_spec->ops,

				  phb_spec->iowa_init,

				  phb_spec->iowa_data);

	return 0;

}



int celleb_pci_probe_mode(struct pci_bus *bus)

arch/powerpc/platforms/cell/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ static int __devinit cell_setup_phb(struct pci_controller *phb) 


	iowa_register_bus(phb, &spiderpci_ops, &spiderpci_iowa_init,

				  (void *)SPIDER_PCI_REG_BASE);

	io_workaround_init();



	return 0;

}